[plplot] 54/68: Import Debian changes 5.9.9-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 f189dfe81f381235cd5b66fdabab48e67d887d7c
Author: Andrew Ross <andrewross at users.sourceforge.net>
Date:   Tue Jan 3 16:09:55 2012 +0000

    Import Debian changes 5.9.9-2
    
    plplot (5.9.9-2) unstable; urgency=low
    
      * debian/control.in: Add recommends on cmake for libplplot-dev since
        this provides a better way of building the examples.
      * Force rebuild to fix dependency problems with ada development library
        and gnat-4.6 which make libplplot-ada0-dev uninstallable.
      * Add explicit dependency on gdc-v1 as package is not yet ready for gdc
        version 2 which is the new default with gdc-4.6 (closes: #653088).
---
 debian/changelog  | 11 +++++++++++
 debian/control    |  6 +++---
 debian/control.in |  6 +++---
 debian/rules      |  2 ++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc4a688..f6b3635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+plplot (5.9.9-2) unstable; urgency=low
+
+  * debian/control.in: Add recommends on cmake for libplplot-dev since
+    this provides a better way of building the examples.
+  * Force rebuild to fix dependency problems with ada development library
+    and gnat-4.6 which make libplplot-ada0-dev uninstallable.
+  * Add explicit dependency on gdc-v1 as package is not yet ready for gdc
+    version 2 which is the new default with gdc-4.6 (closes: #653088).
+
+ -- Andrew Ross <andrewross at users.sourceforge.net>  Tue, 03 Jan 2012 16:09:55 +0000
+
 plplot (5.9.9-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 7d3399f..aeb3a20 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
  fastjar, swig, gnat [!sh4], libqt4-dev, python-sip-dev, 
  python-qt4, python-qt4-dev,
  ocaml-nox, camlidl, ocaml-findlib, libcairo-ocaml-dev,
- liblablgtk2-ocaml-dev, liblua5.1-0-dev, lua5.1, gdc
+ 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
 Build-Conflicts: libplplot5, octave3.0-headers
@@ -47,7 +47,7 @@ Description: Scientific plotting library
 Package: libplplot-dev
 Architecture: any
 Section: libdevel
-Recommends: pkg-config, libplplot-ocaml, libplplot-lua, libplplot-d
+Recommends: pkg-config, cmake, libplplot-ocaml, libplplot-lua, libplplot-d
 Suggests: plplot-doc
 Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
  libltdl3-dev, libqsastime-dev, ${misc:Depends}, 
@@ -355,7 +355,7 @@ Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
  libplplot-ada0 (= ${binary:Version})
 Recommends: libplplot-dev
 Breaks: libplplot-ada (<< 5.9.8-2), libplplot-dev (<< 5.9.8-2)
-Description: Scientific plotting library (development files)
+Description: Ada support for PLplot, a plotting library (development files)
  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
diff --git a/debian/control.in b/debian/control.in
index d292c75..df2e703 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,7 +14,7 @@ Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
  fastjar, swig, gnat [!sh4], libqt4-dev, python-sip-dev, 
  python-qt4, python-qt4-dev,
  ocaml-nox, camlidl, ocaml-findlib, libcairo-ocaml-dev,
- liblablgtk2-ocaml-dev, liblua5.1-0-dev, lua5.1, gdc
+ 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
 Build-Conflicts: libplplot5, octave3.0-headers
@@ -47,7 +47,7 @@ Description: Scientific plotting library
 Package: libplplot-dev
 Architecture: any
 Section: libdevel
-Recommends: pkg-config, libplplot-ocaml, libplplot-lua, libplplot-d
+Recommends: pkg-config, cmake, libplplot-ocaml, libplplot-lua, libplplot-d
 Suggests: plplot-doc
 Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
  libltdl3-dev, libqsastime-dev, ${misc:Depends}, 
@@ -355,7 +355,7 @@ Depends: libplplot11 (= ${binary:Version}), libqhull-dev, libfreetype6-dev,
  libplplot-ada0 (= ${binary:Version})
 Recommends: libplplot-dev
 Breaks: libplplot-ada (<< 5.9.8-2), libplplot-dev (<< 5.9.8-2)
-Description: Scientific plotting library (development files)
+Description: Ada support for PLplot, a plotting library (development files)
  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
diff --git a/debian/rules b/debian/rules
index 2b37fc7..d0f37b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,7 @@ CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
 #CXXFLAGS += -fvisibility=hidden
 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 LDFLAGS += -Wl,--as-needed
+DC = gdc-v1
 
 
 JAVA_HOME = /usr/lib/jvm/default-java
@@ -92,6 +93,7 @@ config-stamp: control
 	(cd $(BUILD_DIR) ; \
 	PKG_CONFIG_ENV=" " F77=gfortran FC=gfortran \
 	JAVA_HOME=$(JAVA_HOME) \
+	DC=$(DC) \
 	cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) )
 	touch config-stamp
 

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