[spyder] 02/14: Update the patch queue

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository spyder.

commit 3b30f909e4d50648ed5feff0f4ac5e0f1c42055c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Sep 22 10:47:04 2017 +0100

    Update the patch queue
    
    - Rename 0001-fix-spyderlib-path.patch to more explicit
      Customize-paths-for-Debian.patch
    - Drop Always-use-setuptools.patch, no longer required
    - Drop Fixup-rope-dependency.patch, no longer required
    
    Gbp-Dch: Full
---
 debian/patches/Always-use-setuptools.patch          | 21 ---------------------
 ...-path.patch => Customize-paths-for-Debian.patch} |  4 ++--
 debian/patches/Fixup-rope-dependency.patch          | 21 ---------------------
 debian/patches/series                               |  4 +---
 4 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/debian/patches/Always-use-setuptools.patch b/debian/patches/Always-use-setuptools.patch
deleted file mode 100644
index 2da0ea9..0000000
--- a/debian/patches/Always-use-setuptools.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Sat, 13 May 2017 18:08:39 +0100
-Subject: Always use setuptools
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 9d022d0..86ded99 100644
---- a/setup.py
-+++ b/setup.py
-@@ -19,7 +19,7 @@ import subprocess
- import sys
- import shutil
- 
--from distutils.core import setup
-+from setuptools import setup
- from distutils.command.build import build
- from distutils.command.install import install
- from distutils.command.install_data import install_data
diff --git a/debian/patches/0001-fix-spyderlib-path.patch b/debian/patches/Customize-paths-for-Debian.patch
similarity index 92%
rename from debian/patches/0001-fix-spyderlib-path.patch
rename to debian/patches/Customize-paths-for-Debian.patch
index f5a8fbc..d6eeeab 100644
--- a/debian/patches/0001-fix-spyderlib-path.patch
+++ b/debian/patches/Customize-paths-for-Debian.patch
@@ -1,14 +1,14 @@
 From: Debian Science Maintainers
  <debian-science-maintainers at lists.alioth.debian.org>
 Date: Fri, 18 Jul 2014 11:30:15 +0200
-Subject: fix-spyderlib-path
+Subject: Customize paths for Debian
 
 ---
  spyder/__init__.py | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/spyder/__init__.py b/spyder/__init__.py
-index 9dd19b4..945eb07 100644
+index 0596708..e1d2843 100644
 --- a/spyder/__init__.py
 +++ b/spyder/__init__.py
 @@ -37,6 +37,11 @@ __forum_url__   = 'http://groups.google.com/group/spyderlib'
diff --git a/debian/patches/Fixup-rope-dependency.patch b/debian/patches/Fixup-rope-dependency.patch
deleted file mode 100644
index c8d763b..0000000
--- a/debian/patches/Fixup-rope-dependency.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Sat, 13 May 2017 18:15:47 +0100
-Subject: Fixup rope dependency
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 86ded99..d84d77b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -272,7 +272,7 @@ if any(arg == 'bdist_wheel' for arg in sys.argv):
-     import setuptools     # analysis:ignore
- 
- install_requires = [
--    'rope_py3k' if PY3 else 'rope>=0.9.4',
-+    'rope>=0.10.5' if PY3 else 'rope>=0.9.4',
-     'jedi>=0.9.0',
-     'pyflakes',
-     'pygments>=2.0',
diff --git a/debian/patches/series b/debian/patches/series
index d36739c..f640e53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-0001-fix-spyderlib-path.patch
-Always-use-setuptools.patch
-Fixup-rope-dependency.patch
+Customize-paths-for-Debian.patch
 Add-manpage-for-Spyder.patch

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