[SCM] image display tool for astronomy branch, ubuntu, updated. c6f807b224c4cc6f58f71e3ccf9bcbd9219080f7

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit c8b4b12b49b446e98fc73952ff0f593b237c1fbb
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 13 16:28:04 2012 +0200

    wrap-and-sort

diff --git a/debian/control b/debian/control
index c801fda..a2d9bbf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,18 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: debhelper (>= 7.0.50), autotools-dev, zlib1g-dev,
- libxt-dev, libxrandr-dev, tcl-dev, tk-dev, libtk-img-dev, libxml2-dev, 
- libwcstools-dev, libfuntools-dev, libstarlink-ast-dev
+Build-Depends: autotools-dev,
+               debhelper (>= 7.0.50),
+               libfuntools-dev,
+               libstarlink-ast-dev,
+               libtk-img-dev,
+               libwcstools-dev,
+               libxml2-dev,
+               libxrandr-dev,
+               libxt-dev,
+               tcl-dev,
+               tk-dev,
+               zlib1g-dev
 Standards-Version: 3.9.3
 Homepage: http://hea-www.harvard.edu/RD/ds9/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/saods9.git
@@ -13,8 +22,16 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/saods9.git
 
 Package: saods9
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, tcllib, tkcon, hv3, tcl-xpa, 
- tclxml, tcl-signal, tk-table (>= 2.9), saods9-doc (= ${binary:Version})
+Depends: hv3,
+         saods9-doc (= ${binary:Version}),
+         tcl-signal,
+         tcl-xpa,
+         tcllib,
+         tclxml,
+         tk-table (>= 2.9),
+         tkcon,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: xpa-tools
 Description: Image display tool for astronomy
  DS9 is an application for astronomical imaging and data
diff --git a/debian/copyright b/debian/copyright
index f030141..4f4718f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Author: William Joye <wjoye at cfa.harvard.edu>
 Source: http://hea-www.harvard.edu/saord/download/ds9/source
 
 Files: *
-Copyright: Copyright (C) 1999-2010 Smithsonian Astrophysical Observatory, 
+Copyright: Copyright (C) 1999-2010 Smithsonian Astrophysical Observatory,
  Cambridge, MA, USA
  Copyright (c) 2002 Ingo Oppermann (ingo_opp at users.sourceforge.net)
  Copyright (c) 1993 Association of Universities for Research in Astronomy.
@@ -25,7 +25,7 @@ License: GPLv2+
  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the GNU General Public License for more details.
  .
- On Debian systems, the complete text of the GNU General Public 
+ On Debian systems, the complete text of the GNU General Public
  License can be found in `/usr/share/common-licenses/GPL-2'.
 
 Files: src/tkfbox.tcl src/xmfbox.tcl
@@ -113,7 +113,7 @@ License: BSD
  (It is my understanding that this is the original "BSD with
  advertizing clause", and, since it is licensed by Berkeley, has been
  since relicensed without the advertizing clause.  Here, I only restate
- the license included upstream.) 
+ the license included upstream.)
 
 Files: blt3.0/*
 Copyright: Copyright 1991-2009 George A Howlett,
@@ -122,7 +122,7 @@ Copyright: Copyright 1991-2009 George A Howlett,
  Copyright (c) 1985-1991 Massachusetts Institute of Technology,
  Copyright (c) 1987 by Digital Equipment Corporation, Maynard, Massachusetts
  Copyright (c) 1990-1993, David Koblas. (koblas at netcom.com)
- Copyright (c) 1991-1998, Thomas G. Lane. 
+ Copyright (c) 1991-1998, Thomas G. Lane.
  Copyright (c) 1998-1999 by Scriptics Corporation
  Copyright (c) 1993-1998 Lucent Technologies, Inc
  Copyright (c) 1989 by Jef Poskanzer
@@ -156,7 +156,7 @@ License: public-domain
  Tue,  4 Jan 2005 21:53:52 -0500.  The Debian .diff is hereby placed
  into the public domain.
  .
- Based on Justin's diff, the debianization is completely rewritten for 
+ Based on Justin's diff, the debianization is completely rewritten for
  the updstream version 6.2 by Ole Streicher <debian at liska.ath.cx>.
  Contributions came from the Gentoo packaging by Sebastien Fabbro
  <bicatali at gentoo.org>.
diff --git a/debian/saods9.install b/debian/saods9.install
index 1e9701d..c1f43b0 100644
--- a/debian/saods9.install
+++ b/debian/saods9.install
@@ -1,6 +1,6 @@
 bin/ds9 usr/bin/
-debian/saods9.desktop usr/share/applications
+blt3.0/library/* /usr/share/saods9/blt3.0
 debian/ds9.xpm usr/share/pixmaps
-src /usr/share/saods9/
+debian/saods9.desktop usr/share/applications
 msgs /usr/share/saods9/
-blt3.0/library/* /usr/share/saods9/blt3.0
+src /usr/share/saods9/

-- 
image display tool for astronomy