[cpl-plugin-xsh] 14/15: Merge branch 'debian-template' into debian
Ole Streicher
olebole-guest at alioth.debian.org
Wed Oct 30 11:24:17 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository cpl-plugin-xsh.
commit 924cf29060790ff994ae3ecaa75326260dfd9a61
Merge: 59fb8fd f8add71
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Oct 30 11:38:35 2013 +0100
Merge branch 'debian-template' into debian
Conflicts:
debian/control
debian/control | 8 +-
debian/cpl-plugin.doc-base.in | 16 +++
debian/cpl-plugin.docs.in | 1 +
debian/cpl-plugin.manpages.in | 2 +
debian/create_manpage.py | 113 ++++++++++++++++++++
debian/create_sphinx.py | 237 +++++++++++++++++++++++++++++++++++++++++
debian/rules | 33 ++++--
7 files changed, 399 insertions(+), 11 deletions(-)
diff --cc debian/control
index 210dbee,15d2392..be57b5b
--- a/debian/control
+++ b/debian/control
@@@ -6,32 -6,34 +6,36 @@@ Uploaders: Ole Streicher <debian at liska.
Build-Depends: debhelper (>= 9),
dh-autoreconf,
libcpl-dev (>= 5.3.1),
+ libgsl0-dev,
- liblapack-dev
++ liblapack-dev,
+ 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/xsh
+Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-xsh.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-xsh.git
-Package: cpl-plugin-template
+Package: cpl-plugin-xsh
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: esorex|python-cpl
Suggests: cpl-plugin-template-calib
Multi-Arch: same
- Description: ESO data reduction pipeline XSHOOTER
-Description: ESO data reduction pipeline template
- This is the data reduction pipeline for the Template instrument of the
++Description: ESO data reduction pipeline for XSHOOTER
+ This is the data reduction pipeline for the XSHOOTER instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
.
- This package is used as a template for the other ESO recipes. It is not
- meant to built as a package.
+ XSHOOTER is a multi wavelength (300-2500nm) medium resolution spectrograph
+ mounted at the UT2 Cassegrain focus. XSHOOTER consists of 3 arms, each with
+ optimized optics, dispersive elements and detectors.
-Package: cpl-plugin-template-calib
+Package: cpl-plugin-xsh-calib
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, cpl-plugin-template, wget
-Section: contrib/science
-Description: ESO data reduction pipeline calibration data downloaded template
- This package downloads calibration and other static data of the
- data reduction pipeline for the Template instrument of the
+Depends: ${misc:Depends}, cpl-plugin-xsh, wget
+Description: ESO data reduction pipeline calibration data downloader for XSHOOTER
+ This package downloads calibration and other static data of the
+ data reduction pipeline for the XSHOOTER instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-xsh.git
More information about the debian-science-commits
mailing list