Remove conflicts

Change-Id: I790d41822d4741c71295acbf04db73616bd3dc8b

diff --git a/debian/control b/debian/control
index 581718ce07f782625dc59381061575db22fda018..ea2e469e952fdd4358e51e8baadd00d1cb5aa580 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Standards-Version: 3.9.6
 Package: libdtkcore1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libdtkbase, libdtkutil, libdtksettings, libdtkcore
 Multi-Arch: same
 Description: Deepin Tool Kit Core library
  DtkCore is base library of Deepin Qt/C++ applications.

diff --git a/debian/libdtkcore-dev.install b/debian/libdtkcore-dev.install
index c42bad43b4f377f431b791ad05bb55965b5f1c57..682da5cdc56a4638ef02b723f29620c18ed87ebe 100644 (file)
--- a/debian/libdtkcore-dev.install
+++ b/debian/libdtkcore-dev.install
@@ -1,4 +1,3 @@
 usr/lib/*/lib*.so
 usr/include
 usr/lib/*/pkgconfig/*.pc
-usr/bin/dtk-settings-tool