rev 10995 - branches/kde4/packages/kdelibs/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-06-12 17:32:53 +0000 (Thu, 12 Jun 2008)
New Revision: 10995

Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/control
Log:
Final snapshot version and experimental.
usual changelog nitpicking
fix for #480686


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-06-12 16:48:22 UTC (rev 10994)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-06-12 17:32:53 UTC (rev 10995)
@@ -1,4 +1,4 @@
-kde4libs (4:4.0.82+svn819794-1) UNRELEASED; urgency=low
+kde4libs (4:4.0.82+svn819867-1) experimental; urgency=low
 
   * New upstream development snapshot.
 
@@ -13,6 +13,8 @@
   * Add build depends on phonon-dev.
   * Update UPSTREAMVERSION in debian/rules.
   * Update installed files.
+  * Add Conflicts with libkjsembed-dev from KDE 3 to kdelibs5-dev.
+    (Closes: #480686)
 
   +++ Changes by Modestas Vainius:
 
@@ -23,11 +25,11 @@
   +++ Changes by Sune Vuorela:
 
   * Install config files in /usr/share/kde4/config.
-  * Patch kstandarddirs to look in home, installpath, prefix/path  except when
+  * Patch kstandarddirs to look in home, installpath, prefix/path except when
     config files, where home, /etc/kde4, prefix/path, installpath is
-    preferred. Patch developed in cooperation with fedora (Closes: #484897).
+    preferred. Patch developed in cooperation with Fedora. (Closes: #484897).
   * Add README file about the configuration stuff.
-  * Versioned build-dep on shared-mime-info
+  * Versioned build-dep on shared-mime-info.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 Jun 2008 21:06:42 +0300
 

Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control	2008-06-12 16:48:22 UTC (rev 10994)
+++ branches/kde4/packages/kdelibs/debian/control	2008-06-12 17:32:53 UTC (rev 10995)
@@ -48,7 +48,7 @@
  libsoprano-dev (>= 2.0.98), automoc (>= 1.0~svn805317), ${sameVersionDep:libphonon-dev:kdelibs5-Depends-libphonon4}
 Suggests: kdelibs5-doc (= ${source:Version})
 Replaces: kdebase-runtime-data (<< 4:4.0.60), kdelibs5-data (<< 4:4.0.80-1)
-Conflicts: kdelibs4-dev
+Conflicts: kdelibs4-dev, libkjsembed-dev 
 Description: development files for the KDE 4 core libraries
  This package contains development files for building KDE 4 applications and
  other software that uses the KDE 4 libraries.