Bug#666501: xmds: Adjust the package for the new octave package version 3.6.1

[Rafael Laboissiere]

Package: xmds
Version: 1.6.6-6
Severity: important
Tags: patch

The current version of xmds 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) will be completed (see the wiki
page of the DOG [1]).

The xmds package needed octave3.2-headers only for making the
substitution of ${octave:Depends} in debian/control through the script
octave3.2-depends.  There will be no such script in octave_3.6.1, since
we abandoned the packages with versioned names.  We think that the Debian
packages depending/recommending/suggesting octave should specify 
themselves the needed version.  Making xmds simply suggest "octave" will
be appropriate, since the *.m and *.dat files generated by xmds work with
both versions 3.2 and 3.6 of Octave.

The simple solution for this problem is implemented in the debdiff
patch attached below.

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

Versions of packages xmds depends on:
ii  fftw-dev         2.1.5-1
ii  libc6            2.13-27
ii  libfftw3-dev     3.3-1
ii  libgcc1          1:4.6.3-1
ii  libstdc++6       4.6.3-1
ii  mpi-default-dev  1.0.1

xmds recommends no packages.

Versions of packages xmds suggests:
ii  octave3.2  3.2.4-12+b1

-- no debconf information

Rafael
-------------- next part --------------
diff -u xmds-1.6.6/debian/changelog xmds-1.6.6/debian/changelog
--- xmds-1.6.6/debian/changelog
+++ xmds-1.6.6/debian/changelog
@@ -1,3 +1,13 @@
+xmds (1.6.6-7) UNRELEASED; urgency=low
+
+  * debian/control:
+    + Suggest a non-versioned dependency on Octave
+    + Drop build-dependency on octave3.2-headers, since this was needed
+      only because of the octave3.2-depends script
+  * debian/rules: Drop call to octave3.2-depends
+
+ -- Rafael Laboissiere <rafael at laboissiere.net>  Sat, 31 Mar 2012 09:41:03 +0200
+
 xmds (1.6.6-6) unstable; urgency=low
 
   * Team upload
diff -u xmds-1.6.6/debian/control xmds-1.6.6/debian/control
--- xmds-1.6.6/debian/control
+++ xmds-1.6.6/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christian T. Steigies <cts at debian.org>
 Build-Depends: cdbs, debhelper (>= 7.0.0), autotools-dev, fftw-dev,
- libfftw3-dev, mpi-default-dev, octave3.2-headers, autoconf, quilt
+ libfftw3-dev, mpi-default-dev, autoconf, quilt
 Standards-Version: 3.9.2
 Homepage: http://xmds.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/xmds/
@@ -14,7 +14,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, fftw-dev, libfftw3-dev, mpi-default-dev,
  ${misc:Depends}
-Suggests: ${octave:Depends}
+Suggests: octave
 Description: eXtensible Multi-Dimensional Simulator
  XMDS is a code generator that integrates equations, from Ordinary
  Differential Equations (ODEs) up to stochastic Partial Differential
diff -u xmds-1.6.6/debian/rules xmds-1.6.6/debian/rules
--- xmds-1.6.6/debian/rules
+++ xmds-1.6.6/debian/rules
@@ -31,9 +31,6 @@
 	  rm -f lorenz* )
 	touch make-examples-stamp
 
-install/xmds::
-	octave3.2-depends
-
 binary-install/xmds::
 	# Move Octave file into the correct directory
 	mkdir -p $(mdir)