[cpl-plugin-uves] 05/07: Merge branch 'debian-template' into debian

Ole Streicher olebole-guest at moszumanska.debian.org
Tue Dec 31 14:27:19 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-uves.

commit 27c4f76d7b6d2a8e12ced049674760d6e6e5421a
Merge: 53a26e9 612fc70
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 31 15:14:34 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                            |  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 ef0cc3e,9ef51f7..622bfa7
--- a/debian/control
+++ b/debian/control
@@@ -12,36 -10,40 +12,46 @@@ 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/uves
 +Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-uves.git
 +Vcs-Browser: http://git.debian.org/?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
 -Recommends: esorex|python-cpl, cpl-plugin-template-doc
 -Suggests: cpl-plugin-template-calib
++Recommends: esorex|python-cpl, cpl-plugin-uves-doc
 +Suggests: cpl-plugin-uves-calib
  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}
+ Section: doc
 -Description: ESO data reduction pipeline documentation template
++Description: ESO data reduction pipeline documentation for UVES
+  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 UVES instrument of the Very Large Telescope
+  (VLT) from the European Southern Observatory (ESO).
+ 
 -Package: cpl-plugin-template-calib
 +Package: cpl-plugin-uves-calib
  Architecture: all
  Multi-Arch: foreign
 -Depends: ${misc:Depends}, cpl-plugin-template, wget
 +Depends: ${misc:Depends}, cpl-plugin-uves, wget
  Section: contrib/science
 -Description: ESO data reduction pipeline calibration data downloader template
 +Description: ESO data reduction pipeline calibration data downloader for UVES
   This package downloads calibration and other static data of the 
 - data reduction pipeline for the Template instrument of the
 + data reduction pipeline for the UVES instrument of the
   Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --cc debian/patches/serial-tests
index 0000000,616e45e..6c2ec34
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
+ @@ -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
++ DISTCLEANFILES = *~
+  
 ---- a/template/tests/Makefile.am
 -+++ b/template/tests/Makefile.am
++--- a/uves/tests/Makefile.am
+++++ b/uves/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 = *~
+  
diff --cc debian/patches/series
index d690338,9839386..5ba9065
--- 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
 +use_system_qfits.patch
 +fix_compiler_errors.patch
 +shlib-calls-exit.patch
 +fix-typos.patch
+ serial-tests

-- 
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