[Debian-astro-commits] [cpl-plugin-template] 33/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 6f17d10a765403071aa56988faae979c90e334fa
Merge: 022876c b101e81
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Oct 26 12:57:56 2013 +0200

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

 debian/control                |   8 +-
 debian/cpl-plugin.docs.in     |   1 +
 debian/cpl-plugin.manpages.in |   2 +
 debian/create_manpage.py      | 113 +++++++++++++++++++++
 debian/create_sphinx.py       | 222 ++++++++++++++++++++++++++++++++++++++++++
 debian/repackage.sh           |  18 +++-
 debian/rules                  |  31 ++++--
 7 files changed, 383 insertions(+), 12 deletions(-)

diff --cc debian/control
index c3aaf73,9c3a698..e6eca38
--- a/debian/control
+++ b/debian/control
@@@ -3,13 -3,18 +3,19 @@@ Section: scienc
  Priority: optional
  Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
  Uploaders: Ole Streicher <debian at liska.ath.cx>
- Build-Depends: debhelper (>= 9), dh-autoreconf, libcpl-dev (>= 5.3.1), libfftw3-dev
+ Build-Depends: debhelper (>= 9),
+                dh-autoreconf,
+                libcpl-dev (>= 5.3.1),
++	       libfftw3-dev,
+                python,
+                python-cpl,
+                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