On Sun, Feb 25, 2018 at 08:14:10AM +0100, Helmut Grohne wrote:
> Please multiarchify libostyle1c2 to allow coinstallation with itself.
Niels Thykier remarked that a crucial bit is missng in my patch: The
actual Multi-Arch: same marking that needs to go to the libostyle1c2
binary package.
> The attached patch implements that.
Updated.
Helmut
diff -u openjade-1.4devel1/debian/changelog openjade-1.4devel1/debian/changelog
--- openjade-1.4devel1/debian/changelog
+++ openjade-1.4devel1/debian/changelog
@@ -1,3 +1,12 @@
+openjade (1.4devel1-21.4) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Multiarchify: (Closes: #-1)
+ + Let dh_auto_configure pass --libdir to ./configure.
+ + Update debian/*.install files.
+
+ -- Helmut Grohne <hel...@subdivi.de> Sat, 24 Feb 2018 14:31:36 +0100
+
openjade (1.4devel1-21.3) unstable; urgency=low
* Non-maintainer upload.
diff -u openjade-1.4devel1/debian/libostyle-dev.install
openjade-1.4devel1/debian/libostyle-dev.install
--- openjade-1.4devel1/debian/libostyle-dev.install
+++ openjade-1.4devel1/debian/libostyle-dev.install
@@ -2,2 +2,2 @@
-debian/tmp/usr/lib/lib*.a usr/lib
-debian/tmp/usr/lib/lib*.so usr/lib
+debian/tmp/usr/lib/*/lib*.a
+debian/tmp/usr/lib/*/lib*.so
diff -u openjade-1.4devel1/debian/libostyle1c2.install
openjade-1.4devel1/debian/libostyle1c2.install
--- openjade-1.4devel1/debian/libostyle1c2.install
+++ openjade-1.4devel1/debian/libostyle1c2.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/lib*.so.[0-9].[0-9].[0-0] usr/lib
-debian/tmp/usr/lib/lib*.so.[0-9] usr/lib
+debian/tmp/usr/lib/*/lib*.so.[0-9].[0-9].[0-0]
+debian/tmp/usr/lib/*/lib*.so.[0-9]
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@
Package: libostyle1c2
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libostyle1
diff -u openjade-1.4devel1/debian/rules openjade-1.4devel1/debian/rules
--- openjade-1.4devel1/debian/rules
+++ openjade-1.4devel1/debian/rules
@@ -97,7 +97,7 @@
configure-stamp:
dh_autoreconf
dh_buildinfo generate cat
- ./configure --prefix=/usr --enable-http --enable-shared --enable-static
+ dh_auto_configure -- --enable-http --enable-shared --enable-static
touch $@
