Dear Maintainer, I’ve prepared an 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).
Please find attached the debdiff (only for the debian/ subdir). I am going to look for a sponsor for this NMU. If you want me to provide a series of patches that you can incorporate into your VCS, don't hesitate to ask. Thanks for you work,
--- pfstools-1.8.1/debian/changelog 2012-06-03 12:17:55.000000000 +0200
+++ pfstools-1.8.5/debian/changelog 2012-06-03 11:29:20.000000000 +0200
@@ -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 <sebastien.ville...@ens.fr> Sun, 03 Jun 2012 11:00:46 +0200
+
pfstools (1.8.1-2) unstable; urgency=low
[ Thomas Weber ]
--- pfstools-1.8.1/debian/control 2012-06-03 12:17:55.000000000 +0200
+++ pfstools-1.8.5/debian/control 2012-06-03 11:28:39.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian PhotoTools Maintainers <pkg-phototools-de...@lists.alioth.debian.org>
Uploaders: Sebastian Harl <tok...@debian.org>
-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 @@
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 @@
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
--- pfstools-1.8.1/debian/octave-pfstools.install 2012-06-03 12:17:55.000000000 +0200
+++ pfstools-1.8.5/debian/octave-pfstools.install 2012-06-03 10:58:11.000000000 +0200
@@ -1,3 +1,3 @@
-usr/lib/octave/*
+usr/lib/*/octave/*
usr/share/octave/*
--- pfstools-1.8.1/debian/patches/00list 2012-06-03 12:17:55.000000000 +0200
+++ pfstools-1.8.5/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-octave-nargin.dpatch
-octave-signal.dpatch
-gcc-4.4.dpatch
--- pfstools-1.8.1/debian/patches/gcc-4.4.dpatch 2012-06-03 12:17:55.000000000 +0200
+++ pfstools-1.8.5/debian/patches/gcc-4.4.dpatch 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc-4.4.dpatch by Fabrice Coutadeur <fabric...@ubuntu.com>
-##
-## 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 z...@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;
-
--- pfstools-1.8.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ pfstools-1.8.5/debian/patches/series 2012-06-03 11:10:01.000000000 +0200
@@ -0,0 +1,3 @@
+octave-nargin.dpatch
+octave-signal.dpatch
+
--- pfstools-1.8.1/debian/rules 2012-06-03 12:17:55.000000000 +0200
+++ pfstools-1.8.5/debian/rules 2012-06-03 11:25:31.000000000 +0200
@@ -19,14 +19,13 @@
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 @@
# 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 @@
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -114,7 +113,6 @@
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
--- pfstools-1.8.1/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ pfstools-1.8.5/debian/source/format 2012-06-03 11:26:19.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
-- Sébastien Villemot Researcher in Economics & Debian Maintainer http://www.dynare.org/sebastien Phone: +33-1-40-77-84-04 - GPG Key: 4096R/381A7594
pgpkLWC4hL5bq.pgp
Description: PGP signature
