[libdata-messagepack-perl] 01/03: Build-depend on recent libmsgpack-dev, and add patch to link against that.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libdata-messagepack-perl.

commit e7c394e494d406f492aa5dc47d987285dcb8838e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jan 12 13:44:54 2016 +0530

    Build-depend on recent libmsgpack-dev, and add patch to link against that.
---
 debian/TODO                              |  1 -
 debian/patches/2001_use_system_lib.patch | 16 ++++++++++++++++
 debian/patches/README                    |  3 +++
 debian/patches/series                    |  1 +
 debian/rules                             |  9 +++++++--
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 3673a90..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1 +0,0 @@
-  * Use headers from libmsgpack-dev when bug#749079 is solved.
diff --git a/debian/patches/2001_use_system_lib.patch b/debian/patches/2001_use_system_lib.patch
new file mode 100644
index 0000000..0d139a2
--- /dev/null
+++ b/debian/patches/2001_use_system_lib.patch
@@ -0,0 +1,16 @@
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -25,11 +25,10 @@
+         requires_c99();
+         use_xshelper();
+         cc_warnings;
+-        cc_include_paths('include');
+         cc_src_paths('xs-src');
+ 	postamble (qq{
+-xs-src/pack.o : xshelper.h include/msgpack/pack_define.h include/msgpack/pack_template.h include/msgpack/sysdep.h
+-xs-src/unpack.o : xshelper.h include/msgpack/unpack_define.h include/msgpack/unpack_template.h include/msgpack/sysdep.h
++xs-src/pack.o : xshelper.h msgpack/pack_define.h msgpack/pack_template.h msgpack/sysdep.h
++xs-src/unpack.o : xshelper.h msgpack/unpack_define.h msgpack/unpack_template.h msgpack/sysdep.h
+ });
+ 
+         if($Module::Install::AUTHOR) {
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..40572ee
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+2001_use_system_lib.patch
diff --git a/debian/rules b/debian/rules
index a80b2f3..fc49658 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,12 @@ DEB_UPSTREAM_URL = http://www.cpan.org/modules/by-module/Data
 #  TODO: Drop when adopted in cdbs
 CDBS_BUILD_DEPENDS_rules_debhelper_v9 = debhelper
 
+# Needed by upstream build
+bdeps = libmsgpack-dev (>= 0.5.8)
+
 # Needed by upstream testsuite
-deps-test = libtest-requires-perl, libtest-leaktrace-perl
+bdeps-test = libtest-requires-perl, libtest-leaktrace-perl
+
+CDBS_BUILD_DEPENDS +=, $(bdeps), $(bdeps-test)
 
-CDBS_BUILD_DEPENDS +=, $(deps-test)
+DEB_UPSTREAM_CRUFT_MOVE = include

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdata-messagepack-perl.git