rev 16244 - in trunk/packages: kdebase-runtime/debian kdebase-runtime/debian/patches kdebase-workspace/debian kdebase-workspace/debian/patches
Sune Vuorela
pusling-guest at alioth.debian.org
Wed Nov 11 16:39:16 UTC 2009
Author: pusling-guest
Date: 2009-11-11 16:39:15 +0000 (Wed, 11 Nov 2009)
New Revision: 16244
Added:
trunk/packages/kdebase-runtime/debian/kdebase-runtime.links
Removed:
trunk/packages/kdebase-runtime/debian/patches/03_ktrash4.diff
trunk/packages/kdebase-workspace/debian/patches/22_execute_ktrash4.diff
Modified:
trunk/packages/kdebase-runtime/debian/changelog
trunk/packages/kdebase-runtime/debian/kdebase-runtime.install
trunk/packages/kdebase-runtime/debian/patches/series
trunk/packages/kdebase-workspace/debian/control
trunk/packages/kdebase-workspace/debian/patches/series
Log:
don't rename ktrash any longer. really fixes 494427. still a todo for ~4.4 or so
Modified: trunk/packages/kdebase-runtime/debian/changelog
===================================================================
--- trunk/packages/kdebase-runtime/debian/changelog 2009-11-11 15:29:03 UTC (rev 16243)
+++ trunk/packages/kdebase-runtime/debian/changelog 2009-11-11 16:39:15 UTC (rev 16244)
@@ -15,6 +15,11 @@
* Add liblzma-dev build-depend to add XZ support.
+ +++ Changes by Sune Vuorela:
+
+ * Remove the ktrash debian renaming. Not needed since we got rid of kde3
+ kdebase in unstable.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 11 Nov 2009 12:53:50 +0100
kdebase-runtime (4:4.3.2-1) unstable; urgency=low
Modified: trunk/packages/kdebase-runtime/debian/kdebase-runtime.install
===================================================================
--- trunk/packages/kdebase-runtime/debian/kdebase-runtime.install 2009-11-11 15:29:03 UTC (rev 16243)
+++ trunk/packages/kdebase-runtime/debian/kdebase-runtime.install 2009-11-11 16:39:15 UTC (rev 16244)
@@ -18,7 +18,7 @@
usr/bin/kstart
usr/bin/ksvgtopng4
usr/bin/ktraderclient
-usr/bin/ktrash4
+usr/bin/ktrash
usr/bin/kuiserver
usr/bin/kwalletd
usr/bin/kwriteconfig
Added: trunk/packages/kdebase-runtime/debian/kdebase-runtime.links
===================================================================
--- trunk/packages/kdebase-runtime/debian/kdebase-runtime.links (rev 0)
+++ trunk/packages/kdebase-runtime/debian/kdebase-runtime.links 2009-11-11 16:39:15 UTC (rev 16244)
@@ -0,0 +1,2 @@
+#compability until we want to Break: plasma-widgets-workspace (<< 4:4.3.3), probably around 4:4.4 or so.
+/usr/bin/trash /usr/bin/trash4
Modified: trunk/packages/kdebase-runtime/debian/patches/series
===================================================================
--- trunk/packages/kdebase-runtime/debian/patches/series 2009-11-11 15:29:03 UTC (rev 16243)
+++ trunk/packages/kdebase-runtime/debian/patches/series 2009-11-11 16:39:15 UTC (rev 16244)
@@ -1,4 +1,3 @@
01_kde4_information_menu.diff
02_ksvgtopng4.diff
-03_ktrash4.diff
25_khelp_htdig.diff
Modified: trunk/packages/kdebase-workspace/debian/control
===================================================================
--- trunk/packages/kdebase-workspace/debian/control 2009-11-11 15:29:03 UTC (rev 16243)
+++ trunk/packages/kdebase-workspace/debian/control 2009-11-11 16:39:15 UTC (rev 16244)
@@ -129,7 +129,7 @@
Package: plasma-widgets-workspace
Section: kde
Architecture: any
-Depends: ${shlibs:Depends}, plasma-dataengines-workspace (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, plasma-dataengines-workspace (= ${binary:Version}), ${misc:Depends}, kdebase-runtime (>> 4.3.3~)
Replaces: kdebase-workspace-bin (<< 4:4.1.82), kdebase-workspace-data (<< 4:4.1.82), libplasma2,
plasma-applets-workspace
Conflicts: libplasma2, plasma-applets-workspace
Modified: trunk/packages/kdebase-workspace/debian/patches/series
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/series 2009-11-11 15:29:03 UTC (rev 16243)
+++ trunk/packages/kdebase-workspace/debian/patches/series 2009-11-11 16:39:15 UTC (rev 16244)
@@ -8,7 +8,6 @@
13_kdm_override_docs.diff
20_use_dejavu_as_default_font.diff
21_kdm_doesnt_use_kstandarddirs.diff
-22_execute_ktrash4.diff
23_do_not_depend_on_bindings.diff
24_do_not_search_for_libeet.diff
25_task.h_forward_decl_netwininfo.diff
More information about the pkg-kde-commits
mailing list