[Debian-astro-commits] [cpl-plugin-template] 39/81: Merge branch 'debian-template' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository cpl-plugin-template.

commit 7f5ad6d2cf6a414261af7851f425902949b5d4e4
Merge: dc63557 34c17bc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Oct 26 14:43:35 2013 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control

 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --cc debian/control
index 2f2c045,15d2392..7e6d80e
--- a/debian/control
+++ b/debian/control
@@@ -6,16 -6,16 +6,17 @@@ Uploaders: Ole Streicher <debian at liska.
  Build-Depends: debhelper (>= 9),
                 dh-autoreconf,
                 libcpl-dev (>= 5.3.1),
 +	       libfftw3-dev,
                 python,
                 python-cpl,
+                python-pyfits,
                 python-sphinx
  Standards-Version: 3.9.4
 -Homepage: http://www.eso.org/sci/software/pipelines/template
 -Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-template.git
 -Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-template.git
 +Homepage: http://www.eso.org/sci/software/pipelines/amber
 +Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-amber.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-amber.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-amber
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Recommends: esorex|python-cpl

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