[plplot] 28/68: Import Debian changes 5.8.0~RC1-2

[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 8a44d0ecbfe46b458bbf2508f3dcf5124ca0ee2e
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Wed Oct 31 22:20:25 2007 +0100

    Import Debian changes 5.8.0~RC1-2
    
    plplot (5.8.0~RC1-2) unstable; urgency=low
    
      * Added Cairo driver and dropped psttf driver, making the former
        replace/conflict with the later
---
 debian/NEWS                           | 10 ++++++++++
 debian/changelog                      |  7 +++++++
 debian/control                        | 28 ++++++++++++++++------------
 debian/plplot9-driver-cairo.files     |  2 ++
 debian/plplot9-driver-psttf.substvars |  1 +
 debian/rules                          |  4 ++--
 6 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..656d3ee
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,10 @@
+plplot (5.8.0~RC1-2) 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.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Thu, 01 Nov 2007 10:19:31 +0100
+
diff --git a/debian/changelog b/debian/changelog
index e91be41..6f7e5c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plplot (5.8.0~RC1-2) unstable; urgency=low
+
+  * Added Cairo driver and dropped psttf driver, making the former
+    replace/conflict with the later
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 31 Oct 2007 22:20:25 +0100
+
 plplot (5.8.0~RC1-1) unstable; urgency=low
 
   [ Andrew Ross ]
diff --git a/debian/control b/debian/control
index 351b0de..fa5b33d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38),
  tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev,
  libxi-dev, gfortran, itk3-dev, octave2.9-headers,
  libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev,
- libgnomeprintui2.2-dev, libgnomeui-dev, liblasi-dev (>= 1.0.6),
+ libgnomeprintui2.2-dev, libgnomeui-dev,
  m4, libqhull-dev, libxml-parser-perl, libxml-dom-perl,
  libltdl3-dev, pkg-config, dpatch, atlas3-base-dev
  [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k],
@@ -29,7 +29,7 @@ Section: libs
 Conflicts: libplplot5, plplot (<< 5)
 Depends: ${shlibs:Depends}
 Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, plplot9-driver-gd,
- plplot-driver-psttf, plplot-driver-wxwidgets, plplot-tcl
+ plplot-driver-cairo, plplot-driver-wxwidgets, 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
@@ -147,16 +147,6 @@ Description: Scientific plotting library (Gnome Canvas Widget driver)
  .
   Homepage: http://www.plplot.org
 
-Package: plplot9-driver-psttf
-Architecture: any
-Section: libs
-Depends: libplplot9, ${shlibs:Depends}
-Description: Scientific plotting library (PostScript with Unicode support)
- This package provides the PostScript driver module with Unicode
- support for PLplot, a scientific plotting library.
- .
-  Homepage: http://www.plplot.org
-
 Package: plplot9-driver-wxwidgets
 Architecture: any
 Section: libs
@@ -204,6 +194,20 @@ Description: Scientific plotting library (GD driver)
  .
   Homepage: http://www.plplot.org
 
+Package: plplot9-driver-cairo
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: plplot9-driver-psttf
+Replaces: plplot9-driver-psttf
+Description: Scientific plotting library (Cairo driver)
+ This package provides the Cairo driver module for PLplot, a
+ scientific plotting library.  It is based on the Cairo 2D
+ graphics library with supportting multiple output devices (X-Window,
+ PDF, PostScript, and PNG).
+ .
+  Homepage: http://www.plplot.org
+
 Package: python-plplot
 Architecture: any
 Section: python
diff --git a/debian/plplot9-driver-cairo.files b/debian/plplot9-driver-cairo.files
new file mode 100644
index 0000000..c7bc8bf
--- /dev/null
+++ b/debian/plplot9-driver-cairo.files
@@ -0,0 +1,2 @@
+usr/lib/plplot*/driversd/cairo.*
+usr/share/doc/plplot9-driver-cairo
diff --git a/debian/plplot9-driver-psttf.substvars b/debian/plplot9-driver-psttf.substvars
new file mode 100644
index 0000000..d3b2d2f
--- /dev/null
+++ b/debian/plplot9-driver-psttf.substvars
@@ -0,0 +1 @@
+shlibs:Depends=libc6 (>= 2.6.1-1), libcsiro0 (>= 5.8.0~RC1), libfreetype6 (>= 2.3.5), libgcc1 (>= 1:4.2.1), libglib2.0-0 (>= 2.14.0), liblasi0, libltdl3 (>= 1.5.2-2), libpango1.0-0 (>= 1.18.3), libplplot9 (>= 5.8.0~RC1), libqhull5, libstdc++6 (>= 4.2.1)
diff --git a/debian/rules b/debian/rules
index ad7a494..d2430c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
 	-DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \
 	-DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar \
 	-DOCTAVE_OCT_DIR=$(OCTDIR) \
-	-DUSE_RPATH=OFF
+	-DUSE_RPATH=OFF -DPLD_psttf=OFF
 
 BUILD_DIR = $(debbase)/build_tmp
 SRC_DIR = $(shell pwd)
@@ -104,7 +104,7 @@ install-stamp: build-stamp
 		plplot9-driver-gd plplot9-driver-xwin octave-plplot	\
 		python-plplot plplot-bin libplplot-c++9c2 		\
 		plplot9-driver-gnome2 plplot9-driver-wxwidgets		\
-		plplot9-driver-psttf libplplot-fortran9			\
+		plplot9-driver-cairo libplplot-fortran9			\
 		libplplot9-java; do					\
 	  ln -s $(libpkg) $(debdoc)/$$i ;				\
 	done

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