From: Arun Kumar Pariyar <openarungeek@gmail.com>
Date: Sun, 20 Dec 2020 17:43:19 +0000 (+0545)
Subject: minor cleanup on debian/rules
X-Git-Tag: archive/raspbian/5.7.12-2+rpi1^2~54
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=258dfe38b335302934056731ce57b8690eed66ed;p=dtkcore.git

minor cleanup on debian/rules
---

diff --git a/debian/changelog b/debian/changelog
index 18c3b21..34f6022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ dtkcore (5.2.2.5-1) unstable; urgency=medium
     + Set Replaces+Breaks with libdtkwidget-dev (<< 5.2.2.10-1).
   * Add symbols file for libdtkcore5.
   * debian/copyright: Update license information.
+  * debian/rules: Cleanup and ensure proper build.
 
- -- Arun Kumar Pariyar <openarungeek@gmail.com>  Sat, 28 Nov 2020 20:31:50 +0545
+ -- Arun Kumar Pariyar <openarungeek@gmail.com>  Sun, 20 Dec 2020 23:27:37 +0545
 
 dtkcore (5.2.2.5-1~exp1) experimental; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 1ba93ef..529ee5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND =
+
 export QT_SELECT := 5
 
 # Explicitly enable hardening
@@ -17,24 +17,11 @@ include /usr/share/dpkg/architecture.mk
 # Retrieve version info
 include /usr/share/dpkg/default.mk
 
-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 $@ --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	dh_auto_configure -- LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) VERSION=$(CONFIG_VERSION)
+	dh_auto_configure -- LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) VERSION=$(DEB_VERSION_UPSTREAM)
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k CHANGELOG.md