[spyder] 01/04: move localedata into spyder-common

[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 57ab2c2d2807d9cd2c065c365705cc2201dcd1e4
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Sep 30 09:06:11 2016 +0200

    move localedata into spyder-common
---
 debian/changelog                             | 7 +++++++
 debian/patches/0001-fix-spyderlib-path.patch | 3 ++-
 debian/python-spyder.pyremove                | 1 +
 debian/python3-spyder.pyremove               | 3 ++-
 debian/rules                                 | 1 +
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ca3d6c..6ec9732 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spyder (3.0.1+dfsg1-2) UNRELEASED; urgency=medium
+
+  * New upstream version 3.0.1+dfsg1
+  * Move the locale data into the spyder-common package
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 30 Oct 2016 19:22:44 +0100
+
 spyder (3.0.1+dfsg1-1) unstable; urgency=medium
 
   * New upstream version 3.0.1+dfsg1
diff --git a/debian/patches/0001-fix-spyderlib-path.patch b/debian/patches/0001-fix-spyderlib-path.patch
index c446f46..d2420ee 100644
--- a/debian/patches/0001-fix-spyderlib-path.patch
+++ b/debian/patches/0001-fix-spyderlib-path.patch
@@ -11,11 +11,12 @@ diff --git a/spyder/__init__.py b/spyder/__init__.py
 index 46da56e..cf4b33a 100644
 --- a/spyder/__init__.py
 +++ b/spyder/__init__.py
-@@ -35,6 +35,10 @@ __forum_url__   = 'http://groups.google.com/group/spyderlib'
+@@ -35,6 +35,11 @@ __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/spyder/images'
++LOCALEPATH = '/usr/share/spyder/locale'
 +DOCPATH = '/usr/share/doc/spyder-doc/html'
 +MATHJAXPATH = '/usr/share/javascript/mathjax'
 +JQUERYPATH = '/usr/share/javascript/jquery'
diff --git a/debian/python-spyder.pyremove b/debian/python-spyder.pyremove
index 5d062e0..349988a 100644
--- a/debian/python-spyder.pyremove
+++ b/debian/python-spyder.pyremove
@@ -1 +1,2 @@
 spyder/images
+spyder/locale
\ No newline at end of file
diff --git a/debian/python3-spyder.pyremove b/debian/python3-spyder.pyremove
index a70a049..72165ab 100644
--- a/debian/python3-spyder.pyremove
+++ b/debian/python3-spyder.pyremove
@@ -1 +1,2 @@
-/spyder/images/*
+spyder/images
+spyder/locale
diff --git a/debian/rules b/debian/rules
index c0d2945..5c88d52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ override_dh_auto_install:
 
 	# install the spyder-common files
 	dh_install -p spyder-common spyder/images usr/share/spyder
+	dh_install -p spyder-common spyder/locale usr/share/spyder
 
 	# install the spyder files
 	python setup.py install_scripts -d debian/spyder/usr/bin

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