From: Boyuan Yang <073plan@gmail.com>
Date: Wed, 2 Aug 2017 13:46:04 +0000 (+0800)
Subject: Merge remote-tracking branch 'deepin/master' into debian
X-Git-Tag: archive/raspbian/5.7.12-2+rpi1^2~177
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a553a0eba8931f64cb1ffff0c9362f3c500bf8a4;p=dtkcore.git

Merge remote-tracking branch 'deepin/master' into debian
---

a553a0eba8931f64cb1ffff0c9362f3c500bf8a4
diff --cc debian/control
index 21113ce,aa7a326..775dbca
--- a/debian/control
+++ b/debian/control
@@@ -1,43 -1,24 +1,43 @@@
  Source: dtkcore
  Section: devel
  Priority: optional
 -Maintainer: Deepin Sysdev <sysdev@deepin.com>
 -Build-Depends: debhelper (>= 9), qt5-default, pkg-config,
 - qttools5-dev-tools, qtbase5-private-dev
 -Standards-Version: 3.9.6
 +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 (>= 10),
 + pkg-config,
 + qtbase5-dev,
 + qtbase5-private-dev,
 + qttools5-dev-tools,
 +Standards-Version: 4.0.0
 +Homepage: https://www.deepin.org/
 +Vcs-Git: https://anonscm.debian.org/git/pkg-deepin/dtkcore.git
 +Vcs-Browser: https://anonscm.debian.org/git/pkg-deepin/dtkcore.git
 +
 +Package: libdtkcore-dev
 +Architecture: any
 +Section: libdevel
 +Depends:
 + ${misc:Depends},
-  ${shlibs:Depends},
++ libdtkcore2 (= ${binary:Version}),
 +Description: Deepin Tool Kit Core library (development files)
 + DtkCore is a base devel 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: libdtkcore1
+ Package: libdtkcore2
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}
+ Multi-Arch: same
 +Depends:
 + ${misc:Depends},
 + ${shlibs:Depends},
- Multi-Arch: same
  Description: Deepin Tool Kit Core library
-  DtkCore is a base library for Deepin Qt/C++ applications.
 - DtkCore is base library of Deepin Qt/C++ applications.
++ DtkCore is a base library of Deepin Qt/C++ applications.
   .
 - This package contains the shared libraries.
 -
 -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.
 + This package is part of DDE (Deepin Desktop Environment).
   .
 - This package contains the header files and static libraries of DtkCore
 + This package contains the shared libraries.
diff --cc debian/libdtkcore-dev.install
index 951b0df,0f7e742..c9e33ac
--- a/debian/libdtkcore-dev.install
+++ b/debian/libdtkcore-dev.install
@@@ -1,3 -1,4 +1,4 @@@
 -usr/lib/*/lib*.so
  usr/include
 +usr/lib/*/lib*.so
  usr/lib/*/pkgconfig/*.pc
+ usr/lib/dtk2/*