Prepare new upload (2.0.15-1, unstable)

diff --git a/debian/changelog b/debian/changelog
index 66df1a1b6e41f3d3b8b0e04790f5675cdf003d02..7b95b156baee4bc40c527f8d5342f2f5f49834aa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+dtkcore (2.0.15-1) unstable; urgency=medium
+
+  * New upstream release 2.0.15.
+  * debian/control:
+    + Bump Standards-Version to 4.4.0.
+  * debian/shlibs: Bump minimum library version requirement to
+    2.0.11.
+  * debian/rules: Remove manually version parsing.
+
+ -- Boyuan Yang <byang@debian.org>  Sun, 14 Jul 2019 16:16:55 -0400
+
 dtkcore (2.0.9.17-1) unstable; urgency=medium
 
   * New upstream release 2.0.9.17.

diff --git a/debian/control b/debian/control
index 6fe2a6e9b6199056df097e179150c7070981857b..c2a7c4c0cf470a8a47071a9c30a2d87d5ef60fd7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  qtbase5-private-dev,
  qttools5-dev-tools,
 Rules-Requires-Root: no
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Homepage: https://github.com/linuxdeepin/dtkcore
 Vcs-Git: https://salsa.debian.org/pkg-deepin-team/dtkcore.git
 Vcs-Browser: https://salsa.debian.org/pkg-deepin-team/dtkcore

diff --git a/debian/libdtkcore2.install b/debian/libdtkcore2.install
index 638d4f6b8a0865556cbb1babf3fb3eada50f1ada..e1964fcf97e4853e0a05118f986f071b38b7bfb5 100644 (file)
--- a/debian/libdtkcore2.install
+++ b/debian/libdtkcore2.install
@@ -1,3 +1,3 @@
-usr/lib/*/libdtk-2.0.9/DCore/bin/deepin-os-release
+usr/lib/*/libdtk-2.0.15/DCore/bin/deepin-os-release
 usr/lib/*/libdtkcore.so.2
 usr/lib/*/libdtkcore.so.2.*

diff --git a/debian/libdtkcore2.shlibs b/debian/libdtkcore2.shlibs
index e88d1f94818bc70ac630ae221e21e83d1753455e..733ac151f1172d873942a0147fb6fe9fb3d486be 100644 (file)
--- a/debian/libdtkcore2.shlibs
+++ b/debian/libdtkcore2.shlibs
@@ -1 +1 @@
-libdtkcore 2 libdtkcore2 (>= 2.0.9.9)
+libdtkcore 2 libdtkcore2 (>= 2.0.11)

diff --git a/debian/rules b/debian/rules
index 06300b909cdcb37588e2afdab678259e01f4b8a3..53a4e71a661d4b8006a8c67184139bb73f5cec4c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,13 +15,12 @@ include /usr/share/dpkg/default.mk
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-# DTK: Automatic version parsing
-#
 ifneq (,$(wildcard .git/config))
        CONFIG_VERSION=
 else
-_PACK_VER = $(shell echo $(DEB_VERSION) | awk -F'[+_~-]' '{print $$1}')
-_BUILD_VER = $(shell echo $(DEB_VERSION) | awk -F'[+_~-]' '{print $$2}' | sed 's/[^0-9]//g')
+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
@@ -29,11 +28,11 @@ else
 endif
 endif
 
+
 %:
        dh $@ --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-       @echo "I: Current dtkcore VERSION is $(CONFIG_VERSION)"
        dh_auto_configure -- LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) VERSION=$(CONFIG_VERSION)
 
 override_dh_makeshlibs: