Package: nmzmail
Severity: wishlist
Version: 1.1-2

There is ./debian/rules.new shipped in the new package.
I don't think it was suppose to be there.

Regards,
Dmitrijs.

diff -u nmzmail-1.1/debian/compat nmzmail-1.1/debian/compat
--- nmzmail-1.1/debian/compat
+++ nmzmail-1.1/debian/compat
@@ -1 +1 @@
-7
+9
diff -u nmzmail-1.1/debian/control nmzmail-1.1/debian/control
--- nmzmail-1.1/debian/control
+++ nmzmail-1.1/debian/control
@@ -2,13 +2,13 @@
 Section: mail
 Priority: optional
 Maintainer: Kevin Coyner <[email protected]>
-Build-Depends: debhelper (>= 7.4~), autotools-dev, libreadline-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9.2~), autotools-dev, dpkg-dev (>= 1.16.1~), libreadline-dev
+Standards-Version: 3.9.3
 Homepage: http://www.ecademix.com/JohannesHofmann/nmzmail.html
 
 Package: nmzmail
 Architecture: any
-Depends: ${shlibs:Depends}, namazu2, namazu2-index-tools
+Depends: ${shlibs:Depends}, ${misc:Depends}, namazu2, namazu2-index-tools
 Suggests: mutt
 Enhances: mutt
 Description: indexes and searches email in maildir folders
diff -u nmzmail-1.1/debian/rules nmzmail-1.1/debian/rules
--- nmzmail-1.1/debian/rules
+++ nmzmail-1.1/debian/rules
@@ -4,12 +4,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 # 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)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
+CFLAGS += -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -30,7 +33,9 @@
 
 	touch configure-stamp
 
-build: configure-stamp build-stamp
+build: build-arch build-indep
+build-arch: configure-stamp build-stamp
+build-indep:
 
 build-stamp:
 	dh_testdir
diff -u nmzmail-1.1/debian/changelog nmzmail-1.1/debian/changelog
--- nmzmail-1.1/debian/changelog
+++ nmzmail-1.1/debian/changelog
@@ -1,3 +1,19 @@
+nmzmail (1.1-2) unstable; urgency=low
+
+  * debian/control:
+    + Updated Standards-Version to 3.9.3.
+    + Add ${misc:Depends} to binary Depends.
+    + Add dpkg-dev to Build-Depends to support hardening.
+    + Updated debhelper version to 9.2~.
+  * debian/compat updated from 7 to 9.
+  * Changes to debian/rules to support hardening.
+  * Closing bug related to modifying conffiles. These files were modified by
+    namazu2 and were addressed in Bug #688498. Closes: #688290.  
+  * A mutt macro and cron suggestion are provided in the man page. Additional
+    usage details are suggested in README.Debian. Closes: #552731.
+
+ -- Kevin Coyner <[email protected]>  Sun, 30 Sep 2012 01:30:28 +0000
+
 nmzmail (1.1-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- nmzmail-1.1.orig/debian/rules.new
+++ nmzmail-1.1/debian/rules.new
@@ -0,0 +1,83 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
+# 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)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS += -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+
+	ln -sf /usr/share/misc/config.sub config.sub
+	ln -sf /usr/share/misc/config.guess config.guess
+	rm -f config.cache
+
+	# Add here commands to configure the package.
+	./configure CFLAGS="$(CFLAGS)" --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+	touch configure-stamp
+
+build: configure-stamp binary-arch binary-indep 
+	
+build-stamp:
+	$(MAKE)
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installman
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+	[ ! -f Makefile ] || make clean
+	[ ! -f Makefile ] || make distclean
+	# Add here commands to clean up after the build process.
+	find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \;
+	dh_clean
+
+install:
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	# Add here commands to install the package into debian/nmzmail.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/nmzmail
+
+# Build architecture-independent files here.
+binary-indep: configure-stamp build-stamp
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: configure-stamp build-stamp install
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

Reply via email to