projects
/
dtkcore.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
db108e0
)
Remove conflicts
author
Iceyer
<me@iceyer.net>
Mon, 31 Jul 2017 04:55:22 +0000
(12:55 +0800)
committer
Iceyer
<me@iceyer.net>
Mon, 31 Jul 2017 04:55:22 +0000
(12:55 +0800)
Change-Id: I9757b7b7592b906e1d21159f0ba286ec00e4d410
debian/control
patch
|
blob
|
history
diff --git
a/debian/control
b/debian/control
index 7fd1bb5df70e91b795de15a48a3ff7b897c545d4..aa7a326cd4d66d63f249e770651851f86a242341 100644
(file)
--- a/
debian/control
+++ b/
debian/control
@@
-18,7
+18,6
@@
Description: Deepin Tool Kit Core library
Package: libdtkcore-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libdtkcore2( =${binary:Version})
-Conflicts: libdtkbase-dev, libdtkutil-dev, libdtksettings-dev
Description: Deepin Tool Kit Core Devel library
DtkCore is base devel library of Deepin Qt/C++ applications.
.