[guidata] 01/01: Add the python3 modules and switch to pybuild

Frédéric-Emmanuel Picca picca at moszumanska.debian.org
Thu Aug 27 08:54:55 UTC 2015


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

picca pushed a commit to branch master
in repository guidata.

commit 24fb23d8cdada8cd1c92f9f98208d23cfbb938c9
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Wed Aug 26 15:20:36 2015 +0200

    Add the python3 modules and switch to pybuild
---
 debian/README.Debian                             |  7 ---
 debian/changelog                                 |  6 +++
 debian/control                                   | 57 ++++++++++++++++++++----
 debian/guidata-tests3.desktop                    | 10 +++++
 debian/{doc-base => python-guidata-doc.doc-base} |  4 +-
 debian/{docs => python-guidata-doc.docs}         |  0
 debian/python-guidata.install                    |  1 -
 debian/rules                                     | 19 ++++----
 8 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 9952e7d..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,7 +0,0 @@
-guidata for Debian
-------------------
-
-the upstream sources is distributed as a zip file, so it was repackaged
-with tar.
-
- -- Picca Frédéric-Emmanuel <picca at debian.org>  Tue, 17 Feb 2009 22:35:15 +0100
diff --git a/debian/changelog b/debian/changelog
index e865368..4170a45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+guidata (1.7.0~b2-1~exp2) experimental; urgency=medium
+
+  * Add the python3 modules and switch to pybuild
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Wed, 26 Aug 2015 09:21:32 +0200
+
 guidata (1.7.0~b2-1~exp1) UNRELEASED; urgency=medium
 
   * Imported Upstream version 1.7.0~b2
diff --git a/debian/control b/debian/control
index ee5e510..d2bf3ba 100644
--- a/debian/control
+++ b/debian/control
@@ -4,29 +4,70 @@ Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
 Section: science
 Priority: extra
 Build-Depends: debhelper (>= 9),
+	       dh-python,
                python-all,
                python-qt4,
 	       python-setuptools,
 	       python-sip,
-               python-spyderlib
-Build-Depends-Indep: python-sphinx
+	       python-sphinx,
+               python-spyderlib,
+	       python3-all,
+	       python3-setuptools,
+	       python3-sip,
+	       python3-sphinx,
+               python3-spyderlib,
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/guidata.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/guidata.git
-Homepage: http://code.google.com/p/guidata/
+Homepage: https://github.com/PierreRaybaut/guidata
 X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
 
 Package: python-guidata
 Architecture: all
 Section: python
 Depends: ${misc:Depends},
          ${python:Depends},
-         ${sphinxdoc:Depends},
          python-h5py,
          python-spyderlib
 Breaks: ${python:Breaks}
 Provides: ${python:Provides}
-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.
- It also provides helpers and application development tools for PyQt4.
+Description: dataset manipulation GUI generator - Python 2
+ Based on the Qt Python binding module PyQt4, guidata is a Python
+ library generating graphical user interfaces for easy dataset editing
+ and display. It also provides helpers and application development
+ tools for PyQt4.
+ .
+ This is the Python 2 version of the package.
+
+Package: python3-guidata
+Architecture: all
+Section: python
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         python3-h5py,
+         python3-spyderlib
+Breaks: ${python3:Breaks}
+Provides: ${python3:Provides}
+Description: dataset manipulation GUI generator - Python 3
+ Based on the Qt Python binding module PyQt4, guidata is a Python
+ library generating graphical user interfaces for easy dataset editing
+ and display. It also provides helpers and application development
+ tools for PyQt4.
+ .
+ This is the Python 3 version of the package.
+
+Package: python-guidata-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends},
+Breaks: python-guidata (<< 1.7.0~b2-1~exp2)
+Replaces: python-guidata (<< 1.7.0~b2-1~exp2)
+Description: dataset manipulation GUI generator - Documentation
+ Based on the Qt Python binding module PyQt4, guidata is a Python
+ library generating graphical user interfaces for easy dataset editing
+ and display. It also provides helpers and application development
+ tools for PyQt4.
+ .
+ This is the common documentation package.
\ No newline at end of file
diff --git a/debian/guidata-tests3.desktop b/debian/guidata-tests3.desktop
new file mode 100644
index 0000000..ba8e7ea
--- /dev/null
+++ b/debian/guidata-tests3.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=guidata-tests3
+GenericName=guidata test application (Python 3)
+Comment=you can use this applications to test all guidata features.
+TryExec=guidata-tests3
+Exec=guidata-tests3
+Icon=guidata.svg
+Categories=Education;Science;Physics;
diff --git a/debian/doc-base b/debian/python-guidata-doc.doc-base
similarity index 77%
rename from debian/doc-base
rename to debian/python-guidata-doc.doc-base
index f413a7b..9988cfa 100644
--- a/debian/doc-base
+++ b/debian/python-guidata-doc.doc-base
@@ -8,5 +8,5 @@ Abstract: guidata_
 Section: Text
 
 Format: HTML
-Index: /usr/share/doc/python-guidata/html/index.html
-Files: /usr/share/doc/python-guidata/html/*
+Index: /usr/share/doc/python-guidata-doc/html/index.html
+Files: /usr/share/doc/python-guidata-doc/html/*
diff --git a/debian/docs b/debian/python-guidata-doc.docs
similarity index 100%
rename from debian/docs
rename to debian/python-guidata-doc.docs
diff --git a/debian/python-guidata.install b/debian/python-guidata.install
deleted file mode 100644
index f7e019c..0000000
--- a/debian/python-guidata.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/guidata-tests.desktop /usr/share/applications
diff --git a/debian/rules b/debian/rules
index 1d7438f..d10fcd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,18 @@
 #!/usr/bin/make -f
 
-VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
-# for backport without bpo on stable
-WITH_SPHINXDOC = $(shell if [ -x /usr/bin/dh_sphinxdoc ]; then echo "--with sphinxdoc"; fi)
+export PYBUILD_NAME=guidata
 
-get-orig-source:
-	uscan --force-download --upstream-version $(VERSION) --repack
+%:
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_clean:
 	rm -rf build/sphinx
 	dh_clean
 
-%:
-	dh $@ --with python2 $(WITH_SPHINXDOC)
-
-.PHONY: get-orig-source
+override_dh_install:
+	dh_install
+	# rename the script
+	mv debian/python3-guidata/usr/bin/guidata-tests debian/python3-guidata/usr/bin/guidata-tests3
+	# install the .desktop files
+	dh_install -p python-guidata debian/guidata-tests.desktop /usr/share/applications
+	dh_install -p python3-guidata debian/guidata-tests3.desktop /usr/share/applications

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



More information about the debian-science-commits mailing list