[libsnl] 02/03: Made library multiarch

[Wolfgang Fütterer]

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

wlfuetter-guest pushed a commit to branch master
in repository libsnl.

commit 326e69927a5e86778e5c9bc613bddb43c055fea5
Author: Wolfgang Fuetterer <debian at wlf-online.de>
Date:   Sun May 3 10:32:52 2015 +0200

    Made library multiarch
---
 debian/control             |  3 +++
 debian/libsnl-dev.dirs     |  2 +-
 debian/libsnl-dev.links    |  1 -
 debian/libsnl-dev.links.in |  1 +
 debian/libsnl0.install     |  1 -
 debian/libsnl0.install.in  |  1 +
 debian/libsnl0.links       |  1 -
 debian/libsnl0.links.in    |  1 +
 debian/rules               | 19 ++++++++++++++++++-
 9 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index a64b2c5..f86ba77 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Architecture: any
 Section: libdevel
 Depends: libsnl0 (= ${binary:Version}),
          ${misc:Depends}
+Multi-Arch: foreign
 Description: Simple Nurbs Library (development files)
  libSNL is a library of routines used for the 
  manipulation of NURBS curves and surfaces. 
@@ -24,6 +25,8 @@ Package: libsnl0
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Multi-Arch: same         
+Pre-Depends: ${misc:Pre-Depends}         
 Description: Simple Nurbs Library
  libSNL is a library of routines used for the 
  manipulation of NURBS curves and surfaces. 
diff --git a/debian/libsnl-dev.dirs b/debian/libsnl-dev.dirs
index 4418816..609beee 100644
--- a/debian/libsnl-dev.dirs
+++ b/debian/libsnl-dev.dirs
@@ -1,2 +1,2 @@
-usr/lib
+usr/lib/
 usr/include
diff --git a/debian/libsnl-dev.links b/debian/libsnl-dev.links
deleted file mode 100644
index edc4acb..0000000
--- a/debian/libsnl-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libSNL.so.0 usr/lib/libSNL.so
diff --git a/debian/libsnl-dev.links.in b/debian/libsnl-dev.links.in
new file mode 100644
index 0000000..c1be42c
--- /dev/null
+++ b/debian/libsnl-dev.links.in
@@ -0,0 +1 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libSNL.so.0 usr/lib/@DEB_HOST_MULTIARCH@/libSNL.so
diff --git a/debian/libsnl0.install b/debian/libsnl0.install
deleted file mode 100644
index bb57e8f..0000000
--- a/debian/libsnl0.install
+++ /dev/null
@@ -1 +0,0 @@
-src/lib*.so.* /usr/lib
diff --git a/debian/libsnl0.install.in b/debian/libsnl0.install.in
new file mode 100644
index 0000000..40c9500
--- /dev/null
+++ b/debian/libsnl0.install.in
@@ -0,0 +1 @@
+src/lib*.so.* usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/debian/libsnl0.links b/debian/libsnl0.links
deleted file mode 100644
index f48740d..0000000
--- a/debian/libsnl0.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libSNL.so.0.2 usr/lib/libSNL.so.0
diff --git a/debian/libsnl0.links.in b/debian/libsnl0.links.in
new file mode 100644
index 0000000..50d4d2e
--- /dev/null
+++ b/debian/libsnl0.links.in
@@ -0,0 +1 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libSNL.so.0.2 usr/lib/@DEB_HOST_MULTIARCH@/libSNL.so.0
diff --git a/debian/rules b/debian/rules
index 8f4bd14..6c6876b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,33 @@
 #!/usr/bin/make -f
 # See debhelper(7) (uncomment to enable)
 # output every command that modifies files on the build system.
-# DH_VERBOSE = 1
+DH_VERBOSE = 1
 
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+INSTALL = \
+debian/libsnl0.install \
+debian/libsnl0.links \
+debian/libsnl-dev.links
+
 %:
 	dh $@ -Dsrc
+	
+override_dh_install: ${INSTALL}
+	dh_install
 
 override_dh_auto_build:
 	dh_auto_build -- CFLAGS="$(CFLAGS) $(CPPFLAGS) $(LDFLAGS)"
 
 override_dh_auto_clean:
 	rm -f src/*.o src/make.dep src/libSNL.so.0.2 src/snlTest
+	rm -f debian/%.install debian/%.install
+
+debian/%.install: debian/%.install.in
+	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
+	
+debian/%.links: debian/%.links.in
+	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@

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