[cpl-plugin-sinfo] 03/05: Merge branch 'debian-template' into debian

[Ole Streicher]

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

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

commit c2e73cc3a97e24c7b59ca61c38418a0aff5ddec2
Merge: 703d070 e179dc1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 14:13:39 2014 +0200

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

 debian/control | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --cc debian/control
index 9e078ad,ee87152..e4eaf07
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,7 +1,7 @@@
 -Source: cpl-plugin-template
 +Source: cpl-plugin-sinfo
  Section: science
  Priority: optional
- Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+ Maintainer: Debian Astronomy Maintainers <debian-astro-maintainers at lists.alioth.debian.org>
  Uploaders: Ole Streicher <debian at liska.ath.cx>
  Build-Depends: debhelper (>= 9),
                 dh-autoreconf,
@@@ -11,11 -11,11 +11,11 @@@
                 python-pyfits,
                 python-sphinx
  Standards-Version: 3.9.5
 -Homepage: http://www.eso.org/sci/software/pipelines/template
 -Vcs-Git: git://anonscm.debian.org/debian-astro/packages/cpl-plugin-template.git
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugin-template.git
 +Homepage: http://www.eso.org/sci/software/pipelines/sinfoni/sinfo-pipe-recipes.html
- Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-sinfo.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-sinfo.git
++Vcs-Git: git://anonscm.debian.org/debian-astro/packages/cpl-plugin-sinfo.git
++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugin-sinfo.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-sinfo
  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-sinfo.git