Convert patches to quilt

9 files changed, 9 insertions, 224 deletions

diff --git a/debian/changelog b/debian/changelog
index 725b3c8..052ccf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ucspi-tcp (1:0.88-4) UNRELEASED; urgency=medium
 
   * New maintainer (Closes: #907094)
+  * Convert patches to quilt
 
  -- Dmitry Bogatov <KAction@debian.org>  Thu, 29 Nov 2018 06:22:03 +0000
 
diff --git a/debian/control b/debian/control
index b1d5887..f40426d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,8 @@ Source: ucspi-tcp
 Section: net
 Priority: optional
 Maintainer: Dmitry Bogatov <KAction@debian.org>
+Build-Depends:
+  debhelper-compat (= 11),
 Standards-Version: 3.8.0.1
 Vcs-Git: http://smarden.org/git/ucspi-tcp.git/
 
diff --git a/debian/implicit b/debian/implicit
deleted file mode 100644
index 19d8944..0000000
--- a/debian/implicit
+++ /dev/null
@@ -1,93 +0,0 @@
-# $Id: 60d9070435b8d5608f20f60bc44e081960b6e39d $
-
-.PHONY: deb-checkdir deb-checkuid
-
-deb-checkdir:
-	@test -e debian/control || sh -cx '! : wrong directory'
-deb-checkuid:
-	@test "`id -u`" -eq 0 || sh -cx '! : need root privileges'
-
-%.deb: %.deb-docs %.deb-DEBIAN
-	@rm -f $*.deb $*.deb-checkdir $*.deb-docs $*.deb-docs-base \
-	  $*.deb-docs-docs $*.deb-docs-examples $*.deb-DEBIAN \
-	  $*.deb-DEBIAN-dir $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums
-
-%.udeb: %.deb-DEBIAN
-	@rm -f $*.deb $*.deb-checkdir $*.deb-DEBIAN $*.deb-DEBIAN-dir \
-	  $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums
-
-%.deb-checkdir: install
-	@test -d debian/$* || sh -cx '! : directory debian/$* missing'
-	@test "`id -u`" -eq 0 || sh -cx '! : need root privileges'
-
-%.deb-docs-base: install
-	: implicit
-	@rm -f debian/$*/usr/share/doc/$*/* || :
-	@install -d -m0755 debian/$*/usr/share/doc/$*
-	: debian/$*/usr/share/doc/$*/
-	@sh -cx 'install -m0644 debian/copyright debian/$*/usr/share/doc/$*/'
-	@sh -cx 'install -m0644 debian/changelog \
-	  debian/$*/usr/share/doc/$*/changelog.Debian'
-	@test ! -r changelog || \
-	  sh -cx 'install -m0644 changelog debian/$*/usr/share/doc/$*/'
-	@test -r debian/$*/usr/share/doc/$*/changelog || \
-	  sh -cx 'mv debian/$*/usr/share/doc/$*/changelog.Debian \
-	    debian/$*/usr/share/doc/$*/changelog'
-	@test -s debian/$*/usr/share/doc/$*/changelog || \
-	  sh -cx 'rm -f debian/$*/usr/share/doc/$*/changelog'
-	@gzip -9n debian/$*/usr/share/doc/$*/changelog*
-%.deb-docs-docs: %.deb-docs-base
-	@for i in `cat debian/$*.docs 2>/dev/null || :`; do \
-	  if test -d $$i; then \
-	    sh -cx "install -d -m0755 debian/$*/usr/share/doc/$*/$${i##*/}" && \
-	    for j in $$i/*; do \
-	      sh -cx "install -m0644 $$j \
-	        debian/$*/usr/share/doc/$*/$${i##*/}/" || exit 1; \
-	    done || exit 1; \
-	    continue; \
-	  fi; \
-	  sh -cx "install -m0644 $$i debian/$*/usr/share/doc/$*/" || exit 1; \
-	done
-	@test ! -r debian/$*.README.Debian || \
-	  sh -cx 'install -m0644 debian/$*.README.Debian \
-	    debian/$*/usr/share/doc/$*/README.Debian'
-	@if test -r debian/$*.NEWS.Debian; then \
-	  sh -cx 'install -m0644 debian/$*.NEWS.Debian \
-	    debian/$*/usr/share/doc/$*/NEWS.Debian && \
-	      gzip -9n debian/$*/usr/share/doc/$*/NEWS.Debian'; \
-	fi
-%.deb-docs-examples: %.deb-docs-docs
-	@rm -rf debian/$*/usr/share/doc/$*/examples
-	: debian/$*/usr/share/doc/$*/examples/
-	@test ! -r debian/$*.examples || \
-	  install -d -m0755 debian/$*/usr/share/doc/$*/examples
-	@for i in `cat debian/$*.examples 2>/dev/null || :`; do \
-	  sh -cx "install -m0644 $$i debian/$*/usr/share/doc/$*/examples/" \
-	    || exit 1; \
-	done
-%.deb-docs: %.deb-checkdir %.deb-docs-base %.deb-docs-docs %.deb-docs-examples
-	: debian/$*/usr/share/doc/$*/ ok
-
-%.deb-DEBIAN-base: install
-	@rm -rf debian/$*/DEBIAN
-	: debian/$*/DEBIAN/
-	@install -d -m0755 debian/$*/DEBIAN
-	@for i in conffiles shlibs templates; do \
-	  test ! -r debian/$*.$$i || \
-	    sh -cx "install -m0644 debian/$*.$$i debian/$*/DEBIAN/$$i" \
-	      || exit 1; \
-	done
-%.deb-DEBIAN-scripts: %.deb-DEBIAN-base
-	@for i in preinst prerm postinst postrm config; do \
-	  test ! -r debian/$*.$$i || \
-	    sh -cx "install -m0755 debian/$*.$$i debian/$*/DEBIAN/$$i" \
-	      || exit 1; \
-	done
-%.deb-DEBIAN-md5sums: %.deb-DEBIAN-base %.deb-docs
-	: debian/$*/DEBIAN/md5sums
-	@rm -f debian/$*/DEBIAN/md5sums
-	@cd debian/$* && find * -path 'DEBIAN' -prune -o \
-	  -type f -exec md5sum {} \; | LC_ALL=C sort >>DEBIAN/md5sums
-%.deb-DEBIAN: %.deb-checkdir %.deb-DEBIAN-base %.deb-DEBIAN-scripts \
-	  %.deb-DEBIAN-md5sums
-	: debian/$*/DEBIAN/ ok
diff --git a/debian/diff/0001-error.h-include-errno.h-instead-of-extern-int.diff b/debian/patches/0001-error.h-include-errno.h-instead-of-extern-int.diff
index 433e575..433e575 100644
--- a/debian/diff/0001-error.h-include-errno.h-instead-of-extern-int.diff
+++ b/debian/patches/0001-error.h-include-errno.h-instead-of-extern-int.diff
diff --git a/debian/diff/0002-rblsmtpd.c-don-t-use-a-the-default-rbl.maps.vix.com.diff b/debian/patches/0002-rblsmtpd.c-don-t-use-a-the-default-rbl.maps.vix.com.diff
index a4d9603..a4d9603 100644
--- a/debian/diff/0002-rblsmtpd.c-don-t-use-a-the-default-rbl.maps.vix.com.diff
+++ b/debian/patches/0002-rblsmtpd.c-don-t-use-a-the-default-rbl.maps.vix.com.diff
diff --git a/debian/diff/0003-Makefile-target-choose-do-not-depend-on-conf-home.diff b/debian/patches/0003-Makefile-target-choose-do-not-depend-on-conf-home.diff
index 4f9bfbf..4f9bfbf 100644
--- a/debian/diff/0003-Makefile-target-choose-do-not-depend-on-conf-home.diff
+++ b/debian/patches/0003-Makefile-target-choose-do-not-depend-on-conf-home.diff
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fa68b20
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-error.h-include-errno.h-instead-of-extern-int.diff
+0002-rblsmtpd.c-don-t-use-a-the-default-rbl.maps.vix.com.diff
+0003-Makefile-target-choose-do-not-depend-on-conf-home.diff
diff --git a/debian/rules b/debian/rules
index de3db17..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,133 +1,4 @@
 #!/usr/bin/make -f
 
-STRIP =strip
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-  STRIP =: nostrip
-endif
-
-DIR=$(shell pwd)/debian/ucspi-tcp
-DIRIPV6=$(shell pwd)/debian/ucspi-tcp-ipv6
-
-configure: deb-checkdir configure-stamp
-configure-stamp:
-	for i in `cat FILES`; do \
-	  test -r ucspi-tcp-ipv6/$$i || \
-	  cp -p $$i ucspi-tcp-ipv6/$$i || exit 1; \
-	done
-	touch configure-stamp
-
-patch: deb-checkdir patch-stamp ucspi-tcp-ipv6/patch-stamp
-patch-stamp: configure-stamp
-	for i in `ls -1 debian/diff/*.diff || :`; do \
-	  patch -p1 <$$i || exit 1; \
-	done
-	touch patch-stamp
-ucspi-tcp-ipv6/patch-stamp: configure-stamp
-	for i in `ls -1 ucspi-tcp-ipv6/diff/*.diff || :`; do \
-	  (cd ucspi-tcp-ipv6/ && patch -p1) <$$i || exit 1; \
-	done
-	touch ucspi-tcp-ipv6/patch-stamp
-
-build: deb-checkdir build-stamp ucspi-tcp-ipv6/build-stamp
-build-stamp: patch-stamp
-	test -r conf-home'{orig}' || cp -f conf-home conf-home'{orig}'
-	echo /usr >conf-home
-	$(MAKE)
-	touch build-stamp
-ucspi-tcp-ipv6/build-stamp: ucspi-tcp-ipv6/patch-stamp
-	test -r ucspi-tcp-ipv6/conf-home'{orig}' || \
-	  cp -f ucspi-tcp-ipv6/conf-home ucspi-tcp-ipv6/conf-home'{orig}'
-	echo /usr >ucspi-tcp-ipv6/conf-home
-	$(MAKE) -Cucspi-tcp-ipv6/
-	touch ucspi-tcp-ipv6/build-stamp
-
-clean: deb-checkdir deb-checkuid
-	rm -f `cat TARGETS`
-	for i in ucspi-tcp-ipv6/*; do test -d $$i || rm -f $$i; done
-	test ! -e patch-stamp || \
-	  for i in `ls -1r debian/diff/*.diff || :`; do patch -p1 -R <$$i; done
-	rm -f configure-stamp patch-stamp build-stamp \
-	  ucspi-tcp-ipv6/patch-stamp ucspi-tcp-ipv6/build-stamp
-	rm -rf '$(DIR)' '$(DIRIPV6)'
-	rm -f debian/files debian/substvars changelog
-	test ! -r conf-home'{orig}' || mv -f conf-home'{orig}' conf-home
-
-install: deb-checkdir deb-checkuid build-stamp ucspi-tcp-ipv6/build-stamp
-	rm -rf '$(DIR)' '$(DIRIPV6)'
-	# ucspi-tcp
-	# programs
-	install -d -m0755 '$(DIR)'/usr/bin
-	test -r conf-home'{orig}' || cp conf-home conf-home'{orig}'
-	echo '$(DIR)'/usr >conf-home
-	rm -f install instcheck install.o instcheck.o hier.o auto_home.c \
-	  auto_home.o
-	$(MAKE) install instcheck
-	mv -f conf-home'{orig}' conf-home
-	./install
-	./instcheck
-	# fix up permissions
-	chmod g-s '$(DIR)'/usr '$(DIR)'/usr/bin
-	# strip
-	for i in addcr argv0 delcr fixcrio mconnect-io rblsmtpd recordio \
-	 tcpclient tcprules tcprulescheck tcpserver; do \
-	  $(STRIP) -R .comment -R .note '$(DIR)'/usr/bin/$$i || exit 1; \
-	done
-	# manpages
-	install -d -m0755 '$(DIR)'/usr/share/man/man1
-	for i in debian/ucspi-tcp-man/*.1; do \
-	  install -m0644 $$i '$(DIR)'/usr/share/man/man1/ && \
-	  gzip -9n '$(DIR)'/usr/share/man/man1/$${i##*/} || exit 1; \
-	done
-	# ucspi-tcp-ipv6
-	# programs
-	install -d -m0755 '$(DIRIPV6)'/usr/bin
-	test -r ucspi-tcp-ipv6/conf-home'{orig}' || \
-	  cp ucspi-tcp-ipv6/conf-home ucspi-tcp-ipv6/conf-home'{orig}'
-	echo '$(DIRIPV6)'/usr >ucspi-tcp-ipv6/conf-home
-	for i in install instcheck install.o instcheck.o hier.o auto_home.c \
-	 auto_home.o; do \
-	  rm -f ucspi-tcp-ipv6/$$i; \
-	done
-	$(MAKE) -Cucspi-tcp-ipv6/ install instcheck
-	mv -f ucspi-tcp-ipv6/conf-home'{orig}' ucspi-tcp-ipv6/conf-home
-	(cd ucspi-tcp-ipv6/ && ./install)
-	(cd ucspi-tcp-ipv6/ && ./instcheck)
-	# fix up permissions
-	chmod g-s '$(DIRIPV6)'/usr '$(DIRIPV6)'/usr/bin \
-	  '$(DIRIPV6)'/usr/man '$(DIRIPV6)'/usr/man/man1
-	# strip
-	for i in addcr argv0 delcr fixcrio mconnect-io rblsmtpd recordio \
-	 tcpclient tcprules tcprulescheck tcpserver; do \
-	  $(STRIP) -R .comment -R .note '$(DIRIPV6)'/usr/bin/$$i || exit 1; \
-	done
-	# manpages
-	install -d -m0755 '$(DIRIPV6)'/usr/share
-	rm -rf '$(DIRIPV6)'/usr/man/man5  # don't include tcp-environ(5)
-	mv '$(DIRIPV6)'/usr/man '$(DIRIPV6)'/usr/share/
-	for i in fixcrio.1 rblsmtpd.1 tcpcat.1; do \
-	  install -m0644 debian/ucspi-tcp-man/$$i \
-	    '$(DIRIPV6)'/usr/share/man/man1/; \
-	done
-	for i in '$(DIRIPV6)'/usr/share/man/man1/*.1; do \
-	  gzip -9n $$i || exit 1; \
-	done
-	# changelog
-	test -r changelog || ln -s CHANGES changelog
-
-binary: binary-arch binary-indep
-binary-arch: install ucspi-tcp.deb ucspi-tcp-ipv6.deb
-	rm -f debian/substvars
-	dpkg-shlibdeps '$(DIR)'/usr/bin/*
-	dpkg-gencontrol -isp -pucspi-tcp -P'$(DIR)'
-	dpkg -b '$(DIR)' ..
-	rm -f debian/substvars
-	dpkg-shlibdeps '$(DIRIPV6)'/usr/bin/*
-	dpkg-gencontrol -isp -pucspi-tcp-ipv6 -P'$(DIRIPV6)'
-	dpkg -b '$(DIRIPV6)' ..
-
-binary-indep:
-
-.PHONY: configure patch ucspi-tcp-ipv6/patch build ucspi-tcp-ipv6/build \
-  clean install binary-indep binary-arch binary
-
-include debian/implicit
+%:
+	dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)