[SCM] Control pipeline recipes from the European Southern Observatory branch, debian, updated. upstream/0.3.5.1-56-g2792d7f

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 2792d7fc3b319ed6d18c2d09fad17f2053d8ed56
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Mar 29 13:21:46 2013 +0100

    Push to 0.5

diff --git a/debian/changelog b/debian/changelog
index ac28c13..bcd7d90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-cpl (0.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Ole Streicher <debian at liska.ath.cx>  Thu, 28 Mar 2013 17:52:12 +0100
+
 python-cpl (0.4-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/download_tests.sh b/debian/download_tests.sh
index 2621b80..c33c643 100755
--- a/debian/download_tests.sh
+++ b/debian/download_tests.sh
@@ -5,7 +5,7 @@
 PACKAGE_NAME=python-cpl
 VERSION=$2
 SUBDIR=test
-UPSTREAM_BASE=http://www.aip.de/~oles/python-cpl
+UPSTREAM_BASE=https://pypi.python.org/packages/source/p/python-cpl
 UPSTREAM_TAR=${UPSTREAM_BASE}/${PACKAGE_NAME}-${SUBDIR}-${VERSION}.tar.gz
 TARFILENAME=$(dirname $3)/${PACKAGE_NAME}_${VERSION}.orig-${SUBDIR}.tar.gz
 
diff --git a/debian/patches/disable_crash_tests.patch b/debian/patches/disable_crash_tests.patch
index b4dea37..72f9acb 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
-@@ -474,17 +474,17 @@
+@@ -509,17 +509,17 @@
                           len('9d123996fa9a7bda315d07e063043454'))
  
  class RecipeCrashing(RecipeTestCase):
diff --git a/debian/patches/fix_cplsize.patch b/debian/patches/fix_cplsize.patch
deleted file mode 100644
index c38a8f5..0000000
--- a/debian/patches/fix_cplsize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Set CPL size to "long long" to fix FTBS on 32 bit systems
---- a/cpl/cpl_api.h
-+++ b/cpl/cpl_api.h
-@@ -40,7 +40,7 @@
- 
- typedef int cpl_error_code, cpl_errorstate, cpl_boolean, cpl_frame_group,
-     cpl_parameter_mode, cpl_parameter_class, cpl_type, cpl_msg_severity;
--typedef size_t cpl_size;
-+typedef long long cpl_size;
- typedef void cpl_pluginlist, cpl_frameset, cpl_frame, 
-     cpl_parameter, cpl_parameterlist, cpl_recipeconfig;
- 
diff --git a/debian/patches/series b/debian/patches/series
index e87b5d2..a410047 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 set-default-plugin-path.patch
 disable_crash_tests.patch
-fix_cplsize.patch
diff --git a/debian/patches/set-default-plugin-path.patch b/debian/patches/set-default-plugin-path.patch
index c2f04b7..dfaf659 100644
--- a/debian/patches/set-default-plugin-path.patch
+++ b/debian/patches/set-default-plugin-path.patch
@@ -3,7 +3,7 @@ Description: Set the default plugin path to the one where recipes are
  installed in Debian.
 --- a/cpl/recipe.py
 +++ b/cpl/recipe.py
-@@ -28,7 +28,7 @@
+@@ -30,7 +30,7 @@
      is called.
      '''
  

-- 
Control pipeline recipes from the European Southern Observatory