From: Boyuan Yang <073plan@gmail.com>
Date: Mon, 5 Mar 2018 08:24:14 +0000 (+0800)
Subject: Merge tag '2.0.7'
X-Git-Tag: archive/raspbian/5.7.12-2+rpi1^2~137
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4f3b00fc3deb3d1398c90a05a679fba7cd014c93;p=dtkcore.git

Merge tag '2.0.7'

Release 2.0.7
---

4f3b00fc3deb3d1398c90a05a679fba7cd014c93
diff --cc debian/control
index 24b5481,910fc9b..a517d5e
--- a/debian/control
+++ b/debian/control
@@@ -1,65 -1,32 +1,73 @@@
  Source: dtkcore
 -Section: libdevel
 +Section: libs
  Priority: optional
 -Maintainer: Deepin Packages Builder <packages@deepin.com>
 -Build-Depends: debhelper (>= 9), pkg-config,
 - qttools5-dev-tools, qtbase5-private-dev, libgsettings-qt-dev
 -Standards-Version: 3.9.8
 +Maintainer: Debian Deepin Packaging Team <pkg-deepin-devel@lists.alioth.debian.org>
 +Uploaders:
 + Boyuan Yang <073plan@gmail.com>,
 + Yanhao Mo <yanhaocs@gmail.com>,
 +Build-Depends:
 + debhelper (>= 11),
 + libgsettings-qt-dev,
 + pkg-config,
 + pkg-kde-tools,
 + qtbase5-dev,
 + qtbase5-private-dev,
 + qttools5-dev-tools,
 +Standards-Version: 4.1.3
 +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
  
 -Package: libdtkcore2
 +Package: libdtkcore-bin
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}
 -Multi-Arch: same
 -Description: Deepin Tool Kit Core library
 - DtkCore is base library of Deepin Qt/C++ applications.
 +Section: utils
 +Depends:
 + libdtkcore2 (= ${binary:Version}),
 + ${misc:Depends},
 + ${shlibs:Depends},
 +Description: Deepin Tool Kit Core library (utilities)
 + DtkCore is a base devel library for Deepin Qt/C++ applications.
   .
 - This package contains the shared libraries.
 + This package is part of DDE (Deepin Desktop Environment).
 + .
 + This package contains various command-line utilities used by Deepin Tool Kit
 + and other Deepin software. Some tools were originally provided by DtkSettings.
  
+ Package: libdtkcore-bin
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}, libdtkcore2( =${binary:Version})
+ Description: Deepin Tool Kit Core Utilities
+  DtkCore is base devel library of Deepin Qt/C++ applications.
+  .
+  This package contains the utilities of DtkCore
+ 
  Package: libdtkcore-dev
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}, libdtkcore2( =${binary:Version})
 -Description: Deepin Tool Kit Core Devel library
 - DtkCore is base devel library of Deepin Qt/C++ applications.
 +Section: libdevel
 +Multi-Arch: same
 +Depends:
 + libdtkcore2 (= ${binary:Version}),
 + ${misc:Depends},
 +Breaks:
 + libdtkwidget-dev (<< 2.0.5.2-3),
 +Replaces:
 + libdtkwidget-dev (<< 2.0.5.2-3),
 +Description: Deepin Tool Kit Core library (development files)
 + DtkCore is a base library for Deepin Qt/C++ applications.
 + .
 + This package is part of DDE (Deepin Desktop Environment).
 + .
 + This package contains the header files and static libraries of DtkCore.
 +
 +Package: libdtkcore2
 +Architecture: any
 +Multi-Arch: same
 +Depends:
 + ${misc:Depends},
 + ${shlibs:Depends},
 +Description: Deepin Tool Kit Core library
 + DtkCore is a base library of Deepin Qt/C++ applications.
   .
 - This package contains the header files and static libraries of DtkCore
 + This package is part of DDE (Deepin Desktop Environment).
 + .
 + This package contains the shared libraries.
diff --cc debian/libdtkcore-dev.install
index 4d84b84,b549f55..74468ee
--- a/debian/libdtkcore-dev.install
+++ b/debian/libdtkcore-dev.install
@@@ -1,5 -1,6 +1,7 @@@
 -usr/lib/*/lib*.so
  usr/include
 -usr/lib/*/pkgconfig/*.pc
 +usr/include/*/qt5/QtXcb
 +usr/lib/*/libdtkcore.so
 +usr/lib/*/pkgconfig/dtkcore.pc
  usr/lib/*/cmake/*/*.cmake
+ usr/lib/*/qt5/*
+ usr/lib/*/libdtk/modules/*
diff --cc debian/rules
index 7c6c778,06264e9..29a010a
--- a/debian/rules
+++ b/debian/rules
@@@ -10,28 -5,27 +10,44 @@@ export QT_SELECT := 
  
  DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
  
 +_QT_COMPAT_VERSION := 5.9.2
 +_TMPDIR := debian/tmp
 +_QTXCBDIR := $(_TMPDIR)/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtXcb/$(_QT_COMPAT_VERSION)/QtXcb/private
 +
++#
++# DTK: Automatic version parsing
++#
+ ifneq (,$(wildcard .git/config))
+ 	CONFIG_VERSION=
+ else
+ VERSION = $(shell dpkg-parsechangelog -ldebian/changelog -SVersion)
+ _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 $@ --parallel
 +	dh $@ --with pkgkde_symbolshelper
  
  override_dh_auto_configure:
- 	dh_auto_configure -- LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+ 	dh_auto_configure -- LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) VERSION=$(CONFIG_VERSION)
  
 -override_dh_auto_test:
 -	echo "skip auto test"
 -
  override_dh_makeshlibs:
  	dh_makeshlibs -V
 +
 +override_dh_missing:
 +	# remove known useless test file
 +	rm -f debian/tmp/usr/tests/tests/tests
 +	dh_missing --fail-missing
 +
 +override_dh_installchangelogs:
 +	dh_installchangelogs -k CHANGELOG.md
 +
 +override_dh_install:
 +	mkdir -p $(_QTXCBDIR)
 +	cp -t $(_QTXCBDIR)/ libqt5xcbqpa-dev/$(_QT_COMPAT_VERSION)/*.h
 +	dh_install