[SCM] efficient 2D data-plotting library branch, master, updated. upstream/2.0.7.1-24-g5802091

Picca Frédéric-Emmanuel picca at synchrotron-soleil.fr
Sun Feb 20 22:22:14 UTC 2011


The following commit has been merged in the master branch:
commit 8088df216ceaa0175b7732c27812b853aec060ba
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Sun Feb 20 22:37:34 2011 +0100

    * fix the FTBFS 614148 with the right FFLAGS.

diff --git a/debian/changelog b/debian/changelog
index 2e41002..4ec69e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 guiqwt (2.0.8.1-3) unstable; urgency=low
 
-  * fix the doc generation with the right Build-Depends-Indep
+  * fix FTBFS tries to include non-PIC FORTRAN object in shared library
+    thanks Hector Oron for the report and the fix;
+    Closes: 614148
+  * improve the doc generation by adding the right Build-Depends-Indep
+    and depending on debhelper 8.1.1 to avoid sphinx files compression.
 
  -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>  Sun, 20 Feb 2011 21:58:11 +0100
 
diff --git a/debian/rules b/debian/rules
index 3b46c89..c08c2d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-export LDFLAGS=-shared
+export LDFLAGS= $(shell dpkg-buildflags --get LDFLAGS) -shared
+export FFLAGS = $(shell dpkg-buildflags --get FFLAGS) -fPIC
 
 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
 
@@ -11,11 +12,6 @@ override_dh_clean:
 	dh_clean
 	rm -rf build
 
-# do not compress the javascript files generated by sphinx
-# if compressed the documentation search engine is broken.
-override_dh_compress:
-	dh_compress -X.js
-
 %:
 	dh $@ --with python-support
 

-- 
efficient 2D data-plotting library



More information about the debian-science-commits mailing list