[Debian-astro-commits] [cpl-plugin-template] 30/76: 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 4774aef4c301a22beddd0d16afe669979302ff8b
Merge: 6084d1a 34c17bc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Oct 26 14:51:57 2013 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control
    	debian/create_manpage.py
    	debian/create_sphinx.py
    	debian/rules

 debian/control             |  1 +
 debian/cpl-plugin.doc-base | 13 +++++++++++++
 debian/create_manpage.py   |  2 +-
 debian/repackage.sh        |  6 ++++++
 debian/rules               |  6 ++++--
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --cc debian/control
index 2fa06f6,15d2392..18a9751
--- a/debian/control
+++ b/debian/control
@@@ -8,13 -8,14 +8,14 @@@ Build-Depends: debhelper (>= 9)
                 libcpl-dev (>= 5.3.1),
                 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/giraffe/giraf-pipe-recipes.html
 +Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-giraf.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-giraf.git
  
 -Package: cpl-plugin-template
 +Package: cpl-plugin-giraf
  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-astro/packages/cpl-plugin-template.git