[funtools] 01/01: Enable multiarch for library (not for tcl yet)

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository funtools.

commit 6bb0b14c49aeeafaa97040fc4253e2d78cbf83a0
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Sep 29 15:42:50 2013 +0200

    Enable multiarch for library (not for tcl yet)
---
 debian/changelog               |    6 ++++++
 debian/clean                   |    5 +++++
 debian/control                 |    6 ++++--
 debian/libfuntools-dev.install |    6 +++---
 debian/libfuntools1.install    |    4 ++--
 debian/patches/multiarch.patch |   33 +++++++++++++++++++++++++++++++++
 debian/patches/series          |    1 +
 7 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 85280cc..24b67a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+funtools (1.4.4-5) unstable; urgency=low
+
+  * Enable multiarch for library (not for tcl yet).
+
+ -- Ole Streicher <debian at liska.ath.cx>  Sun, 29 Sep 2013 15:15:17 +0200
+
 funtools (1.4.4-4) unstable; urgency=low
 
   * Check command line input for funjoin and funimage. Closes: #715928, #715929
diff --git a/debian/clean b/debian/clean
index e7b2781..d09ae17 100644
--- a/debian/clean
+++ b/debian/clean
@@ -7,3 +7,8 @@ util/NaN.h
 util/config.status.lineno
 pkgIndex.tcl-old
 wcs/config.log
+gnu/_funsort
+gnu/sort.o
+conf.h
+*/conf.h
+tclfun.c
diff --git a/debian/control b/debian/control
index 8cf96d4..554ba55 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: autotools-dev,
                zlib1g-dev
 Standards-Version: 3.9.4
 Homepage: https://www.cfa.harvard.edu/~john/funtools/
-Vcs-Git: git://git.debian.org/git/debian-science/packages/funtools.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/funtools.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/funtools.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/funtools.git
 
 Package: funtools
 Architecture: any
@@ -35,6 +35,8 @@ Package: libfuntools1
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Minimal buy-in FITS library
  Funtools, is a "minimal buy-in" FITS library and utility package developed at
  the High Energy Astrophysics Division of SAO. The Funtools library
diff --git a/debian/libfuntools-dev.install b/debian/libfuntools-dev.install
index 4325b63..6405da1 100644
--- a/debian/libfuntools-dev.install
+++ b/debian/libfuntools-dev.install
@@ -1,6 +1,6 @@
 usr/include/funtools/*.h
-usr/lib/libfuntools.a
-usr/lib/libfuntools.so
-usr/lib/pkgconfig/funtools.pc
+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 69169c4..ff8f9af 100644
--- a/debian/libfuntools1.install
+++ b/debian/libfuntools1.install
@@ -1,2 +1,2 @@
-usr/lib/libfuntools.so.1
-usr/lib/libfuntools.so.1.0
+usr/lib/*/libfuntools.so.1
+usr/lib/*/libfuntools.so.1.0
diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
new file mode 100644
index 0000000..2074117
--- /dev/null
+++ b/debian/patches/multiarch.patch
@@ -0,0 +1,33 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Copy files to the correct destinations according to multiarch.
+ The corresponding variables are set with debhelper compat 9.
+ tcl-funtools is not multiarch yet.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -37,20 +37,20 @@
+ INSTALL_ROOT = $(DESTDIR)
+ 
+ # Directory in which to install the .a or .so binary for the FUNTOOLS library:
+-LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
+-TCL_LIB_INSTALL_DIR =  $(LIB_INSTALL_DIR)/tcltk/funtools
++LIB_INSTALL_DIR =	$(INSTALL_ROOT)@libdir@
++TCL_LIB_INSTALL_DIR =   $(INSTALL_ROOT)$(exec_prefix)/lib/tcltk/funtools
+ 
+ # Directory in which to install the program wish:
+-BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR =	$(INSTALL_ROOT)@bindir@
+ 
+ # Directory in which to install the funtools.h include file:
+-INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include/funtools
++INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)@includedir@/funtools
+ 
+ # Top-level directory for manual entries:
+-MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/share/man
++MAN_INSTALL_DIR =	$(INSTALL_ROOT)@mandir@
+ 
+ # Top-level directory for share entries:
+-MAN_SHARE_DIR =		$(INSTALL_ROOT)$(prefix)/share/funtools
++MAN_SHARE_DIR =		$(INSTALL_ROOT)@datadir@/funtools
+ 
+ # util files are in the util subdirectory
+ UTIL_INC =		-I./util
diff --git a/debian/patches/series b/debian/patches/series
index 149d29b..6cb242f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ build_tclfun.patch
 build_bsd+hurd.patch
 ds9_fixes.diff
 fix_crashes.patch
+multiarch.patch

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