pkg-kde: commit - rev 29 - people/jd/trunk/kdelibs/debian
Author: jd-guest
Date: 2004-02-11 21:16:39 +0100 (Wed, 11 Feb 2004)
New Revision: 29
Modified:
people/jd/trunk/kdelibs/debian/control
Log:
Fix some conflicts. Not sure about the replaces.
Modified: people/jd/trunk/kdelibs/debian/control
===================================================================
--- people/jd/trunk/kdelibs/debian/control 2004-02-11 20:15:59 UTC (rev 28)
+++ people/jd/trunk/kdelibs/debian/control 2004-02-11 20:16:39 UTC (rev 29)
@@ -24,8 +24,8 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, netpbm, python
-Conflicts: kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), kdelibs-dev (<< 4:3.0.0), kdelibs4-dev (<= 4:3.1.4-2), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0)
-Replaces: kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), kdelibs-dev (<< 4:3.0.0), kdelibs4-dev (<= 4:3.1.4-2), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0)
+Conflicts: kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), kdelibs-dev (<< 4:3.0.0), kdelibs4-dev (<= 4:3.1.4-2), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), konqueror (<< 4:3.1.5)
+Replaces: kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), kdelibs-dev (<< 4:3.0.0), kdelibs4-dev (<= 4:3.1.4-2), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), konqueror (<< 4:3.1.5)
Description: KDE core binaries
KDE is a powerful Open Source graphical desktop environment
for Unix workstations. It combines ease of use, contemporary
@@ -74,8 +74,8 @@
Architecture: any
Depends: kdelibs4 (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev, libarts1-dev, libcupsys2-dev, libfam-dev, libpcre3-dev, libssl-dev, libxml2-utils, libxrender-dev
Provides: kdelibs-dev
-Conflicts: kate (<< 4:3.0.0), kdebase-dev (<< 4:3.0.0), kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs-dev (<< 4:3.0.0), kdepim-dev (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), libarts-dev (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), libkmid-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0)
-Replaces: kate (<< 4:3.0.0), kdebase-dev (<< 4:3.0.0), kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs-dev (<< 4:3.0.0), kdepim-dev (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), libarts-dev (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), libkmid-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0)
+Conflicts: kate (<< 4:3.0.0), kdebase-dev (<< 4:3.0.0), kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs-dev (<< 4:3.0.0), kdepim-dev (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), libarts-dev (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), libkmid-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), kdelibs4 ( << 4:3.1.5), libkonq4-dev (<< 4:3.1.5)
+Replaces: kate (<< 4:3.0.0), kdebase-dev (<< 4:3.0.0), kdelibs3 (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs-dev (<< 4:3.0.0), kdepim-dev (<< 4:3.0.0), kdepim-libs (<< 4:3.0.0), libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), libarts-dev (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), libkmid-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0) ,kdelibs4 ( << 4:3.1.5), libkonq4-dev (<< 4:3.1.5)
Description: KDE core libraries (development files)
KDE is a powerful Open Source graphical desktop environment
for Unix workstations. It combines ease of use, contemporary
Reply to: