updated .install files and rules from the upstream

diff --git a/debian/libdtkcore-dev.install b/debian/libdtkcore-dev.install
index c531d4e908aa8669d03010a11fd00b8021208371..f1f7613e75cd4799e83adef2d96faf2138212972 100644 (file)
--- a/debian/libdtkcore-dev.install
+++ b/debian/libdtkcore-dev.install
@@ -1,5 +1,5 @@
+usr/lib/*/lib*.so
 usr/include
+usr/lib/*/pkgconfig/*.pc
 usr/lib/*/cmake/*/*.cmake
-usr/lib/*/libdtkcore.so
-usr/lib/*/pkgconfig/dtkcore.pc
 usr/lib/*/qt5/*

diff --git a/debian/libdtkcore5.install b/debian/libdtkcore5.install
index 70462947406f64c7a86766e147a9811b0e0e0452..751f0dc036697182636d109b08eba7161015de7f 100644 (file)
--- a/debian/libdtkcore5.install
+++ b/debian/libdtkcore5.install
@@ -1,3 +1,2 @@
-usr/lib/*/libdtkcore.so.5
-usr/lib/*/libdtkcore.so.5.*
+usr/lib/*/lib*.so.*
 usr/share/glib-2.0/schemas

diff --git a/debian/rules b/debian/rules
index 4dc878b2dd66a1950a68235b6ba86f47a42c9c11..ea6bc6914fec65754f02d74f1af0fab857ae564f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,28 @@ include /usr/share/dpkg/default.mk
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+ifneq (,$(wildcard .git/config))
+       CONFIG_VERSION=
+else
+VERSION = $(DEB_VERSION_UPSTREAM)
+_PACK_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$1}')
+_BUILD_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$2}' | sed 's/[^0-9]//g')
+ifeq ($(_BUILD_VER),)
+       CONFIG_VERSION = $(_PACK_VER)
+else
+       CONFIG_VERSION = $(_PACK_VER).$(_BUILD_VER)
+endif
+endif
+
 %:
-       dh $@
+       dh $@ --parallel
+
+override_dh_auto_configure:
+       dh_auto_configure -- LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) VERSION=$(CONFIG_VERSION)
+
 
 override_dh_makeshlibs:
        dh_makeshlibs -V