Package: gperf Version: 3.0.3-1+b1 Severity: minor I have just done a delayed NMU for gperf 3.0.4-0.1. The upload fixes #642513 and gives modernizes the package a bit.
I have uploaded to DELAYED/10, please speed up, delay, or cancel the upload as you see fit. Here are the patches. Cheers, -Hilko
>From 8c09dc24511a1a645e332c611db3665d636947ac Mon Sep 17 00:00:00 2001 From: Hilko Bengen <[email protected]> Date: Sat, 27 Jul 2013 14:22:36 +0200 Subject: [PATCH 1/8] The license has been changed to GPL3+ --- debian/copyright | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index b7af862..9581be6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,5 +8,6 @@ Copyright: Written by Douglas C. Schmidt <[email protected]> and Bruno Haible <[email protected]>. -GNU GPERF is copyrighted under the GNU General Public License, version 2. -A copy of this license can be found in /usr/share/common-licenses/GPL. +GNU GPERF is copyrighted under the GNU General Public License, version +3 or later. A copy of this license can be found in +/usr/share/common-licenses/GPL-3. -- 1.8.3.2
>From b9087f0f0efa489fbd47ab05d904f86524cb0b29 Mon Sep 17 00:00:00 2001 From: Hilko Bengen <[email protected]> Date: Sat, 27 Jul 2013 14:07:04 +0200 Subject: [PATCH 2/8] Added watch file --- debian/watch | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/watch diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..88302b9 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnu.org/pub/gnu/gperf/gperf-(.*)\.tar\.gz \ No newline at end of file -- 1.8.3.2
>From 7e5db6110436ac97dd000b07c618a2e1ac9a8c41 Mon Sep 17 00:00:00 2001 From: Hilko Bengen <[email protected]> Date: Sat, 27 Jul 2013 14:09:07 +0200 Subject: [PATCH 3/8] Do not use dh-buildinfo, do not call obsolete install-info in postinst (Closes: #642513) --- debian/control | 2 +- debian/info | 15 --------------- debian/postinst | 5 ----- debian/rules | 1 - 4 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 debian/info delete mode 100644 debian/postinst diff --git a/debian/control b/debian/control index 5db622e..038fc0a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: J.H.M. Dassen (Ray) <[email protected]> Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 4), dh-buildinfo +Build-Depends: debhelper (>= 4) Package: gperf Architecture: any diff --git a/debian/info b/debian/info deleted file mode 100644 index 4411945..0000000 --- a/debian/info +++ /dev/null @@ -1,15 +0,0 @@ -# This is a configuration files for installing a .info menu -# The Description to be placed into the directory -DESCR="GNU perfect hash function generator" - -# The section this info file should be placed in (Regexp) followed by -# the new section name to be created if the Regexp does not match -# (Optional. If not given the .info will be appended to the directory) -SECTION_MATCH="Development" -#SECTION_NAME="New Section Name" - -# The file referred to from the Info directory -FILE=gperf.info - -# Optional. The files to be copied to /usr/info -#FILES=*.info diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index a17a785..0000000 --- a/debian/postinst +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/sh -set -e - -install-info --quiet --section "Development" "Development" /usr/share/info/gperf.info -#DEBHELPER# diff --git a/debian/rules b/debian/rules index 2ec06e3..d0e7ae4 100755 --- a/debian/rules +++ b/debian/rules @@ -76,7 +76,6 @@ binary-arch: build dh_fixperms dh_installdeb dh_shlibdeps - dh_buildinfo dh_gencontrol # dh_makeshlibs dh_md5sums -- 1.8.3.2
>From d9d30e2f587a73b44945e2153d6a11ab00e443c1 Mon Sep 17 00:00:00 2001 From: Hilko Bengen <[email protected]> Date: Sat, 27 Jul 2013 14:14:32 +0200 Subject: [PATCH 4/8] Bumped Debhelper compat level, Standards-Version, cleaned up debian/rules --- debian/compat | 1 + debian/control | 6 ++--- debian/dirs | 3 --- debian/rules | 85 ++++------------------------------------------------------ 4 files changed, 9 insertions(+), 86 deletions(-) create mode 100644 debian/compat delete mode 100644 debian/dirs diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control index 038fc0a..738bea9 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,12 @@ Source: gperf Section: devel Priority: optional Maintainer: J.H.M. Dassen (Ray) <[email protected]> -Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 4) +Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 9~) Package: gperf Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, Replaces: libg++272-dev, libg++27-dev Description: Perfect hash function generator gperf is a program that generates perfect hash functions for sets of diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 3a9aa8b..0000000 --- a/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/man/man1 -usr/share/info diff --git a/debian/rules b/debian/rules index d0e7ae4..92cbdd2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,85 +1,10 @@ #!/usr/bin/make -f -# Made with the aid of dh_make, by Craig Small -# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. -# Some lines taken from debmake, by Cristoph Lameter. -SHELL+= -e - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This is the debhelper compatability version to use. -export DH_COMPAT=4 - -DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) -CONFARGS= --host=$(DEB_HOST_GNU_TYPE) -endif - -build: build-stamp -build-stamp: - dh_testdir - - env CFLAGS="-O2 -g -Wall" CXXFLAGS="-O2 -g -Wall" \ - ./configure --prefix=/usr -v \ - --mandir=/usr/share/man --infodir=/usr/share/info $(CONFARGS) - make all -ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) - make check -endif - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) distclean - rm -f debug.output - - dh_clean - -# Build architecture-independent files here. -binary-indep: build -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build -# dh_testversion - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the files into debian/tmp - $(MAKE) install INSTALL="install -p" \ - prefix=`pwd`/debian/gperf/usr \ - docdir=`pwd`/debian/gperf/usr/share/doc/gperf/ \ - mandir=`pwd`/debian/gperf/usr/share/man \ - infodir=`pwd`/debian/gperf/usr/share/info +override_dh_installdocs: + dh_installdocs rm -rf debian/gperf/usr/share/man/dvi rm -rf debian/gperf/usr/share/man/html + mv debian/gperf/usr/share/doc/gperf.html debian/gperf/usr/share/doc/gperf/ - dh_installdocs - dh_installexamples - dh_installmenu -# dh_installinit - dh_installcron - #dh_installmanpages -# dh_undocumented - dh_installchangelogs ChangeLog - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol -# dh_makeshlibs - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary +%: + dh $@ -- 1.8.3.2
>From 89e635a6774f5d4a213fae3027f6e8ee4bbe7797 Mon Sep 17 00:00:00 2001 From: Hilko Bengen <[email protected]> Date: Sat, 27 Jul 2013 14:17:04 +0200 Subject: [PATCH 5/8] Texinfo is needed for building the documentation. (Only info and HTML are built.) --- debian/control | 2 +- doc/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 738bea9..ebef96a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: J.H.M. Dassen (Ray) <[email protected]> Standards-Version: 3.9.4 -Build-Depends: debhelper (>= 9~) +Build-Depends: debhelper (>= 9~), texinfo, Package: gperf Architecture: any diff --git a/doc/Makefile.in b/doc/Makefile.in index fc06c15..471417f 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -63,7 +63,7 @@ SHELL = /bin/sh VPATH = $(srcdir) -all : info ps pdf html +all : info html info : $(srcdir)/gperf.info -- 1.8.3.2
>From de89674f63952c918807e98878034fcc3ef9f070 Mon Sep 17 00:00:00 2001 From: Hilko Bengen <[email protected]> Date: Sat, 27 Jul 2013 14:18:46 +0200 Subject: [PATCH 6/8] Fixed error in Texinfo documentation --- doc/gperf.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/gperf.texi b/doc/gperf.texi index 0bb42b8..646dc28 100644 --- a/doc/gperf.texi +++ b/doc/gperf.texi @@ -1128,7 +1128,7 @@ hash table. Default name is @samp{wordlist}. This option permits the use of two hash tables in the same file, even when the option @samp{-G} (or, equivalently, the @samp{%global-table} declaration) is given. -@itemx --length-table-name=@var{length-table-array-name} +@item --length-table-name=@var{length-table-array-name} @cindex Array name Allows you to specify the name for the generated array containing the length table. Default name is @samp{lengthtable}. This option permits the -- 1.8.3.2
>From d4f2f1ff721fc7398dd854453bc3564626a55922 Mon Sep 17 00:00:00 2001 From: Hilko Bengen <[email protected]> Date: Sat, 27 Jul 2013 14:23:41 +0200 Subject: [PATCH 7/8] Removed "Apps" from doc-base entry, as suggested by Lintian --- debian/gperf.doc-base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/gperf.doc-base b/debian/gperf.doc-base index cb33e13..bd6bc16 100644 --- a/debian/gperf.doc-base +++ b/debian/gperf.doc-base @@ -2,7 +2,7 @@ Document: gperf Title: User's Guide to gperf Author: Douglas C. Schmidt, Bruno Haible Abstract: GNU Perfect Hash Function Generator -Section: Apps/Programming +Section: Programming Format: info Index: /usr/share/info/gperf.info.gz -- 1.8.3.2
>From a2b9fea55649440637b628e4ee48389f72a65ded Mon Sep 17 00:00:00 2001 From: Hilko Bengen <[email protected]> Date: Sat, 27 Jul 2013 14:37:15 +0200 Subject: [PATCH 8/8] 3.0.4-0.1 --- debian/changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 165c4c3..5c98098 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +gperf (3.0.4-0.1) unstable; urgency=low + + * Non-maintainer upload + * New upstream release (Closes: 698414), the license has been changed to GPL3+. + * Added watch file + * Do not use dh-buildinfo, do not call obsolete install-info in postinst + (Closes: #642513) + * Bumped Debhelper compat level, Standards-Version, cleaned up debian/rules + * Texinfo is needed for building the documentation. (Only info and HTML are built.) + * Fixed error in Texinfo documentation + * Removed "Apps" from doc-base entry, as suggested by Lintian + + -- Hilko Bengen <[email protected]> Sat, 27 Jul 2013 14:35:10 +0200 + gperf (3.0.3-1) unstable; urgency=low * New upstream release -- 1.8.3.2
