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

Wed Jul 22 10:25:21 UTC 2015

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

olebole pushed a commit to branch debian
in repository xpa.

commit 1a4f8fdb4ff11226e8f5ec6079382a336f715dbc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jul 22 12:25:05 2015 +0200

    Convert to multiarch
---
 debian/changelog                    | 6 ++++++
 debian/control                      | 2 ++
 debian/libxpa-dev.install           | 4 ++--
 debian/libxpa1.install              | 4 ++--
 debian/patches/fix_paths.patch      | 8 ++++++--
 debian/patches/install_tclxpa.patch | 4 ++--
 debian/rules                        | 2 +-
 debian/tcl-xpa.install              | 4 ++--
 8 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ceb373..5902e25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xpa (2.1.15-5) unstable; urgency=low
+
+  * Convert to multi-arch
+
+ -- Ole Streicher <olebole at debian.org>  Wed, 22 Jul 2015 12:22:50 +0200
+
 xpa (2.1.15-4) unstable; urgency=low
 
   * Update maintainers e-mail address
diff --git a/debian/control b/debian/control
index 33888f4..4994db8 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-astro/packages/xpa.git
 Package: libxpa1
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Seamless communication between Unix programs (shared library)
  The XPA messaging system provides seamless communication between many kinds
@@ -60,6 +61,7 @@ Description: Tools for seamless communication between Unix programs
 
 Package: tcl-xpa
 Architecture: any
+Multi-Arch: same
 Section: interpreters
 Depends: libxpa1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Seamless communication between Unix programs (Tcl interface)
diff --git a/debian/libxpa-dev.install b/debian/libxpa-dev.install
index e5855be..d052aef 100644
--- a/debian/libxpa-dev.install
+++ b/debian/libxpa-dev.install
@@ -1,7 +1,7 @@
 usr/include/prsetup.h
 usr/include/xpa.h
-usr/lib/libxpa.a
-usr/lib/libxpa.so
+usr/lib/*/libxpa.a
+usr/lib/*/libxpa.so
 usr/share/man/man3/xpaaccess.3
 usr/share/man/man3/xpaatexit.3
 usr/share/man/man3/xpacleanup.3
diff --git a/debian/libxpa1.install b/debian/libxpa1.install
index a37b660..f3dd4b1 100644
--- a/debian/libxpa1.install
+++ b/debian/libxpa1.install
@@ -1,2 +1,2 @@
-usr/lib/libxpa.so.1
-usr/lib/libxpa.so.1.0
+usr/lib/*/libxpa.so.1
+usr/lib/*/libxpa.so.1.0
diff --git a/debian/patches/fix_paths.patch b/debian/patches/fix_paths.patch
index 33e4acc..7e6b0a2 100644
--- a/debian/patches/fix_paths.patch
+++ b/debian/patches/fix_paths.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Fix the paths for a chroot build and for FHS
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -34,7 +34,7 @@
+@@ -34,10 +34,10 @@
  # to be different than those used for actually reference files at
  # run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
  # when installing files.
@@ -10,7 +10,11 @@ Description: Fix the paths for a chroot build and for FHS
 +INSTALL_ROOT = $(DESTDIR)
  
  # Directory in which to install the .a or .so binary for the XPA library:
- LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
+-LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib/${DEB_HOST_MULTIARCH}
+ 
+ # Directory in which to install the program wish:
+ BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
 @@ -46,7 +46,7 @@
  INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
  
diff --git a/debian/patches/install_tclxpa.patch b/debian/patches/install_tclxpa.patch
index ebbaa38..0b49475 100644
--- a/debian/patches/install_tclxpa.patch
+++ b/debian/patches/install_tclxpa.patch
@@ -6,8 +6,8 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
 @@ -38,6 +38,7 @@
  
  # Directory in which to install the .a or .so binary for the XPA library:
- LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
-+TCL_LIB_INSTALL_DIR =	$(LIB_INSTALL_DIR)/tcltk/xpa
+ LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib/${DEB_HOST_MULTIARCH}
++TCL_LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib/tcltk/${DEB_HOST_MULTIARCH}/xpa
  
  # Directory in which to install the program wish:
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
diff --git a/debian/rules b/debian/rules
index e556fc5..e926634 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 	dh $@ --with autotools_dev
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-shared --with-threads --with-tclconfig=/usr/lib --with-tcl=/usr/include/tcl
+	dh_auto_configure -- --enable-shared=link --with-threads --with-tclconfig=/usr/lib --with-tcl=/usr/include/tcl
 
 override_dh_auto_build:
 	dh_auto_build -- all tclxpa
diff --git a/debian/tcl-xpa.install b/debian/tcl-xpa.install
index b5344da..2ce10a2 100644
--- a/debian/tcl-xpa.install
+++ b/debian/tcl-xpa.install
@@ -1,3 +1,3 @@
-usr/lib/tcltk/xpa/libtclxpa.so
-usr/lib/tcltk/xpa/pkgIndex.tcl
+usr/lib/tcltk/*/xpa/libtclxpa.so
+usr/lib/tcltk/*/xpa/pkgIndex.tcl
 usr/share/man/man3/xpa.3tcl

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

