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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 3dc4a3ba1c08cf34725a5ed751e49ec43c296f2c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Nov 26 12:10:21 2012 +0100

    Updated Debian files to new upstream version

diff --git a/debian/changelog b/debian/changelog
index 507d6e0..9485fda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-cpl (0.4-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 26 Nov 2012 12:00:24 +0100
+
 python-cpl (0.3.8-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/copyright b/debian/copyright
index 554ee51..3f0e09a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,7 @@ Source: https://github.com/olebole/python-cpl/
 
 Files: *
 Copyright: Copyright (C) 2010 Ole Streicher
+ Copyright (C) 2001-2008 European Southern Observatory
 License: GPL-2
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -19,10 +20,3 @@ License: GPL-2
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
-
-Files: test/iiinstrumentp/*
-Copyright: Copyright (C) 2002,2003 European Southern Observatory
-License: GPL-2
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/disable_crash_tests.patch b/debian/patches/disable_crash_tests.patch
index b482294..b4dea37 100644
--- a/debian/patches/disable_crash_tests.patch
+++ b/debian/patches/disable_crash_tests.patch
@@ -6,10 +6,10 @@ 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
-@@ -413,17 +413,17 @@
-         self.recipe.tag = 'some_unknown_tag'
-         self.assertRaises(cpl.CplError, self.recipe, self.raw_frame)
+@@ -474,17 +474,17 @@
+                          len('9d123996fa9a7bda315d07e063043454'))
  
+ class RecipeCrashing(RecipeTestCase):
 -    def test_corrupted(self):
 +    def _test_corrupted(self):
          '''Handling of recipe crashes because of corrupted memory'''
diff --git a/debian/patches/set-default-plugin-path.patch b/debian/patches/set-default-plugin-path.patch
index a942625..c2f04b7 100644
--- a/debian/patches/set-default-plugin-path.patch
+++ b/debian/patches/set-default-plugin-path.patch
@@ -1,14 +1,14 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Set the default plugin path to the one where recipes are
  installed in Debian.
---- a/cpl/recipes.py
-+++ b/cpl/recipes.py
-@@ -40,7 +40,7 @@
-       Standard is 0: nothing dumped.
+--- a/cpl/recipe.py
++++ b/cpl/recipe.py
+@@ -28,7 +28,7 @@
+     is called.
      '''
  
 -    path = [ '.' ]
 +    path = [ '/usr/lib/DEB_HOST_MULTIARCH/cpl/plugins', '/usr/lib/cpl/plugins']
- 
-     def __init__(self, name, filename = None, version = None, threaded = False):
-         '''Try to load a recipe with the specified name in the directory
+     '''Search path for the recipes. It may be set to either a string, or to a
+     list of strings. All shared libraries in the search path and their
+     subdirectories are searched for CPL recipes. On default, the path is
diff --git a/debian/rules b/debian/rules
index bef8792..09c1add 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ override_dh_auto_test: build_test_recipe
 
 override_dh_install:
 	dh_install
-	find debian -name recipes.py -exec sed s+DEB_HOST_MULTIARCH+$(DEB_HOST_MULTIARCH)+g -i {} \;
+	find debian -name recipe.py -exec sed s+DEB_HOST_MULTIARCH+$(DEB_HOST_MULTIARCH)+g -i {} \;
 
 override_dh_shlibdeps:
 	dh_shlibdeps
diff --git a/debian/watch b/debian/watch
index 36b5ebb..ce9788f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 # format version number, currently 3; this line is compulsory!
 version=3
-http://www.aip.de/~oles/python-cpl/install.html python-cpl-([0-9].*)\.tar\.gz debian debian/download_tests.sh
+http://www.aip.de/~oles/python-cpl/install.html .+/python-cpl-([0-9].*)\.tar\.gz debian debian/download_tests.sh
 

-- 
Control pipeline recipes from the European Southern Observatory