[Plplot-cvs] SF.net SVN: plplot:[12570] trunk/debian

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

Revision: 12570
          http://sourceforge.net/p/plplot/code/12570
Author:   andrewross
Date:     2013-10-02 19:52:29 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
Update Debian packages for the new 5.9.10 release.

Modified Paths:
--------------
    trunk/debian/README.Debian
    trunk/debian/changelog
    trunk/debian/control
    trunk/debian/control.in
    trunk/debian/libplplot-dev.files
    trunk/debian/libplplot-java.files
    trunk/debian/octave-plplot.files
    trunk/debian/patches/02_unset-python-path.diff
    trunk/debian/patches/fix-lua-includes.diff
    trunk/debian/patches/proper-path-handling.diff
    trunk/debian/patches/series
    trunk/debian/plplot-tcl-dev.files
    trunk/debian/plplot-tcl-dev.lintian-overrides
    trunk/debian/python-plplot.files
    trunk/debian/rules

Added Paths:
-----------
    trunk/debian/libplplot-ada1-dev.files
    trunk/debian/libplplot-ada1.files
    trunk/debian/libplplot-c++11.files
    trunk/debian/libplplot-fortran10.files
    trunk/debian/libplplot12.files
    trunk/debian/patches/fix-d-examples.diff
    trunk/debian/plplot12-driver-cairo.files
    trunk/debian/plplot12-driver-qt.files
    trunk/debian/plplot12-driver-wxwidgets.files
    trunk/debian/plplot12-driver-xwin.files

Removed Paths:
-------------
    trunk/debian/libplplot-ada0-dev.files
    trunk/debian/libplplot-ada0.files
    trunk/debian/libplplot-c++10.files
    trunk/debian/libplplot-fortran9.files
    trunk/debian/libplplot11.files
    trunk/debian/plplot11-driver-cairo.files
    trunk/debian/plplot11-driver-gd.files
    trunk/debian/plplot11-driver-qt.files
    trunk/debian/plplot11-driver-wxwidgets.files
    trunk/debian/plplot11-driver-xwin.files

Modified: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/README.Debian	2013-10-02 19:52:29 UTC (rev 12570)
@@ -14,45 +14,41 @@
     The original PLplot distribution was broken down in several Debian
     packages:
 
-      * libplplot11: Contains the shared C libraries, as well as the
+      * libplplot12: Contains the shared C libraries, as well as the
 	data files and the driver modules that do not depend on other
 	libraries.
 
       * libplplot-dev: Headers and static libraries for developing programs
-        using the PLplot API, as well as many examples in C, C++, and
-        Fortran77.
+        using the PLplot API, as well as many examples in C, C++ and F95.
 
       * plplot-doc: HTML, PS and PDF formats of the PLplot manual.
 
-      * plplot11-driver-xwin: Provides the xwin driver module.
+      * plplot12-driver-xwin: Provides the xwin driver module.
 
-      * plplot11-driver-gd: Provides the GD driver module, which allows
-        direct generation of PNG and JPEG files.
-
-      * plplot11-driver-cairo: Provides the cairo driver module. This uses
+      * plplot12-driver-cairo: Provides the cairo driver module. This uses
 	the cairo library to produce higher quality text using truetype
         fonts. It produces postscript, pdf, svg, png, mem and X output.
         This replaces the plplot9-driver-psttf package in previous
         releases. The cairo driver provides similar results for postscript
         and more functionality.
 
-      * plplot11-driver-wxwidgets: Provides the WXWidgets driver module.
+      * plplot12-driver-wxwidgets: Provides the WXWidgets driver module.
 
-      * plplot11-driver-qt: Provides the qt driver module.
+      * plplot12-driver-qt: Provides the qt driver module.
 
-      * libplplot-c++10: Contains the library for using the C++ PLplot
+      * libplplot-c++11: Contains the library for using the C++ PLplot
 	classes.
 
-      * libplplot-fortran9: Contains the F77 and F90 bindings for
-	the PLplot functions.
+      * libplplot-fortran10: Contains the F95 bindings for the PLplot 
+        functions.
 
       * libplplot-java: Contains the bindings for using the PLplot
 	functions from java. 
 
-      * libplplot-ada0: Contains the runtiem Ada bindings library for the 
+      * libplplot-ada1: Contains the runtime Ada bindings library for the 
         PLplot functions.
 
-      * libplplot-ada0-dev: Development files for the Ada bindings for 
+      * libplplot-ada1-dev: Development files for the Ada bindings for 
         the PLplot functions.
 
       * libplplot-ocaml: Contains the OCaml bindings for the PLplot functions.
@@ -95,7 +91,7 @@
 
     A lot of examples were included in the libplplot-dev, plplot-tcl,
     python-plplot, and octave-plplot packages.  They can be found under
