[cpl-plugin-hawki] 09/09: 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-hawki.

commit 4b7612229bcffd2815855667dc02477cda490981
Merge: 3bf5ed9 34c17bc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Oct 26 14:53:32 2013 +0200

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

 debian/control                |    6 +-
 debian/cpl-plugin.doc-base    |   13 +++
 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           |    6 ++
 debian/rules                  |   33 ++++--
 8 files changed, 386 insertions(+), 10 deletions(-)

diff --cc debian/control
index fc670f8,15d2392..ef6e047
--- a/debian/control
+++ b/debian/control
@@@ -6,14 -6,16 +6,18 @@@ Uploaders: Ole Streicher <debian at liska.
  Build-Depends: debhelper (>= 9),
                 dh-autoreconf,
                 libcpl-dev (>= 5.3.1),
 +               libgsl0-dev,
-                pkg-config
++               pkg-config,
+                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/hawki
 +Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-hawki.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-hawki.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-hawki
  Architecture: any
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Recommends: esorex|python-cpl
diff --cc debian/repackage.sh
index 5e60aa4,eb4be41..f9bc6d9
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@@ -18,15 -18,15 +18,21 @@@ VERSION=$
  # Include full calibration set?
  # If not, the "calib" package will act as a "downloader" package for the 
  # calibration files.
 -INCLUDE_CALIB="no"
 -#INCLUDE_CALIB="yes"
 +#INCLUDE_CALIB="no"
 +INCLUDE_CALIB="yes"
 +
 +# Include test data?
 +# If not, the test (fits) data are removed from the source package.
 +# In this case, also the tests need to be adjusted.
 +#INCLUDE_TEST_DATA="no"
 +INCLUDE_TEST_DATA="yes"
  
+ # Include test data?
+ # If not, the test (fits) data are removed from the source package.
+ # In this case, also the tests need to be adjusted.
+ #INCLUDE_TEST_DATA="no"
+ INCLUDE_TEST_DATA="yes"
+ 
  BASEDIR=$(dirname $3)
  FILENAME=${BASEDIR}/${PIPELINE}-kit-${VERSION}.tar.gz
  tar xf ${FILENAME} -C ${BASEDIR}

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