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

Armin Berres trigger-guest at alioth.debian.org
Sun Dec 14 21:42:34 UTC 2008


Author: trigger-guest
Date: 2008-12-14 21:42:34 +0000 (Sun, 14 Dec 2008)
New Revision: 12941

Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff
Log:
+++ Changes by Armin Berres:
* Fix patch 09_disable_debug_messages_if_not_explicitly_enabled.diff. Now
really only debug output is disabled.

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-14 21:03:29 UTC (rev 12940)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-14 21:42:34 UTC (rev 12941)
@@ -64,8 +64,13 @@
   * Redo patch 20_use_dejavu_as_default_font.diff.
   * Force to build depend on libphonon-dev (>= 4:4.2.80).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 13 Dec 2008 01:39:11 +0200
+  +++ Changes by Armin Berres:
 
+  * Fix patch 09_disable_debug_messages_if_not_explicitly_enabled.diff. Now
+    really only debug output is disabled.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 14 Dec 2008 22:39:49 +0100
+
 kde4libs (4:4.1.3-2) experimental; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: branches/kde4.2/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff	2008-12-14 21:03:29 UTC (rev 12940)
+++ branches/kde4.2/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff	2008-12-14 21:42:34 UTC (rev 12941)
@@ -4,18 +4,20 @@
 See also 04_disable_debug_by_default.diff in kdebase-runtime.
 --- a/kdecore/io/kdebug.cpp
 +++ b/kdecore/io/kdebug.cpp
-@@ -313,7 +313,7 @@
+@@ -313,7 +313,9 @@ struct KDebugPrivate
          }
  
          KConfigGroup cg(config, QString::number(area));
 -        int mode = cg.readEntry(key, 2);
-+        int mode = cg.readEntry(key, 4);
++	// disable debug output by default
++	int defaultMode = type == QtDebugMsg ? 4 : 2;
++        int mode = cg.readEntry(key, defaultMode);
          return OutputMode(mode);
      }
  
 --- a/kdecore/kdebugrc
 +++ b/kdecore/kdebugrc
-@@ -82,7 +82,7 @@
+@@ -82,7 +82,7 @@ InfoOutput=4
  
  # KMail
  [5006]




More information about the pkg-kde-commits mailing list