[plplot] 16/68: Import Debian changes 5.6.1-2
Ole Streicher
olebole at moszumanska.debian.org
Mon Jul 10 07:38:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository plplot.
commit c615948c2cae32c38bf7f2302ea7fba9fb4aa297
Author: Rafael Laboissiere <rafael at debian.org>
Date: Sat Jun 24 23:42:02 2006 +0200
Import Debian changes 5.6.1-2
plplot (5.6.1-2) unstable; urgency=low
* debian/control: Replaced all build-dependencies for java by
java-gcj-compat-dev, which will be default java environment for
building packages soon (thanks to Michael Koch <konqueror at gmx.de>
for the hint, closes: #370655, #372644)
* debian/rules: Set JAVA_HOME to /usr/lib/jvm/java-gcj
* The libcsiro0 package has now its own /usr/share/doc/libcsiro0
directory, eliminating the need for a symlink to
/usr/share/doc/libplplot9, which avoids the circular dependency
libcsiro0 <-> liplplot9 (closes: #342897)
* Adapted to the New Python Policy (closes: #373478):
- debian/control:
+ Build-Depends on debhelper >= 5.0.37.2, python-all-dev >=
2.3.5-11, and python-central >= 0.4.17
+ Added a XB-Python-Version field to the python-plplot package
+ Added a XS-Python-Version with value "all"
- debian/rules:
+ Added call to dh_pycentral
+ Generate the Python modules for versions 2.3 and 2.4 by calling
twice the configure script + make + make install in the newly
created rule install-python%
---
debian/changelog | 25 ++++++++++++++++++++++
debian/control | 17 ++++++++-------
debian/libcsiro0.files | 2 +-
debian/pycompat | 1 +
debian/rules | 56 +++++++++++++++++++++++++++++++-------------------
5 files changed, 72 insertions(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 13ea9ea..cab3565 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+plplot (5.6.1-2) unstable; urgency=low
+
+ * debian/control: Replaced all build-dependencies for java by
+ java-gcj-compat-dev, which will be default java environment for
+ building packages soon (thanks to Michael Koch <konqueror at gmx.de>
+ for the hint, closes: #370655, #372644)
+ * debian/rules: Set JAVA_HOME to /usr/lib/jvm/java-gcj
+ * The libcsiro0 package has now its own /usr/share/doc/libcsiro0
+ directory, eliminating the need for a symlink to
+ /usr/share/doc/libplplot9, which avoids the circular dependency
+ libcsiro0 <-> liplplot9 (closes: #342897)
+ * Adapted to the New Python Policy (closes: #373478):
+ - debian/control:
+ + Build-Depends on debhelper >= 5.0.37.2, python-all-dev >=
+ 2.3.5-11, and python-central >= 0.4.17
+ + Added a XB-Python-Version field to the python-plplot package
+ + Added a XS-Python-Version with value "all"
+ - debian/rules:
+ + Added call to dh_pycentral
+ + Generate the Python modules for versions 2.3 and 2.4 by calling
+ twice the configure script + make + make install in the newly
+ created rule install-python%
+
+ -- Rafael Laboissiere <rafael at debian.org> Sat, 24 Jun 2006 23:42:02 +0200
+
plplot (5.6.1-1) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 0feab88..18a3d33 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,18 @@ Section: math
Priority: optional
Maintainer: Rafael Laboissiere <rafael at debian.org>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.1.67), tcl8.4-dev, tk8.4-dev, itcl3-dev,
- libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, python-dev,
+Build-Depends: debhelper (>= 5.0.37.2), tcl8.4-dev, tk8.4-dev, itcl3-dev,
+ libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev,
octave2.1-headers (>= 2.1.65), libgd2-noxpm-dev | libgd2-xpm-dev,
libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, m4, 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], python-gtk2-dev,
- libgcj6-dev | kaffe-dev | libsablevm1-dev, gcj | java-compiler,
- fastjar | kaffe, liblasi-dev (>= 1.0.5-2), libwxgtk2.6-dev,
- python-gnome2-dev, pdl
+ 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-central (>= 0.4.17), python2.3-numeric, python2.4-numeric
Build-Conflicts: libplplot5
+XS-Python-Version: all
Package: libplplot9
Architecture: any
@@ -77,7 +78,7 @@ Package: libcsiro0
Architecture: any
Section: libs
Conflicts: libplplot5, libplplot9 (<< 5.3.0.cvs.20040303)
-Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}
Description: Scientific plotting library
This package contains two libraries developed by Pavel Sakov, from the
CSIRO Marine Research, used in geometry applications:
@@ -192,7 +193,9 @@ Description: Scientific plotting library (GD driver)
Package: python-plplot
Architecture: any
Section: python
-Depends: ${shlibs:Depends}, ${python:Depends}, python-numeric
+Depends: libplplot9 (= ${Source-Version}), ${shlibs:Depends},
+ ${python:Depends}, python-numeric
+XB-Python-Version: ${python:Versions}
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
diff --git a/debian/libcsiro0.files b/debian/libcsiro0.files
index 6720f32..f0edc5e 100644
--- a/debian/libcsiro0.files
+++ b/debian/libcsiro0.files
@@ -1,2 +1,2 @@
usr/lib/libcsiro*.so.*
-usr/share/doc/libcsiro0
+
diff --git a/debian/pycompat b/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/debian/rules b/debian/rules
index 089269d..263fb7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@
#export DH_VERBOSE=1
include /usr/share/octave/debian/defs.make
+include /usr/share/dpatch/dpatch.make
version := $(shell perl debian/get-upstream-version.pl < configure.ac)
libpkg := libplplot9
@@ -25,13 +26,15 @@ debdoc := $(debshr)/doc
debinfo := $(debshr)/info
debex := $(debshr)/plplot$(version)/examples
-javasetup := $(shell \
- if test ! -f /usr/include/jni.h \
- -a -f /usr/lib/kaffe/include/jni.h ; then \
- echo --with-java-home=/usr/lib/kaffe ; \
- fi)
-
-include /usr/share/dpatch/dpatch.make
+PYVERS = $(shell pyversions -vr)
+CONFIGURE_OPTIONS = \
+ --prefix=/usr --mandir=/usr/share/man \
+ --infodir=/usr/share/info --with-pkg-config \
+ --without-rpath --with-prebuiltdoc \
+ --with-pthreads --with-ltdlsystem \
+ --disable-linuxvga --enable-psttf \
+ --enable-f95 --enable-psttfc --enable-pdl \
+ --with-java-home=/usr/lib/jvm/java-gcj
autotools: autotools-stamp
autotools-stamp:
@@ -43,13 +46,7 @@ autotools-stamp:
config: config-stamp
config-stamp: autotools-stamp
PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --infodir=/usr/share/info --with-pkg-config \
- --without-rpath --with-prebuiltdoc \
- --with-pthreads --with-ltdlsystem \
- --disable-linuxvga --enable-psttf \
- --enable-f95 --enable-psttfc $(javasetup) \
- --enable-pdl
+ ./configure $(CONFIGURE_OPTIONS) --disable-python
touch config-stamp
build: build-stamp
@@ -73,11 +70,12 @@ clean: unpatch
-$(MAKE) -k distclean
rm -f config.sub config.guess
find . -name config.log -o -name config.status | xargs rm -f
- rm -f Makefile
+ rm -f Makefile install-python*
rm -rf $(debbase)/$(libpkg)
dh_clean
-install: install-stamp
+install: install-stamp install-python
+
install-stamp: build-stamp
dh_testdir
dh_testroot
@@ -97,7 +95,7 @@ install-stamp: build-stamp
for i in libplplot-dev plplot-tcl plplot-tcl-dev \
plplot9-driver-gd plplot9-driver-xwin octave-plplot \
python-plplot plplot-bin libplplot-c++9c2 \
- libcsiro0 plplot9-driver-gnome2 libplplot9-java \
+ plplot9-driver-gnome2 libplplot9-java \
plplot9-driver-wxwidgets plplot9-driver-psttf \
libplplot-fortran9 ; do \
ln -s $(libpkg) $(debdoc)/$$i ; \
@@ -106,13 +104,28 @@ install-stamp: build-stamp
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)
touch install-stamp
+install-python: $(PYVERS:%=install-python%)
+ ( 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 \
+ ( cd bindings/$$d; \
+ make clean ; \
+ make ; \
+ make DESTDIR=$(debtmp) install ) ; \
+ done
+ touch $@
+
# Build architecture-independent files here.
binary-indep: build install
dh_testdir -i
@@ -132,10 +145,11 @@ binary-arch: build install
dh_testroot -a
dh_installdirs -a
- dh_installdocs --package=$(libpkg)
- dh_installchangelogs --package=$(libpkg)
+ dh_installdocs --package=$(libpkg) --package=libcsiro0
+ dh_installchangelogs --package=$(libpkg) --package=libcsiro0
- dh_python
+ dh_pycentral --package=python-plplot
+ dh_python --package=python-plplot
dh_strip -a
dh_compress -a -Xexamples/
dh_fixperms -a
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git
More information about the debian-science-commits
mailing list