[Debian-astro-commits] [saods9] 01/01: Convert to multiarch

[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 9b5befc59024b1c42c47b3f1d5bf701302d92c9e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jul 22 09:36:53 2015 +0200

    Convert to multiarch
---
 debian/changelog                  | 1 +
 debian/control                    | 7 +++++--
 debian/saods9-tclpackages.install | 9 +++++----
 debian/saods9.install             | 2 +-
 debian/tksao.install              | 3 ++-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4943965..f88aa82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 saods9 (7.4~b5+repack-2) UNRELEASED; urgency=medium
 
   * Use Tcl/Tk stubs
+  * Convert to multiarch
 
  -- Ole Streicher <olebole at debian.org>  Wed, 22 Jul 2015 08:51:36 +0200
 
diff --git a/debian/control b/debian/control
index 9b9f35c..64404d4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: autotools-dev,
                cpio,
                debhelper (>= 9),
                dh-autoreconf,
+               dh-exec,
                html2text,
                libfuntools-dev,
                libstarlink-ast-dev (>= 7.0.4),
@@ -37,14 +38,14 @@ Package: saods9
 Architecture: all
 Depends: blt (>= 2.5.3),
          libtk-img,
-	 saods9-tclpackages,
+         saods9-tclpackages,
          tcl-signal,
          tcl-xpa,
          tcllib,
          tclxml,
-         tksao,
          tk-table (>= 2.9),
          tkcon,
+         tksao,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: saods9-doc
@@ -75,6 +76,7 @@ Architecture: any
 Depends: blt (>= 2.5.3), ${misc:Depends}, ${shlibs:Depends}
 Recommends: saods9-doc
 Suggests: saods9
+Multi-Arch: same
 Description: Tk widgets for astronomical imaging and data visualization
  SAOTk is an integrated set of Tcl/Tk canvas widgets for astronomical
  imaging and data visualization. The widget set is composed of the
@@ -95,6 +97,7 @@ Package: saods9-tclpackages
 Architecture: any
 Depends: tcl, tk, ${misc:Depends}, ${shlibs:Depends}
 Recommends: saods9
+Multi-Arch: same
 Description: Tcl/Tk packages provided with DS9
  DS9 includes some extra Tcl/Tk packages that it needs for working. These
  packages are tclcheckdns, tcliis, tkhtml1, tkmpeg.
diff --git a/debian/saods9-tclpackages.install b/debian/saods9-tclpackages.install
old mode 100644
new mode 100755
index 6bc7781..a2fddbd
--- a/debian/saods9-tclpackages.install
+++ b/debian/saods9-tclpackages.install
@@ -1,4 +1,5 @@
-lib/tclcheckdns* /usr/lib/tcltk/
-lib/tcliis* /usr/lib/tcltk/
-lib/tkmpeg* /usr/lib/tcltk/
-lib/tkhtml* /usr/lib/tcltk/
+#! /usr/bin/dh-exec
+lib/tclcheckdns* /usr/lib/tcltk/${DEB_HOST_MULTIARCH}/
+lib/tcliis* /usr/lib/tcltk/${DEB_HOST_MULTIARCH}/
+lib/tkmpeg* /usr/lib/tcltk/${DEB_HOST_MULTIARCH}/
+lib/tkhtml* /usr/lib/tcltk/${DEB_HOST_MULTIARCH}/
diff --git a/debian/saods9.install b/debian/saods9.install
index c085a00..476607b 100644
--- a/debian/saods9.install
+++ b/debian/saods9.install
@@ -1,6 +1,6 @@
-ds9/ds9 /usr/bin
 debian/ds9.xpm usr/share/pixmaps
 debian/saods9.desktop usr/share/applications
+ds9/ds9 /usr/bin
 ds9/zipdir/zvfsmntpt/cmaps /usr/share/saods9/
 ds9/zipdir/zvfsmntpt/doc/sun.gif /usr/share/saods9
 ds9/zipdir/zvfsmntpt/msgs /usr/share/saods9/
diff --git a/debian/tksao.install b/debian/tksao.install
old mode 100644
new mode 100755
index 82f6cd9..06a250d
--- a/debian/tksao.install
+++ b/debian/tksao.install
@@ -1 +1,2 @@
-lib/tksao* /usr/lib/tcltk/
+#! /usr/bin/dh-exec
+lib/tksao* /usr/lib/tcltk/${DEB_HOST_MULTIARCH}/

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