diffstat for pnm2ppa-1.13 pnm2ppa-1.13+nondbs changelog | 48 ++++++++++++++++++++++++++++++++++++ control | 20 ++++----------- patches/00_use_env_buildflags.patch | 13 +++++++++ patches/series | 1 rules | 8 +++--- 5 files changed, 72 insertions(+), 18 deletions(-) diff -Nru pnm2ppa-1.13/debian/changelog pnm2ppa-1.13+nondbs/debian/changelog --- pnm2ppa-1.13/debian/changelog 2012-02-01 18:01:36.000000000 +0000 +++ pnm2ppa-1.13+nondbs/debian/changelog 2014-08-06 19:26:13.000000000 +0000 @@ -1,3 +1,51 @@ +pnm2ppa (1.13+nondbs-0ubuntu5) utopic; urgency=low + + * Merged all changes from the Debian package 1.13-6: + o Move the repository from collab-maint to printing; update the VCS-* fields + accordingly + o Add patch to build the make_hash_ink buildtool natively, with the correct + buildflags; use dh-autoreconf to cope with the change + o Use the correct syntax to append to CFLAGS + o Bump debhelper B-D to 9 to align with compat + + -- Till Kamppeter Wed, 6 Feb 2014 21:24:05 +0200 + +pnm2ppa (1.13+nondbs-0ubuntu4) trusty; urgency=low + + * Merged all changes from the Debian package 1.13-5: + o Drop pnm2ppa transitional package which reached stable + o Bump Standards-Version to 3.9.5 without changes needed + o Drop empty directories in /usr/share/doc/ (Closes: #686555) + + -- Till Kamppeter Wed, 19 Feb 2014 15:02:05 +0100 + +pnm2ppa (1.13+nondbs-0ubuntu3) saucy; urgency=low + + * Use the autotools-dev dh addon to update config.guess/config.sub for + arm64. + + -- Colin Watson Thu, 10 Oct 2013 13:53:51 +0100 + +pnm2ppa (1.13+nondbs-0ubuntu2) quantal; urgency=low + + * Rebuild for new armel compiler default of ARMv5t. + + -- Colin Watson Mon, 08 Oct 2012 16:48:29 +0100 + +pnm2ppa (1.13+nondbs-0ubuntu1) precise; urgency=low + + * Pseudo-sync with Debian: This package is noow absolutely identical + with Debian's 1.13-4 except the upstream version number. The upstream + version number got the "+nondbs" to replace the DBS tarball-in-tarball + upstream source tarball by the straight tarball of Debian, to get rid + of the DBS packaging and make future merges, syncs and upstream updates + easier. We cannot wait for a new upstream version here, as upstream + updates happen rarely, perhaps there will even never be a new upstream + version especially because the class of printers supported by pnm2ppa + was discontinued years ago. + + -- Till Kamppeter Wed, 15 Feb 2012 19:11:05 +0100 + pnm2ppa (1.13-4) unstable; urgency=low [ Debconf translation updates ] diff -Nru pnm2ppa-1.13/debian/control pnm2ppa-1.13+nondbs/debian/control --- pnm2ppa-1.13/debian/control 2012-02-01 17:55:11.000000000 +0000 +++ pnm2ppa-1.13+nondbs/debian/control 2014-08-06 17:41:47.000000000 +0000 @@ -1,13 +1,14 @@ Source: pnm2ppa Section: text Priority: optional -Maintainer: Debian Printing Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Printing Team Uploaders: Didier Raboud -Build-Depends: debhelper (>= 8.9.0~) +Build-Depends: debhelper (>= 9~), autotools-dev, dh-autoreconf Homepage: http://pnm2ppa.sf.net/ -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/pnm2ppa.git -Vcs-Git: git://anonscm.debian.org/collab-maint/pnm2ppa.git -Standards-Version: 3.9.2.0 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=printing/pnm2ppa.git +Vcs-Git: https://alioth.debian.org/anonscm/git/printing/pnm2ppa.git +Standards-Version: 3.9.5 Package: printer-driver-pnm2ppa Architecture: any @@ -23,12 +24,3 @@ . pnm2ppa supports the following printers: HP Deskjet 7XX Series, HP Deskjet 820 Series and HP Deskjet 1000 Series. - -Package: pnm2ppa -Depends: printer-driver-pnm2ppa, ${misc:Depends} -Architecture: all -Section: oldlibs -Priority: extra -Description: transitional dummy package for pnm2ppa printer driver - This is a transitional dummy package to transition to uniformly named - printer-driver-pnm2ppa. diff -Nru pnm2ppa-1.13/debian/patches/00_use_env_buildflags.patch pnm2ppa-1.13+nondbs/debian/patches/00_use_env_buildflags.patch --- pnm2ppa-1.13/debian/patches/00_use_env_buildflags.patch 1970-01-01 00:00:00.000000000 +0000 +++ pnm2ppa-1.13+nondbs/debian/patches/00_use_env_buildflags.patch 2014-08-06 17:41:47.000000000 +0000 @@ -0,0 +1,13 @@ +Description: Build make_hash_ink natively, hence use the buildflags +Author: Didier Raboud +Last-Update: 2014-03-06 +--- a/Makefile.am ++++ b/Makefile.am +@@ -128,5 +128,5 @@ + LDFLAGS_FOR_BUILD = + LDLIBS_FOR_BUILD = + +-make_hash_ink: make_hash_ink.c +- $(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $< $(LDLIBS_FOR_BUILD) ++noinst_PROGRAMS = make_hash_ink ++make_hash_ink_SOURCES = make_hash_ink.c diff -Nru pnm2ppa-1.13/debian/patches/series pnm2ppa-1.13+nondbs/debian/patches/series --- pnm2ppa-1.13/debian/patches/series 2012-02-01 17:58:15.000000000 +0000 +++ pnm2ppa-1.13+nondbs/debian/patches/series 2014-08-06 17:41:47.000000000 +0000 @@ -1,3 +1,4 @@ +00_use_env_buildflags.patch 10_177295-fix_signedness.patch 99-examples_shbangs.patch 99-pnm2ppa_manpage.patch diff -Nru pnm2ppa-1.13/debian/rules pnm2ppa-1.13+nondbs/debian/rules --- pnm2ppa-1.13/debian/rules 2012-02-01 17:55:11.000000000 +0000 +++ pnm2ppa-1.13+nondbs/debian/rules 2014-08-06 17:41:47.000000000 +0000 @@ -2,11 +2,10 @@ derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no") -CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -CFLAGS += -DLANG_ENG -Wall +export DEB_CFLAGS_MAINT_APPEND += -DLANG_ENG -Wall %: - dh $@ --parallel --builddirectory=build/ + dh $@ --parallel --builddirectory=build/ --with autotools_dev,autoreconf override_dh_auto_install: dh_auto_install --builddirectory=build/ --destdir=debian/printer-driver-pnm2ppa/ @@ -41,4 +40,5 @@ rm en/pnm2ppa.1;\ rm pl/INSTALACJA;\ rm pl/INSTALACJA.SUSE - + # Remove empty directories + rm -Rf debian/printer-driver-pnm2ppa/usr/share/doc/pnm2ppa