Package: gkrellm-mailwatch
Version: 2.4.3-1
Followup-For: Bug #800297
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.
    - Don't allow $(MAKE) clean to ignore errors.
    - Replace dh_clean -k with dh_prep.
  * debian/compat: Specify 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 -u gkrellm-mailwatch-2.4.3/debian/control gkrellm-mailwatch-2.4.3/debian/control
--- gkrellm-mailwatch-2.4.3/debian/control
+++ gkrellm-mailwatch-2.4.3/debian/control
@@ -1,7 +1,7 @@
 Source: gkrellm-mailwatch
 Section: mail
 Priority: optional
-Build-Depends: debhelper, gkrellm (>= 2.0.0), libgtk2.0-dev
+Build-Depends: debhelper (>= 9), gkrellm (>= 2.0.0), libgtk2.0-dev
 Maintainer: Sjoerd Simons <sjo...@debian.org>
 Standards-Version: 3.1.1
 
@@ -9,7 +9,7 @@
 Architecture: any
 Replaces: gkrellm-mailwatch2
 Conflicts: gkrellm-mailwatch2
-Depends: gkrellm (>= 2.0.0), ${shlibs:Depends}
+Depends: ${misc:Depends}, gkrellm (>= 2.0.0), ${shlibs:Depends}
 Description: GKrellM plugin to watch mailboxes in multiple panels 
  A GKrellM plugin to monitor mbox, maildir and MH style mailboxes in
  multiple gkrellm panels.
diff -u gkrellm-mailwatch-2.4.3/debian/rules gkrellm-mailwatch-2.4.3/debian/rules
--- gkrellm-mailwatch-2.4.3/debian/rules
+++ gkrellm-mailwatch-2.4.3/debian/rules
@@ -5,8 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
 
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -39,14 +37,14 @@
 	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/tmp.
only in patch2:
unchanged:
--- gkrellm-mailwatch-2.4.3.orig/debian/compat
+++ gkrellm-mailwatch-2.4.3/debian/compat
@@ -0,0 +1 @@
+9

Reply via email to