On Sat, Aug 28, 2010 at 01:34:10PM +0200, Marc 'HE' Brockschmidt wrote:
> Roger Leigh <rleigh@codelibre.net> writes:
> > Please could you unblock gutenprint 5.2.6-1?
>
> 245 files changed, 114059 insertions(+), 82843 deletions(-)
>
> Why?
It's a new upstream release which adds new support for
5 Canon printers
12 Epson printers
111 PCL printers
as well as a number of changes for existing supported models.
These are mainly new models which won't be supported in squeeze
without this update.
Looking at the diffstat, the number of code changes is minimal;
the vast majority of those changes are translation updates,
followed by updates and additions to the plain text printer
definitions in XML format.
> > There's also some trivial cleanup of the Debian packaging.
>
> That's not something you should do during the freeze.
It was simply dropping unused dpatch logic given that the
package has been in git for some time now and fixing how
we called the configure script (which was broken). The
addition of debian/source/format and update of Standards-Version
was probably superfluous, but that's it. The small diff of those
changes is attached.
Regards,
Roger
--
.''`. Roger Leigh
: :' : Debian GNU/Linux http://people.debian.org/~rleigh/
`. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/
`- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
diff --git a/debian/changelog b/debian/changelog index 703de6d..8936f72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +gutenprint (5.2.6-1) unstable; urgency=low + + * New upstream stable release. + * Use source format 3.0 (quilt), drop dpatch support. + * Upgrade to Standards Version 3.9.1 (no changes). + * Drop unused --with-ijs configure argument. + * debian/rules install-stamp rule depends on build-stamp + rather than build (which is phony). + + -- Roger Leigh <rleigh@debian.org> Sun, 15 Aug 2010 14:15:09 +0100 + gutenprint (5.2.5-1) unstable; urgency=low * New upstream stable release. diff --git a/debian/control b/debian/control index 924ac20..d70a3ed 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: graphics Priority: optional Maintainer: Debian Printing Group <debian-printing@lists.debian.org> Uploaders: Roger Leigh <rleigh@debian.org>, W. van den Akker <wvdakker@wilsoft.nl> -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Build-Depends: libcups2-dev, libcupsimage2-dev, libgimp2.0-dev, libreadline-dev, libijs-dev, debhelper (>= 7.0.0), zlib1g-dev, flex, gettext, foomatic-db-engine, chrpath, quilt Vcs-Browser: http://git.debian.org/?p=collab-maint/gutenprint.git Vcs-Git: git://git.debian.org/git/collab-maint/gutenprint diff --git a/debian/rules b/debian/rules index d284038..596964b 100755 --- a/debian/rules +++ b/debian/rules @@ -7,9 +7,6 @@ # This has to be exported to make some magic below work. export DH_OPTIONS -# Use dpatch. -include /usr/share/quilt/quilt.make - # 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) @@ -56,14 +53,14 @@ debian/autoconfigure-stamp: debian/control --with-modules=dlopen \ --enable-libgutenprintui2 --with-gimp2 \ --with-cups --enable-cups-level3-ppds --enable-globalized-cups-ppds \ - --with-ijs --with-foomatic --with-foomatic3 \ + --with-foomatic --with-foomatic3 \ --disable-test touch $@ build: debian/build-stamp -debian/build-stamp: patch debian/autoconfigure-stamp +debian/build-stamp: debian/autoconfigure-stamp dh_testdir cd debian/build; \ @@ -71,7 +68,7 @@ debian/build-stamp: patch debian/autoconfigure-stamp touch $@ -clean: realclean unpatch +clean: realclean realclean: debian/control dh_testdir @@ -101,7 +98,7 @@ install-common: debian/install-stamp dh_installdirs dh_install -debian/install-stamp: build debian/control +debian/install-stamp: debian/build-stamp debian/control cd debian/build; \ $(MAKE) DESTDIR=$(CURDIR)/debian/install install @@ -148,4 +145,4 @@ binary-arch: install-arch binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install install-arch install-indep install-common autoconfigure patch unpatch update-patch-series +.PHONY: build clean binary-indep binary-arch binary install install-arch install-indep install-common autoconfigure update-patch-series diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)
Attachment:
signature.asc
Description: Digital signature