diff --git a/debian/changelog b/debian/changelog index c9fefd4..2885dbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +splix (2.0.0-3) unstable; urgency=low + + * Adopt package: set myself as maintainer and remove Jeroen van Wolffelaar + and Pablo Mazzini. Thanks for your work! (Closes: #617819) + * Fix compilation with recent toolchain. (Closes: #565097) + * Fix clean target that would sometimes enter an infinite loop. + * Switch to dpkg-source 3.0 (quilt) format + * Bump Standards-Version to 3.9.2 (no changes needed). + + -- Luca Niccoli Sun, 17 Apr 2011 19:29:05 +0200 + splix (2.0.0-2.2) unstable; urgency=low * Non-maintainer upload. diff --git a/debian/control b/debian/control index 1828f93..206e5b2 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,9 @@ Source: splix Section: text Priority: optional -Maintainer: Jeroen van Wolffelaar -Uploaders: Pablo Mazzini +Maintainer: Luca Niccoli Build-Depends: debhelper (>= 7), libcupsimage2-dev -Standards-Version: 3.8.1 +Standards-Version: 3.9.2 Homepage: http://splix.ap2c.org/ Package: splix diff --git a/debian/copyright b/debian/copyright index c1d97f3..696f1ae 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,16 @@ This package was debianized by Till Kamppeter on Tue, 12 Dec 2006. -The current Debian maintainer is Jeroen van Wolffelaar +The current Debian maintainer is Luca Niccoli It was downloaded from http://splix.ap2c.org/ Upstream Authors: Aurélien Croc -Copyright: (C) 2006, Aurélien Croc (AP²C) +License: + + Copyright: (C) 2006, Aurélien Croc (AP²C) This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/patches/fix_alignment.patch b/debian/patches/fix_alignment.patch new file mode 100644 index 0000000..0600e77 --- /dev/null +++ b/debian/patches/fix_alignment.patch @@ -0,0 +1,13 @@ +Index: splix-2.0.0/src/qpdl.cpp +=================================================================== +--- splix-2.0.0.orig/src/qpdl.cpp 2011-03-11 21:02:13.231934000 +0100 ++++ splix-2.0.0/src/qpdl.cpp 2011-03-11 21:02:26.455934000 +0100 +@@ -33,7 +33,7 @@ + { + unsigned long version, subVersion, size, dataSize, checkSum; + bool color, headerSent=false; +- unsigned char header[0x20]; ++ unsigned char header[0x20] __attribute__((aligned(4))); + const BandPlane *plane; + + version = request.printer()->qpdlVersion(); diff --git a/debian/patches/gcc-4.5_fix.patch b/debian/patches/gcc-4.5_fix.patch new file mode 100644 index 0000000..67261d2 --- /dev/null +++ b/debian/patches/gcc-4.5_fix.patch @@ -0,0 +1,13 @@ +Index: splix-2.0.0/src/ppdfile.cpp +=================================================================== +--- splix-2.0.0.orig/src/ppdfile.cpp 2011-03-11 21:05:57.215934000 +0100 ++++ splix-2.0.0/src/ppdfile.cpp 2011-03-11 21:06:03.067934000 +0100 +@@ -282,7 +282,7 @@ + * Opérateur d'assignation + * Assignment operator + */ +-void PPDFile::Value::operator = (const PPDFile::Value::Value &val) ++void PPDFile::Value::operator = (const PPDFile::Value &val) + { + if (_preformatted) + delete[] _preformatted; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..48a9619 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +fix_alignment.patch +gcc-4.5_fix.patch diff --git a/debian/rules b/debian/rules index 924420e..ce37ff8 100755 --- a/debian/rules +++ b/debian/rules @@ -11,20 +11,20 @@ build: build-stamp build-stamp: configure-stamp dh_testdir - $(MAKE) DISABLE_JBIG=1 rastertoqpdl_LIBS=-lcupsimage pstoqpdl_LIBS=-lcupsimage + /usr/bin/make DISABLE_JBIG=1 rastertoqpdl_LIBS="-lcupsimage -lcups -lpthread" pstoqpdl_LIBS="-lcupsimage -lcups" touch $@ clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp - $(MAKE) clean - dh_clean optimized/pstoqpdl optimized/rastertoqpdl + $(MAKE) clean DISABLE_JBIG=1 + dh_clean optimized/pstoqpdl optimized/rastertoqpdl optimized/src/* debug/src/* install: build dh_testdir dh_testroot - dh_prep + dh_prep dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/splix CUPSPPD=/usr/share/ppd/splix DISABLE_JBIG=1 install 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) diff --git a/optimized/src/qpdl.d b/optimized/src/qpdl.d index 300957b..59a5349 100644 --- a/optimized/src/qpdl.d +++ b/optimized/src/qpdl.d @@ -1,6 +1,6 @@ $(DEPDIR)/src/qpdl.d $(BUILDDIR)/src/qpdl.o: src/qpdl.cpp include/qpdl.h \ - include/page.h include/band.h include/errlog.h include/request.h \ - include/printer.h include/bandplane.h + include/page.h include/band.h include/errlog.h include/request.h \ + include/printer.h include/bandplane.h include/qpdl.h: diff --git a/src/qpdl.cpp b/src/qpdl.cpp index 8c2f4fd..a4236de 100644 --- a/src/qpdl.cpp +++ b/src/qpdl.cpp @@ -33,7 +33,7 @@ { unsigned long version, subVersion, size, dataSize, checkSum; bool color, headerSent=false; - unsigned char header[0x20] __attribute__((aligned(4))); + unsigned char header[0x20]; const BandPlane *plane; version = request.printer()->qpdlVersion();