[SCM] efficient 2D data-plotting library branch, master, updated. 8cfbee7cbbe8767904e3ef4e31fc33ef66893172

Picca Frédéric-Emmanuel picca at synchrotron-soleil.fr
Tue Nov 16 22:15:17 UTC 2010


The following commit has been merged in the master branch:
commit 8cfbee7cbbe8767904e3ef4e31fc33ef66893172
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Tue Nov 16 17:14:48 2010 -0500

    * fix the debian files

diff --git a/debian/control b/debian/control
index 62e6d56..eb31ca4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Build-Depends: debhelper (>= 8.0.0),
 	       python-support (>= 0.90),
 	       python-all-dev,
 	       python-numpy (>= 1.3),
-	       gfortran
-Build-Depends-Indep: python-sphinx
-XS-Python-Version: >= 2.6
+	       gfortran,
+	       python-sphinx
+XS-Python-Version: >= 2.5
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/debian-science/packages/guidata.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/guidata.git
@@ -19,7 +19,7 @@ Homepage: http://sourceforge.net/projects/guidata
 Package: python-guiqwt
 Section: python
 Architecture: any
-Depends: ${shlib:Depends},
+Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ${python:Depends},
 	 python-qwt5-qt4 (>= 5.2),
@@ -27,8 +27,8 @@ Depends: ${shlib:Depends},
 	 python-qscintilla2 (>= 2.1),
 	 python-numpy (>= 1.3),
 	 python-h5py,
-	 python-scipy (>= 0.7)
-	 python-imaging (>= 1.1.6)
+	 python-scipy (>= 0.7),
+	 python-imaging (>= 1.1.6),
 	 libjs-jquery
 XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
diff --git a/debian/links b/debian/links
index 573df97..62eaadf 100644
--- a/debian/links
+++ b/debian/links
@@ -1 +1 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/doc/python-guidata/html/_static/jquery.js
\ No newline at end of file
+/usr/share/javascript/jquery/jquery.js /usr/share/doc/python-guiqwt/html/_static/jquery.js
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index e8313ee..235951a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ get-orig-source:
 override_dh_clean:
 	dh_clean
 	rm -rf build
-	rm -f doc
+	-mv doc doc_src
 
 # do not compress the javascript files generated by sphinx
 # if compressed the documentation search engine is broken.
@@ -19,7 +19,7 @@ override_dh_compress:
 
 # until the upstream rename doc_src -> doc
 override_dh_auto_build:
-	ln -sf doc_src doc
+	mv doc_src doc
 	dh_auto_build
 
 %:

-- 
efficient 2D data-plotting library



More information about the debian-science-commits mailing list