[spyder] 01/01: install the pixmaps at the right place

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository spyder.

commit da80e0f9f7c71cb04562fea595f826a761409004
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Tue Jul 22 13:08:02 2014 +0200

    install the pixmaps at the right place
---
 debian/changelog              |  6 ++++++
 debian/control                | 10 +++++++++-
 debian/python-spyderlib.links |  1 -
 debian/rules                  |  4 ++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8fa41ed..0685f94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+spyder (2.3.0+dfsg-2) unstable; urgency=low
+
+  * move the pixmaps from the python-spyderlib to the spyder packages.
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Tue, 22 Jul 2014 10:09:51 +0200
+
 spyder (2.3.0+dfsg-1) unstable; urgency=medium
 
   * Imported Upstream version 2.3.0+dfsg
diff --git a/debian/control b/debian/control
index 8d65bb2..f05a4b6 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,9 @@ Section: devel
 Depends: ${misc:Depends},
          ${python:Depends},
          python-spyderlib (= ${binary:Version})
+Breaks: ${python-Breaks},
+        python-spyderlib (<< 2.3.0+dfsg-2)
+Replaces: python-spyderlib (<< 2.3.0+dfsg-2)
 Description: python IDE for scientists (Python 2)
  Spyder (previously known as Pydee) is a free open-source Python
  development environment providing MATLAB-like features in a simple
@@ -58,7 +61,7 @@ Recommends: ipython-qtconsole,
 Suggests: tortoisehg,
           gitk
 Breaks: ${python:Breaks},
-        spyder (<< 2.0.12-1)
+        spyder (<< 2.3.0+dfsg-2)
 Provides: ${python:Provides}
 Replaces: spyder (<< 2.0.12-1)
 Description: python IDE for scientists (Python 2)
@@ -94,6 +97,9 @@ Section: devel
 Depends: ${misc:Depends},
          ${python3:Depends},
          python3-spyderlib (= ${binary:Version})
+Breaks: ${python3-Breaks},
+        python3-spyderlib (<< 2.3.0+dfsg-2)
+Replaces: python3-spyderlib (<< 2.3.0+dfsg-2)
 Description: python IDE for scientists (Python 3)
  Spyder (previously known as Pydee) is a free open-source Python
  development environment providing MATLAB-like features in a simple
@@ -125,6 +131,8 @@ Recommends: ipython3-qtconsole,
 Suggests: tortoisehg,
           gitk
 Provides: ${python3:Provides}
+Breakes: ${python3:Breaks},
+         spyder3 (<< 2.3.0+dfsg-2)
 Description: python IDE for scientists (Python 3)
  Originally written to design Spyder (the Scientific PYthon
  Development EnviRonment), the spyderlib Python library provides
diff --git a/debian/python-spyderlib.links b/debian/python-spyderlib.links
deleted file mode 100644
index e9b4252..0000000
--- a/debian/python-spyderlib.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/pyshared/spyderlib/images/spyder.svg /usr/share/icons/hicolor/scalable/apps/spyder.svg
diff --git a/debian/rules b/debian/rules
index b5ab4cc..514aa45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,14 +26,18 @@ override_dh_auto_install:
 	# 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
 	# 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
 	# remove unwanted files until dh_python3 pyremove is backported to wheezy
 	for v in $(PY3VERS); do \

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