Package: octave-gdf
Version: 0.1.2-1
Severity: important
Tags: patch

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

The libgdf 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-gdf package should now simply depend on
octave.  Note that the octave-gdf package will, in fine, depend on
liboctave1, which will pull the appropriate version of octave (3.6.1-4,
currently).

I also added the files octave-gdf.docs and octave-gdf.examples to the
debian/ directory for installing the functions documentation and the 
provided examples.  I think that these are useful additions.

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
diff -Nru libgdf-0.1.2/debian/changelog libgdf-0.1.2/debian/changelog
--- libgdf-0.1.2/debian/changelog       2012-02-29 16:59:18.000000000 +0000
+++ libgdf-0.1.2/debian/changelog       2012-04-02 09:02:39.000000000 +0000
@@ -1,3 +1,22 @@
+libgdf (0.1.2-2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Build-depend on liboctave-dev, such that the package will build 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 *.mex files
+    - Do not invoke the obsolete script octave-depends
+  * debian/octave-gdf.docs: New debhelper file for installing the
+    gdf_{reader,writer}.m files, which contain actually just the
+    documentation for the *.mex files
+  * debian/octave-gdf.examples: New debhelper file for installing the
+    provided examples
+
+ -- Rafael Laboissiere <[email protected]>  Mon, 02 Apr 2012 09:21:23 
+0200
+
 libgdf (0.1.2-1) unstable; urgency=low
 
   * Fresh upstream snapshot
diff -Nru libgdf-0.1.2/debian/control libgdf-0.1.2/debian/control
--- libgdf-0.1.2/debian/control 2012-02-29 16:59:18.000000000 +0000
+++ libgdf-0.1.2/debian/control 2012-04-02 07:21:02.000000000 +0000
@@ -4,7 +4,7 @@
 Uploaders: Yaroslav Halchenko <[email protected]>, Michael Hanke 
<[email protected]>
 Build-Depends: debhelper (>= 7.0.50~), cmake (>= 2.8), help2man,
                           libboost-dev (>> 1.34.2~), libboost-filesystem-dev, 
libboost-program-options-dev, libboost-date-time-dev,
-                          octave-pkg-dev (>= 0.5.7)
+                          liboctave-dev
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://sourceforge.net/projects/libgdf
@@ -60,7 +60,7 @@
 Package: octave-gdf
 Section: science
 Architecture: any
-Depends: ${octave:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: octave, ${shlibs:Depends}, ${misc:Depends}
 Description: IO library for the GDF -- Octave interface
  GDF (General Dataformat for Biosignals) is intended to provide a generic
  storage for biosignals, such as EEG, ECG, MEG etc.
diff -Nru libgdf-0.1.2/debian/octave-gdf.docs 
libgdf-0.1.2/debian/octave-gdf.docs
--- libgdf-0.1.2/debian/octave-gdf.docs 1970-01-01 00:00:00.000000000 +0000
+++ libgdf-0.1.2/debian/octave-gdf.docs 2012-04-02 08:03:52.000000000 +0000
@@ -0,0 +1 @@
+matlab/*.m
diff -Nru libgdf-0.1.2/debian/octave-gdf.examples 
libgdf-0.1.2/debian/octave-gdf.examples
--- libgdf-0.1.2/debian/octave-gdf.examples     1970-01-01 00:00:00.000000000 
+0000
+++ libgdf-0.1.2/debian/octave-gdf.examples     2012-04-02 08:14:54.000000000 
+0000
@@ -0,0 +1 @@
+matlab/examples/*
diff -Nru libgdf-0.1.2/debian/rules libgdf-0.1.2/debian/rules
--- libgdf-0.1.2/debian/rules   2012-02-29 16:59:18.000000000 +0000
+++ libgdf-0.1.2/debian/rules   2012-04-02 07:52:16.000000000 +0000
@@ -18,12 +18,8 @@
        -DBUILD_SHARED_LIBS:BOOL=ON \
        -DBUILD_TESTING:BOOL=ON
 
-# OCTDIR=$(shell octave-config --oct-site-dir)
-# get octave paths (have to build-depend on octave-headers)
-# Note: bdepending on octave-pkg-dev since it is not
-#       embedding version information ;) so we could backport
-#       easily
-include /usr/share/octave/debian/defs.make
+# get octave paths (have to build-depend on liboctave-dev)
+OCTDIR=$(shell octave-config --print LOCALOCTFILEDIR)
 
 %:
        dh $@ --buildsystem=cmake
@@ -55,9 +51,7 @@
 override_dh_auto_install:
        dh_auto_install
        : # Install Octave bindings
-       mkdir -p debian/octave-gdf$(OCTDIR)
-       install matlab/*.mex debian/octave-gdf$(OCTDIR)
-       [ -e /usr/bin/octave-depends ] && octave-depends -poctave-gdf
+       dh_install -poctave-gdf matlab/*.mex $(OCTDIR)/gdf
 
 override_dh_strip:
        dh_strip --dbg-package=libgdf0-dbg

Reply via email to