[cpl-plugin-fors] 07/07: Merge branch 'debian-template' into debian
Ole Streicher
olebole-guest at moszumanska.debian.org
Tue Dec 31 13:01:57 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-fors.
commit a952a9a818abe6cf029efb0fefc3d38cc79e330b
Merge: 3b58005 612fc70
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Dec 31 13:56:09 2013 +0100
Merge branch 'debian-template' into debian
Conflicts:
debian/control
debian/patches/series
debian/control | 14 ++++-
...ugin.doc-base.in => cpl-plugin-doc.doc-base.in} | 6 +-
.../{cpl-plugin.docs.in => cpl-plugin-doc.docs.in} | 0
...ugin.manpages.in => cpl-plugin-doc.manpages.in} | 0
debian/create_sphinx.py | 67 ++++++++++++----------
debian/patches/serial-tests | 36 ++++++++++++
debian/patches/series | 1 +
debian/repackage.sh | 2 +-
debian/rules | 19 +++---
9 files changed, 102 insertions(+), 43 deletions(-)
diff --cc debian/control
index dc6406e,9ef51f7..92b8c9a
--- a/debian/control
+++ b/debian/control
@@@ -12,48 -10,40 +12,58 @@@ Build-Depends: debhelper (>= 9)
python-cpl,
python-pyfits,
python-sphinx
- Standards-Version: 3.9.4
+ Standards-Version: 3.9.5
-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/fors
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-fors.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-fors.git
-Package: cpl-plugin-template
+Package: cpl-plugin-fors
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
- Recommends: esorex|python-cpl, sextractor
-Recommends: esorex|python-cpl, cpl-plugin-template-doc
-Suggests: cpl-plugin-template-calib
++Recommends: esorex|python-cpl, cpl-plugin-template-doc, sextractor
+Suggests: cpl-plugin-fors-calib (= ${binary:Version})
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 FORS
+ FORS pipeline recipes for the reduction of data obtained with the FORS1 and
+ FORS2 instruments in the LSS, MOS, MXU, PMOS, and direct imaging instrument
+ modes.
.
- This package is used as a template for the other ESO recipes. It is not
- meant to built as a package.
+ FORS is the visual and near UV FOcal Reducer and low dispersion Spectrograph
+ for the Very Large Telescope (VLT) of the European Southern Observatory
+ (ESO). Two versions of FORS have been built, upgraded and moved to the
+ Cassegrain foci of different telescopes in the past years. In April 2009,
+ FORS1 was dismounted to make room for X-shooter, so only FORS2 is in
+ operation. FORS is designed as an all-dioptric instrument for the wavelength
+ range from 330 nm to 1100 nm and provides an image scale of 0".25/pixel (or
+ 0".125/pixel with the high resolution collimator) in the standard readout
+ mode (2x2 binning). FORS2 is installed on UT1 (Antu) and is by default
+ equipped with a detector system that is optimised for the red with a very low
+ level of fringes thanks to a mosaic of two 2k x 4k MIT CCDs (with 15 μm
+ pixels). However, the blue-optimised detector system that was previously
+ available on FORS1 has been commissioned on FORS2 and can be requested for
+ Visitor Mode observation. The geometries of both detector systems are
+ similar, with the optical axis falling ~30" above the gap and offsets of a
+ few arc-seconds between the two chips. FORS2 has many modes, including
+ multi-object spectroscopy with exchangable masks, long-slit spectroscopy,
+ imaging and spectro-polarimetry and high-time resolution imaging and
+ spectroscopy.
-Package: cpl-plugin-template-doc
++Package: cpl-plugin-fors-doc
+ Architecture: all
+ Multi-Arch: foreign
+ Depends: ${misc:Depends}
+ Section: doc
-Description: ESO data reduction pipeline documentation template
++Description: ESO data reduction pipeline documentation for FORS
+ This package contains the HTML documentation and manpages for the data
- reduction pipeline for the Template instrument of the Very Large Telescope
++ reduction pipeline for the FORS instrument of the Very Large Telescope
+ (VLT) from the European Southern Observatory (ESO).
+
-Package: cpl-plugin-template-calib
+Package: cpl-plugin-fors-calib
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, cpl-plugin-template, wget
+Depends: ${misc:Depends}, cpl-plugin-fors, wget
Section: contrib/science
-Description: ESO data reduction pipeline calibration data downloader template
+Description: ESO data reduction pipeline calibration data downloader for FORS2
This package downloads calibration and other static data of the
- data reduction pipeline for the Template instrument of the
+ data reduction pipeline for the FORS2 instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --cc debian/patches/serial-tests
index 0000000,616e45e..c9af1af
mode 000000,100644..100644
--- a/debian/patches/serial-tests
+++ b/debian/patches/serial-tests
@@@ -1,0 -1,47 +1,36 @@@
+ Author: Ole Streicher <debian at liska.ath.cx>
+ Description: Force serial-tests to get better verbose output
+ Bug: http://bugs.debian.org/715204
+ --- a/recipes/tests/Makefile.am
+ +++ b/recipes/tests/Makefile.am
+ @@ -17,7 +17,7 @@
+ ## along with this program; if not, write to the Free Software
- ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
-
--AUTOMAKE_OPTIONS = 1.8 foreign
-+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
-
- DISTCLEANFILES = *~ .logfile
-
---- a/template/tests/Makefile.am
-+++ b/template/tests/Makefile.am
-@@ -17,7 +17,7 @@
- ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -AUTOMAKE_OPTIONS = 1.6 foreign
+ +AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
+
- DISTCLEANFILES = *~ .logfile
++ DISTCLEANFILES = *~
+
---- a/regtests/tests/Makefile.am
-+++ b/regtests/tests/Makefile.am
++--- a/fors/tests/Makefile.am
+++++ b/fors/tests/Makefile.am
+ @@ -17,7 +17,7 @@
+ ## along with this program; if not, write to the Free Software
- ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -AUTOMAKE_OPTIONS = 1.8 foreign
+ +AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
+
- DISTCLEANFILES = *~
++ DISTCLEANFILES = *~ .logfile
+
+ --- a/irplib/tests/Makefile.am
+ +++ b/irplib/tests/Makefile.am
+ @@ -17,7 +17,7 @@
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
+
+ -AUTOMAKE_OPTIONS = 1.8 foreign
+ +AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
+
+ DISTCLEANFILES = *~
+
diff --cc debian/patches/series
index a4f8792,9839386..a7335a3
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,4 +1,7 @@@
libadd_cpl.patch
set_plugindir.patch
use-std-paths-for-cpl.patch
+dont_build_sextractor.patch
+private_libmosca.patch
+disable_tests_libmosca.patch
+ serial-tests
diff --cc debian/repackage.sh
index ac2d500,1eddf38..5dce014
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@@ -32,9 -32,9 +32,9 @@@ FILENAME=${BASEDIR}/${PIPELINE}-kit-${V
tar xf ${FILENAME} -C ${BASEDIR}
rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}.orig*.tar.* ${FILENAME}
-TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html"
+TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html --exclude ${PIPELINE}-${VERSION}/sextractor"
if [ $INCLUDE_TEST_DATA = "no" ] ; then
- TAREXCLUDE+=" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data"
+ TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data"
fi
tar xf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/${PIPELINE}-${VERSION}.tar.gz\
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-fors.git
More information about the debian-science-commits
mailing list