rev 7050 - in branches/kde4/packages/kdelibs/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-08-11 21:36:02 +0000 (Sat, 11 Aug 2007)
New Revision: 7050

Added:
   branches/kde4/packages/kdelibs/debian/patches/05_append_4.diff
Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/patches/series
   branches/kde4/packages/kdelibs/debian/rules
Log:
* Replace renaming stuff by a patch.


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2007-08-11 21:02:31 UTC (rev 7049)
+++ branches/kde4/packages/kdelibs/debian/changelog	2007-08-11 21:36:02 UTC (rev 7050)
@@ -8,10 +8,10 @@
 
   * No shipping emoticons images to avoid conflicts with current kdebase-data
     (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. 
+  * Add patch 04_libkdeprint_management_soname.diff to avoid same soname name
+    than in current KDE version.
+  * Add patch to append '4' to kunittestmodrunner, makekdewidgets, preparetips,
+    kconfig_compiler, ksvgtopng 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
 

Added: branches/kde4/packages/kdelibs/debian/patches/05_append_4.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/05_append_4.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/05_append_4.diff	2007-08-11 21:36:02 UTC (rev 7050)
@@ -0,0 +1,55 @@
+--- kdelibs-3.92.0.orig/kde3support/kunittest/CMakeLists.txt
++++ kdelibs-3.92.0/kde3support/kunittest/CMakeLists.txt
+@@ -23,7 +23,7 @@
+ 
+ target_link_libraries(kunittestmodrunner ${KDE4_KDECORE_LIBS} kunittest)
+ 
+-install(TARGETS kunittestmodrunner DESTINATION ${BIN_INSTALL_DIR} )
++install(TARGETS kunittestmodrunner DESTINATION ${BIN_INSTALL_DIR} RENAME kunittestmodrunner4)
+ 
+ 
+ ########### install files ###############
+--- kdelibs-3.92.0.orig/kdecore/kconfig_compiler/CMakeLists.txt
++++ kdelibs-3.92.0/kdecore/kconfig_compiler/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ 
+ target_link_libraries(kconfig_compiler  ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+ 
+-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
++install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} RENAME kconfig_compiler4)
+ 
+ 
+ ########### install files ###############
+--- kdelibs-3.92.0.orig/kdeui/CMakeLists.txt
++++ kdelibs-3.92.0/kdeui/CMakeLists.txt
+@@ -461,7 +461,7 @@
+   sonnet/configwidget.h
+   DESTINATION  ${INCLUDE_INSTALL_DIR}/sonnet )
+ 
+-install(PROGRAMS preparetips DESTINATION ${BIN_INSTALL_DIR} )
++install(PROGRAMS preparetips DESTINATION ${BIN_INSTALL_DIR} RENAME preparetips4)
+ 
+ if (Q_WS_MAC)
+   install(PROGRAMS kernel/start-session-bus.sh DESTINATION ${BIN_INSTALL_DIR} )
+--- kdelibs-3.92.0.orig/kdewidgets/CMakeLists.txt
++++ kdelibs-3.92.0/kdewidgets/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ 
+ target_link_libraries(makekdewidgets  ${KDE4_KDECORE_LIBS} )
+ 
+-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
++install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} RENAME makekdewidgets4)
+ 
+ 
+ ########### next target ###############
+--- kdelibs-3.92.0.orig/pics/CMakeLists.txt
++++ kdelibs-3.92.0/pics/CMakeLists.txt
+@@ -9,7 +9,7 @@
+ set(ksvgtopng_SRCS ksvgtopng.cpp )
+ kde4_add_executable(ksvgtopng NOGUI ${ksvgtopng_SRCS})
+ target_link_libraries(ksvgtopng ${KDE4_KDEUI_LIBS})
+-install(TARGETS ksvgtopng DESTINATION ${BIN_INSTALL_DIR} )
++install(TARGETS ksvgtopng DESTINATION ${BIN_INSTALL_DIR} RENAME ksvgtopng4)
+ 
+ ########### next target ###############
+ 

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2007-08-11 21:02:31 UTC (rev 7049)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2007-08-11 21:36:02 UTC (rev 7050)
@@ -2,3 +2,4 @@
 02_applications_menu_kde4.diff
 03_strigi-0.5.5_support.diff
 04_libkdeprint_management_soname.diff
+05_append_4.diff

Modified: branches/kde4/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4/packages/kdelibs/debian/rules	2007-08-11 21:02:31 UTC (rev 7049)
+++ branches/kde4/packages/kdelibs/debian/rules	2007-08-11 21:36:02 UTC (rev 7050)
@@ -2,9 +2,3 @@
 
 include debian/cdbs/kde.mk
 
-install/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