[Debian-astro-commits] [cpl-plugin-template] 40/76: Merge branch 'debian-template' into debian
Ole Streicher
olebole at moszumanska.debian.org
Wed Sep 23 09:59:50 UTC 2015
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 fa7345bbf8988d41ca1872b9d2b31bbb9668ab00
Merge: 56be3b5 612fc70
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Dec 31 14:12:02 2013 +0100
Merge branch 'debian-template' into debian
Conflicts:
debian/control
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 | 25 ++++++++
debian/patches/series | 1 +
debian/repackage.sh | 2 +-
debian/rules | 19 +++---
9 files changed, 91 insertions(+), 43 deletions(-)
diff --cc debian/control
index 85a7863,9ef51f7..7767bf3
--- 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/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
-Recommends: esorex|python-cpl, cpl-plugin-template-doc
-Suggests: cpl-plugin-template-calib
++Recommends: esorex|python-cpl, cpl-plugin-giraf-doc
+Suggests: cpl-plugin-giraf-calib (= ${binary:Version})
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 GIRAFFE
+ This is the data reduction pipeline for the GIRAFFE 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.
+ GIRAFFE is a medium-high resolution (R=7500-30000) spectrograph for the
+ entire visible range 370-900 nm. GIRAFFE is aimed at carrying out
+ intermediate and high resolution spectroscopy of galactic and extragalactic
+ objects having a high spatial density. The name comes from the first design,
+ where the spectrograph was standing vertically on a platform.
-Package: cpl-plugin-template-doc
++Package: cpl-plugin-giraf-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 GIRAFFE
+ 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 GIRAFFE instrument of the Very Large Telescope
+ (VLT) from the European Southern Observatory (ESO).
+
-Package: cpl-plugin-template-calib
+Package: cpl-plugin-giraf-calib
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, cpl-plugin-template, wget
+Depends: ${misc:Depends}, cpl-plugin-giraf, wget
Section: contrib/science
-Description: ESO data reduction pipeline calibration data downloader template
- This package downloads calibration and other static data of 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 calibration data downloader for GIRAFFE
+ This package downloads calibration data of the data reduction pipeline for the
+ GIRAFFE instrument of the Very Large Telescope (VLT) from the European
+ Southern Observatory (ESO).
diff --cc debian/patches/serial-tests
index 0000000,616e45e..36951fb
mode 000000,100644..100644
--- a/debian/patches/serial-tests
+++ b/debian/patches/serial-tests
@@@ -1,0 -1,47 +1,25 @@@
+ 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/tests/Makefile.am
+++++ b/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
++ ## 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 = *~ .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
+ @@ -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 = *~
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-template.git
More information about the Debian-astro-commits
mailing list