Dear Adam, On Wed, Dec 12, 2012 at 08:22:30PM +0000, Adam D. Barratt wrote: > On Wed, 2012-12-12 at 19:32 +0000, Serafeim Zanikolas wrote: > > cflow (1:1.4+dfsg1-1) unstable; urgency=high > > . > > * Repackage with non DFSG-free texinfo files stripped out of the source > > and > > binary package (closes: #695715). > > Thanks for fixing this. Unfortunately, the fact that you also made this > change: > > > * Raise debhelper compatibility level to 9 and update the debhelper > > version > > dependency, to enable security hardening > > means the package is unlikely to get unblocked. fwiw, this is explicitly > mentioned in "rule #1" on > http://release.debian.org/wheezy/freeze_policy.html
I've reverted the latter change and re-uploaded to unstable. Below's the diff against the previous version in unstable (and attached the diff against the version in testing). Please unblock cflow 1:1.4+dfsg1-2. Thanks, sez diff --git a/debian/changelog b/debian/changelog index ed739e3..545c4bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cflow (1:1.4+dfsg1-2) unstable; urgency=high + + * Revert debian/compat to 7 and versioned dependency on debhelper to + 7.0.50~, to meet current freeze rules. + + -- Serafeim Zanikolas <s...@debian.org> Fri, 14 Dec 2012 10:41:13 +0100 + cflow (1:1.4+dfsg1-1) unstable; urgency=high * Repackage with non DFSG-free texinfo files stripped out of the source and diff --git a/debian/compat b/debian/compat index ec63514..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +7 diff --git a/debian/control b/debian/control index 612f05f..f29c233 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: cflow Section: devel Priority: optional Maintainer: Serafeim Zanikolas <s...@debian.org> -Build-Depends: debhelper (>= 9), docbook-xml (>= 4.5), docbook-xsl, xsltproc +Build-Depends: debhelper (>= 7.0.50~), docbook-xml (>= 4.5), docbook-xsl, xsltproc Standards-Version: 3.9.2 Homepage: http://www.gnu.org/software/cflow/ Vcs-Hg: http://hg.debian.org/hg/collab-maint/cflow/ $ debdiff /var/cache/pbuilder/result/cflow_1.4+dfsg1-1_i386.deb /var/cache/pbuilder/result/cflow_1.4+dfsg1-2_i386.deb File lists identical (after any substitutions) Control files: lines which differ (wdiff format) ------------------------------------------------ Depends: libc6 (>= [-2.4)-] {+2.3)+} Version: [-1:1.4+dfsg1-1-] {+1:1.4+dfsg1-2+} -- Every great idea is worthless without someone to do the work. --Neil Williams
diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..0f8e3d4 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,2 @@ +The upstream source has been repackaged without these non-DFSG-free files: +cflow.info cflow.texi fdl.texi diff --git a/debian/changelog b/debian/changelog index 35ef08d..545c4bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +cflow (1:1.4+dfsg1-2) unstable; urgency=high + + * Revert debian/compat to 7 and versioned dependency on debhelper to + 7.0.50~, to meet current freeze rules. + + -- Serafeim Zanikolas <s...@debian.org> Fri, 14 Dec 2012 10:41:13 +0100 + +cflow (1:1.4+dfsg1-1) unstable; urgency=high + + * Repackage with non DFSG-free texinfo files stripped out of the source and + binary package (closes: #695715). + - Add dversionmangle in debian/watch + - Add debian/patches/nodocs to patch upstream Makefile to not traverse + into the doc directory + - debian/rules clean: wipe autogenerated doc/Makefile + - Add debian/README.source + * Raise debhelper compatibility level to 9 and update the debhelper version + dependency, to enable security hardening + + -- Serafeim Zanikolas <s...@debian.org> Wed, 12 Dec 2012 17:25:47 +0100 + cflow (1:1.4-1) unstable; urgency=low * New upstream release. diff --git a/debian/info b/debian/info deleted file mode 100644 index 911fe2b..0000000 --- a/debian/info +++ /dev/null @@ -1 +0,0 @@ -doc/cflow.info diff --git a/debian/patches/nodocs b/debian/patches/nodocs new file mode 100644 index 0000000..b8fc265 --- /dev/null +++ b/debian/patches/nodocs @@ -0,0 +1,15 @@ +# Description: do not run make in the doc directory +# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695715 +# Author: Serafeim Zanikolas +# Last-Update: 2012-12-12 +--- a/Makefile.in ++++ b/Makefile.in +@@ -734,7 +734,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = gnu src elisp po doc tests ++SUBDIRS = gnu src elisp po tests + EXTRA_DIST = ChangeLog.2007 + + # Define the following variables in order to use the ChangeLog rule below: diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..456c63c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +nodocs diff --git a/debian/rules b/debian/rules index 2a6207c..9b6f481 100755 --- a/debian/rules +++ b/debian/rules @@ -15,8 +15,12 @@ override_dh_auto_install: dh_auto_install rm -f debian/cflow/usr/share/info/dir* +clean: + dh clean + rm -f doc/Makefile + .PHONY: build build-arch build-indep binary binary-arch binary-indep clean -build build-arch build-indep binary binary-arch clean: +build build-arch build-indep binary binary-arch: dh $(@) # In order not to confuse lintian, binary-indep is a separate target: binary-indep: diff --git a/debian/watch b/debian/watch index d31c566..8229a8b 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -ftp://ftp.gnu.org/gnu/cflow/cflow-([0-9.]+)[.]tar[.]gz +opts=dversionmangle=s/\+dfsg\d+$// \ + ftp://ftp.gnu.org/gnu/cflow/cflow-([0-9.]+)[.]tar[.]gz [snip 4+K lines of removal of doc/cflow.info doc/cflow.texi doc/fdl.texi] $ debdiff /var/cache/apt/archives/cflow_1%3a1.4-1_i386.deb /var/cache/pbuilder/result/cflow_1.4+dfsg1-2_i386.deb [The following lists of changes regard files as different if they have different names, permissions or owners.] Files in first .deb but not in second ------------------------------------- -rw-r--r-- root/root /usr/share/info/cflow.info.gz Control files: lines which differ (wdiff format) ------------------------------------------------ Depends: libc6 (>= [-2.3), dpkg (>= 1.15.4) | install-info-] {+2.3)+} Installed-Size: [-361-] {+332+} Version: [-1:1.4-1-] {+1:1.4+dfsg1-2+}
