rev 17392 - trunk/packages/kdelibs/debian

[Modestas Vainius]

Author: modax
Date: 2010-03-09 10:50:43 +0000 (Tue, 09 Mar 2010)
New Revision: 17392

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/kdelibs5-data.install
   trunk/packages/kdelibs/debian/not-installed
Log:
Ship all_languages in kdelibs5-data (Closes: #556264).

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-03-08 23:58:51 UTC (rev 17391)
+++ trunk/packages/kdelibs/debian/changelog	2010-03-09 10:50:43 UTC (rev 17392)
@@ -72,6 +72,7 @@
   * Move cmake from kdelibs5-dev Depends to Breaks.
   * Bump libphonon-dev in Build-Depends to 4:4.6.0really4.3.80.
   * Bump build dependency on dpkg-dev to 1.15.5.
+  * Ship all_languages in kdelibs5-data (Closes: #556264).
 
   [ Kai Wasserbäch ]
   * debian/patches:

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2010-03-08 23:58:51 UTC (rev 17391)
+++ trunk/packages/kdelibs/debian/control	2010-03-09 10:50:43 UTC (rev 17392)
@@ -437,7 +437,8 @@
 Architecture: all
 Pre-Depends: debconf | debconf-2.0
 Depends: ${perl:Depends}, ${misc:Depends}, hicolor-icon-theme
-Replaces: kdebase-workspace-data (<< 4:4.1.66), libplasma2, kjscmd (<< 4:3.5.10-1)
+Replaces: kdebase-workspace-data (<< 4:4.1.66), libplasma2, kjscmd (<< 4:3.5.10-1),
+ kdelibs-data (<< 4:3.5.10.dfsg.1-4)
 Conflicts: kjscmd (<< 4:3.5.10-1)
 Description: core shared data for all KDE Applications
  This package contains architecture-independent data files needed to run KDE

Modified: trunk/packages/kdelibs/debian/kdelibs5-data.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs5-data.install	2010-03-08 23:58:51 UTC (rev 17391)
+++ trunk/packages/kdelibs/debian/kdelibs5-data.install	2010-03-09 10:50:43 UTC (rev 17392)
@@ -455,6 +455,7 @@
 usr/share/kde4/servicetypes/kemoticonsTheme.desktop
 usr/share/kde4/servicetypes/kregexpeditor.desktop
 usr/share/kde4/servicetypes/qimageio_plugin.desktop
+usr/share/locale/all_languages
 usr/share/man/man7/kdeoptions.7
 usr/share/man/man7/qtoptions.7
 usr/share/mime/packages/kde.xml

Modified: trunk/packages/kdelibs/debian/not-installed
===================================================================
--- trunk/packages/kdelibs/debian/not-installed	2010-03-08 23:58:51 UTC (rev 17391)
+++ trunk/packages/kdelibs/debian/not-installed	2010-03-09 10:50:43 UTC (rev 17392)
@@ -1,3 +1,2 @@
 # Files not installed because they conflict with current kdelibs-data:
-./usr/share/locale/all_languages