[SCM] KDE Base Runtime module packaging branch, kde4.5, updated. debian/4.4.5-1-12-g80d3c2b
George Kiagiadakis
gkiagia-guest at alioth.debian.org
Fri Jul 30 18:36:03 UTC 2010
The following commit has been merged in the kde4.5 branch:
commit 756a2e6ec772282ce32818e8fc91388c6a028700
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date: Fri Jul 30 15:28:40 2010 +0300
Refresh patches.
---
debian/changelog | 1 +
debian/patches/01_kde4_information_menu.diff | 13 -------------
.../05_dont_show_netattach_outside_kde.diff | 2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a5bead8..85c6997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ kdebase-runtime (4:4.5.0-0r1) UNRELEASED; urgency=low
[ George Kiagiadakis ]
* Change my email address in uploaders.
+ * Refresh patches.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 30 Jul 2010 14:51:46 +0300
diff --git a/debian/patches/01_kde4_information_menu.diff b/debian/patches/01_kde4_information_menu.diff
index 4b67ab6..a62f584 100644
--- a/debian/patches/01_kde4_information_menu.diff
+++ b/debian/patches/01_kde4_information_menu.diff
@@ -1,16 +1,3 @@
---- a/doc/userguide/kde-for-admins.docbook
-+++ b/doc/userguide/kde-for-admins.docbook
-@@ -1765,8 +1765,8 @@ contents are defined by <filename>kde-se
- whose icon and name are defined by <filename>kde-settings.directory</filename></para>
- </listitem>
- <listitem><para>Info Center has a hidden Information menu whose
--contents are defined by <filename>kde-information.menu</filename> and
--whose icon and name are defined by <filename>kde-information.directory</filename>.</para>
-+contents are defined by <filename>kde4-information.menu</filename> and
-+whose icon and name are defined by <filename>kde4-information.directory</filename>.</para>
- </listitem>
-
- <listitem><para>Screensavers contains a hidden System/Screensavers menu,
--- a/kcontrol/menus/CMakeLists.txt
+++ b/kcontrol/menus/CMakeLists.txt
@@ -5,7 +5,7 @@
diff --git a/debian/patches/05_dont_show_netattach_outside_kde.diff b/debian/patches/05_dont_show_netattach_outside_kde.diff
index 10266e1..0d9db0f 100644
--- a/debian/patches/05_dont_show_netattach_outside_kde.diff
+++ b/debian/patches/05_dont_show_netattach_outside_kde.diff
@@ -5,7 +5,7 @@ Not yet forwarded.
Author: Sune Vuorela
--- a/knetattach/knetattach.desktop
+++ b/knetattach/knetattach.desktop
-@@ -176,4 +176,5 @@ Type=Application
+@@ -178,4 +178,5 @@
Terminal=false
X-KDE-StartupNotify=true
Categories=Qt;KDE;Network;RemoteAccess;
--
KDE Base Runtime module packaging
More information about the pkg-kde-commits
mailing list