Package: cyclades-serial-client
Version: 0.92
Followup-For: Bug #800212
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.
    - Don't allow $(MAKE) distclean to ignore errors.
    - Add recommended build-arch and build-indep targets.
    - Remove config.{cache,log} in clean.
  * debian/compat: Indicate compatibility level of 9.
  * debian/control:
    - Build-depend on debhelper (>= 9).
    - Depend on ${misc:Depends}.

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-18-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 -Nru cyclades-serial-client-0.92ubuntu2/debian/compat cyclades-serial-client-0.92ubuntu3/debian/compat
--- cyclades-serial-client-0.92ubuntu2/debian/compat	1970-01-01 00:00:00.000000000 +0000
+++ cyclades-serial-client-0.92ubuntu3/debian/compat	2016-04-07 02:55:45.000000000 +0000
@@ -0,0 +1 @@
+9
diff -Nru cyclades-serial-client-0.92ubuntu2/debian/control cyclades-serial-client-0.92ubuntu3/debian/control
--- cyclades-serial-client-0.92ubuntu2/debian/control	2009-10-09 20:34:19.000000000 +0000
+++ cyclades-serial-client-0.92ubuntu3/debian/control	2016-04-14 23:29:01.000000000 +0000
@@ -1,13 +1,13 @@
 Source: cyclades-serial-client
 Section: comm
 Priority: optional
 Maintainer: Russell Coker <russ...@coker.com.au>
-Build-Depends: debhelper (>> 3.0.0)
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.5.2
 
 Package: cyclades-serial-client
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: sredird
 Conflicts: tsrdev
 Description: Network Serial port client software for Cyclades terminal servers
diff -Nru cyclades-serial-client-0.92ubuntu2/debian/rules cyclades-serial-client-0.92ubuntu3/debian/rules
--- cyclades-serial-client-0.92ubuntu2/debian/rules	2010-02-26 19:19:42.000000000 +0000
+++ cyclades-serial-client-0.92ubuntu3/debian/rules	2016-04-07 03:07:54.000000000 +0000
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -27,7 +24,9 @@
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/ --mandir=\$${prefix}/usr/share/man
 
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp:  config.status
 	dh_testdir
@@ -43,19 +42,19 @@
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	$(MAKE) distclean
 	-test -r /usr/share/misc/config.sub && \
 	  cp -f /usr/share/misc/config.sub config.sub
 	-test -r /usr/share/misc/config.guess && \
 	  cp -f /usr/share/misc/config.guess config.guess
 
-
+	rm -f config.cache config.log
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package into debian/cyclades-serial-client.

Reply via email to