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

[Fathi Boudra]

Author: fabo
Date: 2008-06-01 08:11:39 +0000 (Sun, 01 Jun 2008)
New Revision: 10815

Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
   branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
Log:
Another day, another snapshot.
Update 20_use_dejavu_as_default_font patch.


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-05-31 19:40:59 UTC (rev 10814)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-06-01 08:11:39 UTC (rev 10815)
@@ -1,9 +1,8 @@
-kde4libs (4:4.0.81+svn814166-1~pre1) UNRELEASED; urgency=low
+kde4libs (4:4.0.81+svn815057-1~pre1) UNRELEASED; urgency=low
 
   * New upstream development snapshot:
-    - The latest upstream commit is r814166 by rpedersen
-    - Date: Thu, 29 May 2008 14:29:32 -0000
-
+    - The latest upstream commit is r815057 by mpyne
+    - Date: Sun Jun 1 03:12:51 2008 UTC
   * Update install files:
     - kdelibs5-dev.install: 1 new file(s) added; 2 file(s) removed;
     - kdelibs5.install: 5 file(s) removed;

Modified: branches/kde4/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff	2008-05-31 19:40:59 UTC (rev 10814)
+++ branches/kde4/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff	2008-06-01 08:11:39 UTC (rev 10815)
@@ -1,83 +1,64 @@
 --- a/kdeui/kernel/kglobalsettings.cpp
 +++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -324,11 +324,9 @@
- 
- #ifdef Q_WS_MAC
+@@ -326,7 +326,7 @@
      _generalFont = new QFont("Lucida Grande", 13);
--    _generalFont->setPointSize(13);
  #else
-     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+     // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
 -    _generalFont = new QFont("Sans Serif", 10);
--    _generalFont->setPointSize(10);
 +    _generalFont = new QFont("DejaVu Sans", 9);
  #endif
      _generalFont->setStyleHint(QFont::SansSerif);
  
-@@ -345,11 +343,9 @@
- 
- #ifdef Q_WS_MAC
+@@ -345,7 +345,7 @@
      _fixedFont = new QFont("Monaco", 10);
--    _fixedFont->setPointSize(10);
  #else
-     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+     // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
 -    _fixedFont = new QFont("Monospace", 10);
--    _fixedFont->setPointSize(10);
-+    _fixedFont = new QFont("DejaVu Sans Mono", 9);
++    _fixedFont = new QFont("DejaVu Sans Mon", 9);
  #endif
      _fixedFont->setStyleHint(QFont::TypeWriter);
  
-@@ -366,11 +362,9 @@
- 
- #ifdef Q_WS_MAC
+@@ -364,7 +364,7 @@
      _toolBarFont = new QFont("Lucida Grande", 11);
--    _toolBarFont->setPointSize(11);
  #else
-     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+     // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
 -    _toolBarFont = new QFont("Sans Serif", 8);
--    _toolBarFont->setPointSize(8);
 +    _toolBarFont = new QFont("DejaVu Sans", 8);
  #endif
      _toolBarFont->setStyleHint(QFont::SansSerif);
  
-@@ -387,11 +381,9 @@
- 
- #ifdef Q_WS_MAC
+@@ -383,7 +383,7 @@
      _menuFont = new QFont("Lucida Grande", 13);
--    _menuFont->setPointSize(13);
  #else
-     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+     // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
 -    _menuFont = new QFont("Sans Serif", 10);
--    _menuFont->setPointSize(10);
 +    _menuFont = new QFont("DejaVu Sans", 9);
  #endif
      _menuFont->setStyleHint(QFont::SansSerif);
  
-@@ -407,8 +399,7 @@
+@@ -399,7 +399,7 @@
          return *_windowTitleFont;
  
-     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+     // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
 -    _windowTitleFont = new QFont("Sans Serif", 9, QFont::Bold);
--    _windowTitleFont->setPointSize(10);
 +    _windowTitleFont = new QFont("DejaVu Sans", 9, QFont::Bold);
      _windowTitleFont->setStyleHint(QFont::SansSerif);
  
      KConfigGroup g( KGlobal::config(), "WM" );
-@@ -423,8 +414,7 @@
+@@ -414,7 +414,7 @@
          return *_taskbarFont;
  
-     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+     // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
 -    _taskbarFont = new QFont("Sans Serif", 10);
--    _taskbarFont->setPointSize(10);
 +    _taskbarFont = new QFont("DejaVu Sans", 9);
      _taskbarFont->setStyleHint(QFont::SansSerif);
  
      KConfigGroup g( KGlobal::config(), "General" );
-@@ -498,8 +488,7 @@
+@@ -488,7 +488,7 @@
          return *_smallestReadableFont;
  
-     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+     // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
 -    _smallestReadableFont = new QFont("Sans Serif", 8);
--    _smallestReadableFont->setPointSize(8);
 +    _smallestReadableFont = new QFont("DejaVu Sans", 8);
      _smallestReadableFont->setStyleHint(QFont::SansSerif);
  

Modified: branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff	2008-05-31 19:40:59 UTC (rev 10814)
+++ branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff	2008-06-01 08:11:39 UTC (rev 10815)
@@ -45,7 +45,7 @@
  install(TARGETS ktexteditor ${INSTALL_TARGETS_DEFAULT_ARGS})
 --- a/kate/CMakeLists.txt
 +++ b/kate/CMakeLists.txt
-@@ -152,7 +152,7 @@
+@@ -146,7 +146,7 @@
  kde4_add_plugin(katepart ${katepart_PART_SRCS})
  
  # linking