[Plplot-cvs] SF.net SVN: plplot:[11631] branches/v5_9_7_debian/debian

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

Revision: 11631
          http://plplot.svn.sourceforge.net/plplot/?rev=11631&view=rev
Author:   andrewross
Date:     2011-03-16 15:54:46 +0000 (Wed, 16 Mar 2011)

Log Message:
-----------

First stab at a debian packages for plplot-5.9.7 in Debian wheezy (current testing).

Modified Paths:
--------------
    branches/v5_9_7_debian/debian/NEWS
    branches/v5_9_7_debian/debian/changelog
    branches/v5_9_7_debian/debian/control.in
    branches/v5_9_7_debian/debian/libplplot9.README.Debian
    branches/v5_9_7_debian/debian/rules

Added Paths:
-----------
    branches/v5_9_7_debian/debian/plplot9-driver-qt.files
    branches/v5_9_7_debian/debian/source/
    branches/v5_9_7_debian/debian/source/format

Removed Paths:
-------------
    branches/v5_9_7_debian/debian/plplot-bin.files
    branches/v5_9_7_debian/debian/source/format

Property Changed:
----------------
    branches/v5_9_7_debian/debian/


Property changes on: branches/v5_9_7_debian/debian
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v5_9_5_debian/debian:10762-11010
   + /branches/v5_9_5_debian/debian:10762-11010
/branches/v5_9_6_debian/debian:11125-11630

Modified: branches/v5_9_7_debian/debian/NEWS
===================================================================
--- branches/v5_9_7_debian/debian/NEWS	2011-03-16 10:04:02 UTC (rev 11630)
+++ branches/v5_9_7_debian/debian/NEWS	2011-03-16 15:54:46 UTC (rev 11631)
@@ -1,10 +1,17 @@
-plplot (5.8.0~RC1-2) unstable; urgency=low
+plplot (5.9.6-1) unstable; urgency=low
 
-  * The psttf driver is dropped in this release.  The cairo driver
-    provides all of its functionality and will replace it eventually.  The
-    plplot9-driver-cairo package has relationships Conflicts/Replaces with
-    plplot9-driver-pstff, which should make the transition smoother for
-    the users.
+    The plplot-bin package has been dropped since all the utilities in contained
+    were now obsolete, or relied on obsolete drivers.
 
- -- Rafael Laboissiere <ra...@de...>  Thu, 01 Nov 2007 10:19:31 +0100
+    A new plplot9-driver-qt package has been introduced for the new qt driver
+    and bindings. This produce high quality interactive output on multiple 
+    platforms (Linux / Mac OS-X / Windows) as well as a range of file formats
+    including postscript, pdf, svg, png, jpeg and ppm. Upstream the gd driver is
+    now disabled by default and the qt or cairo are recommended instead. In a
+    subsequent release it is likely that the Debian package of the gd driver will
+    also be dropped and so it is recommended that you move to the qt or cairo 
+    drivers instead. 
 
+ -- Andrew Ross <and...@us...>  Thu, 12 Jul 2010 23:25:08 +0100
+
+

