[cpl-plugin-uves] 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-uves.

commit af55bbb323765a489f70ab14fc361b600d16d180
Merge: c631f30 e179dc1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 14:37:31 2014 +0200

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

 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/control
index 41a67e0,ee87152..c9504da
--- a/debian/control
+++ b/debian/control
@@@ -13,11 -11,11 +13,11 @@@ Build-Depends: debhelper (>= 9)
                 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/uves
- Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-uves.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-uves.git
++Vcs-Git: git://anonscm.debian.org/debian-astro/packages/cpl-plugin-uves.git
++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugin-uves.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-uves
  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-uves.git