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

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-08-11 19:35:53 +0000 (Sat, 11 Aug 2007)
New Revision: 7045

Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/kdelibs-bin.install
   branches/kde4/packages/kdelibs/debian/kdelibs5.install
   branches/kde4/packages/kdelibs/debian/no-install.list
   branches/kde4/packages/kdelibs/debian/rules
Log:
* Rename kunittestmodrunner, makekdewidgets, preparetips, kconfig_compiler,
 ksvgtopng ending in 4 to avoid conflicts with the current versions.
And some little changes more.


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2007-08-11 17:52:26 UTC (rev 7044)
+++ branches/kde4/packages/kdelibs/debian/changelog	2007-08-11 19:35:53 UTC (rev 7045)
@@ -10,6 +10,8 @@
     (KDE3). See list in no-install.list.
   * Add patch 04_libkdeprint_management_soname.diff to avoid same soname name 
     than in current KDE version. 
+  * Rename kunittestmodrunner, makekdewidgets, preparetips, kconfig_compiler,
+    ksvgtopng ending in 4 to avoid conflicts with the current versions. 
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 11 Aug 2007 19:33:41 +0200
 

Modified: branches/kde4/packages/kdelibs/debian/kdelibs-bin.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs-bin.install	2007-08-11 17:52:26 UTC (rev 7044)
+++ branches/kde4/packages/kdelibs/debian/kdelibs-bin.install	2007-08-11 19:35:53 UTC (rev 7045)
@@ -1,7 +1,7 @@
 usr/bin/checkXML
 usr/bin/js
 usr/bin/kbuildsycoca4
-usr/bin/kconfig_compiler
+usr/bin/kconfig_compiler4
 usr/bin/kcookiejar4
 usr/bin/kde4-config
 usr/bin/kde4automoc
@@ -13,13 +13,13 @@
 usr/bin/kjsconsole
 usr/bin/kross
 usr/bin/kshell4
-usr/bin/ksvgtopng
-usr/bin/kunittestmodrunner
+usr/bin/ksvgtopng4
+usr/bin/kunittestmodrunner4
 usr/bin/kwrapper4
-usr/bin/makekdewidgets
+usr/bin/makekdewidgets4
 usr/bin/meinproc4
 usr/bin/nepomuk-rcgen
-usr/bin/preparetips
+usr/bin/preparetips4
 
 usr/lib/libkdeinit4_kaddprinterwizard.so
 usr/lib/libkdeinit4_klauncher.so

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5.install	2007-08-11 17:52:26 UTC (rev 7044)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5.install	2007-08-11 19:35:53 UTC (rev 7045)
@@ -106,8 +106,8 @@
 usr/lib/libkde3support.so.4
 usr/lib/libkde3support.so.4.0.0
 
-usr/lib/libkdeprint_management.so.4
-usr/lib/libkdeprint_management.so.4.0.0
+usr/lib/libkdeprint_management.so.5
+usr/lib/libkdeprint_management.so.5.0.0
 
 usr/lib/libkdnssd.so.4
 usr/lib/libkdnssd.so.4.0.0

Modified: branches/kde4/packages/kdelibs/debian/no-install.list
===================================================================
--- branches/kde4/packages/kdelibs/debian/no-install.list	2007-08-11 17:52:26 UTC (rev 7044)
+++ branches/kde4/packages/kdelibs/debian/no-install.list	2007-08-11 19:35:53 UTC (rev 7045)
@@ -43,3 +43,6 @@
     /usr/share/emoticons/Default/wilted_rose.png
     /usr/share/emoticons/Default/foot_in_mouth.png
     /usr/share/emoticons/Default/sad.png
+
+Files not installed because they are provided by hicolor-icon-theme
+	/usr/share/icons/hicolor/index.theme

Modified: branches/kde4/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4/packages/kdelibs/debian/rules	2007-08-11 17:52:26 UTC (rev 7044)
+++ branches/kde4/packages/kdelibs/debian/rules	2007-08-11 19:35:53 UTC (rev 7045)
@@ -1,3 +1,10 @@
 #!/usr/bin/make -f
 
 include debian/cdbs/kde.mk
+
+build/kdelibs-bin::
+	mv $(CURDIR)/debian/tmp/usr/bin/kunittestmodrunner $(CURDIR)/debian/tmp/usr/bin/kunittestmodrunner4
+	mv $(CURDIR)/debian/tmp/usr/bin/makekdewidgets $(CURDIR)/debian/tmp/usr/bin/makekdewidgets4
+	mv $(CURDIR)/debian/tmp/usr/bin/preparetips $(CURDIR)/debian/tmp/usr/bin/preparetips4
+	mv $(CURDIR)/debian/tmp/usr/bin/kconfig_compiler $(CURDIR)/debian/tmp/usr/bin/kconfig_compiler4
+	mv $(CURDIR)/debian/tmp/usr/bin/ksvgtopng $(CURDIR)/debian/tmp/usr/bin/ksvgtopng4