Modified: branches/v5_9_7_debian/debian/changelog
===================================================================
--- branches/v5_9_7_debian/debian/changelog	2011-03-16 10:04:02 UTC (rev 11630)
+++ branches/v5_9_7_debian/debian/changelog	2011-03-16 15:54:46 UTC (rev 11631)
@@ -1,18 +1,54 @@
-plplot (5.9.6-1) unstable; urgency=low
+plplot (5.9.7-1) unstable; urgency=low
 
   * New upstream release (closes: #564216).
+  * debian/rules: remove -DHAVE_PTHREADS=ON option as it is on by default. 
+    Option name is also likely to change in future releases.
+  * debian/control.in, debian/rules, debian/python-plplot.files: change from
+    using dh_pycentral to dh_python2 (closes: #616942).
+
+ -- Andrew Ross <and...@us...>  Wed, 16 Mar 2011 11:10:59 +0000
+
+plplot (5.9.6-1) UNRELEASED; urgency=low
+
+  * New upstream release.
   * debian/patches/series: 
     + Remove the following patches which are included upstream
         11_minus-sign-manpage.diff
         16_wxwidget-with-cmake-2.8.diff
         17_fix_cmap_support.diff
+        18_update_cmake_fortran.diff
       and delete the patches from the patches directory.
-    + Comment out 07_octave_prune_examples.diff from the list of applied patches, 
-      but leave patch for now to see if octave example p7 is ok on alpha.
+    + Comment out 07_octave_prune_examples.diff from the list of applied 
+      patches, but leave patch for now to see if octave example p7 is ok 
+      on alpha.
     + Update remaining patches for 5.9.6.
+  * debian/control.in: drop plplot-bin package altogether as all these scripts
+    are now obsolete.
+  * debian/control.in, debian/rules, debian/plplot9-driver-qt.files:
+    Add new plplot9-driver-qt package which includes the qt driver and bindings.
+  * debian/source/format: Add file to select 3.0 (quilt) format for the package. 
+    Fixes lintian warning.
+  * debian/NEWS: update NEWS file for 5.9.6.
 
- -- Andrew Ross <and...@us...>  Wed, 19 May 2010 11:14:30 +0100
+ -- Andrew Ross <and...@us...>  Fri, 27 Aug 2010 23:31:10 +0100
 
+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.
+  * debian/control.in: Fix spelling mistake in cairo driver package 
+    (closes: 592970)
+  * debian/patches/18_update_cmake_fortran.diff: Remove plplot workaround for
+    cmake fortran support as this is no longer needed with cmake 2.8.2 and
+    causes errors building the f77 and f95 libraries.
+
+ -- Andrew Ross <and...@us...>  Thu, 26 Aug 2010 13:38:26 +0100
+
 plplot (5.9.5-3) unstable; urgency=low
 
   * debian/control.in: 

Modified: branches/v5_9_7_debian/debian/control.in
===================================================================
--- branches/v5_9_7_debian/debian/control.in	2011-03-16 10:04:02 UTC (rev 11630)
+++ branches/v5_9_7_debian/debian/control.in	2011-03-16 15:54:46 UTC (rev 11631)
@@ -2,20 +2,20 @@
 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,
  libgd2-noxpm-dev | libgd2-xpm-dev, m4, libqhull-dev (>= 2003.1-8), 
  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,
- fastjar, swig, gnat [!sh4]
+ python-all-dev (>= 2.6.6-3~),
+ python-numpy (>= 1:1.4.1-4~), ttf-freefont, default-jdk,
+ fastjar, swig, gnat [!sh4], libqt4-dev, python-sip-dev
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex, ghostscript
 Build-Conflicts: libplplot5, octave3.0-headers
-XS-Python-Version: all
+X-Python-Version: >=2.4
 Homepage: http://www.plplot.org
 Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian
 Vcs-Browser: http://plplot.svn.sourceforge.net/viewvc/plplot/trunk/debian/
@@ -27,6 +27,8 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: plplot9-driver-xwin, plplot9-driver-gd,
  plplot9-driver-cairo, plplot9-driver-wxwidgets, plplot-tcl
+Replaces: plplot-bin (<< 5.9.6-1)
+Breaks: plplot-bin (<<5.9.6-1)
 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
@@ -124,25 +126,6 @@
  The source code for these libraries are part of the plplot source
  package.
 
-Package: plplot-bin
-Architecture: any
-Conflicts: libplplot9 (<= 5.3.0-4), plplot (<< 5)
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Scientific plotting library (utilities)
- PLplot is relatively small, portable, freely distributable, and is rich
- enough to satisfy most users.  It has a wide range of plot types including
- line (linear, log), contour, 3D, fill, and almost 1000 characters
- (including Greek and mathematical) in its extended font set.  The package
- is designed to make it easy to quickly get graphical output; only a
- handful of function calls is typically required.  For more advanced use,
- virtually all aspects of plotting are configurable.
- .
- 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
 Section: libs
@@ -189,8 +172,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
@@ -242,16 +224,15 @@
  virtually all aspects of plotting are configurable.
  .
  This package provides the Cairo driver module for PLplot.  It is based
- on the Cairo 2D graphics library with supportting multiple output devices
+ on the Cairo 2D graphics library with supporting multiple output devices
  (X-Window, PDF, PostScript, and PNG).
 
 Package: python-plplot
 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
  PLplot is relatively small, portable, freely distributable, and is rich
  enough to satisfy most users.  It has a wide range of plot types including
@@ -317,3 +298,19 @@
  PLplot documentation.  It also contains the man pages for the API
  functions.
 
+Package: plplot9-driver-qt
+Architecture: any
+Section: libs
+Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends}
+Description: Scientific plotting library (qt driver)
+ PLplot is relatively small, portable, freely distributable, and is rich
+ enough to satisfy most users.  It has a wide range of plot types including
+ line (linear, log), contour, 3D, fill, and almost 1000 characters
+ (including Greek and mathematical) in its extended font set.  The package
+ is designed to make it easy to quickly get graphical output; only a
+ handful of function calls is typically required.  For more advanced use,
+ virtually all aspects of plotting are configurable.
+ .
+ This package provides the qt driver module for PLplot. It also provides
+ C++ bindings to allow use of the PLplot API in qt applications.
+

Modified: branches/v5_9_7_debian/debian/libplplot9.README.Debian
===================================================================
--- branches/v5_9_7_debian/debian/libplplot9.README.Debian	2011-03-16 10:04:02 UTC (rev 11630)
+++ branches/v5_9_7_debian/debian/libplplot9.README.Debian	2011-03-16 15:54:46 UTC (rev 11631)
@@ -21,8 +21,6 @@
         using the PLplot API, as well as many examples in C, C++, and
         Fortran77.
 
-      * plplot-bin: Contains various utilities associated with PLplot.
-
       * plplot-doc: HTML, PS and PDF formats of the PLplot manual.
 
       * plplot9-driver-xwin: Provides the xwin driver module.

Deleted: branches/v5_9_7_debian/debian/plplot-bin.files
===================================================================
--- branches/v5_9_7_debian/debian/plplot-bin.files	2011-03-16 10:04:02 UTC (rev 11630)
+++ branches/v5_9_7_debian/debian/plplot-bin.files	2011-03-16 15:54:46 UTC (rev 11631)
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/man
-usr/share/doc/plplot-bin

Copied: branches/v5_9_7_debian/debian/plplot9-driver-qt.files (from rev 11630, branches/v5_9_6_debian/debian/plplot9-driver-qt.files)
===================================================================
--- branches/v5_9_7_debian/debian/plplot9-driver-qt.files	                        (rev 0)
+++ branches/v5_9_7_debian/debian/plplot9-driver-qt.files	2011-03-16 15:54:46 UTC (rev 11631)
@@ -0,0 +1,6 @@
+usr/lib/plplot*/driversd/qt.*
+usr/lib/libplplotqtd.so.*
+usr/share/doc/plplot9-driver-qt
+usr/share/doc/libplplot9/examples/c++/*qt*
+
+

Modified: branches/v5_9_7_debian/debian/rules
===================================================================
--- branches/v5_9_7_debian/debian/rules	2011-03-16 10:04:02 UTC (rev 11630)
+++ branches/v5_9_7_debian/debian/rules	2011-03-16 15:54:46 UTC (rev 11631)
@@ -53,12 +53,11 @@
 	-DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \
 	-DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar
 
-CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
+CONFIGURE_OPTIONS = -DBUILD_TEST=ON \
 	-DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \
 	-DOCTAVE_OCT_DIR=$(OCTDIR) \
 	-DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON  -DENABLE_ocaml=OFF \
 	-DPLD_jpeg=ON -DPLD_png=ON -DPLD_gif=ON \
-        -DDEFAULT_NO_QT_DEVICES=ON \
         -DTCL_TCLSH=/usr/bin/tclsh8.5 \
 	$(ADA_OPTIONS) $(JAVA_OPTIONS) 
 
@@ -113,10 +112,9 @@
 
 install-arch: install-arch-stamp install-python
 	dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \
-		     --no-package=plplot-bin --no-package=python-plplot   \
+		     --no-package=python-plplot   \
 		     --no-package=libplplot9-java --no-package=libplplot-ada
 	dh_movefiles --package=python-plplot
-	dh_movefiles --package=plplot-bin
 	dh_movefiles --package=libplplot9-java
 ifeq ($(BUILD_ADA),yes)
 	dh_movefiles --package=libplplot-ada
@@ -146,8 +144,8 @@
 
 	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 		\
-		plplot9-driver-wxwidgets                                \
+		python-plplot libplplot-c++9c2 plplot9-driver-wxwidgets \
+		plplot9-driver-qt					\
 		plplot9-driver-cairo libplplot-fortran9	; do		\
 	  ln -s $(libpkg) $(debdoc)/$$i ;				\
 	done
@@ -180,7 +178,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 ;				\
@@ -211,7 +209,8 @@
 	dh_installdocs --package=$(libpkg) --package=libcsiro0
 	dh_installchangelogs --package=$(libpkg) --package=libcsiro0
 
-	dh_pycentral --package=python-plplot
+	dh_python2 --package=python-plplot
+	dh_numpy
 	dh_strip -a
 	dh_compress -a -Xexamples/
 	dh_fixperms -a

Deleted: branches/v5_9_7_debian/debian/source/format
===================================================================
--- branches/v5_9_6_debian/debian/source/format	2011-03-16 10:04:02 UTC (rev 11630)
+++ branches/v5_9_7_debian/debian/source/format	2011-03-16 15:54:46 UTC (rev 11631)
@@ -1 +0,0 @@
-3.0 (quilt)

Copied: branches/v5_9_7_debian/debian/source/format (from rev 11630, branches/v5_9_6_debian/debian/source/format)
===================================================================
--- branches/v5_9_7_debian/debian/source/format	                        (rev 0)
+++ branches/v5_9_7_debian/debian/source/format	2011-03-16 15:54:46 UTC (rev 11631)
@@ -0,0 +1 @@
+3.0 (quilt)


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