Package: tzc
Version: 2.6.15-5.3
Followup-For: Bug #800220
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.
    - Add recommended build-arch and build-indep targets.
    - Use dh_prep instead of dh_clean -k.
    - Don't allow $(MAKE) clean to ignore errors.
  * 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)
Foreign Architectures: i386

Kernel: Linux 4.4.0-7-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_US.utf8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -u tzc-2.6.15/debian/control tzc-2.6.15/debian/control
--- tzc-2.6.15/debian/control
+++ tzc-2.6.15/debian/control
@@ -2,12 +2,12 @@
 Section: net
 Priority: optional
 Maintainer: Theodore Y. Ts'o <ty...@mit.edu>
-Build-Depends: debhelper (>> 3.0.0), libzephyr-dev (>= 3.0~beta), comerr-dev
+Build-Depends: debhelper (>= 9), libzephyr-dev (>= 3.0~beta), comerr-dev
 Standards-Version: 3.6.2.1
 
 Package: tzc
 Architecture: any
-Depends: ${shlibs:Depends}, zephyr-clients
+Depends: ${misc:Depends}, ${shlibs:Depends}, zephyr-clients
 Description: Trivial Zephyr Client
  tzc is a trivial zephyr client program which talks to the zephyr servers 
  (via the "zephyr host manager").   It is primarily used by the gnu-emacs
diff -u tzc-2.6.15/debian/rules tzc-2.6.15/debian/rules
--- tzc-2.6.15/debian/rules
+++ tzc-2.6.15/debian/rules
@@ -5,11 +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
-
-
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -23,7 +18,9 @@
 	dh_testdir
 
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp: 
 	dh_testdir
@@ -36,13 +33,13 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	$(MAKE) clean
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tzc.
only in patch2:
unchanged:
--- tzc-2.6.15.orig/debian/compat
+++ tzc-2.6.15/debian/compat
@@ -0,0 +1 @@
+9

Reply via email to