[gle-graphics] 09/23: Import Debian changes 4.2.3b-2

[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 d0c261b873a5896fd2bba012a42e2526e87cab76
Author: Christian T. Steigies <cts at debian.org>
Date:   Mon Nov 7 22:42:59 2011 +0100

    Import Debian changes 4.2.3b-2
    
    gle-graphics (4.2.3b-2) unstable; urgency=low
    
      * configure with-scripts=no
      * remove glebtool only when it exists
      * do not compress LICENSE.txt as it is read by qgle
      * let qgle search for /usr/lib/libgs.so.9 before any other libgs
---
 debian/changelog      |  9 +++++++++
 debian/patches/libgs9 | 11 +++++++++++
 debian/patches/series |  1 +
 debian/rules          | 10 +++++++---
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1093cf3..1ad1096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gle-graphics (4.2.3b-2) unstable; urgency=low
+
+  * configure with-scripts=no
+  * remove glebtool only when it exists
+  * do not compress LICENSE.txt as it is read by qgle
+  * let qgle search for /usr/lib/libgs.so.9 before any other libgs
+
+ -- Christian T. Steigies <cts at debian.org>  Mon, 07 Nov 2011 22:42:59 +0100
+
 gle-graphics (4.2.3b-1) unstable; urgency=low
 
   * new upstream version
diff --git a/debian/patches/libgs9 b/debian/patches/libgs9
new file mode 100644
index 0000000..cedd81c
--- /dev/null
+++ b/debian/patches/libgs9
@@ -0,0 +1,11 @@
+--- a/src/gui/qgslibloader.cpp
++++ b/src/gui/qgslibloader.cpp
+@@ -246,6 +246,8 @@
+ 	/* Try to load the library */
+ 	if (location == "") {
+ 		#ifdef Q_WS_X11
++		// Debian puts libraries in /usr/lib independant of architecture
++		tryLocation("/usr/lib/libgs.so.9");
+ 		#ifdef __x86_64__
+ 		// try 64 bit libraries on 64 bit system
+ 		tryLocation("/usr/lib64/libgs.so");
diff --git a/debian/patches/series b/debian/patches/series
index 134fd2d..47acbd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 qgle.pro.in
 hurd_path_max
 kfreebsd-buildd-has-no-proc
+libgs9
diff --git a/debian/rules b/debian/rules
index fd124a1..9fcf51c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,11 +18,15 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	-autoreconf -vfi
-	./configure --docdir=/usr/share/doc/gle-graphics/ --with-rpath=no
+	./configure --docdir=/usr/share/doc/gle-graphics/ --with-rpath=no --with-scripts=no
 
 override_dh_auto_install:
 	dh_auto_install
 	cp debian/qgle.1 debian/gle-graphics/usr/share/man/man1/
 	cp debian/manip.1 debian/gle-graphics/usr/share/man/man1/
-	# do not ship helper that is only used during build
-	rm debian/gle-graphics/usr/bin/glebtool
+# do not ship helper that is only used during build
+	[ -f debian/gle-graphics/usr/bin/glebtool ] || rm debian/gle-graphics/usr/bin/glebtool
+
+# do not compress LICENSE.txt as it needs to be read by qgle
+override_dh_compress:
+	dh_compress -X usr/share/doc/gle-graphics/LICENSE.txt

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