[spyder] 04/04: refrsh for the spyderlib -> spyder rename
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Sun Sep 25 18:56:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch experimental
in repository spyder.
commit 4e4bf53eb91b3900e7c0f6e0cd81e4a63ff8605e
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sun Sep 25 20:35:32 2016 +0200
refrsh for the spyderlib -> spyder rename
---
debian/changelog | 11 +++++
debian/control | 51 ++++++++++++++++++----
debian/patches/0001-fix-spyderlib-path.patch | 10 ++---
debian/python-spyder.bug-control | 1 +
...hon-spyderlib.preinst => python-spyder.preinst} | 0
debian/python-spyder.pyremove | 1 +
debian/python-spyderlib.bug-control | 1 -
debian/python-spyderlib.pyremove | 2 -
debian/python3-spyder.bug-control | 1 +
debian/python3-spyder.pyremove | 1 +
debian/python3-spyderlib.bug-control | 1 -
debian/python3-spyderlib.pyremove | 2 -
debian/rules | 27 +++++-------
...-spyderlib-doc.doc-base => spyder-doc.doc-base} | 10 ++---
.../{python-spyderlib-doc.docs => spyder-doc.docs} | 0
debian/spyder.bug-control | 2 +-
debian/spyder.links | 2 +-
debian/spyder3.bug-control | 2 +-
debian/spyder3.links | 2 +-
19 files changed, 82 insertions(+), 45 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0b85594..8eff7c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+spyder (3.0.0+dfsg1-1~exp1) experimental; urgency=medium
+
+ * New upstream version 3.0.0+dfsg1
+ * Upstream renamed module spyderlib into spyder
+ * d/control
+ - New binary packages: python-spyder, python3-spyder, spyder-doc
+ - python-spyderlib, python3-spyderlib, python-spyder-doc are now
+ transitional packages.
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sun, 25 Sep 2016 13:21:06 +0200
+
spyder (3.0.0~b5+dfsg1-1~exp1) experimental; urgency=medium
* Imported Upstream version 3.0.0~b5+dfsg1
diff --git a/debian/control b/debian/control
index 73adeac..717aa9b 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Architecture: all
Section: devel
Depends: ${misc:Depends},
${python:Depends},
- python-spyderlib (= ${binary:Version})
+ python-spyder (= ${binary:Version})
Breaks: ${python-Breaks},
python-spyderlib (<< 2.3.0+dfsg-2)
Replaces: python-spyderlib (<< 2.3.0+dfsg-2)
@@ -37,6 +37,15 @@ Description: Python IDE for scientists (Python 2)
Package: python-spyderlib
Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, python-spyder
+Description: transitional dummy package for python-spyder
+ This is a transitional package to ease upgrades to the
+ python-spyder package. It can be safely removed.
+
+Package: python-spyder
+Architecture: all
Section: python
Depends: ${misc:Depends},
${python:Depends},
@@ -63,14 +72,17 @@ Recommends: python-matplotlib,
python-numpy,
python-pandas,
python-scipy,
- python-spyderlib-doc (= ${binary:Version})
+ spyder-doc (= ${binary:Version})
Suggests: tortoisehg,
gitk
Breaks: ${python:Breaks},
spyder (<< 2.3.0+dfsg-2),
- python-spyderlib-doc (<< 2.3.0+dfsg-4)
-Provides: ${python:Provides}
-Replaces: spyder (<< 2.0.12-1)
+ python-spyderlib-doc (<< 2.3.0+dfsg-4),
+ python-spyderlib (<< 3.0.0+dfsg1-1~)
+Provides: ${python:Provides},
+ python-spyderlib
+Replaces: spyder (<< 2.0.12-1),
+ python-spyderlib (<< 3.0.0+dfsg1-1~)
Description: Python IDE for scientists (Python 2 modules)
Originally written to design Spyder (the Scientific PYthon
Development EnviRonment), the spyderlib Python library provides
@@ -84,6 +96,15 @@ Description: Python IDE for scientists (Python 2 modules)
Package: python-spyderlib-doc
Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, spyder-doc
+Description: transitional dummy package for python-spyder-doc
+ This is a transitional package to ease upgrades to the
+ spyder-doc package. It can be safely removed.
+
+Package: spyder-doc
+Architecture: all
Section: doc
Depends: ${misc:Depends},
${sphinxdoc:Depends}
@@ -105,7 +126,7 @@ Architecture: all
Section: devel
Depends: ${misc:Depends},
${python3:Depends},
- python3-spyderlib (= ${binary:Version})
+ python3-spyder (= ${binary:Version})
Breaks: ${python3-Breaks},
python3-spyderlib (<< 2.3.0+dfsg-2)
Replaces: python3-spyderlib (<< 2.3.0+dfsg-2)
@@ -118,6 +139,15 @@ Description: Python IDE for scientists (Python 3)
Package: python3-spyderlib
Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, python3-spyder
+Description: transitional dummy package for python3-spyder
+ This is a transitional package to ease upgrades to the
+ python3-spyder package. It can be safely removed.
+
+Package: python3-spyder
+Architecture: all
Section: python
Depends: ${misc:Depends},
${python3:Depends},
@@ -143,12 +173,15 @@ Recommends: python3-matplotlib,
python3-numpy,
python3-pandas,
python3-scipy,
- python-spyderlib-doc (= ${binary:Version})
+ spyder-doc (= ${binary:Version})
Suggests: tortoisehg,
gitk
Breaks: ${python3:Breaks},
- spyder3 (<< 2.3.0+dfsg-2)
-Provides: ${python3:Provides}
+ spyder3 (<< 2.3.0+dfsg-2),
+ python3-spyderlib (<< 3.0.0+dfsg1-1~)
+Provides: ${python3:Provides},
+ python3-spyderlib
+Replaces: python3-spyderlib (<< 3.0.0+dfsg1-1~)
Description: Python IDE for scientists (Python 3 modules)
Originally written to design Spyder (the Scientific PYthon
Development EnviRonment), the spyderlib Python library provides
diff --git a/debian/patches/0001-fix-spyderlib-path.patch b/debian/patches/0001-fix-spyderlib-path.patch
index 61d5801..c446f46 100644
--- a/debian/patches/0001-fix-spyderlib-path.patch
+++ b/debian/patches/0001-fix-spyderlib-path.patch
@@ -7,16 +7,16 @@ Subject: fix-spyderlib-path
spyderlib/__init__.py | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/spyderlib/__init__.py b/spyderlib/__init__.py
+diff --git a/spyder/__init__.py b/spyder/__init__.py
index 46da56e..cf4b33a 100644
---- a/spyderlib/__init__.py
-+++ b/spyderlib/__init__.py
+--- a/spyder/__init__.py
++++ b/spyder/__init__.py
@@ -35,6 +35,10 @@ __forum_url__ = 'http://groups.google.com/group/spyderlib'
# Dear (Debian, RPM, ...) package makers, please feel free to customize the
# following path to module's data (images) and translations:
DATAPATH = LOCALEPATH = DOCPATH = MATHJAXPATH = JQUERYPATH = ''
-+DATAPATH = '/usr/share/spyderlib/images'
-+DOCPATH = '/usr/share/doc/python-spyderlib-doc/html'
++DATAPATH = '/usr/share/spyder/images'
++DOCPATH = '/usr/share/doc/spyder-doc/html'
+MATHJAXPATH = '/usr/share/javascript/mathjax'
+JQUERYPATH = '/usr/share/javascript/jquery'
diff --git a/debian/python-spyder.bug-control b/debian/python-spyder.bug-control
new file mode 100644
index 0000000..81c14f6
--- /dev/null
+++ b/debian/python-spyder.bug-control
@@ -0,0 +1 @@
+Report-with: python-pyqt5
diff --git a/debian/python-spyderlib.preinst b/debian/python-spyder.preinst
similarity index 100%
rename from debian/python-spyderlib.preinst
rename to debian/python-spyder.preinst
diff --git a/debian/python-spyder.pyremove b/debian/python-spyder.pyremove
new file mode 100644
index 0000000..5d062e0
--- /dev/null
+++ b/debian/python-spyder.pyremove
@@ -0,0 +1 @@
+spyder/images
diff --git a/debian/python-spyderlib.bug-control b/debian/python-spyderlib.bug-control
deleted file mode 100644
index f943204..0000000
--- a/debian/python-spyderlib.bug-control
+++ /dev/null
@@ -1 +0,0 @@
-Report-with: python-qt4
diff --git a/debian/python-spyderlib.pyremove b/debian/python-spyderlib.pyremove
deleted file mode 100644
index 90bd155..0000000
--- a/debian/python-spyderlib.pyremove
+++ /dev/null
@@ -1,2 +0,0 @@
-spyderlib/images
-spyderplugins/images
diff --git a/debian/python3-spyder.bug-control b/debian/python3-spyder.bug-control
new file mode 100644
index 0000000..2194f0f
--- /dev/null
+++ b/debian/python3-spyder.bug-control
@@ -0,0 +1 @@
+Report-with: python3-pyqt5
diff --git a/debian/python3-spyder.pyremove b/debian/python3-spyder.pyremove
new file mode 100644
index 0000000..a70a049
--- /dev/null
+++ b/debian/python3-spyder.pyremove
@@ -0,0 +1 @@
+/spyder/images/*
diff --git a/debian/python3-spyderlib.bug-control b/debian/python3-spyderlib.bug-control
deleted file mode 100644
index b19d691..0000000
--- a/debian/python3-spyderlib.bug-control
+++ /dev/null
@@ -1 +0,0 @@
-Report-with: python3-qt4
diff --git a/debian/python3-spyderlib.pyremove b/debian/python3-spyderlib.pyremove
deleted file mode 100644
index 4864560..0000000
--- a/debian/python3-spyderlib.pyremove
+++ /dev/null
@@ -1,2 +0,0 @@
-/spyderlib/images/*
-/spyderplugins/images/*
diff --git a/debian/rules b/debian/rules
index 3941996..e227c13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,11 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export PYBUILD_NAME=spyderlib
+export PYBUILD_NAME=spyder
export PYBUILD_BUILD_ARGS=--no-doc
export PYBUILD_INSTALL_ARGS=--no-doc
+export PYBUILD_AFTER_INSTALL=rm -rf {destdir}/usr/bin/ {destdir}/usr/share
+
%:
dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
@@ -17,26 +19,19 @@ override_dh_auto_build:
override_dh_auto_install:
dh_auto_install
+
# install the spyder-common files
- dh_install -p spyder-common spyderlib/images usr/share/spyderlib
+ dh_install -p spyder-common spyder/images usr/share/spyder
# install the spyder files
- dh_install --sourcedir=$(CURDIR)/debian/python-spyderlib -p spyder usr/bin
- dh_install --sourcedir=$(CURDIR)/debian/python-spyderlib -p spyder usr/share/applications/spyder.desktop
- dh_install --sourcedir=$(CURDIR)/debian/python-spyderlib -p spyder usr/share/pixmaps/spyder.png
- rm -rf $(CURDIR)/debian/python-spyderlib/usr/bin
- rm -rf $(CURDIR)/debian/python-spyderlib/usr/share/applications
- rm -rf $(CURDIR)/debian/python-spyderlib/usr/share/pixmaps
- rm -f $(CURDIR)/debian/spyder/usr/bin/*.py
+ python setup.py install_scripts -d debian/spyder/usr/bin
+ python setup.py install_data -d debian/spyder/
+ rm -f debian/spyder/usr/bin/spyder_win_post_install.py
# install the spyder3 files
- dh_install --sourcedir=$(CURDIR)/debian/python3-spyderlib -p spyder3 usr/bin
- dh_install --sourcedir=$(CURDIR)/debian/python3-spyderlib -p spyder3 usr/share/applications/spyder3.desktop
- dh_install --sourcedir=$(CURDIR)/debian/python3-spyderlib -p spyder3 usr/share/pixmaps/spyder3.png
- rm -rf $(CURDIR)/debian/python3-spyderlib/usr/bin
- rm -rf $(CURDIR)/debian/python3-spyderlib/usr/share/applications
- rm -rf $(CURDIR)/debian/python3-spyderlib/usr/share/pixmaps
- rm -f $(CURDIR)/debian/spyder3/usr/bin/*.py
+ python3 setup.py install_scripts -d debian/spyder3/usr/bin
+ python3 setup.py install_data -d debian/spyder3/
+ rm -f debian/spyder3/usr/bin/spyder_win_post_install.py
# skip tests for now
override_dh_auto_test:
diff --git a/debian/python-spyderlib-doc.doc-base b/debian/spyder-doc.doc-base
similarity index 52%
rename from debian/python-spyderlib-doc.doc-base
rename to debian/spyder-doc.doc-base
index f1df6f2..572fbae 100644
--- a/debian/python-spyderlib-doc.doc-base
+++ b/debian/spyder-doc.doc-base
@@ -1,12 +1,12 @@
-Document: python-spyderlib-manual
-Title: spyderlib documentation manual
+Document: spyder-manual
+Title: spyder documentation manual
Author: pierre.raybaut at cea.fr
-Abstract: python-spyderlib_
+Abstract: spyder_
Spyder (previously known as Pydee) is a free open-source Python
development environment providing MATLAB-like features in a simple
and light-weighted software.
Section: Programming/Python
Format: HTML
-Index: /usr/share/doc/python-spyderlib-doc/html/index.html
-Files: /usr/share/doc/python-spyderlib-doc/html/*
+Index: /usr/share/doc/spyder-doc/html/index.html
+Files: /usr/share/doc/spyder-doc/html/*
diff --git a/debian/python-spyderlib-doc.docs b/debian/spyder-doc.docs
similarity index 100%
rename from debian/python-spyderlib-doc.docs
rename to debian/spyder-doc.docs
diff --git a/debian/spyder.bug-control b/debian/spyder.bug-control
index 407c1fb..b286f9d 100644
--- a/debian/spyder.bug-control
+++ b/debian/spyder.bug-control
@@ -1 +1 @@
-Report-with: python-spyderlib python-qt4
+Report-with: python-spyder python-pyqt5
diff --git a/debian/spyder.links b/debian/spyder.links
index 2528e67..27f13f4 100644
--- a/debian/spyder.links
+++ b/debian/spyder.links
@@ -1 +1 @@
-/usr/share/doc/python-spyderlib-doc/html /usr/share/doc/spyder/html
+/usr/share/doc/spyder-doc/html /usr/share/doc/spyder/html
diff --git a/debian/spyder3.bug-control b/debian/spyder3.bug-control
index b88150c..4c0ce05 100644
--- a/debian/spyder3.bug-control
+++ b/debian/spyder3.bug-control
@@ -1 +1 @@
-Report-with: python3-spyderlib python3-qt4
+Report-with: python3-spyder python3-pyqt5
diff --git a/debian/spyder3.links b/debian/spyder3.links
index b76e604..08e323e 100644
--- a/debian/spyder3.links
+++ b/debian/spyder3.links
@@ -1 +1 @@
-/usr/share/doc/python-spyderlib-doc/html /usr/share/doc/spyder3/html
+/usr/share/doc/spyder-doc/html /usr/share/doc/spyder3/html
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/spyder.git
More information about the debian-science-commits
mailing list