Merged branch 'nmu/1.8.5-0.1'.

Conflicts:
	debian/changelog
	debian/control

diff --combined debian/changelog
index a84d8013a56d7aa3d7114818b950479730957021,9b8b1c62db86ca4ab34d866f91009b36ea5669ad..af20d6d4575d1b5da450b8dca6d7514ccd1055b8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,28 +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 --combined debian/control
index 4a9f966001454f9fbeec9333c6cdb88338dbffd8,4398056f4ac8e5eb809ffbf31b50089042aa9a2a..7b4954b61a3221d64429d6c6dce6f58e1f6b9f31
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,8 -3,8 +3,8 @@@ Section: graphic
  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.8.4
 +Standards-Version: 3.9.1
  Homepage: http://pfstools.sourceforge.net/
  Vcs-Git: git://git.debian.org/git/pkg-phototools/pfstools.git
  Vcs-Browser: http://git.debian.org/?p=pkg-phototools/pfstools.git
@@@ -12,7 -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 +90,7 @@@ Description: C++ library to read and wr
  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