[Debian-astro-commits] [python-cpl] 03/03: Remove obsolete patches for new version

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository python-cpl.

commit d785a1c68d75982c6a85b4dcfe1ada11bbd0cd38
Author: Ole Streicher <ole at aip.de>
Date:   Mon Feb 22 09:51:13 2016 +0100

    Remove obsolete patches for new version
---
 debian/changelog                         |  6 ++++++
 debian/patches/disable_crash_tests.patch | 29 -----------------------------
 debian/patches/fix_test_recipe.patch     | 27 ---------------------------
 debian/patches/series                    |  2 --
 4 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7a40ff..0ba3cd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-cpl (0.7.2-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <olebole at debian.org>  Mon, 22 Feb 2016 09:50:24 +0100
+
 python-cpl (0.7-4) unstable; urgency=low
 
   * Redirect stderr to stdout in CI test
diff --git a/debian/patches/disable_crash_tests.patch b/debian/patches/disable_crash_tests.patch
deleted file mode 100644
index 83b6aa8..0000000
--- a/debian/patches/disable_crash_tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: On armel, mips and mipsel, the tests that try to crash the recipe
- fail since the handling of corrupted memory seems different there. 
- We disable these tests until we find a better solution here. Recipes 
- should not crash anyway :-)
-Forwarded: not-needed
---- a/test/TestRecipe.py
-+++ b/test/TestRecipe.py
-@@ -578,17 +578,17 @@
-                          len('9d123996fa9a7bda315d07e063043454'))
- 
- class RecipeCrashing(RecipeTestCase):
--    def test_corrupted(self):
-+    def _test_corrupted(self):
-         '''Handling of recipe crashes because of corrupted memory'''
-         self.recipe.param.crashing = 'free'
-         self.assertRaises(cpl.RecipeCrash, self.recipe, self.raw_frame)
- 
--    def test_segfault(self):
-+    def _test_segfault(self):
-         '''Handling of recipe crashes because of segmentation fault'''
-         self.recipe.param.crashing = 'segfault'
-         self.assertRaises(cpl.RecipeCrash, self.recipe, self.raw_frame)
- 
--    def test_cleanup_after_crash(self):
-+    def _test_cleanup_after_crash(self):
-         '''Test that a second run after a crash will succeed'''
-         output_dir = os.path.join(self.temp_dir, 'out')
-         self.recipe.output_dir = output_dir
diff --git a/debian/patches/fix_test_recipe.patch b/debian/patches/fix_test_recipe.patch
deleted file mode 100644
index afb6509..0000000
--- a/debian/patches/fix_test_recipe.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Allow to run the tests from another directory
---- a/test/TestRecipe.py
-+++ b/test/TestRecipe.py
-@@ -16,9 +16,10 @@
- raw_tag = 'RRRECIPE_DOCATG_RAW'
- 
- def create_recipe(name):
--    cname = name + ".c"
--    oname = name + '.o'
--    soname = name + '.so'
-+    d = os.path.dirname(__file__)
-+    cname = os.path.join(d, name + ".c")
-+    oname = os.path.join(d, name + '.o')
-+    soname = os.path.join(d, name + '.so')
-     env = {
-         'CC':  os.getenv("CC", "gcc"),
-         'CPPFLAGS': os.getenv("CPPFLAGS", ""),
-@@ -31,7 +32,7 @@
-     }
-     if (not os.path.exists(soname) or
-         os.path.getmtime(soname) <= os.path.getmtime(cname)):
--        os.system("{CC} {CPPFLAGS} {CFLAGS} -fPIC -c {cname}".format(**env))
-+        os.system("{CC} {CPPFLAGS} {CFLAGS} -fPIC -c -o {oname} {cname}".format(**env))
-         os.system("{CC} {LDFLAGS} -shared -o {soname} {oname} {LIBS}".format(**env))
-         os.remove(oname)
-         
diff --git a/debian/patches/series b/debian/patches/series
index 571c0ba..53b8ccb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 set-default-plugin-path.patch
-disable_crash_tests.patch
-fix_test_recipe.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-cpl.git