[cpl-plugin-uves] 03/03: Merge branch 'debian-template' into debian
Ole Streicher
olebole-guest at moszumanska.debian.org
Wed Jan 8 18:47:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository cpl-plugin-uves.
commit 936dfc22d6b92903590f3afcc313a4f10430d725
Merge: 553574d 8872094
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Jan 8 19:40:01 2014 +0100
Merge branch 'debian-template' into debian
Conflicts:
debian/control
debian/control | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --cc debian/control
index 4d409ee,7ac0db8..bb04e89
--- a/debian/control
+++ b/debian/control
@@@ -13,30 -11,24 +13,30 @@@ Build-Depends: debhelper (>= 9)
python-pyfits,
python-sphinx
Standards-Version: 3.9.5
-Homepage: http://www.eso.org/sci/software/pipelines/template
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-template.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-template.git
+Homepage: http://www.eso.org/sci/software/pipelines/uves
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-uves.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-uves.git
-Package: cpl-plugin-template
+Package: cpl-plugin-uves
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
- Recommends: esorex|python-cpl, cpl-plugin-uves-doc
- Suggests: cpl-plugin-uves-calib
+ Recommends: esorex|python-cpl
-Suggests: cpl-plugin-template-calib, cpl-plugin-template-doc
++Suggests: cpl-plugin-uves-calib, cpl-plugin-uves-doc
Multi-Arch: same
-Description: ESO data reduction pipeline template
- This is the data reduction pipeline for the Template instrument of the
- Very Large Telescope (VLT) from the European Southern Observatory (ESO).
+Description: ESO data reduction pipeline for UVES
+ This is the data reduction pipeline for the UVES 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.
+ UVES is a cross-dispersed echelle spectrograph designed to operate with
+ high efficiency from the atmospheric cut-off at 300 nm to the long
+ wavelength limit of the CCD detectors (about 1100 nm). The light beam
+ from the telescope is split in two arms (UV to Blue, and Visual to Red)
+ within the instrument. The two arms can be operated separately, or in
+ parallel via a dichroic beam splitter. The resolving power is about
+ 40,000 when a 1-arcsec slit is used. The maximum (two-pixel) resolution
+ is 80,000 or 110,000 in the Blue- and the Red Arm, respectively.
-Package: cpl-plugin-template-doc
+Package: cpl-plugin-uves-doc
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-uves.git
More information about the debian-science-commits
mailing list