[plplot] 04/68: Import Debian changes 5.3.1-3

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository plplot.

commit a9d64646d88109743a688fc36a1249d3ab87431c
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri Feb 25 13:36:26 2005 +0100

    Import Debian changes 5.3.1-3
    
    plplot (5.3.1-3) unstable; urgency=low
    
      * Rebuild against Octave 2.1.66
      * debian/control:
        - Build-depends on octave2.1-headers (>= 2.1.65)
        - Fixed typo in description of libcsiro0 package (closes: #284381)
        - Made the libplplot9 package suggest all the driver packages,
          including plplot-tcl, which contains the Tk driver (closes: #285193)
        - Droped several dependencies on libplplot9 (= ${Source-Version}),
          which were causing lintian to complain
      * debian-rules:
        - Include defs.make and use octave-depends command
        - Droped manual setting of octave-plplot.substvars
        - Use OCTDIR to install plplot_octave.oct
---
 debian/changelog | 19 ++++++++++++++++++-
 debian/control   | 21 +++++++++++----------
 debian/rules     | 10 ++++------
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b88f1cc..2ad605d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,23 @@
+plplot (5.3.1-3) unstable; urgency=low
+
+  * Rebuild against Octave 2.1.66
+  * debian/control:
+    - Build-depends on octave2.1-headers (>= 2.1.65)
+    - Fixed typo in description of libcsiro0 package (closes: #284381)
+    - Made the libplplot9 package suggest all the driver packages,
+      including plplot-tcl, which contains the Tk driver (closes: #285193)
+    - Droped several dependencies on libplplot9 (= ${Source-Version}),
+      which were causing lintian to complain
+  * debian-rules:
+    - Include defs.make and use octave-depends command
+    - Droped manual setting of octave-plplot.substvars
+    - Use OCTDIR to install plplot_octave.oct
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 25 Feb 2005 13:36:26 +0100
+
 plplot (5.3.1-2) unstable; urgency=low
 
-  * Rebuilt against Octave 2.1.64.
+   * Rebuilt against Octave 2.1.64.
 
  -- Rafael Laboissiere <rafael at debian.org>  Sat,  4 Dec 2004 16:57:04 +0100
 
diff --git a/debian/control b/debian/control
index 83967c6..115a9f4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: math
 Priority: optional
 Maintainer: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.1.67), tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, g77, fort77 [m68k], itk3-dev, python-numeric | python2.3-numeric, python-dev | python2.3-dev, octave2.1-headers (>= 2.1.54-2), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome-dev, m4, perl, libqhull-dev, libxml-parser-perl, libxml-dom-perl, matwrap, autotools-dev, libltdl3-dev, pkg-config, dpatch, atlas3-base-dev [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k]
+Build-Depends: debhelper (>= 4.1.67), tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, g77, fort77 [m68k], itk3-dev, python-numeric | python2.3-numeric, python-dev | python2.3-dev, octave2.1-headers (>= 2.1.65), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome-dev, m4, perl, libqhull-dev, libxml-parser-perl, libxml-dom-perl, matwrap, autotools-dev, libltdl3-dev, pkg-config, dpatch, atlas3-base-dev [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k]
 Build-Conflicts: libplplot5
 
 Package: libplplot9
@@ -11,6 +11,7 @@ Architecture: any
 Section: libs
 Conflicts: libplplot5, plplot (<< 5)
 Depends: ${shlibs:Depends}
+Suggests: plplot9-driver-xwin, plplot9-driver-gnome, plplot9-driver-gd, plplot-tcl
 Description: Scientific plotting library
  PLplot is relatively small, portable, freely distributable, and is rich
  enough to satisfy most users.  It has a wide range of plot types including
@@ -43,7 +44,7 @@ Package: libplplot-c++9
 Architecture: any
 Section: libs
 Conflicts: libplplot5
-Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}
 Description: Scientific plotting library
  This package contains the C++ binding for PLplot, a scientific plotting
  library.
@@ -56,7 +57,7 @@ Section: libs
 Conflicts: libplplot5, libplplot9 (<< 5.3.0.cvs.20040303)
 Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends}
 Description: Scientific plotting library
- This package contains two libraries developed by Pavel Sakov, form the
+ This package contains two libraries developed by Pavel Sakov, from the
  CSIRO Marine Research, used in geometry applications:
  .
   * libcsirocsa: bivariate Cubic Spline Approximation library
@@ -71,7 +72,7 @@ Package: plplot-bin
 Architecture: any
 Section:
 Conflicts: libplplot9 (<= 5.3.0-4), plplot (<< 5)
-Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}
 Description: Scientific plotting library (utilities)
  This package contains the following utilities associated with PLplot,
  a scientific plotting library:
