From caf7770956a99d793f5297be9b868fdbd9176403 Mon Sep 17 00:00:00 2001 From: twojstaryzdomu Date: Wed, 27 Apr 2022 14:29:34 +0200 Subject: [PATCH] Added Debian package build configuration --- debian/compat | 1 + debian/control | 16 +++++++++ debian/patches/disable_reconfigure_req.diff | 38 +++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 3 ++ debian/watch | 3 ++ options.c | 2 ++ 7 files changed, 64 insertions(+) create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/patches/disable_reconfigure_req.diff create mode 100644 debian/patches/series create mode 100644 debian/rules create mode 100644 debian/watch diff --git a/debian/compat b/debian/compat new file mode 100644 index 000000000..b4de39476 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +11 diff --git a/debian/control b/debian/control new file mode 100644 index 000000000..39d8275bc --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: rsync +Section: unknown +Priority: optional +Maintainer: unknown +Build-Depends: debhelper (>= 11) +Standards-Version: 4.1.3 +Homepage: https://github.com/twojstaryzdomu/rsync +Vcs-Git: https://github.com/twojstaryzdomu/rsync.git +Vcs-Browser: https://github.com/twojstaryzdomu/rsync + + +Package: rsync +Section: unknown +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: rsync description diff --git a/debian/patches/disable_reconfigure_req.diff b/debian/patches/disable_reconfigure_req.diff new file mode 100644 index 000000000..1dce71069 --- /dev/null +++ b/debian/patches/disable_reconfigure_req.diff @@ -0,0 +1,38 @@ +diff --git a/Makefile.in b/Makefile.in +index 3cde955..ef71d7e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -210,15 +210,6 @@ configure.sh config.h.in: configure.ac aclocal.m4 + else \ + echo "config.h.in has CHANGED."; \ + fi +- @if test -f configure.sh.old || test -f config.h.in.old; then \ +- if test "$(MAKECMDGOALS)" = reconfigure; then \ +- echo 'Continuing with "make reconfigure".'; \ +- else \ +- echo 'You may need to run:'; \ +- echo ' make reconfigure'; \ +- exit 1; \ +- fi \ +- fi + + .PHONY: reconfigure + reconfigure: configure.sh +@@ -232,17 +223,6 @@ restatus: + Makefile: Makefile.in config.status configure.sh config.h.in + @if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi + @./config.status +- @if diff Makefile Makefile.old >/dev/null 2>&1; then \ +- echo "Makefile is unchanged."; \ +- rm Makefile.old; \ +- else \ +- if test "$(MAKECMDGOALS)" = reconfigure; then \ +- echo 'Continuing with "make reconfigure".'; \ +- else \ +- echo "Makefile updated -- rerun your make command."; \ +- exit 1; \ +- fi \ +- fi + + stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile + sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..0a5931483 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +disable_reconfigure_req.diff diff --git a/debian/rules b/debian/rules new file mode 100644 index 000000000..cbe925d75 --- /dev/null +++ b/debian/rules @@ -0,0 +1,3 @@ +#!/usr/bin/make -f +%: + dh $@ diff --git a/debian/watch b/debian/watch new file mode 100644 index 000000000..6c67a454c --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/rsync-$1\.tar\.gz/ \ + https://github.com/twojstaryzdomu/rsync/releases .*/v?(\d\S+)\.tar\.gz diff --git a/options.c b/options.c index bd0077fde..6885c6b0d 100644 --- a/options.c +++ b/options.c @@ -1384,6 +1384,8 @@ int parse_arguments(int *argc_p, const char ***argv_p) * only special cases are returned and listed here. */ switch (opt) { + case 'L': + break; case 'V': version_opt_cnt++; break;