[python-mpop] 10/10: Refresh al 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 69f8feab7e66ba9600ee3e061e52564c491333c8
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Feb 6 13:39:42 2016 +0100

    Refresh al patches
---
 debian/patches/fix-config-path.patch                | 11 ++++++-----
 debian/patches/fix_intersphinx_inventory_path.patch | 15 ++++++++++++---
 debian/patches/fix_missing_trollsift.patch          | 18 +++++++++++++-----
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/debian/patches/fix-config-path.patch b/debian/patches/fix-config-path.patch
index 8b583bb..72deca3 100644
--- a/debian/patches/fix-config-path.patch
+++ b/debian/patches/fix-config-path.patch
@@ -4,11 +4,12 @@ Subject: fix-config-path
 
 Set the path for configuration files to /etc
 ---
- mpop/__init__.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
+ mpop/__init__.py | 6 ++++--
+ setup.py         | 6 +++---
+ 2 files changed, 7 insertions(+), 5 deletions(-)
 
 diff --git a/mpop/__init__.py b/mpop/__init__.py
-index 1185007..5ccf683 100644
+index 1185007..5689e14 100644
 --- a/mpop/__init__.py
 +++ b/mpop/__init__.py
 @@ -32,8 +32,10 @@
@@ -24,8 +25,8 @@ index 1185007..5ccf683 100644
  
  CONFIG_PATH = (os.environ.get('PPP_CONFIG_DIR', '') or
                 os.path.join(BASE_PATH, 'etc'))
-Index: python-mpop/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index 6a2b50a..974350f 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -64,9 +64,9 @@ setup(name=NAME,
diff --git a/debian/patches/fix_intersphinx_inventory_path.patch b/debian/patches/fix_intersphinx_inventory_path.patch
index 7721e3a..4e65d13 100644
--- a/debian/patches/fix_intersphinx_inventory_path.patch
+++ b/debian/patches/fix_intersphinx_inventory_path.patch
@@ -1,7 +1,16 @@
-Index: python-mpop/doc/source/conf.py
+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
+
 ===================================================================
---- python-mpop.orig/doc/source/conf.py
-+++ python-mpop/doc/source/conf.py
+---
+ doc/source/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index a5b996f..f6eb775 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
 @@ -225,4 +225,4 @@ latex_documents = [
  
  
diff --git a/debian/patches/fix_missing_trollsift.patch b/debian/patches/fix_missing_trollsift.patch
index 7a2218d..42b7dcd 100644
--- a/debian/patches/fix_missing_trollsift.patch
+++ b/debian/patches/fix_missing_trollsift.patch
@@ -1,7 +1,16 @@
-Index: python-mpop/mpop/tests/test_nc_pps_l2.py
+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
+
 ===================================================================
---- python-mpop.orig/mpop/tests/test_nc_pps_l2.py
-+++ python-mpop/mpop/tests/test_nc_pps_l2.py
+---
+ mpop/tests/test_nc_pps_l2.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/mpop/tests/test_nc_pps_l2.py b/mpop/tests/test_nc_pps_l2.py
+index 671a041..687b758 100644
+--- a/mpop/tests/test_nc_pps_l2.py
++++ b/mpop/tests/test_nc_pps_l2.py
 @@ -23,7 +23,10 @@
  """Unit testing the pps level-2 netCDF reader
  """
@@ -14,7 +23,7 @@ Index: python-mpop/mpop/tests/test_nc_pps_l2.py
  
  CTTH_TESTFILE_LOCAL_1 = '/path/to/my/products/S_NWC_CTTH_noaa19_33897_20150906T1240015Z_20150906T1240598Z.nc'
  CT_TESTFILE_LOCAL_1 = '/path/to/my/products/S_NWC_CT_noaa19_33897_20150906T1240015Z_20150906T1240598Z.nc'
-@@ -41,6 +44,7 @@ CT_TESTFILE_EARS_2 = '/path/to/my/produc
+@@ -41,6 +44,7 @@ CT_TESTFILE_EARS_2 = '/path/to/my/products/W_XX-EUMETSAT-Darmstadt,SING+LEV+SAT,
  CMA_TESTFILE_EARS_2 = '/path/to/my/products/W_XX-EUMETSAT-Darmstadt,SING+LEV+SAT,METOPB+CMA_C_EUMS_20150914093200_15510.nc.bz2'
  
  
@@ -22,4 +31,3 @@ Index: python-mpop/mpop/tests/test_nc_pps_l2.py
  class TestPPSReader(unittest.TestCase):
  
      """Class for testing the PPSReader reader class.
-

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