-    /usr/share/doc/libplplot11/examples/. Makefiles are available along the
+    /usr/share/doc/libplplot12/examples/. Makefiles are available along the
     sources.
 
     For development of C programs with the PLplot library, there is a

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/changelog	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,3 +1,24 @@
+plplot (5.9.10-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/patches/series: Remove backported patches no longer need with 
+    current release and update remaining patches.
+  * debian/control.in: Update dependencies for new documentation build system and to 
+    include shapelib (needed for new map support).
+  * debian/control.in, debian/rules, debian/*.files:
+    Rename packages to reflect bump in SONAME version.
+  * debian/control.in: Drop support for f77 bindings (deprecated upstream 
+    and replaced by the better f95 bindings).
+  * debian/libplplot12.files: Ensure shape file versions of the maps are installed.
+  * debian/control.in, debian/rule: Drop the gd driver support and the 
+    plplot11-driver-gd package. No longer supported upstream and superceded by cairo 
+    and qt drivers.
+  * debian/patches/series, debian/patches/fix-d-examples.diff: Fix from upstream for
+    D example 20 so it compiles with latest gdc.
+  * debian/rules: Fix command line options for python-config to prevent an error.
+
+ -- Andrew Ross <and...@us...>  Tue, 01 Oct 2013 12:44:20 +0100
+
 plplot (5.9.9-7) UNRELEASED; urgency=low
 
   * debian/patches/fix-cmake-ada-support.diff: Update ada support from 
@@ -161,6 +182,7 @@
   * debian/rules, debian/control.in, debian/python-plplot-qt.files:
     Add new python-plplot-qt package which includes the python bindings to
     allow use of the plplot API in qt applications. 
+ -- Andrew Ross <and...@us...>  Mon, 30 Sep 2013 09:47:30 +0100
   * debian/control.in: 
     + Remove dependency of libplplot-java on default-jre as per policy. 
       Java libraries do not need to depend on a java runtime. Fixes 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/control	2013-10-02 19:52:29 UTC (rev 12570)
@@ -6,30 +6,29 @@
 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, liboctave-dev,
- libgd2-noxpm-dev | libgd2-xpm-dev, m4, libqhull-dev (>= 2003.1-8), 
+ m4, libqhull-dev (>= 2003.1-8), 
  libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config, 
  slice, python-gtk2-dev, libwxgtk2.8-dev, 
  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, 
- python-qt4, python-qt4-dev,
+ python-qt4, python-qt4-dev, 
  ocaml-nox, camlidl, ocaml-findlib, libcairo-ocaml-dev,
- liblablgtk2-ocaml-dev, liblua5.1-0-dev, lua5.1, gdc-v1
-Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
- docbook2x, opensp, jadetex, ghostscript
+ liblablgtk2-ocaml-dev, liblua5.1-0-dev, lua5.1, gdc, libshp-dev
+Build-Depends-Indep: xmlto, fop, docbook-xml, docbook-xsl, docbook2x
 Build-Conflicts: libplplot5
 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/
 
-Package: libplplot11
+Package: libplplot12
 Architecture: any
 Section: libs
-Conflicts: libplplot9
+Conflicts: libplplot11
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: plplot11-driver-xwin, plplot11-driver-gd,
- plplot11-driver-cairo, plplot11-driver-qt, plplot11-driver-wxwidgets, plplot-tcl
+Suggests: plplot12-driver-xwin, plplot12-driver-gd,
+ plplot12-driver-cairo, plplot12-driver-qt, plplot12-driver-wxwidgets, plplot-tcl
 Replaces: plplot-bin (<< 5.9.6-1)
 Breaks: plplot-bin (<<5.9.6-1)
 Description: Scientific plotting library
@@ -49,9 +48,9 @@
 Section: libdevel
 Recommends: pkg-config, cmake, libplplot-ocaml, libplplot-lua, libplplot-d
 Suggests: plplot-doc
-Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
+Depends: libplplot12 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
  libltdl3-dev, libqsastime-dev, ${misc:Depends}, 
- libplplot-c++10 (= ${binary:Version}), libplplot-fortran9 (= ${binary:Version})
+ libplplot-c++11 (= ${binary:Version}), libplplot-fortran10 (= ${binary:Version})
 Breaks: libplplot-fortran9 (<< 5.9.8-1)
 Description: Scientific plotting library (development files)
  PLplot is relatively small, portable, freely distributable, and is rich
@@ -65,16 +64,15 @@
  This package contains all that is needed for doing development in C, C++
  and Fortran with PLplot.  Examples of programs for these languages are
  also included.  For development in Tcl/Tk, Python, Octave, Ada and Java 
- install the plplot-tcl-dev, python-plplot, octave-plplot, libplplot-ada0-dev
+ install the plplot-tcl-dev, python-plplot, octave-plplot, libplplot-ada1-dev
  and libplplot-java packages, respectively. This package also includes the 
  OCaml, lua and D examples. To use one of these languages you will also 
  need to install the libplplot-xxx package for that language.
 
-Package: libplplot-c++10
+Package: libplplot-c++11
 Architecture: any
 Section: libs
-Conflicts: libplplot5, libplplot-c++9, libplplot-c++9c2
-Replaces: libplplot-c++9c2
+Conflicts: libplplot5, libplplot-c++9, libplplot-c++9c2, libplplot-c++10
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Scientific plotting library (C++ binding)
  PLplot is relatively small, portable, freely distributable, and is rich
@@ -87,7 +85,7 @@
  .
  This package contains the C++ binding for PLplot.
 
-Package: libplplot-fortran9
+Package: libplplot-fortran10
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}  , ${misc:Depends}
@@ -100,10 +98,9 @@
  handful of function calls is typically required.  For more advanced use,
  virtually all aspects of plotting are configurable.
  .
- This package contains the Fortran 77 and Fortran 95 bindings for
- PLplot. Note: the Fortran 77 bindings have been deprecated in the latest
- version of PLplot, and will be dropped from a future release. New code
- should use the Fortran 95 bindings.
+ This package contains the Fortran 95 bindings for PLplot. Note: the Fortran 
+ 77 bindings have been deprecated upstream for some time and have now been 
+ dropped from the Debian packages. 
 
 Package: libplplot-java
 Architecture: any
@@ -169,7 +166,7 @@
  The source code for this library is part of the plplot source
  package.
 
-Package: plplot11-driver-xwin
+Package: plplot12-driver-xwin
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -186,10 +183,10 @@
  .
  This package provides the X11 driver module for PLplot.
 
-Package: plplot11-driver-wxwidgets
+Package: plplot12-driver-wxwidgets
 Architecture: any
 Section: libs
-Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends}
+Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: plplot9-driver-wxwidgets
 Replaces: plplot9-driver-wxwidgets
 Description: Scientific plotting library (wxWidgets driver)
@@ -205,7 +202,7 @@
 
 Package: plplot-tcl
 Architecture: any
-Depends: plplot11-driver-xwin, iwidgets4, ${shlibs:Depends}, ${misc:Depends}
+Depends: plplot12-driver-xwin, iwidgets4, ${shlibs:Depends}, ${misc:Depends}
 Description: Tcl/Tk 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
@@ -221,7 +218,7 @@
 
 Package: plplot-tcl-dev
 Architecture: any
-Depends: libplplot11 (= ${binary:Version}), plplot-tcl, ${misc:Depends}
+Depends: libplplot12 (= ${binary:Version}), plplot-tcl, ${misc:Depends}
 Breaks: plplot-tcl (<= 5.2.0.cvs.20030224-1)
 Description: Tcl/Tk development support for PLplot, a plotting library
  PLplot is relatively small, portable, freely distributable, and is rich
@@ -235,32 +232,10 @@
  This package contains the necessary files to do development in Tcl/Tk
  with PLplot: header files, shared libraries links, and examples.
 
-Package: plplot11-driver-gd
+Package: plplot12-driver-cairo
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: plplot9-driver-gd
-Replaces: plplot9-driver-gd
-Recommends: ttf-freefont
-Description: Scientific plotting library (GD 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 GD driver module for PLplot. It allows the
- generation of PNG and JPEG files directly from PLplot programs. The GD 
- driver is no longer actively maintained upstream and is likely to be 
- dropped in a future release. The cairo and qt drivers offer newer, and
- better alternatives. 
-
-Package: plplot11-driver-cairo
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: plplot9-driver-cairo
 Replaces: plplot9-driver-cairo
 Description: Scientific plotting library (Cairo driver)
@@ -279,7 +254,7 @@
 Package: python-plplot
 Architecture: any
 Section: python
-Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends},
+Depends: libplplot12 (= ${binary:Version}), ${shlibs:Depends},
  ${python:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 Description: Python support for PLplot, a plotting library
@@ -298,8 +273,8 @@
 Package: python-plplot-qt
 Architecture: any
 Section: python
-Depends: libplplot11 (= ${binary:Version}), python-plplot (= ${binary:Version}), 
- plplot11-driver-qt (= ${binary:Version}), 
+Depends: libplplot12 (= ${binary:Version}), python-plplot (= ${binary:Version}), 
+ plplot12-driver-qt (= ${binary:Version}), 
  ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 Description: Scientific plotting library (python qt GUI)
@@ -316,7 +291,7 @@
 
 Package: octave-plplot
 Architecture: any
-Depends: libplplot11 (= ${binary:Version}), octave (>= 3.6.1), ${shlibs:Depends},
+Depends: libplplot12 (= ${binary:Version}), octave (>= 3.6.1), ${shlibs:Depends},
  ${misc:Depends}
 Description: Octave support for PLplot, a plotting library
  PLplot is relatively small, portable, freely distributable, and is rich
@@ -331,9 +306,9 @@
  almost drop-in replacement for the traditional Gnuplot graphical
  interface in Octave. Examples are also provided.
 
-Package: libplplot-ada0
+Package: libplplot-ada1
 Architecture: any
-Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libplplot12 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Breaks: libplplot-ada (<< 5.9.8-2)
 Replaces: libplplot-ada (<< 5.9.8-2)
 Description: Ada support for PLplot, a plotting library
@@ -348,13 +323,13 @@
  This package contains the runtime Ada bindings library for PLplot.  
 
 
-Package: libplplot-ada0-dev
+Package: libplplot-ada1-dev
 Architecture: any
 Section: libdevel
 Suggests: plplot-doc
-Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
+Depends: libplplot12 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
  libltdl3-dev, libqsastime-dev, gnat, gnat-4.6, ${misc:Depends}, 
- libplplot-ada0 (= ${binary:Version})
+ libplplot-ada1 (= ${binary:Version})
 Recommends: libplplot-dev
 Breaks: libplplot-ada (<< 5.9.8-2), libplplot-dev (<< 5.9.8-2)
 Description: Ada support for PLplot, a plotting library (development files)
@@ -388,10 +363,10 @@
  PLplot documentation.  It also contains the man pages for the API
  functions.
 
-Package: plplot11-driver-qt
+Package: plplot12-driver-qt
 Architecture: any
 Section: libs
-Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends}
+Depends: libplplot12, ${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
@@ -408,7 +383,7 @@
 Package: libplplot-ocaml
 Architecture: any
 Section: ocaml
-Depends: libplplot11, ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends: libplplot12, ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Description: Scientific plotting library (OCaml bindings)
  PLplot is relatively small, portable, freely distributable, and is rich
  enough to satisfy most users.  It has a wide range of plot types including
@@ -424,7 +399,7 @@
 Package: libplplot-lua
 Architecture: any
 Section: libs
-Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends}, lua5.1
+Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}, lua5.1
 Description: Scientific plotting library (lua bindings)
  PLplot is relatively small, portable, freely distributable, and is rich
  enough to satisfy most users.  It has a wide range of plot types including
@@ -440,7 +415,7 @@
 Package: libplplot-d
 Architecture: any
 Section: libs
-Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends}
+Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}
 Description: Scientific plotting library (D language bindings)
  PLplot is relatively small, portable, freely distributable, and is rich
  enough to satisfy most users.  It has a wide range of plot types including

Modified: trunk/debian/control.in
===================================================================
--- trunk/debian/control.in	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/control.in	2013-10-02 19:52:29 UTC (rev 12570)
@@ -6,30 +6,29 @@
 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, liboctave-dev,
- libgd2-noxpm-dev | libgd2-xpm-dev, m4, libqhull-dev (>= 2003.1-8), 
+ m4, libqhull-dev (>= 2003.1-8), 
  libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config, 
  slice, python-gtk2-dev, libwxgtk2.8-dev, 
  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, 
- python-qt4, python-qt4-dev,
+ python-qt4, python-qt4-dev, 
  ocaml-nox, camlidl, ocaml-findlib, libcairo-ocaml-dev,
- liblablgtk2-ocaml-dev, liblua5.1-0-dev, lua5.1, gdc-v1
-Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
- docbook2x, opensp, jadetex, ghostscript
+ liblablgtk2-ocaml-dev, liblua5.1-0-dev, lua5.1, gdc, libshp-dev
+Build-Depends-Indep: xmlto, fop, docbook-xml, docbook-xsl, docbook2x
 Build-Conflicts: libplplot5
 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/
 
-Package: libplplot11
+Package: libplplot12
 Architecture: any
 Section: libs
-Conflicts: libplplot9
+Conflicts: libplplot11
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: plplot11-driver-xwin, plplot11-driver-gd,
- plplot11-driver-cairo, plplot11-driver-qt, plplot11-driver-wxwidgets, plplot-tcl
+Suggests: plplot12-driver-xwin, plplot12-driver-gd,
+ plplot12-driver-cairo, plplot12-driver-qt, plplot12-driver-wxwidgets, plplot-tcl
 Replaces: plplot-bin (<< 5.9.6-1)
 Breaks: plplot-bin (<<5.9.6-1)
 Description: Scientific plotting library
@@ -49,9 +48,9 @@
 Section: libdevel
 Recommends: pkg-config, cmake, libplplot-ocaml, libplplot-lua, libplplot-d
 Suggests: plplot-doc
-Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
+Depends: libplplot12 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
  libltdl3-dev, libqsastime-dev, ${misc:Depends}, 
- libplplot-c++10 (= ${binary:Version}), libplplot-fortran9 (= ${binary:Version})
+ libplplot-c++11 (= ${binary:Version}), libplplot-fortran10 (= ${binary:Version})
 Breaks: libplplot-fortran9 (<< 5.9.8-1)
 Description: Scientific plotting library (development files)
  PLplot is relatively small, portable, freely distributable, and is rich
@@ -65,16 +64,15 @@
  This package contains all that is needed for doing development in C, C++
  and Fortran with PLplot.  Examples of programs for these languages are
  also included.  For development in Tcl/Tk, Python, Octave, Ada and Java 
- install the plplot-tcl-dev, python-plplot, octave-plplot, libplplot-ada0-dev
+ install the plplot-tcl-dev, python-plplot, octave-plplot, libplplot-ada1-dev
  and libplplot-java packages, respectively. This package also includes the 
  OCaml, lua and D examples. To use one of these languages you will also 
  need to install the libplplot-xxx package for that language.
 
-Package: libplplot-c++10
+Package: libplplot-c++11
 Architecture: any
 Section: libs
-Conflicts: libplplot5, libplplot-c++9, libplplot-c++9c2
-Replaces: libplplot-c++9c2
+Conflicts: libplplot5, libplplot-c++9, libplplot-c++9c2, libplplot-c++10
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Scientific plotting library (C++ binding)
  PLplot is relatively small, portable, freely distributable, and is rich
@@ -87,7 +85,7 @@
  .
  This package contains the C++ binding for PLplot.
 
-Package: libplplot-fortran9
+Package: libplplot-fortran10
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}  , ${misc:Depends}
@@ -100,10 +98,9 @@
  handful of function calls is typically required.  For more advanced use,
  virtually all aspects of plotting are configurable.
  .
- This package contains the Fortran 77 and Fortran 95 bindings for
- PLplot. Note: the Fortran 77 bindings have been deprecated in the latest
- version of PLplot, and will be dropped from a future release. New code
- should use the Fortran 95 bindings.
+ This package contains the Fortran 95 bindings for PLplot. Note: the Fortran 
+ 77 bindings have been deprecated upstream for some time and have now been 
+ dropped from the Debian packages. 
 
 Package: libplplot-java
 Architecture: any
@@ -169,7 +166,7 @@
  The source code for this library is part of the plplot source
  package.
 
-Package: plplot11-driver-xwin
+Package: plplot12-driver-xwin
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -186,10 +183,10 @@
  .
  This package provides the X11 driver module for PLplot.
 
-Package: plplot11-driver-wxwidgets
+Package: plplot12-driver-wxwidgets
 Architecture: any
 Section: libs
-Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends}
+Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: plplot9-driver-wxwidgets
 Replaces: plplot9-driver-wxwidgets
 Description: Scientific plotting library (wxWidgets driver)
@@ -205,7 +202,7 @@
 
 Package: plplot-tcl
 Architecture: any
-Depends: plplot11-driver-xwin, iwidgets4, ${shlibs:Depends}, ${misc:Depends}
+Depends: plplot12-driver-xwin, iwidgets4, ${shlibs:Depends}, ${misc:Depends}
 Description: Tcl/Tk 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
@@ -221,7 +218,7 @@
 
 Package: plplot-tcl-dev
 Architecture: any
-Depends: libplplot11 (= ${binary:Version}), plplot-tcl, ${misc:Depends}
+Depends: libplplot12 (= ${binary:Version}), plplot-tcl, ${misc:Depends}
 Breaks: plplot-tcl (<= 5.2.0.cvs.20030224-1)
 Description: Tcl/Tk development support for PLplot, a plotting library
  PLplot is relatively small, portable, freely distributable, and is rich
@@ -235,32 +232,10 @@
  This package contains the necessary files to do development in Tcl/Tk
  with PLplot: header files, shared libraries links, and examples.
 
-Package: plplot11-driver-gd
+Package: plplot12-driver-cairo
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: plplot9-driver-gd
-Replaces: plplot9-driver-gd
-Recommends: ttf-freefont
-Description: Scientific plotting library (GD 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 GD driver module for PLplot. It allows the
- generation of PNG and JPEG files directly from PLplot programs. The GD 
- driver is no longer actively maintained upstream and is likely to be 
- dropped in a future release. The cairo and qt drivers offer newer, and
- better alternatives. 
-
-Package: plplot11-driver-cairo
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: plplot9-driver-cairo
 Replaces: plplot9-driver-cairo
 Description: Scientific plotting library (Cairo driver)
@@ -279,7 +254,7 @@
 Package: python-plplot
 Architecture: any
 Section: python
-Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends},
+Depends: libplplot12 (= ${binary:Version}), ${shlibs:Depends},
  ${python:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 Description: Python support for PLplot, a plotting library
@@ -298,8 +273,8 @@
 Package: python-plplot-qt
 Architecture: any
 Section: python
-Depends: libplplot11 (= ${binary:Version}), python-plplot (= ${binary:Version}), 
- plplot11-driver-qt (= ${binary:Version}), 
+Depends: libplplot12 (= ${binary:Version}), python-plplot (= ${binary:Version}), 
+ plplot12-driver-qt (= ${binary:Version}), 
  ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 Description: Scientific plotting library (python qt GUI)
@@ -316,7 +291,7 @@
 
 Package: octave-plplot
 Architecture: any
-Depends: libplplot11 (= ${binary:Version}), octave (>= 3.6.1), ${shlibs:Depends},
+Depends: libplplot12 (= ${binary:Version}), octave (>= 3.6.1), ${shlibs:Depends},
  ${misc:Depends}
 Description: Octave support for PLplot, a plotting library
  PLplot is relatively small, portable, freely distributable, and is rich
@@ -331,9 +306,9 @@
  almost drop-in replacement for the traditional Gnuplot graphical
  interface in Octave. Examples are also provided.
 
-[ADA:Package: libplplot-ada0
+[ADA:Package: libplplot-ada1
 Architecture: any
-Depends: libplplot11 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libplplot12 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Breaks: libplplot-ada (<< 5.9.8-2)
 Replaces: libplplot-ada (<< 5.9.8-2)
 Description: Ada support for PLplot, a plotting library
@@ -348,13 +323,13 @@
  This package contains the runtime Ada bindings library for PLplot.  
 :]
 
-[ADA:Package: libplplot-ada0-dev
+[ADA:Package: libplplot-ada1-dev
 Architecture: any
 Section: libdevel
 Suggests: plplot-doc
-Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
+Depends: libplplot12 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
  libltdl3-dev, libqsastime-dev, gnat, gnat-4.6, ${misc:Depends}, 
- libplplot-ada0 (= ${binary:Version})
+ libplplot-ada1 (= ${binary:Version})
 Recommends: libplplot-dev
 Breaks: libplplot-ada (<< 5.9.8-2), libplplot-dev (<< 5.9.8-2)
 Description: Ada support for PLplot, a plotting library (development files)
@@ -388,10 +363,10 @@
  PLplot documentation.  It also contains the man pages for the API
  functions.
 
-Package: plplot11-driver-qt
+Package: plplot12-driver-qt
 Architecture: any
 Section: libs
-Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends}
+Depends: libplplot12, ${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
@@ -408,7 +383,7 @@
 Package: libplplot-ocaml
 Architecture: any
 Section: ocaml
-Depends: libplplot11, ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends: libplplot12, ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Description: Scientific plotting library (OCaml bindings)
  PLplot is relatively small, portable, freely distributable, and is rich
  enough to satisfy most users.  It has a wide range of plot types including
@@ -424,7 +399,7 @@
 Package: libplplot-lua
 Architecture: any
 Section: libs
-Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends}, lua5.1
+Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}, lua5.1
 Description: Scientific plotting library (lua bindings)
  PLplot is relatively small, portable, freely distributable, and is rich
  enough to satisfy most users.  It has a wide range of plot types including
@@ -440,7 +415,7 @@
 Package: libplplot-d
 Architecture: any
 Section: libs
-Depends: libplplot11, ${shlibs:Depends}, ${misc:Depends}
+Depends: libplplot12, ${shlibs:Depends}, ${misc:Depends}
 Description: Scientific plotting library (D language bindings)
  PLplot is relatively small, portable, freely distributable, and is rich
  enough to satisfy most users.  It has a wide range of plot types including

Deleted: trunk/debian/libplplot-ada0-dev.files
===================================================================
--- trunk/debian/libplplot-ada0-dev.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/libplplot-ada0-dev.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,5 +0,0 @@
-usr/lib/ada
-usr/share/ada
-usr/lib/libplplotada*.so
-usr/share/doc/libplplot11/examples/ada
-usr/share/doc/libplplot-ada0-dev

Deleted: trunk/debian/libplplot-ada0.files
===================================================================
--- trunk/debian/libplplot-ada0.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/libplplot-ada0.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,2 +0,0 @@
-usr/lib/libplplotada*.so.*
-usr/share/doc/libplplot-ada0

Copied: trunk/debian/libplplot-ada1-dev.files (from rev 12562, trunk/debian/libplplot-ada0-dev.files)
===================================================================
--- trunk/debian/libplplot-ada1-dev.files	                        (rev 0)
+++ trunk/debian/libplplot-ada1-dev.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -0,0 +1,5 @@
+usr/lib/ada
+usr/share/ada
+usr/lib/libplplotada*.so
+usr/share/doc/libplplot12/examples/ada
+usr/share/doc/libplplot-ada1-dev

Copied: trunk/debian/libplplot-ada1.files (from rev 12562, trunk/debian/libplplot-ada0.files)
===================================================================
--- trunk/debian/libplplot-ada1.files	                        (rev 0)
+++ trunk/debian/libplplot-ada1.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -0,0 +1,2 @@
+usr/lib/libplplotada*.so.*
+usr/share/doc/libplplot-ada1

Deleted: trunk/debian/libplplot-c++10.files
===================================================================
--- trunk/debian/libplplot-c++10.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/libplplot-c++10.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,2 +0,0 @@
-usr/lib/libplplotcxxd.so.*
-usr/share/doc/libplplot-c++10

Copied: trunk/debian/libplplot-c++11.files (from rev 12562, trunk/debian/libplplot-c++10.files)
===================================================================
--- trunk/debian/libplplot-c++11.files	                        (rev 0)
+++ trunk/debian/libplplot-c++11.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -0,0 +1,2 @@
+usr/lib/libplplotcxxd.so.*
+usr/share/doc/libplplot-c++11

Modified: trunk/debian/libplplot-dev.files
===================================================================
--- trunk/debian/libplplot-dev.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/libplplot-dev.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -4,6 +4,6 @@
 usr/lib/lib*.so
 usr/lib/fortran
 usr/lib/pkgconfig
-usr/share/doc/libplplot11/examples
-usr/share/doc/libplplot11/README.pkg-config
+usr/share/doc/libplplot12/examples
+usr/share/doc/libplplot12/README.pkg-config
 usr/share/doc/libplplot-dev

Copied: trunk/debian/libplplot-fortran10.files (from rev 12562, trunk/debian/libplplot-fortran9.files)
===================================================================
--- trunk/debian/libplplot-fortran10.files	                        (rev 0)
+++ trunk/debian/libplplot-fortran10.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -0,0 +1,2 @@
+usr/lib/libplplotf*.so.*
+usr/share/doc/libplplot-fortran10

Deleted: trunk/debian/libplplot-fortran9.files
===================================================================
--- trunk/debian/libplplot-fortran9.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/libplplot-fortran9.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,2 +0,0 @@
-usr/lib/libplplotf*.so.*
-usr/share/doc/libplplot-fortran9

Modified: trunk/debian/libplplot-java.files
===================================================================
--- trunk/debian/libplplot-java.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/libplplot-java.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,4 +1,4 @@
 usr/lib/jni
 usr/share/java
-usr/share/doc/libplplot11/examples/java
+usr/share/doc/libplplot12/examples/java
 usr/share/doc/libplplot-java

Deleted: trunk/debian/libplplot11.files
===================================================================
--- trunk/debian/libplplot11.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/libplplot11.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,7 +0,0 @@
-usr/lib
-usr/share/plplot*/*.map
-usr/share/plplot*/*.fnt
-usr/share/plplot*/*.pal
-usr/share/doc/libplplot11
-
-

Copied: trunk/debian/libplplot12.files (from rev 12562, trunk/debian/libplplot11.files)
===================================================================
--- trunk/debian/libplplot12.files	                        (rev 0)
+++ trunk/debian/libplplot12.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -0,0 +1,9 @@
+usr/lib
+usr/share/plplot*/*.map
+usr/share/plplot*/*.fnt
+usr/share/plplot*/*.pal
+usr/share/plplot*/*.shp
+usr/share/plplot*/*.shx
+usr/share/doc/libplplot12
+
+

Modified: trunk/debian/octave-plplot.files
===================================================================
--- trunk/debian/octave-plplot.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/octave-plplot.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,6 +1,6 @@
 usr/share/plplot_octave
 usr/share/octave/site/m/PLplot
 usr/lib/*/octave
-usr/share/doc/libplplot11/*.octave
-usr/share/doc/libplplot11/examples/*octave*
+usr/share/doc/libplplot12/*.octave
+usr/share/doc/libplplot12/examples/*octave*
 usr/share/doc/octave-plplot

Modified: trunk/debian/patches/02_unset-python-path.diff
===================================================================
--- trunk/debian/patches/02_unset-python-path.diff	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/patches/02_unset-python-path.diff	2013-10-02 19:52:29 UTC (rev 12570)
@@ -7,11 +7,11 @@
 
 @DPATCH@
 
-Index: plplot-5.9.9/examples/python/CMakeLists.txt
+Index: plplot-5.9.10/examples/python/CMakeLists.txt
 ===================================================================
---- plplot-5.9.9.orig/examples/python/CMakeLists.txt	2012-02-28 11:40:09.000000000 +0000
-+++ plplot-5.9.9/examples/python/CMakeLists.txt	2012-02-28 11:42:31.000000000 +0000
-@@ -241,7 +241,7 @@
+--- plplot-5.9.10.orig/examples/python/CMakeLists.txt	2013-10-01 13:10:17.191293736 +0100
++++ plplot-5.9.10/examples/python/CMakeLists.txt	2013-10-01 13:10:17.179293736 +0100
+@@ -245,7 +245,7 @@
      @ONLY
      )
  

Added: trunk/debian/patches/fix-d-examples.diff
===================================================================
--- trunk/debian/patches/fix-d-examples.diff	                        (rev 0)
+++ trunk/debian/patches/fix-d-examples.diff	2013-10-02 19:52:29 UTC (rev 12570)
@@ -0,0 +1,15 @@
+Description: Fix D examples
+Author: Andrew Ross <and...@us...>
+Origin: upstream
+Index: plplot-5.9.10/examples/d/x20d.d
+===================================================================
+--- plplot-5.9.10.orig/examples/d/x20d.d	2013-10-02 10:27:39.162480034 +0100
++++ plplot-5.9.10/examples/d/x20d.d	2013-10-02 10:29:03.410477825 +0100
+@@ -6,6 +6,7 @@
+ 
+ import std.math;
+ import std.stdio;
++import std.file;
+ 
+ import plplot;
+ 


Property changes on: trunk/debian/patches/fix-d-examples.diff
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/debian/patches/fix-lua-includes.diff
===================================================================
--- trunk/debian/patches/fix-lua-includes.diff	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/patches/fix-lua-includes.diff	2013-10-02 19:52:29 UTC (rev 12570)
@@ -3,13 +3,13 @@
 Last-Update: 2012-07-19
 
 ===================================================================
-Index: plplot-5.9.9/cmake/modules/lua.cmake
+Index: plplot-5.9.10/cmake/modules/lua.cmake
 ===================================================================
---- plplot-5.9.9.orig/cmake/modules/lua.cmake	2011-10-13 01:43:01.000000000 +0100
-+++ plplot-5.9.9/cmake/modules/lua.cmake	2012-07-20 00:11:55.295075888 +0100
-@@ -118,3 +118,11 @@
-     set(LUA_DIR ${LIB_DIR}/lua/50/plplot)
-   endif(LUA51_FOUND)
+--- plplot-5.9.10.orig/cmake/modules/lua.cmake	2013-10-01 13:10:33.183293316 +0100
++++ plplot-5.9.10/cmake/modules/lua.cmake	2013-10-01 13:10:33.171293317 +0100
+@@ -86,3 +86,11 @@
+     set(LUA_DIR ${LIB_DIR}/lua/${LUA_VERSION}/plplot)
+   endif(LUA_VERSION MATCHES "5\\.0")
  endif(ENABLE_lua)
 +
 +if(ENABLE_lua AND LUA51_FOUND)

Modified: trunk/debian/patches/proper-path-handling.diff
===================================================================
--- trunk/debian/patches/proper-path-handling.diff	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/patches/proper-path-handling.diff	2013-10-02 19:52:29 UTC (rev 12570)
@@ -2,11 +2,13 @@
 Author: Rafael Laboissiere <ra...@la...>
 Last-Update: 2012-03-31
 
---- plplot-5.9.9.orig/bindings/octave/PLplot/toggle_plplot_use.m
-+++ plplot-5.9.9/bindings/octave/PLplot/toggle_plplot_use.m
-@@ -34,9 +34,7 @@ endif
+Index: plplot-5.9.10/bindings/octave/PLplot/toggle_plplot_use.m
+===================================================================
+--- plplot-5.9.10.orig/bindings/octave/PLplot/toggle_plplot_use.m	2013-10-01 13:05:57.927300532 +0100
++++ plplot-5.9.10/bindings/octave/PLplot/toggle_plplot_use.m	2013-10-01 13:05:57.915300532 +0100
+@@ -39,9 +39,7 @@
  use_plplot_path = plplot_octave_path;
- plplot_path_to_remove = strsplit(genpath(use_plplot_path),pathsep);
+ plplot_path_to_remove = char(strsplit(genpath(use_plplot_path),pathsep));
  for use_plplot_i=1:size(plplot_path_to_remove)(1)
 -  if (findstr(path,deblank(plplot_path_to_remove(use_plplot_i,:))) > 0)
 -    rmpath(deblank(plplot_path_to_remove(use_plplot_i,:)));

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/patches/series	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,11 +1,12 @@
+fix-d-examples.diff
 02_unset-python-path.diff
 #04_use-mkoctfile.diff
 #07_octave_prune_examples.diff
-08_nn_link_libm.diff
-replace-deprecated-split.diff
+#08_nn_link_lib.diff
+#replace-deprecated-split.diff
 proper-path-handling.diff
-fix-boolean-operators.diff
-fix-cmake-ada-support.diff
+#fix-boolean-operators.diff
+#fix-cmake-ada-support.diff
 fix-lua-includes.diff
-fix-cmake-d-support.diff
-java-pltr2-fix.diff
+#fix-cmake-d-support.diff
+#java-pltr2-fix.diff

Modified: trunk/debian/plplot-tcl-dev.files
===================================================================
--- trunk/debian/plplot-tcl-dev.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/plplot-tcl-dev.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -3,5 +3,5 @@
 usr/include/plplot/pltk.h
 usr/include/plplot/tclMatrix.h
 usr/share/doc/plplot-tcl-dev
-usr/share/doc/libplplot11/examples/*tcl*
-usr/share/doc/libplplot11/examples/tk
+usr/share/doc/libplplot12/examples/*tcl*
+usr/share/doc/libplplot12/examples/tk

Modified: trunk/debian/plplot-tcl-dev.lintian-overrides
===================================================================
--- trunk/debian/plplot-tcl-dev.lintian-overrides	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/plplot-tcl-dev.lintian-overrides	2013-10-02 19:52:29 UTC (rev 12570)
@@ -2,6 +2,6 @@
 # by CMake and so the interpreter is replaced before the script is 
 # acutally run.
 
-plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot11/examples/tk/tk01.in #!@xtk01_LOCATION@
-plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot11/examples/tk/tk02.in #!@xtk02_LOCATION@
-plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot11/examples/tk/tk04.in #!@xtk04_LOCATION@
+plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot21/examples/tk/tk01.in #!@xtk01_LOCATION@
+plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot21/examples/tk/tk02.in #!@xtk02_LOCATION@
+plplot-tcl-dev binary: example-interpreter-not-absolute usr/share/doc/libplplot21/examples/tk/tk04.in #!@xtk04_LOCATION@

Deleted: trunk/debian/plplot11-driver-cairo.files
===================================================================
--- trunk/debian/plplot11-driver-cairo.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/plplot11-driver-cairo.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,2 +0,0 @@
-usr/lib/plplot*/driversd/cairo.*
-usr/share/doc/plplot11-driver-cairo

Deleted: trunk/debian/plplot11-driver-gd.files
===================================================================
--- trunk/debian/plplot11-driver-gd.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/plplot11-driver-gd.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,4 +0,0 @@
-usr/lib/plplot*/driversd/gd.*
-usr/share/doc/plplot11-driver-gd
-
-

Deleted: trunk/debian/plplot11-driver-qt.files
===================================================================
--- trunk/debian/plplot11-driver-qt.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/plplot11-driver-qt.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,4 +0,0 @@
-usr/lib/plplot*/driversd/qt.*
-usr/lib/libplplotqtd.so.*
-usr/share/doc/plplot11-driver-qt
-usr/lib/python*/plplot_pyqt4.so

Deleted: trunk/debian/plplot11-driver-wxwidgets.files
===================================================================
--- trunk/debian/plplot11-driver-wxwidgets.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/plplot11-driver-wxwidgets.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,5 +0,0 @@
-usr/lib/plplot*/driversd/wxwidgets.*
-usr/lib/libplplotwxwidgetsd.so.*
-usr/share/doc/plplot11-driver-wxwidgets
-
-

Deleted: trunk/debian/plplot11-driver-xwin.files
===================================================================
--- trunk/debian/plplot11-driver-xwin.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/plplot11-driver-xwin.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,4 +0,0 @@
-usr/lib/plplot*/driversd/xwin.*
-usr/share/doc/plplot11-driver-xwin
-
-

Copied: trunk/debian/plplot12-driver-cairo.files (from rev 12562, trunk/debian/plplot11-driver-cairo.files)
===================================================================
--- trunk/debian/plplot12-driver-cairo.files	                        (rev 0)
+++ trunk/debian/plplot12-driver-cairo.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -0,0 +1,2 @@
+usr/lib/plplot*/driversd/cairo.*
+usr/share/doc/plplot12-driver-cairo

Copied: trunk/debian/plplot12-driver-qt.files (from rev 12562, trunk/debian/plplot11-driver-qt.files)
===================================================================
--- trunk/debian/plplot12-driver-qt.files	                        (rev 0)
+++ trunk/debian/plplot12-driver-qt.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -0,0 +1,4 @@
+usr/lib/plplot*/driversd/qt.*
+usr/lib/libplplotqtd.so.*
+usr/share/doc/plplot12-driver-qt
+usr/lib/python*/plplot_pyqt4.so

Copied: trunk/debian/plplot12-driver-wxwidgets.files (from rev 12562, trunk/debian/plplot11-driver-wxwidgets.files)
===================================================================
--- trunk/debian/plplot12-driver-wxwidgets.files	                        (rev 0)
+++ trunk/debian/plplot12-driver-wxwidgets.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -0,0 +1,5 @@
+usr/lib/plplot*/driversd/wxwidgets.*
+usr/lib/libplplotwxwidgetsd.so.*
+usr/share/doc/plplot12-driver-wxwidgets
+
+

Copied: trunk/debian/plplot12-driver-xwin.files (from rev 12562, trunk/debian/plplot11-driver-xwin.files)
===================================================================
--- trunk/debian/plplot12-driver-xwin.files	                        (rev 0)
+++ trunk/debian/plplot12-driver-xwin.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -0,0 +1,4 @@
+usr/lib/plplot*/driversd/xwin.*
+usr/share/doc/plplot12-driver-xwin
+
+

Modified: trunk/debian/python-plplot.files
===================================================================
--- trunk/debian/python-plplot.files	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/python-plplot.files	2013-10-02 19:52:29 UTC (rev 12570)
@@ -1,3 +1,3 @@
 usr/lib/python*
-usr/share/doc/libplplot11/examples/*python*
+usr/share/doc/libplplot12/examples/*python*
 usr/share/doc/python-plplot

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2013-10-02 17:22:29 UTC (rev 12569)
+++ trunk/debian/rules	2013-10-02 19:52:29 UTC (rev 12570)
@@ -16,7 +16,7 @@
 OCTDIR = $(shell octave-config --print LOCALAPIOCTFILEDIR)
 
 version		:= $(shell perl debian/get-upstream-version.pl < cmake/modules/plplot_version.cmake)
-libpkg          := libplplot11
+libpkg          := libplplot12
 docpkg          := plplot-doc
 debbase		:= $(shell pwd)/debian
 debtmp		:= $(debbase)/tmp
@@ -39,7 +39,6 @@
 FFLAGS += -fvisibility=hidden
 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 LDFLAGS += -Wl,--as-needed
-DC = gdc-v1
 
 
 JAVA_HOME = /usr/lib/jvm/default-java
@@ -94,7 +93,7 @@
 config-stamp: control
 	mkdir -p $(BUILD_DIR)
 	( cd $(BUILD_DIR) ; \
-	PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \
+	PKG_CONFIG_ENV=" " FC=gfortran \
 	JAVA_HOME=$(JAVA_HOME) DC=$(DC) \
         CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" \
         LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
@@ -127,9 +126,9 @@
 install-arch: install-arch-stamp install-python
 	dh_movefiles -a --no-package=$(libpkg) --no-package=libplplot-dev \
 		     --no-package=python-plplot --no-package=python-plplot-qt   \
-		     --no-package=libplplot-java --no-package=libplplot-ada0 \
+		     --no-package=libplplot-java --no-package=libplplot-ada1 \
 	             --no-package=libplplot-ocaml --no-package=libplplot-lua \
-	             --no-package=libplplot-d --no-package=libplplot-ada0-dev
+	             --no-package=libplplot-d --no-package=libplplot-ada1-dev
 	dh_movefiles --package=python-plplot-qt
 	dh_movefiles --package=python-plplot
 	dh_movefiles --package=libplplot-java
@@ -137,8 +136,8 @@
 	dh_movefiles --package=libplplot-lua
 	dh_movefiles --package=libplplot-d
 ifeq ($(BUILD_ADA),yes)
-	dh_movefiles --package=libplplot-ada0
-	dh_movefiles --package=libplplot-ada0-dev 
+	dh_movefiles --package=libplplot-ada1
+	dh_movefiles --package=libplplot-ada1-dev 
 endif
 	dh_movefiles --package=libplplot-dev
 	dh_movefiles --package=$(libpkg)
@@ -155,7 +154,7 @@
 	  $(MAKE) DESTDIR=$(debtmp) install )
 
 	( cd $(debdoc)/plplot ; \
-	  rm -f COPYING.LIB *.dvi ; \
+	  rm -f COPYING.LIB ; \
 	  mv ChangeLog.release changelog )
 	mv $(debdoc)/plplot $(debdoc)/$(libpkg)
 
@@ -165,11 +164,11 @@
 	mv $(debex) $(debdoc)/$(libpkg)
 
 	for i in libplplot-dev plplot-tcl plplot-tcl-dev 		\
-		plplot11-driver-gd plplot11-driver-xwin octave-plplot	\
+		plplot12-driver-xwin octave-plplot			\
 		python-plplot-qt                                        \
-		python-plplot libplplot-c++10 plplot11-driver-wxwidgets \
-		plplot11-driver-qt libplplot-java			\
-		plplot11-driver-cairo libplplot-fortran9			\
+		python-plplot libplplot-c++11 plplot12-driver-wxwidgets \
+		plplot12-driver-qt libplplot-java			\
+		plplot12-driver-cairo libplplot-fortran10			\
 		libplplot-ocaml libplplot-lua libplplot-d ; do		\
 	  ln -s $(libpkg) $(debdoc)/$$i ;				\
 	done
@@ -179,8 +178,8 @@
 	( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar )
 
 ifeq ($(BUILD_ADA),yes)
-	ln -s $(libpkg) $(debdoc)/libplplot-ada0
-	ln -s $(libpkg) $(debdoc)/libplplot-ada0-dev
+	ln -s $(libpkg) $(debdoc)/libplplot-ada1
+	ln -s $(libpkg) $(debdoc)/libplplot-ada1-dev
 endif
 
 	touch install-arch-stamp
@@ -201,7 +200,7 @@
 
 install-python%: build-arch-stamp
 	( cd $(BUILD_DIR) ; \
-	  cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=`python-config --config-dir`/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 ; \
+	  cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=`python-config --configdir`/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 qt_gui/pyqt4 ; do		\
 	    ( cd bindings/$$d;				\
 	      $(MAKE) clean ;				\

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