[spyder] 05/05: install the data path under /usr/share/spyder
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Thu May 29 12:15:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch experimental
in repository spyder.
commit 652bc41250ff81023103e82ad54b07ded42d4697
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Thu May 29 13:30:36 2014 +0200
install the data path under /usr/share/spyder
Conflicts:
debian/changelog
debian/control
---
debian/changelog | 9 +++++++
debian/control | 30 +++++++++++++++++-----
...llation.patch => 0001-fix-spyderlib-path.patch} | 15 +++++------
debian/patches/series | 2 +-
debian/python-spyderlib.pyremove | 2 ++
debian/python3-spyderlib.pyremove | 2 ++
debian/rules | 12 ++++++++-
7 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f743eb7..a28a36c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+spyder (2.3.0~rc+dfsg-1~experimental2) experimental; urgency=low
+
+ * Add spyder-common binary package for all the python2,3 common files
+ * debian/path
+ - 0001-fix-documentation-installation.patch (deleted)
+ + 0001-fix-spyderlib-path.patch (new)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Thu, 29 May 2014 09:06:26 +0200
+
spyder (2.3.0~rc+dfsg-1~experimental1) experimental; urgency=low
* Imported Upstream version 2.3.0~rc+dfsg
diff --git a/debian/control b/debian/control
index 47007f7..8d65bb2 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Standards-Version: 3.9.5
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/spyder.git
Vcs-Git: git://anonscm.debian.org/debian-science/packages/spyder.git
Homepage: http://code.google.com/p/spyderlib/
-X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.3
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.2
Package: spyder
Architecture: all
@@ -41,7 +41,8 @@ Depends: ${misc:Depends},
${python:Depends},
libjs-jquery,
libjs-mathjax,
- python-qt4
+ python-qt4,
+ spyder-common
Recommends: ipython-qtconsole,
pep8,
pyflakes (>= 0.5.0),
@@ -75,7 +76,7 @@ Package: python-spyderlib-doc
Architecture: all
Section: doc
Depends: ${misc:Depends},
- ${sphinxdoc:Depends},
+ ${sphinxdoc:Depends}
Description: python IDE for scientists (Documentation)
Originally written to design Spyder (the Scientific PYthon
Development EnviRonment), the spyderlib Python library provides
@@ -107,7 +108,8 @@ Depends: ${misc:Depends},
${python3:Depends},
libjs-jquery,
libjs-mathjax,
- python3-pyqt4
+ python3-pyqt4,
+ spyder-common
Recommends: ipython3-qtconsole,
python3-pep8,
pyflakes (>= 0.5.0),
@@ -115,7 +117,7 @@ Recommends: ipython3-qtconsole,
python3-jedi,
python3-matplotlib,
python3-numpy,
- python3-psutil (>= 0.3.0),
+ python3-psutil,
python3-rope,
python3-scipy,
python3-sphinx,
@@ -133,3 +135,19 @@ Description: python IDE for scientists (Python 3)
v2.2).
.
This is the Python 3 version of the package.
+
+Package: spyder-common
+Architecture: all
+Section: python
+Depends: ${misc:Depends}
+Provides: ${python3:Provides}
+Description: python IDE for scientists (common files)
+ Originally written to design Spyder (the Scientific PYthon
+ Development EnviRonment), the spyderlib Python library provides
+ ready-to-use pure-Python widgets: source code editor with syntax
+ highlighting and code introspection/analysis features, NumPy array
+ editor, dictionary editor, Python console, etc. It's based on the Qt
+ Python binding module PyQt4 (and is compatible with PySide since
+ v2.2).
+ .
+ This is the common files of the package.
diff --git a/debian/patches/0001-fix-documentation-installation.patch b/debian/patches/0001-fix-spyderlib-path.patch
similarity index 63%
rename from debian/patches/0001-fix-documentation-installation.patch
rename to debian/patches/0001-fix-spyderlib-path.patch
index bd7a23b..dcd0210 100644
--- a/debian/patches/0001-fix-documentation-installation.patch
+++ b/debian/patches/0001-fix-spyderlib-path.patch
@@ -1,19 +1,18 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sun, 1 Apr 2012 10:08:11 +0200
-Subject: fix-documentation-installation
-
+Description: 0001 fix spyderlib path.patch
+Subject: fix-spyderlib-path
---
- spyderlib/__init__.py | 3 +++
- 1 file changed, 3 insertions(+)
+ spyderlib/__init__.py | 4 ++++
+ 1 file changed, 4 insertions(+)
diff --git a/spyderlib/__init__.py b/spyderlib/__init__.py
-index bd7a029..28d5de0 100644
+index ebb5469..718fc81 100644
--- a/spyderlib/__init__.py
+++ b/spyderlib/__init__.py
-@@ -35,6 +35,9 @@ __forum_url__ = 'http://groups.google.com/group/spyderlib'
+@@ -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'
+MATHJAXPATH = '/usr/share/javascript/mathjax'
+JQUERYPATH = '/usr/share/javascript/jquery'
diff --git a/debian/patches/series b/debian/patches/series
index d88d3bc..ba8e634 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-fix-documentation-installation.patch
+0001-fix-spyderlib-path.patch
diff --git a/debian/python-spyderlib.pyremove b/debian/python-spyderlib.pyremove
new file mode 100644
index 0000000..90bd155
--- /dev/null
+++ b/debian/python-spyderlib.pyremove
@@ -0,0 +1,2 @@
+spyderlib/images
+spyderplugins/images
diff --git a/debian/python3-spyderlib.pyremove b/debian/python3-spyderlib.pyremove
new file mode 100644
index 0000000..4864560
--- /dev/null
+++ b/debian/python3-spyderlib.pyremove
@@ -0,0 +1,2 @@
+/spyderlib/images/*
+/spyderplugins/images/*
diff --git a/debian/rules b/debian/rules
index 706f5bf..b5ab4cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
# -*- makefile -*-
+# used only until dh_python3 pyremove is backported for wheezy
+PY3VERS := $(shell py3versions -vr)
+
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
export PYBUILD_NAME=spyderlib
@@ -17,16 +20,23 @@ 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 spyderplugins/images usr/share/spyderplugins
# 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
rm -rf $(CURDIR)/debian/python-spyderlib/usr/bin
rm -rf $(CURDIR)/debian/python-spyderlib/usr/share/applications
rm -f $(CURDIR)/debian/spyder/usr/bin/*.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
rm -rf $(CURDIR)/debian/python3-spyderlib/usr/bin
rm -rf $(CURDIR)/debian/python3-spyderlib/usr/share/applications
rm -f $(CURDIR)/debian/spyder3/usr/bin/*.py
+ # remove unwanted files until dh_python3 pyremove is backported to wheezy
+ for v in $(PY3VERS); do \
+ rm -rf $(CURDIR)/debian/python3-spyderlib/usr/lib/python$$v/dist-packages/spyderlib/images ;\
+ rm -rf $(CURDIR)/debian/python3-spyderlib/usr/lib/python$$v/dist-packages/spyderplugins/images ;\
+ done
--
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