diff options
author | Modestas Vainius <modax@debian.org> | 2012-05-13 01:33:38 +0300 |
---|---|---|
committer | Modestas Vainius <modax@debian.org> | 2012-05-13 01:33:38 +0300 |
commit | 2bcea7a9f2e700b669e6fb099ed4669500a46ac9 (patch) | |
tree | cd71413f86cafcfe70f37cad1e5fe95b1b3422f7 /debian/control | |
parent | ac057d1c850d0e7b1c0780682c886dd112059d1d (diff) | |
parent | 7407fad2aaf78f9df7df2fb802415623e4f12065 (diff) | |
download | kde4libs-2bcea7a9f2e700b669e6fb099ed4669500a46ac9.tar.gz |
Merge branch 'master' into kde4.8
Conflicts:
debian/changelog
debian/control
debian/libnepomuk4.symbols
debian/libplasma3.symbols
debian/patches/series
Diffstat (limited to 'debian/control')
-rw-r--r-- | debian/control | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 5e050da..a33f79d 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 7.3.16), cmake (>= 2.6.4), pkg-kde-tools (>= 0.14), libutempter-dev, liblzma-dev, libattica-dev (>= 0.1.90), shared-desktop-ontologies (>= 0.6.50), libpolkit-qt-1-dev (>= 0.99.0), libxss-dev, libqca2-dev, libdbusmenu-qt-dev, docbook-xml, docbook-xsl, libxrender-dev, libkrb5-dev, libudev-dev [linux-any] +Build-Conflicts: libqtwebkit-dev (<< 2.2.1) Standards-Version: 3.9.3 Homepage: http://www.kde.org/ Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git @@ -531,7 +532,7 @@ Package: kdelibs5-dbg Section: debug Architecture: any Priority: extra -Depends: libqt4-dbg (>= 4:4.6), libc6-dbg [amd64] +Depends: libkdecore5 (= ${binary:Version}), libqt4-dbg (>= 4:4.6), libc6-dbg [amd64] Recommends: ${allLibraries}, kdelibs-bin (= ${binary:Version}) Description: debugging symbols for the KDE Development Platform libraries This package contains debugging files used to investigate problems with |