From fb36e9aa4df6786b249117385554ff75400adb4c Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Villemot?= Date: Sun, 10 Jun 2012 12:28:07 +0200 Subject: [PATCH] NMU for octave- and qt-related bugs. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit NMU for pfstools which fixes #604368 (Qt3->Qt4 transition), #666959 (Octave 3.2->3.6 transition) and the Lintian error about obsolete dpatch. The NMU relies on the new upstream release 1.8.5 (which fixes the Qt issue). Thanks to Sébastien Villemot, Rafael Laboissiere, and Ana Guerrero for taking care of that! --- debian/changelog | 25 +++++++++++++++++++++++++ debian/control | 6 +++--- debian/octave-pfstools.install | 2 +- debian/patches/gcc-4.4.dpatch | 21 --------------------- debian/patches/octave-nargin.dpatch | 0 debian/patches/octave-signal.dpatch | 0 debian/patches/{00list => series} | 1 - debian/rules | 10 ++++------ debian/source/format | 1 + 9 files changed, 34 insertions(+), 32 deletions(-) delete mode 100644 debian/patches/gcc-4.4.dpatch mode change 100755 => 100644 debian/patches/octave-nargin.dpatch mode change 100755 => 100644 debian/patches/octave-signal.dpatch rename debian/patches/{00list => series} (73%) create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index cec21de..9b8b1c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +pfstools (1.8.5-0.1) unstable; urgency=low + + * Non-maintainer upload. + + [ Sébastien Villemot ] + * New upstream release, build-depend on Qt4 instead of Qt3 (Closes: #604368) + * gcc-4.4.dpatch: remove patch, applied upstream + * Convert to format 3.0 (quilt) and drop dpatch, because otherwise Lintian + produces an error (dpatch is obsolete) + + [ Rafael Laboissiere ] + * debian/control: + - Build-depend on liboctave-dev, such that the package builds with + Octave 3.6 (Closes: #666959) + - Depend simply on octave, do not use the obsolete ${octave:Depends} + substitution variable anymore + * debian/rules: + - Use directly the octave-config script in order to get the + installation path for the *.oct and *.m files + - Do not invoke the obsolete script octave-depends + * debian/octave-pfstools.install: Adjust for the multiarch path, which + contains the architecture triplet now + + -- Sébastien Villemot Sun, 03 Jun 2012 11:00:46 +0200 + pfstools (1.8.1-2) unstable; urgency=low [ Thomas Weber ] diff --git a/debian/control b/debian/control index b641cca..4398056 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: graphics Priority: optional Maintainer: Debian PhotoTools Maintainers Uploaders: Sebastian Harl -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, gfortran, autotools-dev, libqt3-mt-dev, libmagick++-dev | libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, octave3.2-headers, texlive-latex-base, freeglut3-dev +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), gfortran, autotools-dev, libqt4-dev, libmagick++-dev | libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, liboctave-dev, texlive-latex-base, freeglut3-dev Standards-Version: 3.8.4 Homepage: http://pfstools.sourceforge.net/ Vcs-Git: git://git.debian.org/git/pkg-phototools/pfstools.git @@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-phototools/pfstools.git Package: pfstools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: pfsglview | pfsview, pfstmo, octave3.2, octave-signal, octave-pfstools +Recommends: pfsglview | pfsview, pfstmo, octave, octave-signal, octave-pfstools Suggests: dcraw, exrtools, imagemagick Description: command line HDR manipulation programs pfstools is a set of command line (and two GUI) programs for reading, @@ -90,7 +90,7 @@ Description: C++ library to read and write pfs files Package: octave-pfstools Section: math Architecture: any -Depends: ${octave:Depends}, ${shlibs:Depends}, ${misc:Depends} +Depends: octave, ${shlibs:Depends}, ${misc:Depends} Description: octave bindings for pfstools PFS is a high-dynamic range (HDR) image format. It is an attempt to integrate existing file formats by providing a simple data format that can be used to diff --git a/debian/octave-pfstools.install b/debian/octave-pfstools.install index ff9de68..153a7c8 100644 --- a/debian/octave-pfstools.install +++ b/debian/octave-pfstools.install @@ -1,3 +1,3 @@ -usr/lib/octave/* +usr/lib/*/octave/* usr/share/octave/* diff --git a/debian/patches/gcc-4.4.dpatch b/debian/patches/gcc-4.4.dpatch deleted file mode 100644 index e84dce1..0000000 --- a/debian/patches/gcc-4.4.dpatch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## gcc-4.4.dpatch by Fabrice Coutadeur -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix compilation error with GCC 4.4. Fix get from http://sourceforge.net/tracker/index.php?func=detail&aid=2848391&group_id=129921&atid=716245 -## DP: Rationale (by zack@debian.org): the "name" argument is in fact *not* used as "const" -## DP: Closes: #554494 - -@DPATCH@ -diff -urNad pfstools-1.8.1~/src/filter/pfspanoramic.cpp pfstools-1.8.1/src/filter/pfspanoramic.cpp ---- pfstools-1.8.1~/src/filter/pfspanoramic.cpp 2008-07-29 16:14:30.000000000 +0000 -+++ pfstools-1.8.1/src/filter/pfspanoramic.cpp 2009-09-10 20:11:29.000000000 +0000 -@@ -191,7 +191,7 @@ - singleton.projections[ string( name ) ] = ptr; - } - -- static Projection *getProjection(const char *name) -+ static Projection *getProjection(char *name) - { - char *opts; - diff --git a/debian/patches/octave-nargin.dpatch b/debian/patches/octave-nargin.dpatch old mode 100755 new mode 100644 diff --git a/debian/patches/octave-signal.dpatch b/debian/patches/octave-signal.dpatch old mode 100755 new mode 100644 diff --git a/debian/patches/00list b/debian/patches/series similarity index 73% rename from debian/patches/00list rename to debian/patches/series index a1ac012..d5b9a75 100644 --- a/debian/patches/00list +++ b/debian/patches/series @@ -1,3 +1,2 @@ octave-nargin.dpatch octave-signal.dpatch -gcc-4.4.dpatch diff --git a/debian/rules b/debian/rules index 8ad66f2..f6fde13 100755 --- a/debian/rules +++ b/debian/rules @@ -19,14 +19,13 @@ else CXXFLAGS += -O2 endif -include /usr/share/octave/debian/defs.make -include /usr/share/dpatch/dpatch.make +MDIR = $(shell octave-config --print LOCALFCNFILEDIR) +OCTDIR = $(shell octave-config --print LOCALOCTFILEDIR) confflags = --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ - --with-moc=moc-qt3 \ --with-octave-m-dir=$(MDIR)/pfstools \ --with-octave-oct-dir=$(OCTDIR)/pfstools @@ -36,7 +35,7 @@ confflags += --disable-matlab # These libraries are not available / unusable in Debian. confflags += --disable-jpeghdr --disable-gdal -config.status: configure $(DPATCH_STAMPFN) +config.status: configure dh_testdir for file in config.guess config.sub; do \ @@ -57,7 +56,7 @@ build-stamp: config.status touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp @@ -114,7 +113,6 @@ binary-arch: build install dh_makeshlibs dh_installdeb dh_shlibdeps -Llibpfs-1.2-0 -ldebian/libpfs-1.2-0/usr/lib/ - octave3.2-depends -poctave-pfstools dh_gencontrol dh_md5sums dh_builddeb 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) -- 2.30.2