[SCM] Packaging for getfem++ branch, master, updated. debian/4.2+dfsg1-1_exp3-10-g28a2655

[Anton Gladky]

The following commit has been merged in the master branch:
commit 34b5caf085fefa83a46c2ea796db87dbc8dd08e8
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue May 7 18:45:01 2013 +0200

    Convert to multiarch.

diff --git a/debian/control b/debian/control
index a4f6446..0a4c948 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,8 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/getfem.git
 
 Package: libgetfem4++
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: GETFEM++ generic finite element library
@@ -84,6 +86,8 @@ Description: Python interface to the GETFEM++ generic finite element library
 
 
 Package: scilab-getfem++
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Architecture: alpha amd64 armel armhf i386 ia64 mips mipsel powerpc s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends},
     libgetfem4++ (= ${binary:Version}), scilab
diff --git a/debian/libgetfem++-dev.install b/debian/libgetfem++-dev.install
index 1ede072..588f321 100644
--- a/debian/libgetfem++-dev.install
+++ b/debian/libgetfem++-dev.install
@@ -1,6 +1,6 @@
 usr/bin/getfem-config
 usr/include/getfem
 usr/include/getfem_boost
-usr/lib/libgetfem.so
-usr/lib/libgetfem.a
+usr/lib/*/libgetfem.so
+usr/lib/*/libgetfem.a
 
diff --git a/debian/libgetfem4++.install b/debian/libgetfem4++.install
index eec7936..104903b 100644
--- a/debian/libgetfem4++.install
+++ b/debian/libgetfem4++.install
@@ -1 +1 @@
-usr/lib/libgetfem.so.4*
+usr/lib/*/libgetfem.so.4*
diff --git a/debian/rules b/debian/rules
index 0a45582..49b8e10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ endif
 
 
 # shared library versions, option 1
-version=4.1.1
+version=4.2
 major=5
 # option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
 #version=`ls src/.libs/lib*.so.* | \
@@ -66,27 +66,20 @@ major=5
 #=====================================================================
 
 override_dh_auto_configure:
-	aclocal -I ./m4
-	libtoolize -f
-	autoheader
-	autoreconf
-	autoconf
-	automake -a --gnu `find . -name Makefile.am | sed -e 's@\./\(.*\)\.am@\1 at g'`
-	./configure $(configure_flags)
-
+	dh_auto_configure --	$(configure_flags)
 
 override_dh_auto_build:
 	dh_auto_build
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/scilab-getfem++/
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/scilab-getfem++/
 
 override_dh_auto_install:
 	dh_auto_install -- DESTDIR=$(CURDIR)/debian/tmp 
 	# Workaround for the other archs without scilab getfem++
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/scilab-getfem++/
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/scilab-getfem++/
 	mkdir -p $(CURDIR)/debian/scilab-getfem++/usr/share/scilab/contrib/
 	cd $(CURDIR)/debian/scilab-getfem++/usr/share/scilab/contrib/; \
 	rm -f scilab-getfem++; \
-	ln -s ../../../lib/scilab-getfem++/ getfem++
+	ln -s ../../../lib/$(DEB_HOST_MULTIARCH)/scilab-getfem++/ getfem++
 
 override_dh_install:
 	dh_install --list-missing
diff --git a/debian/scilab-getfem++.install b/debian/scilab-getfem++.install
index 533c19f..c8b66dd 100644
--- a/debian/scilab-getfem++.install
+++ b/debian/scilab-getfem++.install
@@ -1 +1 @@
-usr/lib/scilab-getfem++/
+usr/lib/*/scilab-getfem++/

-- 
Packaging for getfem++