Package: src:capnproto
Version:
Tags: patch
Usertags: origin-ubuntu ubuntu-patch xenial

In Ubuntu, we've applied the attached patch to achieve the following:

    - debian/compat, debian/control:
      + Bump to debhelper 9 (needed for MultiArch).
    - debian/{control, *.install}:
      + Convert to MutliArch support.

We thought you might be interested in doing the same.
diff -pruN -x '*~' capnproto-0.5.3.orig/debian/compat 
capnproto-0.5.3/debian/compat
--- capnproto-0.5.3.orig/debian/compat  2015-10-31 07:52:49.000000000 +0100
+++ capnproto-0.5.3/debian/compat       2015-12-26 20:27:54.000000000 +0100
@@ -1 +1 @@
-8
+9
diff -pruN -x '*~' capnproto-0.5.3.orig/debian/control 
capnproto-0.5.3/debian/control
--- capnproto-0.5.3.orig/debian/control 2015-10-31 07:52:49.000000000 +0100
+++ capnproto-0.5.3/debian/control      2015-12-26 21:33:43.782543436 +0100
@@ -2,7 +2,7 @@ Source: capnproto
 Section: devel
 Priority: optional
 Maintainer: Tom Lee <deb...@tomlee.co>
-Build-Depends: debhelper (>= 8.0.0), gcc (>= 4.7),
+Build-Depends: debhelper (>= 9), gcc (>= 4.7),
  python-all (>= 2.6), dpkg-dev (>= 1.16.1.1), docbook-xsl, docbook-xml,
  xsltproc, dh-autoreconf, netbase
 Standards-Version: 3.9.6
@@ -12,6 +12,7 @@ Vcs-Browser: http://github.com/thomaslee
 
 Package: libcapnp-0.5.3
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Cap'n Proto C++ library
@@ -29,6 +30,7 @@ Description: Cap'n Proto C++ library
 
 Package: libcapnp-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends}, libcapnp-0.5.3 (= ${binary:Version})
 Description: Cap'n Proto C++ library (development files)
@@ -47,6 +49,7 @@ Description: Cap'n Proto C++ library (de
 
 Package: capnproto
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libcapnp-0.5.3 (= ${binary:Version})
 Description: tool for working with the Cap'n Proto data interchange format
diff -pruN -x '*~' capnproto-0.5.3.orig/debian/libcapnp-0.5.3.install 
capnproto-0.5.3/debian/libcapnp-0.5.3.install
--- capnproto-0.5.3.orig/debian/libcapnp-0.5.3.install  2015-10-31 
07:52:49.000000000 +0100
+++ capnproto-0.5.3/debian/libcapnp-0.5.3.install       2015-12-26 
20:30:22.000000000 +0100
@@ -1,5 +1,5 @@
-usr/lib/libcapnp-0.5.3.so
-usr/lib/libcapnp-rpc-0.5.3.so
-usr/lib/libcapnpc-*.so
-usr/lib/libkj-0.5.3.so
-usr/lib/libkj-async-0.5.3.so
+/usr/lib/*/libcapnp-0.5.3.so
+/usr/lib/*/libcapnp-rpc-0.5.3.so
+/usr/lib/*/libcapnpc-*.so
+/usr/lib/*/libkj-0.5.3.so
+/usr/lib/*/libkj-async-0.5.3.so
diff -pruN -x '*~' capnproto-0.5.3.orig/debian/libcapnp-dev.install 
capnproto-0.5.3/debian/libcapnp-dev.install
--- capnproto-0.5.3.orig/debian/libcapnp-dev.install    2015-10-31 
07:52:49.000000000 +0100
+++ capnproto-0.5.3/debian/libcapnp-dev.install 2015-12-26 20:32:40.000000000 
+0100
@@ -1,13 +1,13 @@
-usr/lib/libcapnp.a
-usr/lib/libcapnp.so
-usr/lib/libcapnp-rpc.a
-usr/lib/libcapnp-rpc.so
-usr/lib/libcapnpc.a
-usr/lib/libcapnpc.so
-usr/lib/libkj.a
-usr/lib/libkj.so
-usr/lib/libkj-async.a
-usr/lib/libkj-async.so
-usr/lib/pkgconfig
-usr/lib/cmake
+/usr/lib/*/libcapnp.a
+/usr/lib/*/libcapnp.so
+/usr/lib/*/libcapnp-rpc.a
+/usr/lib/*/libcapnp-rpc.so
+/usr/lib/*/libcapnpc.a
+/usr/lib/*/libcapnpc.so
+/usr/lib/*/libkj.a
+/usr/lib/*/libkj.so
+/usr/lib/*/libkj-async.a
+/usr/lib/*/libkj-async.so
+/usr/lib/*/pkgconfig
+/usr/lib/*/cmake
 usr/include

Reply via email to