[Pkg-bitcoin-commits] [SCM] libblkmaker packaging branch, master, updated. fa7380116d4c1f44f79cedf2c7213b6929fcc9ae

[Dmitry Smirnov]

The following commit has been merged in the master branch:
commit f71113faf87ae4686404f637d4bbc8876f0f3367
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Fri Jun 21 08:32:38 2013 +1000

    backported patch to replace our workaround for missing header

diff --git a/debian/patches/install_header.patch b/debian/patches/install_header.patch
new file mode 100644
index 0000000..78a0c47
--- /dev/null
+++ b/debian/patches/install_header.patch
@@ -0,0 +1,20 @@
+Last-Update: 2013-05-01
+Forwarded: not-needed
+Origin: upstream,commit:fb9e98690b79bd109efb9fdec0273dd57e72f591
+From: Luke Dashjr <luke-jr+git at utopios.org>
+Subject: [PATCH] Bugfix: Install header for libblkmaker_jansson
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,8 +25,11 @@
+ 	$(JANSSON_LIBS) \
+ 	-no-undefined \
+ 	-version-info $(LIBBLKMAKER_SO_VERSION)
+ 
++libblkmaker_jansson_includedir = $(includedir)/libblkmaker-$(LIBBLKMAKER_API_VERSION)
++libblkmaker_jansson_include_HEADERS = \
++	blkmaker_jansson.h
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = \
+ 	libblkmaker_jansson-$(LIBBLKMAKER_API_VERSION).pc
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..178493c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+install_header.patch
diff --git a/debian/rules b/debian/rules
index b42fc0f..0f2a43f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,9 +50,6 @@ override_dh_install:
             usr/include/libblkmaker-*/*            \
             usr/lib/*/lib*-[0-9.]*.so              \
             usr/lib/*/pkgconfig/lib*-[0-9.]*.pc
-	## Bugfix:
-	dh_install -p$(pdev) \
-            blkmaker_jansson.h    /usr/include/libblkmaker-0.1
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=$(plib)

-- 
libblkmaker packaging