[cpl-plugin-vimos] 05/07: Merge branch 'debian-template' into debian
Ole Streicher
olebole-guest at moszumanska.debian.org
Tue Dec 31 14:47:26 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-vimos.
commit 565b3612509a46b35361ffbff312a4e759cb4385
Merge: 591551b 612fc70
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Dec 31 15:35:18 2013 +0100
Merge branch 'debian-template' into debian
Conflicts:
debian/control
debian/create_sphinx.py
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 | 1 +
debian/patches/serial-tests | 47 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 19 +++++----
8 files changed, 76 insertions(+), 12 deletions(-)
diff --cc debian/control
index b3687a0,9ef51f7..8ade726
--- a/debian/control
+++ b/debian/control
@@@ -10,33 -10,40 +10,43 @@@ 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/vimos
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-vimos.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-vimos.git
-Package: cpl-plugin-template
+Package: cpl-plugin-vimos
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-vimos-doc, sextractor
+Suggests: cpl-plugin-vimos-calib
Multi-Arch: same
-Description: ESO data reduction pipeline template
- This is the data reduction pipeline for the Template instrument of the
+Description: ESO data reduction pipeline for VIMOS
+ This is the data reduction pipeline for the Vimos 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.
+ VIMOS is a multi-mode wide-field optical instrument mounted at the Nasmyth
+ focus B of UT3. VIMOS allows imaging in UBVRIz and multi-object low (R ~ 200)
+ to high (R ~ 2500) resolution spectroscopy. The wavelength range covered in
+ the two spectroscopic modes goes from 360 to 1000 nm. VIMOS is made of 4
+ quadrants of 7'x8' each separated by a gap of about 2'.
-Package: cpl-plugin-template-doc
++Package: cpl-plugin-vimos-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 VIMOS
+ 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 VIMOS instrument of the Very Large Telescope
+ (VLT) from the European Southern Observatory (ESO).
+
-Package: cpl-plugin-template-calib
+Package: cpl-plugin-vimos-calib
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, cpl-plugin-template, wget
+Depends: ${misc:Depends}, cpl-plugin-vimos, wget
Section: contrib/science
-Description: ESO data reduction pipeline calibration data downloader template
+Description: ESO data reduction pipeline calibration data downloader for VIMOS
This package downloads calibration and other static data of the
- data reduction pipeline for the Template instrument of the
+ data reduction pipeline for the VIMOS instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --cc debian/create_sphinx.py
index fd63d0d,cf72d4e..3a9492a
--- a/debian/create_sphinx.py
+++ b/debian/create_sphinx.py
@@@ -138,13 -138,15 +138,14 @@@ html_theme = 'sphinxdoc
pipeline = sys.argv[1]
cpl.Recipe.path = "recipes"
-recipes = [ cpl.Recipe(name) for name, version in cpl.Recipe.list() ]
+recipes = [ name for name, version in cpl.Recipe.list() ]
oca = file(os.path.join("calib", "gasgano", "config", pipeline + ".oca")).read()
oca = oca[oca.find("action"):]
-recipes_oca = [recipe for recipe in recipes if recipe.__name__ in oca]
-index = [ oca.find(recipe.__name__) for recipe in recipes_oca ]
+recipes_oca = [name for name in recipes if name in oca]
+index = [ oca.find(name) for name in recipes_oca ]
recipes_oca = [r for (i, r) in sorted(zip(index, recipes_oca))]
-
-recipes_x = [recipe for recipe in recipes if not recipe.__name__ in oca]
+recipes_x = [name for name in recipes if not name in oca]
+ recipes_x.sort()
def par(recipe, template, delimiter = "", count = None):
return delimiter.join(template.format(
diff --cc debian/patches/serial-tests
index 0000000,616e45e..b22164e
mode 000000,100644..100644
--- a/debian/patches/serial-tests
+++ b/debian/patches/serial-tests
@@@ -1,0 -1,47 +1,47 @@@
+ 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
++--- a/libpil/tests/Makefile.am
+++++ b/libpil/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
++ ## 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 = *~ .logfile
++ DISTCLEANFILES = *~
+
---- a/template/tests/Makefile.am
-+++ b/template/tests/Makefile.am
++--- a/tests/Makefile.am
+++++ b/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.8 foreign
+ +AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
+
- DISTCLEANFILES = *~ .logfile
++ DISTCLEANFILES = *~
+
+ --- a/regtests/tests/Makefile.am
+ +++ b/regtests/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
+
+ -AUTOMAKE_OPTIONS = 1.8 foreign
+ +AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
+
+ DISTCLEANFILES = *~
+
+ --- 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 01ad6e3,9839386..ff69df1
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,4 +1,8 @@@
libadd_cpl.patch
set_plugindir.patch
use-std-paths-for-cpl.patch
+fix_compiler_errors.patch
+private_libpil.patch
+dont_build_sextractor.patch
+shlib-calls-exit.patch
+ serial-tests
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-vimos.git
More information about the debian-science-commits
mailing list