rev 7852 - in branches/kde4/packages/kdebase-runtime/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-11-11 15:52:27 +0000 (Sun, 11 Nov 2007)
New Revision: 7852

Added:
   branches/kde4/packages/kdebase-runtime/debian/patches/03_ktrash4.diff
Modified:
   branches/kde4/packages/kdebase-runtime/debian/changelog
   branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-bin.install
   branches/kde4/packages/kdebase-runtime/debian/patches/series
Log:
* Add 03_ktrash4: append 4 to ktrash.


Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog	2007-11-11 15:26:05 UTC (rev 7851)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2007-11-11 15:52:27 UTC (rev 7852)
@@ -10,7 +10,8 @@
     dependencies for nepomuk.
   * Update installed files.
   * Add 01_kde4_information_menu: prepend kde4 to information.menu.
-  * Add 01_ksvgtopng4: append 4 to ksvgtopng.
+  * Add 02_ksvgtopng4: append 4 to ksvgtopng.
+  * Add 03_ktrash4: append 4 to ktrash.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Nov 2007 00:13:11 +0100
 

Modified: branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-bin.install
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-bin.install	2007-11-11 15:26:05 UTC (rev 7851)
+++ branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-bin.install	2007-11-11 15:52:27 UTC (rev 7852)
@@ -15,7 +15,7 @@
 usr/bin/kstart
 usr/bin/ksvgtopng4
 usr/bin/ktraderclient
-usr/bin/ktrash
+usr/bin/ktrash4
 usr/bin/kuiserver
 usr/bin/kwriteconfig
 usr/lib/kde4/cursorthumbnail.so

Added: branches/kde4/packages/kdebase-runtime/debian/patches/03_ktrash4.diff
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/03_ktrash4.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/03_ktrash4.diff	2007-11-11 15:52:27 UTC (rev 7852)
@@ -0,0 +1,35 @@
+--- a/kioslave/trash/CMakeLists.txt
++++ b/kioslave/trash/CMakeLists.txt
+@@ -35,7 +35,7 @@
+ 
+ target_link_libraries(ktrash  ${KDE4_KIO_LIBS} )
+ 
+-install(TARGETS ktrash DESTINATION ${BIN_INSTALL_DIR})
++install(TARGETS ktrash DESTINATION ${BIN_INSTALL_DIR} RENAME ktrash4)
+ 
+ ########### install files ###############
+ 
+--- a/kioslave/trash/ktrash.cpp
++++ b/kioslave/trash/ktrash.cpp
+@@ -30,17 +30,17 @@
+ int main(int argc, char *argv[])
+ {
+     //KApplication::disableAutoDcopRegistration();
+-    KCmdLineArgs::init( argc, argv, "ktrash", 0,
+-                        ki18n( "ktrash" ),
++    KCmdLineArgs::init( argc, argv, "ktrash4", 0,
++                        ki18n( "ktrash4" ),
+                         KDE_VERSION_STRING ,
+                         ki18n( "Helper program to handle the KDE trash can\n"
+-				   "Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' trash:/\"" ));
++				   "Note: to move files to the trash, do not use ktrash4, but \"kfmclient move 'url' trash:/\"" ));
+ 
+     KCmdLineOptions options;
+     options.add("empty", ki18n( "Empty the contents of the trash" ));
+     //{ "migrate", I18N_NOOP( "Migrate contents of old trash" ), 0 },
+     options.add("restore <file>", ki18n( "Restore a trashed file to its original location" ));
+-    // This hack is for the servicemenu on trash.desktop which uses Exec=ktrash -empty. %f is implied...
++    // This hack is for the servicemenu on trash.desktop which uses Exec=ktrash4 -empty. %f is implied...
+     options.add("+[ignored]", ki18n( "Ignored" ));
+     KCmdLineArgs::addCmdLineOptions( options );
+     KApplication app;

Modified: branches/kde4/packages/kdebase-runtime/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/series	2007-11-11 15:26:05 UTC (rev 7851)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/series	2007-11-11 15:52:27 UTC (rev 7852)
@@ -1,2 +1,3 @@
 01_kde4_information_menu.diff
 02_ksvgtopng4.diff
+03_ktrash4.diff