[Plplot-cvs] SF.net SVN: plplot:[11130] branches/v5_9_5_debian/debian

[<and...@us...>]

Revision: 11130
          http://plplot.svn.sourceforge.net/plplot/?rev=11130&view=rev
Author:   andrewross
Date:     2010-08-12 21:36:30 +0000 (Thu, 12 Aug 2010)

Log Message:
-----------
Backport updates for debian package to 5.9.5 in unstable. Freeze is now on so can't upload 5.9.6 packages. Fixes numpy bug. 

Modified Paths:
--------------
    branches/v5_9_5_debian/debian/changelog
    branches/v5_9_5_debian/debian/control.in
    branches/v5_9_5_debian/debian/plplot-bin.files
    branches/v5_9_5_debian/debian/rules

Modified: branches/v5_9_5_debian/debian/changelog
===================================================================
--- branches/v5_9_5_debian/debian/changelog	2010-08-12 21:24:44 UTC (rev 11129)
+++ branches/v5_9_5_debian/debian/changelog	2010-08-12 21:36:30 UTC (rev 11130)
@@ -1,3 +1,15 @@
+plplot (5.9.5-4) unstable; urgency=low
+
+  * debian/rules, debian/control.in: update to use dh_numpy in debian/rules 
+    to get versioned numpy support. Requires python numpy >= 1:1.1.4.1-4~ 
+    (closes: 590770).
+  * debian/control.in: Bump standards version to 3.9.1.
+  * debian/control.in, debian/plplot-bin.files: remove references to plrender
+    in package descriptions (no longer included) and also remove plpr / plm2gif
+    scripts which rely on plrender.
+
+ -- Andrew Ross <and...@us...>  Thu, 12 Jul 2010 20:26:31 +0100
+
 plplot (5.9.5-3) unstable; urgency=low
 
   * debian/control.in: 

Modified: branches/v5_9_5_debian/debian/control.in
===================================================================
--- branches/v5_9_5_debian/debian/control.in	2010-08-12 21:24:44 UTC (rev 11129)
+++ branches/v5_9_5_debian/debian/control.in	2010-08-12 21:36:30 UTC (rev 11130)
@@ -2,7 +2,7 @@
 Section: math
 Priority: optional
 Maintainer: Andrew Ross <and...@us...>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Build-Depends: cmake (>= 2.6.3), debhelper (>= 7), 
  tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
  libxi-dev, gfortran, itk3-dev, octave3.2-headers,
@@ -10,7 +10,7 @@
  libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config, 
  quilt, slice, python-gtk2-dev, libwxgtk2.8-dev, 
  python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
- python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk,
+ python-numpy (>= 1:1.4.1-4~), ttf-freefont, default-jdk,
  fastjar, swig, gnat [!sh4]
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex, ghostscript
@@ -140,8 +140,6 @@
  This package contains the following utilities associated with PLplot.
  .
   * pltek - review a Tektronix vector file
-  * plm2gif - converts PLplot metafiles to GIF files
-  * plpr - converts PLplot metafile to something the printer will understand
 
 Package: plplot9-driver-xwin
 Architecture: any
@@ -189,8 +187,7 @@
  .
  This package contains the Tcl/Tk support for PLplot: shared libraries,
  Tcl modules, the Tk driver, and some programs for interactive use of
- PLplot (plserver and pltcl). Also included is the utility program
- plrender to render PLplot metafiles.
+ PLplot (plserver and pltcl). 
 
 Package: plplot-tcl-dev
 Architecture: any
@@ -249,7 +246,7 @@
 Architecture: any
 Section: python
 Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends},
- ${python:Depends}, python-numpy, ${misc:Depends}
+ ${python:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python support for PLplot, a plotting library

Modified: branches/v5_9_5_debian/debian/plplot-bin.files
===================================================================
--- branches/v5_9_5_debian/debian/plplot-bin.files	2010-08-12 21:24:44 UTC (rev 11129)
+++ branches/v5_9_5_debian/debian/plplot-bin.files	2010-08-12 21:36:30 UTC (rev 11130)
@@ -1,3 +1,3 @@
-usr/bin
-usr/share/man
+usr/bin/pltek
+usr/share/man/man1/pltek.1
 usr/share/doc/plplot-bin

Modified: branches/v5_9_5_debian/debian/rules
===================================================================
--- branches/v5_9_5_debian/debian/rules	2010-08-12 21:24:44 UTC (rev 11129)
+++ branches/v5_9_5_debian/debian/rules	2010-08-12 21:36:30 UTC (rev 11130)
@@ -180,7 +180,7 @@
 
 install-python%: build-arch-stamp
 	( cd $(BUILD_DIR) ; \
-	  cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy"  -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \
+	  cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy;/usr/lib/pyshared/python$*/numpy/core/include/numpy"  -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \
 	  for d in python ; do		\
 	    ( cd bindings/$$d;				\
 	      $(MAKE) clean ;				\
@@ -212,6 +212,7 @@
 	dh_installchangelogs --package=$(libpkg) --package=libcsiro0
 
 	dh_pycentral --package=python-plplot
+	dh_numpy
 	dh_strip -a
 	dh_compress -a -Xexamples/
 	dh_fixperms -a


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.