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

[Dmitry Smirnov]

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

    rules clean-up

diff --git a/debian/rules b/debian/rules
index 0f2a43f..6abfb5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,48 +7,36 @@
 PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
 
-ifneq (,$(wildcard configure.ac))
-    # API version
-    apiver:=$(shell perl -ne 'print $$1 if m{LIBBLKMAKER_API_VERSION\],\s*\[([\d\.]+)\]}' configure.ac)
-    # ABI major version
-    somajor:=$(shell perl -ne 'print $$1 if m{LIBBLKMAKER_SO_VERSION\],\s+\[\d+:(\d+):\d+\]}' configure.ac)
-endif
+API=-$(shell perl -ne 'print $$1 if m{LIBBLKMAKER_API_VERSION\],\s*\[([\d\.]+)\]}' configure.ac)-
+# ABI major version
+somajor=$(shell perl -ne 'print $$1 if m{LIBBLKMAKER_SO_VERSION\],\s+\[\d+:(\d+):\d+\]}' configure.ac)
 # The base library name
-plib=$(PKG)-$(apiver)-$(somajor)
-pdev=$(PKG)-$(apiver)-dev
-pdbg=$(PKG)-$(apiver)-dbg
+plib=$(PKG)$(API)$(somajor)
+pdev=$(PKG)$(API)dev
+pdbg=$(PKG)$(API)dbg
 
 # Ensure the build aborts when there are still references to undefined
 # symbols: LDFLAGS += -Wl,-z,defs
 
 # Make the linker work a bit harder so dynamic loading can be done
-# faster: #LDFLAGS += -Wl,-O1
+# faster: LDFLAGS += -Wl,-O1
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,-O1
 
 %:
 	dh $@ --parallel --with autoreconf
 
-CHK_FILES=debian/$(plib).symbols
-$(CHK_FILES):
-	@echo "Error: Packaging files are not set up for base library name. Check if \"$@\" exist."
-	exit 1
-
-override_dh_autoreconf: $(CHK_FILES)
-	$(info I: apiver=$(apiver))
-	$(info I: somajor=$(somajor))
-	$(info I: library-name=$(plib))
-	dh_autoreconf
-
 override_dh_auto_install:
 	dh_auto_install --destdir=$(CURDIR)/debian/tmp
 
 override_dh_install:
-	dh_install -p$(plib) --autodest \
+	$(info I: library-name=$(plib))
+	$(if $(wildcard debian/$(plib).symbols),,$(error invalid package/library name..))
+	dh_install -p$(plib) --autodest    \
             usr/lib/*/lib*-[0-9]*.so.*
-	dh_install -p$(pdev) --autodest \
-            usr/include/libblkmaker-*/*            \
-            usr/lib/*/lib*-[0-9.]*.so              \
+	dh_install -p$(pdev) --autodest      \
+            usr/include/*/*                   \
+            usr/lib/*/lib*-[0-9.]*.so          \
             usr/lib/*/pkgconfig/lib*-[0-9.]*.pc
 
 override_dh_installdocs:
@@ -59,7 +47,7 @@ override_dh_installdocs:
 #	dh_makeshlibs -v -V
 
 override_dh_gencontrol:
-	dh_gencontrol -v -- -Vplib=$(plib) -Vapiver=$(apiver)
+	dh_gencontrol -v -- -Vplib=$(plib)
 
 # gracefully handle stripping if -dbg package (un-)commented in debian/control
 override_dh_strip:

-- 
libblkmaker packaging