[Pkg-phototools-devel] Bug#666959: pfstools: Adjust for the new octave package version 3.6.1

[Rafael Laboissiere]

Package: pfstools
Version: 1.8.1-2
Severity: important
Tags: patch

The current version of pfstools in sid build-depends on
octave3.2-headers.  This later package will be removed from unstable once
the transition to the new version of octave (currently 3.6.1)q will be
completed (see the wiki page of the DOG [1]).  

The pfstools package needs octave3.2-headers for including the makefile 
fragment defs.make and for calling the octave-depends script that makes
the substitution of ${octave:Depends}.  These files have been dropped in
the Debian packaging of Octave 3.6.1.  

I am attaching below a patch for fixing the issues in this bug report.
The patch was obtained through debdiff. I added the corresponding entries
to debian/changelog.  The octave-pfstools package should now simply
depend on octave.  Note that the octave-pfstools package will, in fine,
depend on liboctave1, which will pull the appropriate version of octave
(3.6.1-4, currently).  

I also changed the file debian/octave-pfstools.install to reflect the
fact that the path for the *.oct files is now multiarch and contains the
architecture triplet.

Rafael 

[1] http://wiki.debian.org/Teams/DebianOctaveGroup 


-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (700, 'testing'), (650, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-2-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
diff -u pfstools-1.8.1/debian/octave-pfstools.install pfstools-1.8.1/debian/octave-pfstools.install
--- pfstools-1.8.1/debian/octave-pfstools.install
+++ pfstools-1.8.1/debian/octave-pfstools.install
@@ -1,3 +1,3 @@
-usr/lib/octave/*
+usr/lib/*/octave/*
 usr/share/octave/*
 
diff -u pfstools-1.8.1/debian/control pfstools-1.8.1/debian/control
--- pfstools-1.8.1/debian/control
+++ pfstools-1.8.1/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel at lists.alioth.debian.org>
 Uploaders: Sebastian Harl <tokkee at 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), dpatch, gfortran, autotools-dev, libqt3-mt-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
diff -u pfstools-1.8.1/debian/rules pfstools-1.8.1/debian/rules
--- pfstools-1.8.1/debian/rules
+++ pfstools-1.8.1/debian/rules
@@ -19,7 +19,9 @@
 	CXXFLAGS += -O2
 endif
 
-include /usr/share/octave/debian/defs.make
+MDIR = $(shell octave-config  --print LOCALFCNFILEDIR)
+OCTDIR = $(shell octave-config  --print LOCALOCTFILEDIR)
+
 include /usr/share/dpatch/dpatch.make
 
 confflags = --host=$(DEB_HOST_GNU_TYPE) \
@@ -114,7 +116,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
diff -u pfstools-1.8.1/debian/changelog pfstools-1.8.1/debian/changelog
--- pfstools-1.8.1/debian/changelog
+++ pfstools-1.8.1/debian/changelog
@@ -1,3 +1,19 @@
+pfstools (1.8.1-3) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Build-depend on liboctave-dev, such that the package builds with
+      Octave 3.6
+    - 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
+
+ -- Rafael Laboissiere <rafael at laboissiere.net>  Mon, 02 Apr 2012 23:32:29 +0200
+
 pfstools (1.8.1-2) unstable; urgency=low
 
   [ Thomas Weber ]