[gle-graphics] 07/23: Import Debian changes 4.2.2-5

[Christian T. Steigies]

This is an automated email from the git hooks/post-receive script.

cts pushed a commit to branch master
in repository gle-graphics.

commit 5ffe16c221d55118bcc5af1e723342c4b157e338
Author: Christian T. Steigies <cts at debian.org>
Date:   Thu Oct 6 23:10:58 2011 +0200

    Import Debian changes 4.2.2-5
    
    gle-graphics (4.2.2-5) unstable; urgency=low
    
      * Switch to dpkg-source 3.0 (quilt) format
      * qgle: link with -ldl for all unix targets (closes: #554556)
      * recommend libgs9 instead of libgs8
      * Updated Standards-Version to 3.9.2 (no changes)
      * do not ignore make clean errors
---
 debian/changelog           | 10 ++++++++++
 debian/control             |  8 ++++----
 debian/patches/qgle.pro.in | 24 ++++++++++++++++++++++++
 debian/patches/series      |  1 +
 debian/rules               |  8 ++++----
 debian/source/format       |  1 +
 debian/stamp-patched       |  0
 7 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fcc94a1..c45f972 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gle-graphics (4.2.2-5) unstable; urgency=low
+
+  * Switch to dpkg-source 3.0 (quilt) format
+  * qgle: link with -ldl for all unix targets (closes: #554556)
+  * recommend libgs9 instead of libgs8
+  * Updated Standards-Version to 3.9.2 (no changes)
+  * do not ignore make clean errors
+
+ -- Christian T. Steigies <cts at debian.org>  Thu, 06 Oct 2011 23:10:58 +0200
+
 gle-graphics (4.2.2-4) unstable; urgency=low
 
   * add libtool and pkg-config to build-depends
diff --git a/debian/control b/debian/control
index dcccb95..ef4d431 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,15 @@ Source: gle-graphics
 Section: graphics
 Priority: optional
 Maintainer: Christian T. Steigies <cts at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libtiff-dev, libboost-dev, cdbs, libqt4-dev, libjpeg-dev, libpng-dev, ncurses-dev, texlive, texlive-latex-extra, automake, ghostscript, libtool, pkg-config
+Build-Depends: debhelper (>= 5.0.0), cdbs, libtiff-dev, libboost-dev, libqt4-dev, libjpeg-dev, libpng-dev, ncurses-dev, texlive, texlive-latex-extra, automake, ghostscript, libtool, pkg-config
 X-Build-Depends: docbook-to-man
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 
 Package: gle-graphics
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libgs8
-Description: An interactive Graphics Language Editor
+Recommends: libgs9
+Description: Interactive Graphics Language Editor
  GLE  is  a  high  quality  graphics  package for scientists,
  combining  a  user  friendly  interface with a full range of
  facilities    for   producing  publication  quality  graphs,
diff --git a/debian/patches/qgle.pro.in b/debian/patches/qgle.pro.in
new file mode 100644
index 0000000..8635550
--- /dev/null
+++ b/debian/patches/qgle.pro.in
@@ -0,0 +1,24 @@
+Description: Always link qgle with -ldl
+ When building with binutils-gold on amd64,
+ qgle is not linked with -ldl.
+Forwarded: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554556
+Author: Christian T. Steigies <cts at debian.org>
+Last-Update: 2011-10-06
+
+--- a/src/gui/qgle.pro.in
++++ b/src/gui/qgle.pro.in
+@@ -161,13 +161,9 @@
+              images/reload.png \
+              images/reload_red.png
+ 
+-linux-g++ {
+-	LIBS += -ldl
+-}
+-
+ # link against the GLE library (unix -> Linux and Mac OS/X)
+ unix {
+-	LIBS += -lgle-graphics- at GLE_VERSION@ -L../../build/lib/
++	LIBS += -ldl -lgle-graphics- at GLE_VERSION@ -L../../build/lib/
+ }
+ win32 {
+ 	LIBS += -lgle-graphics- at GLE_VERSION@ -L../../build/bin/
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9f36053
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+qgle.pro.in
diff --git a/debian/rules b/debian/rules
index 4efdb4b..7f582d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ DEB_TAR_SRCDIR = gle4
 #include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 # To add pre-configure actions (ignore warnings):
 makebuilddir/gle-graphics::
@@ -18,10 +18,10 @@ build/gle-graphics::
 	make doc
 
 clean::
-	-make clean
+	[ ! -f Makefile ] || make clean
 	-rm Makefile
-	-make -C gle-refman -f Makefile.gcc clean
-	-make -C gle-refman/fonttest -f Makefile.gcc clean
+	[ ! -f gle-refman/Makefile.gcc ] || make -C gle-refman -f Makefile.gcc clean
+	[ ! -f gle-refman/Makefile.gcc ] || make -C gle-refman/fonttest -f Makefile.gcc clean
 	-rm -r gle-refman/appendix/fig/.gle/
 	-rm src/font/*.fmt
 	-rm src/font/*.fve
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/stamp-patched b/debian/stamp-patched
new file mode 100644
index 0000000..e69de29

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