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

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-08-11 17:37:12 +0000 (Sat, 11 Aug 2007)
New Revision: 7043

Added:
   branches/kde4/packages/kdelibs/debian/no-install.list
Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/kdelibs5-data.install
Log:
* No shipping emoticons images to avoid conflicts with current kdebase-data
 (KDE3). See list in no-install.list.



Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2007-08-11 17:08:24 UTC (rev 7042)
+++ branches/kde4/packages/kdelibs/debian/changelog	2007-08-11 17:37:12 UTC (rev 7043)
@@ -1,9 +1,16 @@
 kde4libs (4:3.92.0.dfsg.1-2) experimental; urgency=low
 
+  +++ Changes by Fathi Boudra:
+
   * Add patch to support strigi-0.5.5.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 10 Aug 2007 23:10:30 +0200
+  +++ Changes by Ana Beatriz Guerrero Lopez:
 
+  * No shipping emoticons images to avoid conflicts with current kdebase-data
+    (KDE3). See list in no-install.list.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 11 Aug 2007 19:33:41 +0200
+
 kde4libs (4:3.92.0.dfsg.1-1) experimental; urgency=low
 
   * KDE4 beta 1, first upload to the Debian archive.

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-data.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-data.install	2007-08-11 17:08:24 UTC (rev 7042)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-data.install	2007-08-11 17:37:12 UTC (rev 7043)
@@ -55,49 +55,6 @@
 usr/share/doc/kde4/HTML/en/sonnet/index.cache.bz2
 usr/share/doc/kde4/HTML/en/sonnet/index.docbook
 
-usr/share/emoticons/Default/angry.png
-usr/share/emoticons/Default/bat.png
-usr/share/emoticons/Default/beer.png
-usr/share/emoticons/Default/biggrin.png
-usr/share/emoticons/Default/cake.png
-usr/share/emoticons/Default/camera.png
-usr/share/emoticons/Default/cat.png
-usr/share/emoticons/Default/clock.png
-usr/share/emoticons/Default/cocktail.png
-usr/share/emoticons/Default/confused.png
-usr/share/emoticons/Default/cry.png
-usr/share/emoticons/Default/cup.png
-usr/share/emoticons/Default/dog.png
-usr/share/emoticons/Default/email.png
-usr/share/emoticons/Default/embarassed.png
-usr/share/emoticons/Default/emoticons.xml
-usr/share/emoticons/Default/film.png
-usr/share/emoticons/Default/foot_in_mouth.png
-usr/share/emoticons/Default/innocent.png
-usr/share/emoticons/Default/kiss.png
-usr/share/emoticons/Default/lightbulb.png
-usr/share/emoticons/Default/love.png
-usr/share/emoticons/Default/note.png
-usr/share/emoticons/Default/oh.png
-usr/share/emoticons/Default/omg.png
-usr/share/emoticons/Default/phone.png
-usr/share/emoticons/Default/present.png
-usr/share/emoticons/Default/rose.png
-usr/share/emoticons/Default/sad.png
-usr/share/emoticons/Default/shade.png
-usr/share/emoticons/Default/sleep.png
-usr/share/emoticons/Default/smile.png
-usr/share/emoticons/Default/star.png
-usr/share/emoticons/Default/teeth.png
-usr/share/emoticons/Default/thumbs_down.png
-usr/share/emoticons/Default/thumbs_up.png
-usr/share/emoticons/Default/tongue.png
-usr/share/emoticons/Default/undecided.png
-usr/share/emoticons/Default/unhappy.png
-usr/share/emoticons/Default/unlove.png
-usr/share/emoticons/Default/wilted_rose.png
-usr/share/emoticons/Default/wink.png
-
 usr/share/icons/hicolor/16x16/actions/presence_away.png
 usr/share/icons/hicolor/16x16/actions/presence_offline.png
 usr/share/icons/hicolor/16x16/actions/presence_online.png
@@ -7511,6 +7468,5 @@
 usr/share/kde4/servicetypes/renamedialogplugin.desktop
 usr/share/kde4/servicetypes/sonnetspeller.desktop
 
-usr/share/locale/all_languages
 
 usr/share/mime/packages/kde.xml

Added: branches/kde4/packages/kdelibs/debian/no-install.list
===================================================================
--- branches/kde4/packages/kdelibs/debian/no-install.list	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/no-install.list	2007-08-11 17:37:12 UTC (rev 7043)
@@ -0,0 +1,45 @@
+Files not installed due to conflicts with current kdelibs-data:
+
+    /usr/share/locale/all_languages
+    /usr/share/emoticons/Default/shade.png
+    /usr/share/emoticons/Default/love.png
+    /usr/share/emoticons/Default/embarassed.png
+    /usr/share/emoticons/Default/confused.png
+    /usr/share/emoticons/Default/oh.png
+    /usr/share/emoticons/Default/innocent.png
+    /usr/share/emoticons/Default/cocktail.png
+    /usr/share/emoticons/Default/kiss.png
+    /usr/share/emoticons/Default/dog.png
+    /usr/share/emoticons/Default/note.png
+    /usr/share/emoticons/Default/bat.png
+    /usr/share/emoticons/Default/sleep.png
+    /usr/share/emoticons/Default/smile.png
+    /usr/share/emoticons/Default/unhappy.png
+    /usr/share/emoticons/Default/thumbs_down.png
+    /usr/share/emoticons/Default/angry.png
+    /usr/share/emoticons/Default/thumbs_up.png
+    /usr/share/emoticons/Default/cup.png
+    /usr/share/emoticons/Default/emoticons.xml
+    /usr/share/emoticons/Default/teeth.png
+    /usr/share/emoticons/Default/camera.png
+    /usr/share/emoticons/Default/tongue.png
+    /usr/share/emoticons/Default/beer.png
+    /usr/share/emoticons/Default/cry.png
+    /usr/share/emoticons/Default/present.png
+    /usr/share/emoticons/Default/clock.png
+    /usr/share/emoticons/Default/wink.png
+    /usr/share/emoticons/Default/biggrin.png
+    /usr/share/emoticons/Default/film.png
+    /usr/share/emoticons/Default/cake.png
+    /usr/share/emoticons/Default/cat.png
+    /usr/share/emoticons/Default/unlove.png
+    /usr/share/emoticons/Default/rose.png
+    /usr/share/emoticons/Default/omg.png
+    /usr/share/emoticons/Default/email.png
+    /usr/share/emoticons/Default/lightbulb.png
+    /usr/share/emoticons/Default/phone.png
+    /usr/share/emoticons/Default/star.png
+    /usr/share/emoticons/Default/undecided.png
+    /usr/share/emoticons/Default/wilted_rose.png
+    /usr/share/emoticons/Default/foot_in_mouth.png
+    /usr/share/emoticons/Default/sad.png