[SCM] Control pipeline recipes from the European Southern Observatory branch, master, updated. upstream/0.3.5.1-6-g4ca9f20

[Ole Streicher]

The following commit has been merged in the master branch:
commit b339aaa49dc05836fa84e82bddabc5bfcf989550
Merge: 357873362ab31d43ecd1535a4cf816a28a20b801 20cd80a86163d16d14b710cafd12e19c31e3da4f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Nov 29 09:40:20 2011 +0100

    Merge branch 'master' into HEAD
    
    Conflicts:
    	debian/control
    	debian/watch

diff --combined debian/control
index 93139bf,0d93176..2ad031e
--- a/debian/control
+++ b/debian/control
@@@ -1,11 -1,14 +1,14 @@@
  Source: python-cpl
  Section: python
  Priority: optional
- Maintainer: Ole Streicher <debian at liska.ath.cx>
 -Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
++Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.de
+ Uploaders: Ole Streicher <debian at liska.ath.cx>
  Build-Depends: python-all-dev (>= 2.6.6-3~), debhelper (>= 7.0.50~), 
   dh-autoreconf, libcpl-dev (>= 5.1.0), python-numpy, python-pyfits
  Standards-Version: 3.9.2
  Homepage: http://www.aip.de/~oles/python-cpl/index.html
+ Vcs-Git: git://git.debian.org/git/debian-science/packages/python-cpl.git
+ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/python-cpl.git
  
  Package: python-cpl
  Architecture: any

-- 
Control pipeline recipes from the European Southern Observatory