[python-mpop] 03/10: Refresh all 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 76517b616e2ce44181a39d5a56e6ef7126177252
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Feb 6 09:12:22 2016 +0000

    Refresh all patches
---
 debian/changelog                     |  1 +
 debian/patches/fix-config-path.patch | 70 ++++++++++++++----------------------
 2 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5836d03..fc902df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 python-mpop (1.2.1-1) UNRELEASED; urgency=medium
 
   * New upstream release (Closes: #813873)
+  * Refresh all patches
   * Fix debian/watch file
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 22 Mar 2015 18:32:19 +0000
diff --git a/debian/patches/fix-config-path.patch b/debian/patches/fix-config-path.patch
index f9d348b..8b583bb 100644
--- a/debian/patches/fix-config-path.patch
+++ b/debian/patches/fix-config-path.patch
@@ -1,22 +1,16 @@
+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
+
 Set the path for configuration files to /etc
-Index: python-mpop/mpop/__init__.py
-===================================================================
---- python-mpop.orig/mpop/__init__.py
-+++ python-mpop/mpop/__init__.py
-@@ -4,11 +4,11 @@
- 
- # SMHI,
- # Folkborgsvägen 1,
--# Norrköping, 
-+# Norrköping,
- # Sweden
- 
- # Author(s):
-- 
-+
- #   Martin Raspaud <martin.raspaud at smhi.se>
- #   Adam Dybbroe <adam.dybbroe at smhi.se>
- 
+---
+ mpop/__init__.py | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/mpop/__init__.py b/mpop/__init__.py
+index 1185007..5ccf683 100644
+--- a/mpop/__init__.py
++++ b/mpop/__init__.py
 @@ -32,8 +32,10 @@
  
  import os
@@ -32,30 +26,18 @@ Index: python-mpop/mpop/__init__.py
                 os.path.join(BASE_PATH, 'etc'))
 Index: python-mpop/setup.py
 ===================================================================
---- python-mpop.orig/setup.py
-+++ python-mpop/setup.py
-@@ -4,11 +4,11 @@
- 
- # SMHI,
- # Folkborgsvägen 1,
--# Norrköping, 
-+# Norrköping,
- # Sweden
- 
- # Author(s):
-- 
-+
- #   Martin Raspaud <martin.raspaud at smhi.se>
- #   Adam Dybbroe <adam.dybbroe at smhi.se>
- 
-@@ -55,8 +55,8 @@ setup(name=NAME,
-       url="https://github.com/mraspaud/mpop",
+--- a/setup.py
++++ b/setup.py
+@@ -64,9 +64,9 @@ setup(name=NAME,
        packages=['mpop', 'mpop.satellites', 'mpop.instruments', 'mpop.satin',
-                 'mpop.satout', 'mpop.saturn', 'mpop.imageo'],
--      data_files=[('etc',[os.path.join('etc', 'geo_image.cfg')],
--                   'etc',[os.path.join('etc', 'eps_avhrrl1b_6.5.xml')]),
-+      data_files=[('/etc',[os.path.join('etc', 'geo_image.cfg')],
-+                   '/etc',[os.path.join('etc', 'eps_avhrrl1b_6.5.xml')]),
-                   (os.path.join('share', 'doc', NAME),
-                    [os.path.join('doc', 'Makefile'),
-                     os.path.join('doc', 'source', 'conf.py'),
+                 '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')])],
+       zip_safe=False,
+       install_requires=requires,
+       test_requires=["mock"],

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