[python-mpop] 02/04: Re-number patches

[Antonio Valentino]

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

a_valentino-guest pushed a commit to branch master
in repository python-mpop.

commit d86a37638daed02628e4a056c33472ed7e753b01
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Feb 27 17:53:52 2016 +0000

    Re-number patches
---
 debian/changelog                                       |  8 ++++----
 ...ix-config-path.patch => 0001-fix-config-path.patch} | 18 +++++++-----------
 ...patch => 0002-fix-intersphinx-inventory-path.patch} |  3 +--
 ...rollsift.patch => 0003-fix-missing-trollsift.patch} |  3 +--
 debian/patches/series                                  |  6 +++---
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 478c1f0..c902ef4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,10 +9,10 @@ python-mpop (1.2.1-1) UNRELEASED; urgency=medium
     - fix Vcs-* URLs
     - update dependencies
   * debian/patches:
-    - new fix_intersphinx_inventory_path.patch: avoid internet access when
-      generating sphinx doc
-    - new fix_missing_trollsift.patch: skip tests on the PPSReader if the
-      trollsift module is not installed
+    - new 0002_fix_intersphinx_inventory_path.patch: avoid internet access
+      when generating sphinx doc
+    - new 0003_fix_missing_trollsift.patch: skip tests on the PPSReader if
+      the trollsift module is not installed
     - new tempararily-disable-TestProjector.test_init.patch: see upstream
       bug https://github.com/pytroll/pyresample/issues/36
 
diff --git a/debian/patches/fix-config-path.patch b/debian/patches/0001-fix-config-path.patch
similarity index 68%
rename from debian/patches/fix-config-path.patch
rename to debian/patches/0001-fix-config-path.patch
index 72deca3..639419c 100644
--- a/debian/patches/fix-config-path.patch
+++ b/debian/patches/0001-fix-config-path.patch
@@ -1,12 +1,12 @@
 From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Date: Sat, 6 Feb 2016 09:13:13 +0000
-Subject: fix-config-path
+Subject: fix config path
 
 Set the path for configuration files to /etc
 ---
  mpop/__init__.py | 6 ++++--
- setup.py         | 6 +++---
- 2 files changed, 7 insertions(+), 5 deletions(-)
+ setup.py         | 2 +-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/mpop/__init__.py b/mpop/__init__.py
 index 1185007..5689e14 100644
@@ -26,19 +26,15 @@ index 1185007..5689e14 100644
  CONFIG_PATH = (os.environ.get('PPP_CONFIG_DIR', '') or
                 os.path.join(BASE_PATH, 'etc'))
 diff --git a/setup.py b/setup.py
-index 6a2b50a..974350f 100644
+index 6a2b50a..dcbd879 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -64,9 +64,9 @@ setup(name=NAME,
+@@ -64,7 +64,7 @@ setup(name=NAME,
        packages=['mpop', 'mpop.satellites', 'mpop.instruments', 'mpop.satin',
                  'mpop.satout', 'mpop.saturn', 'mpop.imageo',
                  'mpop.imageo.formats'],
 -      data_files=[(os.path.join('etc', 'pytroll'),
--                   [os.path.join('etc', 'geo_image.cfg'),
--                    os.path.join('etc', 'eps_avhrrl1b_6.5.xml')])],
 +      data_files=[(os.path.join('/etc', 'pytroll'),
-+                   [os.path.join('/etc', 'geo_image.cfg'),
-+                    os.path.join('/etc', 'eps_avhrrl1b_6.5.xml')])],
+                    [os.path.join('etc', 'geo_image.cfg'),
+                     os.path.join('etc', 'eps_avhrrl1b_6.5.xml')])],
        zip_safe=False,
-       install_requires=requires,
-       test_requires=["mock"],
diff --git a/debian/patches/fix_intersphinx_inventory_path.patch b/debian/patches/0002-fix-intersphinx-inventory-path.patch
similarity index 84%
rename from debian/patches/fix_intersphinx_inventory_path.patch
rename to debian/patches/0002-fix-intersphinx-inventory-path.patch
index 4e65d13..95c6925 100644
--- a/debian/patches/fix_intersphinx_inventory_path.patch
+++ b/debian/patches/0002-fix-intersphinx-inventory-path.patch
@@ -1,8 +1,7 @@
 From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Date: Sat, 6 Feb 2016 12:38:17 +0000
-Subject: fix_intersphinx_inventory_path
+Subject: fix intersphinx inventory path
 
-===================================================================
 ---
  doc/source/conf.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/fix_missing_trollsift.patch b/debian/patches/0003-fix-missing-trollsift.patch
similarity index 92%
rename from debian/patches/fix_missing_trollsift.patch
rename to debian/patches/0003-fix-missing-trollsift.patch
index 42b7dcd..2f2ef75 100644
--- a/debian/patches/fix_missing_trollsift.patch
+++ b/debian/patches/0003-fix-missing-trollsift.patch
@@ -1,8 +1,7 @@
 From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Date: Sat, 6 Feb 2016 12:38:17 +0000
-Subject: fix_missing_trollsift
+Subject: fix missing trollsift
 
-===================================================================
 ---
  mpop/tests/test_nc_pps_l2.py | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/debian/patches/series b/debian/patches/series
index 85731b7..5e19008 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-fix-config-path.patch
-fix_intersphinx_inventory_path.patch
-fix_missing_trollsift.patch
+0001-fix-config-path.patch
+0002-fix-intersphinx-inventory-path.patch
+0003-fix-missing-trollsift.patch
 0004-tempararily-disable-TestProjector.test_init.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-mpop.git