Source: librevenge
Version: 0.0.4-5
User: [email protected]
Usertags: rebootstrap
Control: affects -1 src:libwpd src:libwpg

The original patch now breaks the gdb integration, so I am submitting an
updated patch for just the multiarch stuff.

In particular, librevenge.pc is currently not in a multiarch path and
thus ignored by cross pkg-config. Thus currently makes at least libwpd
and libwpg fail to cross build from source.

Given that there has been little activity on this bug, I intend to NMU
it. Any objections?

Helmut
diff --minimal -Nru librevenge-0.0.4/debian/changelog 
librevenge-0.0.4/debian/changelog
--- librevenge-0.0.4/debian/changelog   2016-07-23 12:42:55.000000000 +0200
+++ librevenge-0.0.4/debian/changelog   2016-09-03 17:03:44.000000000 +0200
@@ -1,3 +1,10 @@
+librevenge (0.0.4-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to multiarch (closes: #-1)
+
+ -- Helmut Grohne <[email protected]>  Sat, 03 Sep 2016 16:54:51 +0200
+
 librevenge (0.0.4-5) unstable; urgency=medium
 
   * remove superfluous fi (closes: #832177) 
diff --minimal -Nru librevenge-0.0.4/debian/control 
librevenge-0.0.4/debian/control
--- librevenge-0.0.4/debian/control     2016-01-25 22:24:50.000000000 +0100
+++ librevenge-0.0.4/debian/control     2016-09-03 17:03:33.000000000 +0200
@@ -18,6 +18,7 @@
 Architecture: any
 Depends: librevenge-0.0-0 (= ${binary:Version}),
          ${misc:Depends}
+Multi-Arch: same
 Description: Base Library for writing document interface filters -- development
  librevenge is a base library for writing document import filters. It has
  interfaces for text documents, vector graphics, spreadsheets and 
presentations.
@@ -27,6 +28,7 @@
 Package: librevenge-0.0-0
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
 Description: Base Library for writing document interface filters
  librevenge is a base library for writing document import filters. It has
  interfaces for text documents, vector graphics, spreadsheets and 
presentations.
diff --minimal -Nru librevenge-0.0.4/debian/librevenge-0.0-0.install 
librevenge-0.0.4/debian/librevenge-0.0-0.install
--- librevenge-0.0.4/debian/librevenge-0.0-0.install    2013-02-27 
21:33:09.000000000 +0100
+++ librevenge-0.0.4/debian/librevenge-0.0-0.install    2016-09-03 
16:59:35.000000000 +0200
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --minimal -Nru librevenge-0.0.4/debian/librevenge-dev.install 
librevenge-0.0.4/debian/librevenge-dev.install
--- librevenge-0.0.4/debian/librevenge-dev.install      2013-05-02 
21:21:57.000000000 +0200
+++ librevenge-0.0.4/debian/librevenge-dev.install      2016-09-03 
16:59:46.000000000 +0200
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --minimal -Nru librevenge-0.0.4/debian/rules librevenge-0.0.4/debian/rules
--- librevenge-0.0.4/debian/rules       2016-07-23 12:42:27.000000000 +0200
+++ librevenge-0.0.4/debian/rules       2016-09-03 16:57:10.000000000 +0200
@@ -5,7 +5,7 @@
 
 include /usr/share/dpkg/architecture.mk
 
-LIBDIR=/usr/lib
+LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 %:
        dh $@ --parallel --with autoreconf

Reply via email to