Bug#695861: src:libsigsegv: support Multi-Arch

[Helmut Grohne]

Package: src:libsigsegv
Version: 2.10-1
Severity: normal
Tags: patch
User: multiarch-devel at lists.alioth.debian.org
Usertags: multiarch

Please convert the package to Multi-Arch. The package is quite nice and
was easy to convert. Since the patch moves libraries, please hold the
patch back until after the release of wheezy. Also note that the
following warning should be fixed at some point:

dpkg-buildpackage: warning: debian/rules must be updated to support the 'build-arch' and 'build-indep' targets (at least 'build-arch' seems to be missing)

Helmut
-------------- next part --------------
diff -Nru libsigsegv-2.10/debian/changelog libsigsegv-2.10/debian/changelog
--- libsigsegv-2.10/debian/changelog	2011-07-26 15:33:55.000000000 +0200
+++ libsigsegv-2.10/debian/changelog	2012-12-13 17:28:09.000000000 +0100
@@ -1,3 +1,10 @@
+libsigsegv (2.10-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Enable Multi-Arch.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Thu, 13 Dec 2012 17:27:57 +0100
+
 libsigsegv (2.10-1) experimental; urgency=low
 
   * refresh patches
diff -Nru libsigsegv-2.10/debian/control libsigsegv-2.10/debian/control
--- libsigsegv-2.10/debian/control	2011-07-26 15:09:23.000000000 +0200
+++ libsigsegv-2.10/debian/control	2012-12-13 17:39:38.000000000 +0100
@@ -15,6 +15,8 @@
 Package: libsigsegv2
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Architecture: any
 Description: Library for handling page faults in a portable way
  GNU libsigsegv is a library that allows handling page faults in a
@@ -26,6 +28,7 @@
 Package: libsigsegv-dev
 Depends: libsigsegv2 (= ${binary:Version}), ${misc:Depends}
 Architecture: any
+Multi-Arch: same
 Description: Library for handling page faults in a portable way development package
  GNU libsigsegv is a library that allows handling page faults in a
  portable way. It is used e.g. for generational garbage collectors
diff -Nru libsigsegv-2.10/debian/libsigsegv-dev.files libsigsegv-2.10/debian/libsigsegv-dev.files
--- libsigsegv-2.10/debian/libsigsegv-dev.files	2011-07-26 15:09:23.000000000 +0200
+++ libsigsegv-2.10/debian/libsigsegv-dev.files	2012-12-13 17:36:44.000000000 +0100
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff -Nru libsigsegv-2.10/debian/libsigsegv2.files libsigsegv-2.10/debian/libsigsegv2.files
--- libsigsegv-2.10/debian/libsigsegv2.files	2011-07-26 15:09:23.000000000 +0200
+++ libsigsegv-2.10/debian/libsigsegv2.files	2012-12-13 17:33:38.000000000 +0100
@@ -1 +1 @@
-usr/lib/libsigsegv.so.*
+usr/lib/*/libsigsegv.so.*
diff -Nru libsigsegv-2.10/debian/rules libsigsegv-2.10/debian/rules
--- libsigsegv-2.10/debian/rules	2011-07-26 15:09:23.000000000 +0200
+++ libsigsegv-2.10/debian/rules	2012-12-13 17:33:26.000000000 +0100
@@ -50,7 +50,7 @@
 	# build-aux/* files.
 	automake --add-missing --copy
 
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-shared
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --libdir=\$${prefix}/lib/$(DEB_HOST_GNU_TYPE) --enable-shared
 
 
 build: build-stamp