[SCM] ESO library for automated astronomical data-reduction branch, master, updated. upstream/5.3.1-29-g442624e

Ole Streicher debian at liska.ath.cx
Fri Apr 13 07:10:39 UTC 2012 

The following commit has been merged in the master branch:
commit 442624edac9c2660fdf61f55df6eeba80ff3ea01
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 13 09:04:48 2012 +0200

    Warp-and-sort

diff --git a/debian/control b/debian/control
index 2e3bb5a..aa04a64 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,15 @@ Priority: optional
 Section: science
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: debhelper (>= 8), dh-autoreconf, libcfitsio3-dev (>= 3.27),
- wcslib-dev (>= 4.4.4), libfftw3-dev (>= 3.1.2), doxygen, libltdl-dev, 
- texlive-fonts-recommended, default-jdk
+Build-Depends: debhelper (>= 8),
+               default-jdk,
+               dh-autoreconf,
+               doxygen,
+               libcfitsio3-dev (>= 3.27),
+               libfftw3-dev (>= 3.1.2),
+               libltdl-dev,
+               texlive-fonts-recommended,
+               wcslib-dev (>= 4.4.4)
 Standards-Version: 3.9.3
 Homepage: http://www.eso.org/sci/software/cpl/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl.git
@@ -14,9 +20,14 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl.git
 Package: libcpl-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, wcslib-dev, libcext-dev, libcfitsio3-dev,
- libcplcore20 (= ${binary:Version}), libcpldrs20 (= ${binary:Version}),
- libcpldfs20 (= ${binary:Version}), libcplui20 (= ${binary:Version})
+Depends: libcext-dev,
+         libcfitsio3-dev,
+         libcplcore20 (= ${binary:Version}),
+         libcpldfs20 (= ${binary:Version}),
+         libcpldrs20 (= ${binary:Version}),
+         libcplui20 (= ${binary:Version}),
+         wcslib-dev,
+         ${misc:Depends}
 Description: ESO library for automated astronomical data-reduction
  The Common Pipeline Library (CPL) comprises a set of ISO-C libraries that
  provide a comprehensive, efficient and robust software toolkit. It forms a
@@ -33,16 +44,16 @@ Description: ESO library for automated astronomical data-reduction
  The CPL provides a host of functionality, presented in a clear,
  generic and uniform manner. Among its many features, the CPL offers:
  .
-  * many useful low-level data types (images, tables, matrices, strings, 
+  * many useful low-level data types (images, tables, matrices, strings,
     property lists, ...),
-  * many fundamental statistic, arithmetic and conversion operations for 
+  * many fundamental statistic, arithmetic and conversion operations for
     these data types.
-  * medium-level data access methods (e.g. a data abstraction layer for 
+  * medium-level data access methods (e.g. a data abstraction layer for
     FITS files),
   * data table organisation and manipulation,
   * keyword/value handling and management,
   * a standardised application interface for pipeline recipes, and,
-  * support for dynamic loading of recipe modules. 
+  * support for dynamic loading of recipe modules.
  .
  Despite the current bias towards instrument pipeline development, the
  library also provides a variety of general-purpose image- and
@@ -77,7 +88,7 @@ Description: Fundamental CPL data types and functions
  image, cpl table, cpl vector, cpl matrix etc.), the operations defined on
  these data types, and elementary utility functions. There should not be any
  physical units associated with any of the data types or functions of that
- library. 
+ library.
  .
  The Common Pipeline Library (CPL) comprises a set of ISO-C libraries that
  provide a comprehensive, efficient and robust software toolkit. It forms a
@@ -109,7 +120,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Description: CPL higher level data processing algorithms
  The CPLDRS (DRS for Data Reduction System) implements higher level data
  processing algorithms (such as wavelength calibration, image recombination,
- dark-frame correction and so on). 
+ dark-frame correction and so on).
  .
  The Common Pipeline Library (CPL) comprises a set of ISO-C libraries that
  provide a comprehensive, efficient and robust software toolkit. It forms a
@@ -145,29 +156,18 @@ Description: Commonly used utility functions for C programs
  Library (CPL). The library contains a basic collections framework (maps,
  linked lists, queues), memory management, strings, logging and others.
 
-Package: libcext-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends}, libcext0 (= ${binary:Version})
-Description: Commonly used utility functions for C programs (development files)
- This is a C utility library, which is used to implement ESO's Common Pipeline
- Library (CPL). The library contains a basic collections framework (maps,
- linked lists, queues), memory management, strings, logging and others.
- .
- The package contains the static library and the C header files.
- 
 Package: libcext-doc
 Section: doc
 Architecture: all
-Multi-Arch: foreign
 Depends: ${misc:Depends}
-Suggests: libcext-dev
 Description: API documentation for ESO's C utility library libcext
  The libcext is a C utility library, which is used to implement ESO's Common
  Pipeline Library (CPL). The library contains a basic collections framework
  (maps, linked lists, queues), memory management, strings, logging and others.
  .
  The package contains the API documentation for libcpl.
+Multi-Arch: foreign
+Suggests: libcext-dev
 
 Package: libcplgasgano20
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 5cbf973..9ee4125 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
 Upstream-Name: cpl
-Upstream-Author: Carlo Izzo <cizzo at eso.org>, 
+Upstream-Author: Carlo Izzo <cizzo at eso.org>,
  Ralf Palsa <rpalsa at eso.org>,
- Yves Jung <yjung at eso.org>, 
+ Yves Jung <yjung at eso.org>,
  Lars Lundin <llundin at eso.org>
 Source: http://www.eso.org/sci/software/cpl/download.html
 
@@ -65,4 +65,3 @@ License: GPL-2
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
-
diff --git a/debian/libcpl-dev.install b/debian/libcpl-dev.install
index 9ca3cc8..b9b9fdf 100644
--- a/debian/libcpl-dev.install
+++ b/debian/libcpl-dev.install
@@ -1,9 +1,9 @@
 usr/include/cpl*
-usr/lib/*/libcpldrs.a
-usr/lib/*/libcpldfs.a
 usr/lib/*/libcplcore.a
-usr/lib/*/libcplui.a
-usr/lib/*/libcpldrs.so
-usr/lib/*/libcpldfs.so
 usr/lib/*/libcplcore.so
+usr/lib/*/libcpldfs.a
+usr/lib/*/libcpldfs.so
+usr/lib/*/libcpldrs.a
+usr/lib/*/libcpldrs.so
+usr/lib/*/libcplui.a
 usr/lib/*/libcplui.so

-- 
ESO library for automated astronomical data-reduction

More information about the debian-science-commits mailing list