[SCM] Minimal buy-in FITS library and utility package branch, ubuntu, updated. 65164f3d12111b7b976c9b5550735e266fddf296

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit c0c11df0a20d135c2eff7bd74c66834956084e26
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jun 8 17:52:46 2012 +0200

    wrap-and-sort

diff --git a/debian/control b/debian/control
index 601f70e..02ac09a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,13 @@ Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.5.0), autotools-dev, dh-autoreconf, 
- tcl-dev, zlib1g-dev, libwcstools-dev, gawk
+Build-Depends: autotools-dev,
+               debhelper (>= 7.5.0),
+               dh-autoreconf,
+               gawk,
+               libwcstools-dev,
+               tcl-dev,
+               zlib1g-dev
 Standards-Version: 3.9.3
 Homepage: https://www.cfa.harvard.edu/~john/funtools/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/funtools.git
@@ -77,4 +82,3 @@ Description: Minimal buy-in FITS library (Tcl interface)
  index files.
  .
  This package contains the Tcl interface.
-
diff --git a/debian/copyright b/debian/copyright
index 69bebec..89b020c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Author: Eric Mandel <eric at head.cfa.havard.edu>
 Source: http://hea-www.harvard.edu/saord/funtools/
 
 Files: *
-Copyright: Copyright (c) 1998-2007 Smithsonian Astrophysical Observatory, 
+Copyright: Copyright (c) 1998-2007 Smithsonian Astrophysical Observatory,
  Cambridge, MA, USA
  Copyright (c) 1991-2003 John B. Roll jr.
  Copyright (C) 1988-1995 Free Software Foundation, Inc.
@@ -28,12 +28,12 @@ License: GPLv2
   Cambridge, MA 02138 USA
   eric at cfa.harvard.edu
  .
- On Debian systems, the complete text of the GNU General 
+ On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files: wcs/*
 Copyright:  Copyright (C) 1994-2002, Mark Calabretta
- Copyright (c) 1998-2007 Smithsonian Astrophysical Observatory, 
+ Copyright (c) 1998-2007 Smithsonian Astrophysical Observatory,
  Cambridge, MA, USA
 License: LGPLv2+
  This library is free software; you can redistribute it and/or
@@ -45,12 +45,12 @@ License: LGPLv2+
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
- .    
- On Debian systems, the complete text of the GNU Lesser General 
+ .
+ On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-2'.
  .
- Remark by Ole Streicher: These source files are not used to build the 
- package. Instead, the distributed debian package libwcstools-dev is 
+ Remark by Ole Streicher: These source files are not used to build the
+ package. Instead, the distributed debian package libwcstools-dev is
  used.
 
 Files: util/zlib-1.2.3/*
@@ -75,7 +75,7 @@ License: BSD
   Jean-loup Gailly        Mark Adler
   jloup at gzip.org          madler at alumni.caltech.edu
  .
- Remark by Ole Streicher: These source files are not used to build the 
+ Remark by Ole Streicher: These source files are not used to build the
  package. Instead, the distributed debian package zlib-dev is used.
 
 Files: debian/*
diff --git a/debian/libfuntools-dev.install b/debian/libfuntools-dev.install
index 902e096..4325b63 100644
--- a/debian/libfuntools-dev.install
+++ b/debian/libfuntools-dev.install
@@ -1,6 +1,6 @@
 usr/include/funtools/*.h
-usr/lib/libfuntools.so
 usr/lib/libfuntools.a
+usr/lib/libfuntools.so
 usr/lib/pkgconfig/funtools.pc
 usr/share/man/man3/*.3
 usr/share/man/man7/*.7
diff --git a/debian/libfuntools1.install b/debian/libfuntools1.install
index d3d495b..69169c4 100644
--- a/debian/libfuntools1.install
+++ b/debian/libfuntools1.install
@@ -1,2 +1,2 @@
-usr/lib/libfuntools.so.1.0
 usr/lib/libfuntools.so.1
+usr/lib/libfuntools.so.1.0

-- 
Minimal buy-in FITS library and utility package