[python-cpl] 03/03: Adjust 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 27ce33be1f746dd4c632122e4ed4a7bfa40fe873
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 24 16:57:40 2015 +0200

    Adjust patches for new version
---
 debian/changelog                         |  5 +++--
 debian/patches/disable_crash_tests.patch |  2 +-
 debian/patches/fix_test_recipe.patch     | 25 +++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  5 +----
 debian/tests/python-cpl                  | 10 ++--------
 6 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78ffae1..32fc3be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-python-cpl (0.7~beta-1) UNRELEASED; urgency=low
+python-cpl (0.7-1) UNRELEASED; urgency=low
 
   * New upstream version
   * Build python3 package
+  * Create CI tests
 
- -- Ole Streicher <olebole at debian.org>  Wed, 22 Apr 2015 12:49:49 +0200
+ -- Ole Streicher <olebole at debian.org>  Fri, 24 Apr 2015 16:36:15 +0200
 
 python-cpl (0.6.2-4) unstable; urgency=low
 
diff --git a/debian/patches/disable_crash_tests.patch b/debian/patches/disable_crash_tests.patch
index 56096de..83b6aa8 100644
--- a/debian/patches/disable_crash_tests.patch
+++ b/debian/patches/disable_crash_tests.patch
@@ -6,7 +6,7 @@ Description: On armel, mips and mipsel, the tests that try to crash the recipe
 Forwarded: not-needed
 --- a/test/TestRecipe.py
 +++ b/test/TestRecipe.py
-@@ -582,17 +582,17 @@
+@@ -578,17 +578,17 @@
                           len('9d123996fa9a7bda315d07e063043454'))
  
  class RecipeCrashing(RecipeTestCase):
diff --git a/debian/patches/fix_test_recipe.patch b/debian/patches/fix_test_recipe.patch
new file mode 100644
index 0000000..4ea028a
--- /dev/null
+++ b/debian/patches/fix_test_recipe.patch
@@ -0,0 +1,25 @@
+--- 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 a410047..571c0ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 set-default-plugin-path.patch
 disable_crash_tests.patch
+fix_test_recipe.patch
diff --git a/debian/rules b/debian/rules
index b261f49..e577c5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,8 @@ export http_proxy = http://127.0.9.1:9
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
 
-build_test_recipe:
-	(cd test/iiinstrumentp && ./bootstrap && ./configure && make CPPFLAGS="$$CPPFLAGS -D_XOPEN_SOURCE=500")
-
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-override_dh_auto_test: build_test_recipe
+override_dh_auto_test:
 	for PYTHON in $(PYTHON2) $(PYTHON3); do \
 	    python$$PYTHON setup.py build_ext -i && \
 	    MALLOC_CHECK_=0 PYTHONPATH=$$(pwd) python$$PYTHON test/TestRecipe.py \
diff --git a/debian/tests/python-cpl b/debian/tests/python-cpl
index 9bf87b3..c4df1af 100755
--- a/debian/tests/python-cpl
+++ b/debian/tests/python-cpl
@@ -1,13 +1,7 @@
 #!/bin/sh
 
-cp -r test "$ADTTMP"
+cp -r test/* "$ADTTMP"
 cd "$ADTTMP"
 
-# Build test recipe
-( cd test/iiinstrumentp && \
-  ./bootstrap && \
-  ./configure && \
-  make CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500" )
-
 # Run the tests
-MALLOC_CHECK_=0 exec python -Wignore test/TestRecipe.py
+MALLOC_CHECK_=0 exec python -Wignore TestRecipe.py

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