Merged branch 'nmu/1.8.5-0.1'.

Conflicts:
	debian/changelog
	debian/control

diff --git a/debian/changelog b/debian/changelog
index a84d8013a56d7aa3d7114818b950479730957021..af20d6d4575d1b5da450b8dca6d7514ccd1055b8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,35 @@
-pfstools (1.8.2-1) unstable; urgency=low
+pfstools (1.8.5-1) unstable; urgency=low
 
-  * New upstream release.
-  * debian/patches:
-    - Removed gcc-4.4 -- applied upstream.
   * debian/control:
     - Updated standards-version to 3.9.1 -- no changes.
 
  -- Sebastian Harl <tokkee@debian.org>  Sat, 31 Jul 2010 19:31:26 +0200
 
+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.villemot@ens.fr>  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 4a9f966001454f9fbeec9333c6cdb88338dbffd8..7b4954b61a3221d64429d6c6dce6f58e1f6b9f31 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
 Priority: optional
 Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel@lists.alioth.debian.org>
 Uploaders: Sebastian Harl <tokkee@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.9.1
 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 ff9de68f9a3de11d2b3e6b95d24a2898f1311151..153a7c88538a42371ccf623c4242786a00daeee2 100644 (file)
--- 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/00list b/debian/patches/00list
deleted file mode 100644 (file)
index d5b9a75..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-octave-nargin.dpatch
-octave-signal.dpatch

diff --git a/debian/patches/octave-nargin.dpatch b/debian/patches/octave-nargin.dpatch
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/debian/patches/octave-signal.dpatch b/debian/patches/octave-signal.dpatch
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..d5b9a75
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+octave-nargin.dpatch
+octave-signal.dpatch

diff --git a/debian/rules b/debian/rules
index 8ad66f20ec7a9719bc23e26c40aa275110e72bde..f6fde13f7a278b7fe6dd89bb6daf5da6e93e63a9 100755 (executable)
--- 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 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)