[cpl-plugin-kmos] 07/11: 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-kmos.

commit 02f76698d66ac4bea10e7fcd9f85d8328d8a21f6
Merge: cd68d9d 5bb4e3a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Oct 26 13:37:14 2013 +0200

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

 debian/control                |    7 +-
 debian/cpl-plugin.docs.in     |    1 +
 debian/cpl-plugin.manpages.in |    2 +
 debian/create_manpage.py      |  113 +++++++++++++++++++++
 debian/create_sphinx.py       |  222 +++++++++++++++++++++++++++++++++++++++++
 debian/rules                  |   31 ++++--
 6 files changed, 366 insertions(+), 10 deletions(-)

diff --cc debian/control
index c9e0247,c903f61..681bc41
--- a/debian/control
+++ b/debian/control
@@@ -3,13 -3,18 +3,18 @@@ 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 (>= 6.3.1)
+ Build-Depends: debhelper (>= 9),
+                dh-autoreconf,
 -               libcpl-dev (>= 5.3.1),
++               libcpl-dev (>= 6.3.1),
+                python,
+                python-cpl,
+                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/kmos
 +Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-kmos.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-kmos.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-kmos
  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-science/packages/cpl-plugin-kmos.git