[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=c015edc

The following commit has been merged in the master branch:
commit c015edcfe13e3acc86f8c2a493622f3e129a90dc
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Fri Apr 8 18:19:28 2011 +0100

    Disable kubuntu_02_microblog_default_configuration.diff, it doesn't
    work reliably and causes a crash on live CD startup (or when kwallet
    doesn't exist)
---
 debian/changelog      | 8 ++++++++
 debian/patches/series | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 82a09f0..7bcddac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kdeplasma-addons (4:4.6.2-0ubuntu2) natty; urgency=low
+
+  * Disable kubuntu_02_microblog_default_configuration.diff, it doesn't
+    work reliably and causes a crash on live CD startup (or when kwallet
+    doesn't exist)
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 08 Apr 2011 18:17:47 +0100
+
 kdeplasma-addons (4:4.6.2-0ubuntu1) natty; urgency=low
 
   * New upstream release
diff --git a/debian/patches/series b/debian/patches/series
index f02f1d8..fc93edc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 kubuntu_04_kimpanel_disable_scim.diff
-kubuntu_02_microblog_default_configuration.diff
+#kubuntu_02_microblog_default_configuration.diff
 #kubuntu_03_opendestop_setup.diff

-- 
KDE Plasma Addons module packaging