[saods9] 02/02: Merge saods9 and saods9-data

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch experimental
in repository saods9.

commit b0bfa7443832581eefa184e1d15b685c0b484754
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jul 7 15:02:40 2015 +0200

    Merge saods9 and saods9-data
---
 debian/changelog           |  3 ++-
 debian/control             | 13 -------------
 debian/saods9-data.install |  5 -----
 debian/saods9.install      |  5 +++++
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ccdaf6d..41a55e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-saods9 (7.4~b4+repack-2) UNRELEASED; urgency=low
+saods9 (7.4~b4+repack-2) experimental; urgency=low
 
+  * Merge saods9 and saods9-data
   * Create and use tcl packages for saotk, tcliis, tclcheckdns, tkmpeg
 
  -- Ole Streicher <olebole at debian.org>  Tue, 07 Jul 2015 14:53:05 +0200
diff --git a/debian/control b/debian/control
index 1bc7cb8..0ed3990 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,6 @@ Package: saods9
 Architecture: any
 Depends: blt (>= 2.5.3),
          libtk-img,
-         saods9-data (= ${source:Version}),
          tcl-signal,
          tcl-xpa,
          tcllib,
@@ -79,15 +78,3 @@ Description: Image display tool for astronomy (help files/documentation)
  configurable and extensible via XPA and SAMP.
  .
  This package contains the documentation and help pages.
-
-Package: saods9-data
-Architecture: all
-Depends: ${misc:Depends}
-Description: Image display tool for astronomy (shared data)
- SAOImage DS9 is an astronomical imaging and data visualization
- application. DS9 supports FITS images and binary tables, multiple frame
- buffers, region manipulation, and many scale algorithms and colormaps. It
- provides for easy communication with external analysis tasks and is highly
- configurable and extensible via XPA and SAMP.
- .
- This package contains the architecture independent files.
diff --git a/debian/saods9-data.install b/debian/saods9-data.install
deleted file mode 100644
index 232b4ee..0000000
--- a/debian/saods9-data.install
+++ /dev/null
@@ -1,5 +0,0 @@
-ds9/zipdir/zvfsmntpt/cmaps /usr/share/saods9/
-ds9/zipdir/zvfsmntpt/doc/sun.gif /usr/share/saods9
-ds9/zipdir/zvfsmntpt/msgs /usr/share/saods9/
-ds9/zipdir/zvfsmntpt/src /usr/share/saods9/
-ds9/zipdir/zvfsmntpt/template /usr/share/saods9/
diff --git a/debian/saods9.install b/debian/saods9.install
index 6b3db3d..8b9c072 100644
--- a/debian/saods9.install
+++ b/debian/saods9.install
@@ -3,5 +3,10 @@ lib/saotk* /usr/lib/tcltk/
 lib/tclcheckdns* /usr/lib/tcltk/
 lib/tcliis* /usr/lib/tcltk/
 lib/tkmpeg* /usr/lib/tcltk/
+ds9/zipdir/zvfsmntpt/cmaps /usr/share/saods9/
+ds9/zipdir/zvfsmntpt/doc/sun.gif /usr/share/saods9
+ds9/zipdir/zvfsmntpt/msgs /usr/share/saods9/
+ds9/zipdir/zvfsmntpt/src /usr/share/saods9/
+ds9/zipdir/zvfsmntpt/template /usr/share/saods9/
 debian/ds9.xpm usr/share/pixmaps
 debian/saods9.desktop usr/share/applications

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git