[SCM] Control pipeline recipes from the European Southern Observatory branch, ubuntu, updated. upstream/0.3.5.1-42-gd3efd74

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit e1a2b538fcc007ae1f71f5b801118a89411181f6
Merge: 17c17b1f11efef129cc9e258664f4e68f4ab9832 1d0dd7faf2b87129d6fed1e36c48dab423c59ec5
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jun 22 09:56:42 2012 +0200

    Merge branch 'debian' into ubuntu

diff --combined debian/changelog
index 1932365,8a60d20..2337baf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,12 @@@
 -python-cpl (0.3.6-1) unstable; urgency=low
 +python-cpl (0.3.6-1~ubuntu1) oneiric; urgency=low
  
    * New upstream release
    * Add Multi-Arch default plugin directory. Python-cpl itself is,
      however, not multi-arch.
+   * Set DM-Upload-Allowed
+   * Disable tests that try to crash recipe. Fixes FTBS on armel, mips, mipsel
  
-  -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Fri, 13 Apr 2012 10:00:00 +0200
+  -- Ole Streicher <debian at liska.ath.cx>  Fri, 22 Jun 2012 09:52:50 +0200
  
  python-cpl (0.3.5.1-1) unstable; urgency=low
  

-- 
Control pipeline recipes from the European Southern Observatory