[plplot] 19/68: Import Debian changes 5.6.1-5

[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 ec33dee82e6144ec70eebe3196cd86fb18734063
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Mon Jun 26 10:45:51 2006 +0200

    Import Debian changes 5.6.1-5
    
    plplot (5.6.1-5) unstable; urgency=low
    
      * debian/control: Removed build-dependency on pdl, which causes circular
        dependencies because pdl depends on libplplot9.  It is a bad thing to
        require libplplot9 installed in order to build libplplot9.
      * debian/rules:
        - Dropped --enable-pdl from the list of options to configure
        - Call the dh_movefiles command only after everything has been
          installed in debian/tmp, including the python2.{3,4} specific stuff.
          This will avoid build errors due to libraries being moved away from
          debian/tmp/usr/lib (closes: #375396)
---
 debian/changelog | 14 ++++++++++++++
 debian/control   |  2 +-
 debian/rules     | 29 ++++++++++++++---------------
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f546eac..d41afff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+plplot (5.6.1-5) unstable; urgency=low
+
+  * debian/control: Removed build-dependency on pdl, which causes circular
+    dependencies because pdl depends on libplplot9.  It is a bad thing to
+    require libplplot9 installed in order to build libplplot9.
+  * debian/rules:
+    - Dropped --enable-pdl from the list of options to configure
+    - Call the dh_movefiles command only after everything has been
+      installed in debian/tmp, including the python2.{3,4} specific stuff.
+      This will avoid build errors due to libraries being moved away from
+      debian/tmp/usr/lib (closes: #375396)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 26 Jun 2006 10:45:51 +0200
+
 plplot (5.6.1-4) unstable; urgency=low
 
   * debian/control: Build-Depends on python-numeric >= 24.2-3, because
diff --git a/debian/control b/debian/control
index ecf8154..d03c378 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5.0.37.2), tcl8.4-dev, tk8.4-dev, itcl3-dev,
  libltdl3-dev, pkg-config, dpatch, atlas3-base-dev [!arm !m68k],
  refblas3-dev [arm m68k], lapack3-dev [arm m68k], python-gtk2-dev,
  java-gcj-compat-dev, liblasi-dev (>= 1.0.5-2), libwxgtk2.6-dev,
- python-gnome2-dev, pdl, python-all-dev (>= 2.3.5-11),
+ python-gnome2-dev, python-all-dev (>= 2.3.5-11),
  python-central (>= 0.4.17), python-numeric (>= 24.2-3),
  ttf-freefont
 Build-Conflicts: libplplot5
diff --git a/debian/rules b/debian/rules
index 263fb7d..f9878cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ CONFIGURE_OPTIONS =				\
     --without-rpath --with-prebuiltdoc		\
     --with-pthreads --with-ltdlsystem		\
     --disable-linuxvga  --enable-psttf		\
-    --enable-f95 --enable-psttfc --enable-pdl	\
+    --enable-f95 --enable-psttfc		\
     --with-java-home=/usr/lib/jvm/java-gcj
 
 autotools: autotools-stamp
@@ -75,12 +75,19 @@ clean: unpatch
 	dh_clean
 
 install: install-stamp install-python
+	dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \
+		     --no-package=plplot-bin --no-package=python-plplot
+	dh_movefiles -i
+	dh_movefiles --package=python-plplot
+	dh_movefiles --package=libplplot-dev
+	dh_movefiles --package=plplot-bin
+	dh_movefiles --package=$(libpkg)
 
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 
-	make DESTDIR=$(debtmp) OCTAVE_OCT_DIR=$(OCTDIR) install
+	$(MAKE) DESTDIR=$(debtmp) OCTAVE_OCT_DIR=$(OCTDIR) install
 
 	rm -f $(debtmp)/usr/bin/plplot-config
 
@@ -101,28 +108,20 @@ install-stamp: build-stamp
 	  ln -s $(libpkg) $(debdoc)/$$i ;				\
 	done
 
-	dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \
-		     --no-package=plplot-bin --no-package=python-plplot
-	dh_movefiles -i
-	dh_movefiles --package=libplplot-dev
-	dh_movefiles --package=plplot-bin
-	dh_movefiles --package=$(libpkg)
-
 	touch install-stamp
 
 install-python: $(PYVERS:%=install-python%)
-	( cd examples/python ; make DESTDIR=$(debtmp) install )
+	( cd examples/python ; $(MAKE) DESTDIR=$(debtmp) install )
 	mv $(debex)/python $(debdoc)/$(libpkg)/examples
-	dh_movefiles --package=python-plplot
 	touch $@
 
 install-python%: build-stamp
 	PYTHON=python$* ./configure $(CONFIGURE_OPTIONS)
-	for d in python gnome2/python ; do		\
+	for d in gnome2/python python ; do		\
 	    ( cd  bindings/$$d;				\
-	      make clean ;				\
-	      make ;					\
-	      make DESTDIR=$(debtmp) install ) ;	\
+	      $(MAKE) clean ;				\
+	      $(MAKE) ;					\
+	      $(MAKE) DESTDIR=$(debtmp) install ) ;	\
 	done
 	touch $@
 

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