[Debian-astro-commits] [ftools-fv] 01/02: Convert to multiarch

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository ftools-fv.

commit 49c5066e6d55b454643e8384cf6c6a92b3f51028
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jul 22 15:50:43 2015 +0200

    Convert to multiarch
---
 debian/changelog                        |  1 +
 debian/control                          |  1 +
 debian/ftools-pow.install               |  2 +-
 debian/patches/fvtmp.patch              |  6 +++---
 debian/patches/pow_create_package.patch | 18 +++++++++++++-----
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d45a4e5..63ce1d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ftools-fv (5.3+dfsg-7) UNRELEASED; urgency=low
 
   * Change default temp location to /tmp
+  * Convert POW to multi-arch
 
  -- Ole Streicher <olebole at debian.org>  Mon, 18 May 2015 14:24:19 +0200
 
diff --git a/debian/control b/debian/control
index 3d873b2..5d19bd4 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Description: Tool for viewing and editing FITS format files
 
 Package: ftools-pow
 Architecture: any
+Multi-Arch: same
 Depends: itcl3,
          itk3,
          iwidgets4,
diff --git a/debian/ftools-pow.install b/debian/ftools-pow.install
index efb62ed..d44f7b8 100644
--- a/debian/ftools-pow.install
+++ b/debian/ftools-pow.install
@@ -1,5 +1,5 @@
 usr/bin/POWplot
 usr/include/pow.h
 usr/include/tkpict.h
-usr/lib/tcltk/POW
+usr/lib/tcltk/*/POW
 usr/share/ftools/POW
diff --git a/debian/patches/fvtmp.patch b/debian/patches/fvtmp.patch
index 5f0d607..6d460f1 100644
--- a/debian/patches/fvtmp.patch
+++ b/debian/patches/fvtmp.patch
@@ -3,9 +3,9 @@ Description: Change default temp location to /tmp
  According to FHS, temporary files should be written to /tmp, and not to
  the home directory. This patch moves the temp files there while keeping the
  FVTMP behaviour intact.
---- fv.orig/ftools/guis/fv/class/fvApp.tcl
-+++ fv/ftools/guis/fv/class/fvApp.tcl
-@@ -438,37 +438,45 @@ itcl::body fvApp::_setupBackup { } {
+--- a/ftools/guis/fv/class/fvApp.tcl
++++ b/ftools/guis/fv/class/fvApp.tcl
+@@ -438,37 +438,45 @@
     if { $isWin } {
        set fvBackupDir "fv_tmp"
        set fvHOME FV_HOME
diff --git a/debian/patches/pow_create_package.patch b/debian/patches/pow_create_package.patch
index d7c10e0..dc95cfd 100644
--- a/debian/patches/pow_create_package.patch
+++ b/debian/patches/pow_create_package.patch
@@ -42,20 +42,28 @@ Description: Create and "package require" the POW package.
  
 --- a/tcltk/pow/Makefile.in
 +++ b/tcltk/pow/Makefile.in
-@@ -80,6 +80,7 @@
+@@ -80,18 +80,19 @@
  
  shared: ${SHARED_OBJ}
  	${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} -o ${SHARED_LIB}
 +	echo "pkg_mkIndex  . libpow.so" | tclsh8.5
  
  install:
- 	@if [ ! -d ${INSTALLDIR}/lib/tcltk/POW ]; then \
-@@ -91,7 +92,7 @@
+-	@if [ ! -d ${INSTALLDIR}/lib/tcltk/POW ]; then \
+-		echo "mkdir ${INSTALLDIR}/lib/tcltk/POW"; \
+-		mkdir -p ${INSTALLDIR}/lib/tcltk/POW; \
++	@if [ ! -d ${INSTALLDIR}/lib/tcltk/${DEB_HOST_MULTIARCH}/POW ]; then \
++		echo "mkdir ${INSTALLDIR}/lib/tcltk/${DEB_HOST_MULTIARCH}/POW"; \
++		mkdir -p ${INSTALLDIR}/lib/tcltk/${DEB_HOST_MULTIARCH}/POW; \
+ 	fi
+ 	@if [ "x${C_LIB_OPTION}" = xstatic ]; then \
+ 		echo "cp ${STATIC_LIB} ${INSTALLDIR}/lib/"; \
  		cp ${STATIC_LIB} ${INSTALLDIR}/lib/; \
  	else \
- 		echo "cp ${SHARED_LIB} ${INSTALLDIR}/lib/tcltk/POW/"; \
+-		echo "cp ${SHARED_LIB} ${INSTALLDIR}/lib/tcltk/POW/"; \
 -		cp ${SHARED_LIB} ${INSTALLDIR}/lib/tcltk/POW/; \
-+		cp ${SHARED_LIB} pkgIndex.tcl ${INSTALLDIR}/lib/tcltk/POW/; \
++		echo "cp ${SHARED_LIB} ${INSTALLDIR}/lib/tcltk/${DEB_HOST_MULTIARCH}/POW/"; \
++		cp ${SHARED_LIB} pkgIndex.tcl ${INSTALLDIR}/lib/tcltk/${DEB_HOST_MULTIARCH}/POW/; \
  	fi
  	mkdir -p ${INSTALLDIR}/bin
  	@for file in ${SCRIPTS}; do \

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