@@ -88,7 +89,7 @@ Description: Scientific plotting library (utilities)
 Package: plplot9-driver-xwin
 Architecture: any
 Section: libs
-Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}
 Conflicts: plplot-lib, plplot (<< 5)
 Description: Scientific plotting library (X11 driver)
  This package provides the X11 driver module for PLplot, a scientific
@@ -99,7 +100,7 @@ Description: Scientific plotting library (X11 driver)
 Package: plplot9-driver-gnome
 Architecture: any
 Section: libs
-Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}
 Description: Scientific plotting library (Gnome canvas driver)
  This package provides the Gnome canvas driver module for PLplot, a
  scientific plotting library.
@@ -109,7 +110,7 @@ Description: Scientific plotting library (Gnome canvas driver)
 Package: plplot-tcl
 Architecture: any
 Priority: extra
-Depends: libplplot9 (= ${Source-Version}), plplot9-driver-xwin, iwidgets4, ${shlibs:Depends}
+Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends}
 Description: Tcl/Tk support for PLplot, a plotting library
  This package contains the Tcl/Tk support for PLplot, a scientific
  plotting library: shared libraries, Tcl modules, the Tk driver, and
@@ -134,7 +135,7 @@ Description: Tcl/Tk development support for PLplot, a plotting library
 Package: plplot9-driver-gd
 Architecture: any
 Section: libs
-Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}
 Description: Scientific plotting library (GD driver)
  This package provides the GD driver module for PLplot, a scientific plotting
  library.  It allows the generation of PNG and JPEG files directly from
@@ -145,7 +146,7 @@ Description: Scientific plotting library (GD driver)
 Package: python-plplot
 Architecture: any
 Section: python
-Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends}, ${python:Depends}, python-numeric
+Depends: ${shlibs:Depends}, ${python:Depends}, python-numeric
 Description: Python support for PLplot, a plotting library
  This package contains the library plmodule.so for gluing the PLplot
  scientific plotting library into Python applications.  Examples are also
@@ -156,7 +157,7 @@ Description: Python support for PLplot, a plotting library
 Package: octave-plplot
 Architecture: any
 Priority: extra
-Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends}, ${octave:Depends}
+Depends: ${shlibs:Depends}, ${octave:Depends}
 Description: Octave support for PLplot, a plotting library
  This package contains the Octave bindings for PLplot, a scientific plotting
  library.  It provides an almost drop-in replacement for the traditional
diff --git a/debian/rules b/debian/rules
index f5514d1..8075aa4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,8 @@
 
 export DH_COMPAT=4
 
+include /usr/share/octave/debian/defs.make
+
 version		:= $(shell perl debian/get-upstream-version.pl < configure.ac)
 libpkg          := libplplot9
 debbase		:= $(shell pwd)/debian
@@ -43,11 +45,6 @@ config-stamp: autotools-stamp
                     --infodir=/usr/share/info --with-freetype           \
                     --without-rpath --with-prebuiltdoc --disable-java   \
                     --with-pthreads --with-ltdlsystem
-	( octver=`egrep "^OCTAVE_VERSION =" Makefile                   \
-              | sed "s/OCTAVE_VERSION = *//" | sed 's/ *$$//'`       ; \
-          octpkgver=`echo $$octver | sed 's/\.[0-9]*$$//'`           ; \
-          echo "octave:Depends=octave$$octpkgver (>= $$octver)"        \
-              > debian/octave-plplot.substvars )
 	touch config-stamp
 
 build: build-stamp
@@ -72,7 +69,7 @@ install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 
-	make DESTDIR=$(debtmp) install
+	make DESTDIR=$(debtmp) OCTAVE_OCT_DIR=$(OCTDIR) install
 
 	rm -f $(debtmp)/usr/bin/plplot-config
 
@@ -126,6 +123,7 @@ binary-arch: build install
 	dh_makeshlibs -V -a
 	dh_shlibdeps -a -L $(libpkg) \
           -l $(debbase)/$(libpkg)/usr/lib:$(debbase)/plplot-tcl/usr/lib
+	octave-depends --package=octave-plplot
 	dh_installdeb -a
 	dh_gencontrol -a
 	dh_md5sums -a

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git