[guiqwt] 02/04: release

Frédéric-Emmanuel Picca picca at moszumanska.debian.org
Thu Nov 12 20:40:57 UTC 2015


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

picca pushed a commit to branch master
in repository guiqwt.

commit f0e784e05c444107f6ff54500caff4de2b60b281
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Nov 7 12:21:19 2015 +0100

    release
---
 debian/changelog                                          |  8 ++++++++
 debian/control                                            |  8 ++++----
 debian/{guiqwt-tests.desktop => guiqwt-tests-py2.desktop} |  6 +++---
 .../{guiqwt-tests3.desktop => guiqwt-tests-py3.desktop}   |  6 +++---
 debian/rules                                              | 15 ++++++++-------
 debian/{sift.desktop => sift-py2.desktop}                 |  4 ++--
 debian/{sift3.desktop => sift-py3.desktop}                |  4 ++--
 7 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56cda69..745589e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+guiqwt (3.0.0~rc1-1~exp1) experimental; urgency=medium
+
+  * Imported Upstream version 3.0.0~rc1
+  * debian/control
+    - Depends python-qwt (>= 0.5.0~)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sat, 07 Nov 2015 12:04:58 +0100
+
 guiqwt (3.0.0~b7-1~exp1) experimental; urgency=medium
 
   * Imported Upstream version 3.0.0~b7
diff --git a/debian/control b/debian/control
index b5549cb..58816cf 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,14 @@ Build-Depends: debhelper (>= 9),
                python-all-dev,
                python-guidata (>= 1.7.0~),
                python-numpy,
-	       python-qwt,
+	       python-qwt (>= 0.5.0~),
 	       python-setuptools,
                python-sphinx,
                cython3,
                python3-all-dev,
                python3-guidata (>= 1.7.0~),
                python3-numpy,
-	       python3-qwt (>= 0.4.0~),
+	       python3-qwt (>= 0.5.0~),
 	       python3-setuptools,
                python3-sphinx,
 Standards-Version: 3.9.6
@@ -34,7 +34,7 @@ Depends: ${shlibs:Depends},
          python-guidata (>= 1.7.0~),
          python-h5py,
          python-imaging,
-         python-qwt (>= 0.4.0~),
+         python-qwt (>= 0.5.0~),
          python-scipy,
 Recommends: python-dicom
 Suggests: spyder (>= 2.0.10)
@@ -57,7 +57,7 @@ Depends: ${shlibs:Depends},
          python3-guidata (>= 1.7.0~),
          python3-h5py,
          python3-pil,
-         python3-qwt (>= 0.4.0~),
+         python3-qwt (>= 0.5.0~),
          python3-scipy,
 Recommends: python3-dicom
 Suggests: spyder3 (>= 2.0.10)
diff --git a/debian/guiqwt-tests.desktop b/debian/guiqwt-tests-py2.desktop
similarity index 79%
rename from debian/guiqwt-tests.desktop
rename to debian/guiqwt-tests-py2.desktop
index ba17ba5..f7c2450 100644
--- a/debian/guiqwt-tests.desktop
+++ b/debian/guiqwt-tests-py2.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=guiqwt-tests
+Name=guiqwt-tests-py2
 GenericName=guiqwt test application
 Comment=you can use this applications to test all guiqwt features.
-TryExec=guiqwt-tests
-Exec=guiqwt-tests
+TryExec=guiqwt-tests-py2
+Exec=guiqwt-tests-py2
 Icon=/usr/share/pyshared/guiqwt/images/guiqwt.png
 MimeType=application/x-foo;
 Categories=Education;Science;Physics;
diff --git a/debian/guiqwt-tests3.desktop b/debian/guiqwt-tests-py3.desktop
similarity index 78%
rename from debian/guiqwt-tests3.desktop
rename to debian/guiqwt-tests-py3.desktop
index 12cb0c0..5677472 100644
--- a/debian/guiqwt-tests3.desktop
+++ b/debian/guiqwt-tests-py3.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=guiqwt-tests3
+Name=guiqwt-tests-py3
 GenericName=guiqwt test application (Python 3)
 Comment=you can use this applications to test all guiqwt features.
-TryExec=guiqwt-tests3
-Exec=guiqwt-tests3
+TryExec=guiqwt-tests-py3
+Exec=guiqwt-tests-py3
 Icon=/usr/share/pyshared/guiqwt/images/guiqwt.png
 Categories=Education;Science;Physics;
diff --git a/debian/rules b/debian/rules
index 0914f1d..a9b0627 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,13 +17,14 @@ override_dh_auto_install:
 	dh_auto_install
 	dh_numpy
 	dh_numpy3
-	# rename the script
-	mv debian/python3-guiqwt/usr/bin/guiqwt-tests debian/python3-guiqwt/usr/bin/guiqwt-tests3
-	mv debian/python3-guiqwt/usr/bin/sift debian/python3-guiqwt/usr/bin/sift3
 	# install the .desktop files
-	dh_install -p python-guiqwt debian/guiqwt-tests.desktop /usr/share/applications
-	dh_install -p python3-guiqwt debian/guiqwt-tests3.desktop /usr/share/applications
-	dh_install -p python-guiqwt debian/sift.desktop /usr/share/applications
-	dh_install -p python3-guiqwt debian/sift3.desktop /usr/share/applications
+	dh_install -p python-guiqwt debian/guiqwt-tests-py2.desktop /usr/share/applications
+	dh_install -p python3-guiqwt debian/guiqwt-tests-py3.desktop /usr/share/applications
+	dh_install -p python-guiqwt debian/sift-py2.desktop /usr/share/applications
+	dh_install -p python3-guiqwt debian/sift-py3.desktop /usr/share/applications
 	# install the qtdesigner files
 	dh_install -p python-guiqwt qtdesigner/*.py /usr/lib/qt4/plugins/designer/python
+
+# wait until the shebang is fixed by the upstream
+override_dh_python3:
+        dh_python3 --shebang=/usr/bin/python3
diff --git a/debian/sift.desktop b/debian/sift-py2.desktop
similarity index 72%
rename from debian/sift.desktop
rename to debian/sift-py2.desktop
index 39871ca..cc0dd42 100644
--- a/debian/sift.desktop
+++ b/debian/sift-py2.desktop
@@ -4,7 +4,7 @@ Type=Application
 Name=Sift
 GenericName=Sift
 Comment=Signal and Image Filtering Tool (demo software based on guidata and guiqwt)
-TryExec=sift
-Exec=sift
+TryExec=sift-py2
+Exec=sift-py2
 MimeType=application/x-foo;
 Categories=Development;Science;Physics;
\ No newline at end of file
diff --git a/debian/sift3.desktop b/debian/sift-py3.desktop
similarity index 86%
rename from debian/sift3.desktop
rename to debian/sift-py3.desktop
index d001197..78d2b18 100644
--- a/debian/sift3.desktop
+++ b/debian/sift-py3.desktop
@@ -4,6 +4,6 @@ Type=Application
 Name=Sift
 GenericName=Sift (Python 3)
 Comment=Signal and Image Filtering Tool (demo software based on guidata and guiqwt)
-TryExec=sift3
-Exec=sift3
+TryExec=sift-py3
+Exec=sift-py3
 Categories=Development;Science;Physics;

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



More information about the debian-science-commits mailing list