[SCM] dataset manipulation GUI generator branch, master, updated. upstream/1.2.4-35-g6d5ad89

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 219369c63a4863c2d483b79e2925e4bebbcfdbb0
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Sun Mar 6 22:49:24 2011 +0100

    switch to dh_python2

diff --git a/debian/control b/debian/control
index ecb1c69..7a9b11b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,11 @@ Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8.0.0),
-	       python-support (>= 0.90),
-	       python-all,
+Build-Depends: debhelper (>= 8.1.1),
+	       python-all (>= 2.6.6-3~),
 	       python-qt4
 Build-Depends-Indep: python-sphinx
-XS-Python-Version: >= 2.5
+X-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
@@ -23,8 +22,8 @@ Depends: ${misc:Depends},
 	 python-qscintilla2,
 	 python-h5py,
 	 libjs-jquery
-XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
+Breaks: ${python:Breaks}
 Description: dataset manipulation GUI generator
  Based on the Qt Python binding module PyQt4, guidata is a Python library
  generating graphical user interfaces for easy dataset editing and display.
diff --git a/debian/rules b/debian/rules
index e6e3389..469b8b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,12 +9,7 @@ override_dh_clean:
 	rm -rf build/sphinx
 	dh_clean
 
-# 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
+	dh $@ --with python2
 
 .PHONY: get-orig-source

-- 
dataset manipulation GUI generator