[plplot] 07/68: Import Debian changes 5.3.1-6

[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 549b3c59b608dafd75cd602c22bbf12977f9d13e
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun Sep 18 14:51:55 2005 +0200

    Import Debian changes 5.3.1-6
    
    plplot (5.3.1-6) unstable; urgency=low
    
      * This version will *_really_* complete the C++ ABI transition.  I forgot
        to do it for the libplplot-c++9 package, which is now called
        libplplot-c++9c2.  Most of the changes come from the Ubuntu patch
        (thanks to Stephan Hermann <sh at sourcecode.de>):
    
        + debian/control: adjusted packagename, conflicts/replaces, dependencies
        + debian/rules: adjusted packagename
        + debian/libplplot-c++9c2.files: renamed and edited to new packagename
---
 debian/changelog                   | 13 +++++++++++++
 debian/control                     |  7 ++++---
 debian/libplplot-c++9.files        |  2 --
 debian/libplplot-c++9c2.files      |  2 ++
 debian/libplplot9-java.files       |  4 ++++
 debian/plplot9-driver-gnome2.files |  3 +++
 debian/python-plplot-gnome2.files  |  4 ++++
 debian/rules                       |  4 ++--
 8 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71bb63c..dd95b93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+plplot (5.3.1-6) unstable; urgency=low
+
+  * This version will *_really_* complete the C++ ABI transition.  I forgot
+    to do it for the libplplot-c++9 package, which is now called
+    libplplot-c++9c2.  Most of the changes come from the Ubuntu patch
+    (thanks to Stephan Hermann <sh at sourcecode.de>):
+
+    + debian/control: adjusted packagename, conflicts/replaces, dependencies
+    + debian/rules: adjusted packagename
+    + debian/libplplot-c++9c2.files: renamed and edited to new packagename
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 18 Sep 2005 14:51:55 +0200
+
 plplot (5.3.1-5) unstable; urgency=low
 
   * First build with gcc/g++ 4.0.  This should complete the C++ ABI
diff --git a/debian/control b/debian/control
index 7024d6c..a28d085 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Package: libplplot-dev
 Architecture: any
 Section: libdevel
 Recommends: pkg-config
-Depends: libplplot9 (= ${Source-Version}), libplplot-c++9 (= ${Source-Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev
+Depends: libplplot9 (= ${Source-Version}), libplplot-c++9c2 (= ${Source-Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev
 Description: Scientific plotting library (development files)
  This package contains all that is needed for doing development in C, C++,
  and Fortran with PLplot, a scientific plotting library.  Examples of
@@ -40,10 +40,11 @@ Description: Scientific plotting library (development files)
  .
  Homepage: http://www.plplot.org
 
-Package: libplplot-c++9
+Package: libplplot-c++9c2
 Architecture: any
 Section: libs
-Conflicts: libplplot5
+Conflicts: libplplot5, libplplot-c++9
+Replaces: libplplot-c++9
 Depends: ${shlibs:Depends}
 Description: Scientific plotting library
  This package contains the C++ binding for PLplot, a scientific plotting
diff --git a/debian/libplplot-c++9.files b/debian/libplplot-c++9.files
deleted file mode 100644
index 6583ca1..0000000
--- a/debian/libplplot-c++9.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libplplotcxxd.so.*
-usr/share/doc/libplplot-c++9
diff --git a/debian/libplplot-c++9c2.files b/debian/libplplot-c++9c2.files
new file mode 100644
index 0000000..842cff2
--- /dev/null
+++ b/debian/libplplot-c++9c2.files
@@ -0,0 +1,2 @@
+usr/lib/libplplotcxxd.so.*
+usr/share/doc/libplplot-c++9c2
diff --git a/debian/libplplot9-java.files b/debian/libplplot9-java.files
new file mode 100644
index 0000000..23f75c4
--- /dev/null
+++ b/debian/libplplot9-java.files
@@ -0,0 +1,4 @@
+usr/lib/jni
+usr/share/java
+usr/share/doc/libplplot9/examples/java
+usr/share/doc/libplplot9-java
diff --git a/debian/plplot9-driver-gnome2.files b/debian/plplot9-driver-gnome2.files
new file mode 100644
index 0000000..67f45d9
--- /dev/null
+++ b/debian/plplot9-driver-gnome2.files
@@ -0,0 +1,3 @@
+usr/lib/libplplotgnome2d.so.*
+usr/lib/plplot*/driversd/gcw.*
+usr/share/doc/plplot9-driver-gnome2
diff --git a/debian/python-plplot-gnome2.files b/debian/python-plplot-gnome2.files
new file mode 100644
index 0000000..2c96dd5
--- /dev/null
+++ b/debian/python-plplot-gnome2.files
@@ -0,0 +1,4 @@
+usr/lib/python*/*/gcw*
+usr/lib/python*/*/*plplotcanvas*
+usr/share/doc/libplplot9/examples/python/*plplotcanvas*
+usr/share/doc/python-plplot-gnome2
diff --git a/debian/rules b/debian/rules
index 8857bbb..32afcad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,13 +88,13 @@ install-stamp: build-stamp
 
 	for i in libplplot-dev plplot-tcl plplot-tcl-dev plplot-doc  \
 	         plplot9-driver-gd plplot9-driver-xwin plplot9-driver-gnome \
-                 octave-plplot python-plplot plplot-bin libplplot-c++9 \
+                 octave-plplot python-plplot plplot-bin libplplot-c++9c2 \
 		 libcsiro0 ; do \
 	  ln -s $(libpkg) $(debdoc)/$$i ; \
 	done
 
 	dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \
-	                --no-package=plplot-bin
+		     --no-package=plplot-bin
 	dh_movefiles -i
 	dh_movefiles --package=libplplot-dev
 	dh_movefiles --package=plplot-bin

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