Package: cvs-syncmail
Version: 2.3-1
Followup-For: Bug #800208
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu xenial ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/rules:
    - Remove legacy DH_COMPAT export.
    - Use dh_prep instead of dh_clean -k.
    - Add recommended build-arch and build-indep targets.
  * debian/compat: Indicate compatibility level of 9.
  * debian/control:
    - Build-depend on debhelper (>= 9).
    - Depend on ${misc:Depends}.
    - Change Build-Depends-Indep to Build-Depends, since both are used in the
      clean target.

Thanks for considering the patch.

Logan Rosen

-- System Information:
Debian Release: stretch/sid
  APT prefers xenial-updates
  APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 4.4.0-17-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -u cvs-syncmail-2.3/debian/control cvs-syncmail-2.3/debian/control
--- cvs-syncmail-2.3/debian/control
+++ cvs-syncmail-2.3/debian/control
@@ -2,12 +2,12 @@
 Section: utils
 Priority: optional
 Maintainer: Christopher Sacca <csa...@thecsl.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), dpatch
+Build-Depends: debhelper (>= 9), dpatch
 Standards-Version: 3.6.2
 
 Package: cvs-syncmail
 Architecture: all
-Depends: ${shlibs:Depends}, python (>= 2.2.2)
+Depends: ${misc:Depends}, ${shlibs:Depends}, python (>= 2.2.2)
 Description: Notification program for CVS checkins
  syncmail is a CVS notification tool which can provide a diff for every 
  change to a CVS repository, mailed to specified email addresses. This 
diff -u cvs-syncmail-2.3/debian/rules cvs-syncmail-2.3/debian/rules
--- cvs-syncmail-2.3/debian/rules
+++ cvs-syncmail-2.3/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-export DH_COMPAT=3
-
 # Include magic dpatch stuff to give us
 # patch and depatch targets
 include /usr/share/dpatch/dpatch.make
@@ -15,7 +13,9 @@
 	dh_testdir
 	touch configure-stamp
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp: configure-stamp 
 	dh_testdir
@@ -32,7 +32,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	install syncmail $(CURDIR)/debian/cvs-syncmail/usr/bin/
 
only in patch2:
unchanged:
--- cvs-syncmail-2.3.orig/debian/compat
+++ cvs-syncmail-2.3/debian/compat
@@ -0,0 +1 @@
+9

Reply via email to