rev 10521 - in branches/kde4/packages/kdebase-workspace/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Sat May 10 07:00:56 UTC 2008 

Author: fabo
Date: 2008-05-10 07:00:56 +0000 (Sat, 10 May 2008)
New Revision: 10521

Added:
   branches/kde4/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff
Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
   branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/series
   branches/kde4/packages/kdebase-workspace/debian/rules
Log:
* Update kdebase-workspace-data.install
* Bump versions to 4.0.73.

* Add 20 patch to use DejaVu font as default font.
* Fix 97_fix_target_link_libraries patch:
  proper libplasma target link libraries.
* Add libqt4-opengl-dev build dependency since Qt4 split.


Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-05-09 20:38:15 UTC (rev 10520)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-05-10 07:00:56 UTC (rev 10521)
@@ -1,12 +1,10 @@
-kdebase-workspace (4:4.0.72+svn804277-1~pre2) UNRELEASED; urgency=low
+kdebase-workspace (4:4.0.73-1) UNRELEASED; urgency=low
 
-  * New upstream development snapshot:
-    - The latest upstream commit is r804277 by ereslibre
-    - Date: Mon, 05 May 2008 15:56:56 -0000
+  * New upstream development snapshot.
 
   * Resolved bugs:
     - kdm password field is again reachable without mouse click when using
-      Debian kdm theme (Closes: #478666)
+      Debian kdm theme. (Closes: #478666)
 
   +++ Changes by Modestas Vainius:
 
@@ -15,8 +13,15 @@
 
   +++ Changes by Armin Berres:
 
-  * Raise libkwineffects1 shlibs version in debian/rules. 
+  * Raise libkwineffects1 shlibs version in debian/rules.
 
+  +++ Changes by Fathi Boudra:
+
+  * Add 20 patch to use DejaVu font as default font.
+  * Fix 97_fix_target_link_libraries patch:
+    proper libplasma target link libraries.
+  * Add libqt4-opengl-dev build dependency since Qt4 split.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 May 2008 01:16:08 +0200
 
 kdebase-workspace (4:4.0.72-1) experimental; urgency=low

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2008-05-09 20:38:15 UTC (rev 10520)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-05-10 07:00:56 UTC (rev 10521)
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake, 
- kdepimlibs5-dev (>= 4:4.0.72), libphonon-dev (>= 4:4.0.72),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake,
+ kdepimlibs5-dev (>= 4:4.0.73), libphonon-dev (>= 4:4.0.73),
  libbluetooth-dev, libcaptury-dev, libdbus-1-dev, libnm-util-dev,
  libpam0g-dev, libqimageblitz-dev (>= 1:0.0.4-2), libraw1394-dev, libsensors-dev,
  libstrigiqtdbusclient-dev (>= 0.5.8-2), libusb-dev, libxkbfile-dev,
  libxcomposite-dev, libxdamage-dev, libxfixes-dev, libxklavier12-dev,
  libxrandr-dev, libxrender-dev, libxxf86misc-dev, network-manager-dev,
  libsmbclient-dev, libxcb1-dev, libxine-dev, libstreamanalyzer-dev, libfontconfig-dev, libglu1-mesa-dev,
- libsm-dev, libxft-dev, libxtst-dev
+ libsm-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev
 Standards-Version: 3.7.3
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdebase-workspace
@@ -66,8 +66,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}, kdebase-workspace-bin (= ${binary:Version}),
  ksysguard (= ${binary:Version}), kde-window-manager (= ${binary:Version}),
- libplasma-dev (= ${binary:Version}),  kdepimlibs5-dev (>= 4:4.0.68), 
- libbluetooth-dev, libcaptury-dev, libphonon-dev (>=4:4.0.68),
+ libplasma-dev (= ${binary:Version}),  kdepimlibs5-dev (>= 4:4.0.73),
+ libbluetooth-dev, libcaptury-dev, libphonon-dev (>=4:4.0.73),
  libdbus-1-dev, libnm-util-dev, libpam0g-dev, libqimageblitz-dev (>=1:0.0.4-2),
  libraw1394-dev, libsensors-dev, libstrigiqtdbusclient-dev (>= 0.5.8-2),
  libusb-dev, libxkbfile-dev, libxcomposite-dev, libxdamage-dev, libxfixes-dev,
@@ -198,7 +198,7 @@
 Section: libdevel
 Architecture: any
 Priority: optional
-Depends: libplasma1 (= ${binary:Version}), kdelibs5-dev (>= 4:4.0.68)
+Depends: libplasma1 (= ${binary:Version}), kdelibs5-dev (>= 4:4.0.73)
 Description: development files for the KDE 4 Plasma desktop
  This package contains headers and other development files needed to build
  software that uses the KDE 4 Plasma library.

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-05-09 20:38:15 UTC (rev 10520)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-05-10 07:00:56 UTC (rev 10521)
@@ -105,6 +105,7 @@
 usr/share/kde4/apps/desktoptheme/default/widgets/branding.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/clock.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/connection-established.svg
+usr/share/kde4/apps/desktoptheme/default/widgets/containment-controls.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/iconbutton.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/panel-background.svg
 usr/share/kde4/apps/desktoptheme/default/widgets/plot-background.svg

Added: branches/kde4/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff	2008-05-10 07:00:56 UTC (rev 10521)
@@ -0,0 +1,95 @@
+--- a/doc/kdm/kdmrc-ref.docbook
++++ b/doc/kdm/kdmrc-ref.docbook
+@@ -1463,7 +1463,7 @@
+ <para>
+ The normal font used in the greeter.
+ </para>
+-<para>The default is <quote>Sans Serif,10</quote>.</para>
++<para>The default is <quote>DejaVu,8</quote>.</para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -1473,7 +1473,7 @@
+ <para>
+ The font used for the <quote>Login Failed</quote> message.
+ </para>
+-<para>The default is <quote>Sans Serif,10,bold</quote>.</para>
++<para>The default is <quote>DejaVu,8,bold</quote>.</para>
+ </listitem>
+ </varlistentry>
+ 
+--- a/kcontrol/fonts/fonts.cpp
++++ b/kcontrol/fonts/fonts.cpp
+@@ -513,18 +513,18 @@
+ 
+   // Keep in sync with kdelibs/kdeui/kernel/kglobalsettings.cpp
+ 
+-  QFont f0("Sans Serif", 10);
+-  QFont f1("Monospace", 10);
+-  QFont f2("Sans Serif", 8);
+-  QFont f3("Sans Serif", 9, QFont::Bold);
+-  QFont f4("Sans Serif", 10);
+-  QFont f5("Sans Serif", 8); // smallestReadableFont
++  QFont f0("DejaVu Sans", 8);
++  QFont f1("DejaVu Sans Mono", 8);
++  QFont f2("DejaVu Sans", 8);
++  QFont f3("DejaVu Sans", 8, QFont::Bold);
++  QFont f4("DejaVu Sans", 8);
++  QFont f5("DejaVu Sans", 8); // smallestReadableFont
+ 
+-  f0.setPointSize(10);
+-  f1.setPointSize(10);
++  f0.setPointSize(8);
++  f1.setPointSize(8);
+   f2.setPointSize(8);
+-  f3.setPointSize(9);
+-  f4.setPointSize(10);
++  f3.setPointSize(8);
++  f4.setPointSize(8);
+   f5.setPointSize(8);
+ 
+   defaultFontList << f0 << f1 << f5 << f2 << f0 << f3 << f4 << f0;
+--- a/kcontrol/kdm/kdm-gen.cpp
++++ b/kcontrol/kdm/kdm-gen.cpp
+@@ -204,9 +204,9 @@
+ 
+ void KDMGeneralWidget::set_def()
+ {
+-	stdFontChooser->setFont( QFont( "Sans Serif", 10 ) );
+-	failFontChooser->setFont( QFont( "Sans Serif", 10, QFont::Bold ) );
+-	greetingFontChooser->setFont( QFont( "Serif", 20 ) );
++	stdFontChooser->setFont( QFont( "DejaVu Sans", 8 ) );
++	failFontChooser->setFont( QFont( "DejaVu Sans", 8, QFont::Bold ) );
++	greetingFontChooser->setFont( QFont( "DejaVu", 16 ) );
+ }
+ 
+ void KDMGeneralWidget::save()
+--- a/kdm/config.def
++++ b/kdm/config.def
+@@ -2170,20 +2170,20 @@
+ 
+ Key: StdFont
+ Type: string
+-Default: "Sans Serif,10,5,0,50,0"
+-CDefault: "Sans Serif,10"
++Default: "DejaVu Sans,8,5,0,50,0"
++CDefault: "DejaVu Sans,8"
+ User: greeter(normalFont):font
+-Instance: #*/"Sans Serif,10,5,0,50,0"
++Instance: #*/"DejaVu Sans,8,5,0,50,0"
+ Comment: &
+ Description:
+  The normal font used in the greeter.
+ 
+ Key: FailFont
+ Type: string
+-Default: "Sans Serif,10,5,0,75,0"
+-CDefault: "Sans Serif,10,bold"
++Default: "DejaVu Sans,8,5,0,75,0"
++CDefault: "DejaVu Sans,8,bold"
+ User: greeter:font
+-Instance: #*/"Sans Serif,10,5,0,75,0"
++Instance: #*/"DejaVu Sans,8,5,0,75,0"
+ Comment: &
+ Description:
+  The font used for the <quote>Login Failed</quote> message.

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-05-09 20:38:15 UTC (rev 10520)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-05-10 07:00:56 UTC (rev 10521)
@@ -95,15 +95,16 @@
  install(TARGETS kworkspace ${INSTALL_TARGETS_DEFAULT_ARGS} )
 --- a/libs/plasma/CMakeLists.txt
 +++ b/libs/plasma/CMakeLists.txt
-@@ -80,7 +80,7 @@
- target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY})
+@@ -78,7 +78,8 @@
+ kde4_add_library(plasma SHARED ${plasma_LIB_SRCS})
  
+ target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}
+-${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${KDE4_THREADWEAVER_LIBRARIES})
++${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${KDE4_THREADWEAVER_LIBRARIES}
++${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${KDE4_SOLID_LIBS})
+ 
  if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
--    target_link_libraries(plasma ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
-+    target_link_libraries(plasma ${QT_QTOPENGL_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${OPENGL_gl_LIBRARY} ${KDE4_SOLID_LIBS} )
- endif(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
- 
- set_target_properties(plasma PROPERTIES VERSION 1.0.0 SOVERSION 1)
+     target_link_libraries(plasma ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
 --- a/libs/solid/control/CMakeLists.txt
 +++ b/libs/solid/control/CMakeLists.txt
 @@ -28,7 +28,7 @@

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-05-09 20:38:15 UTC (rev 10520)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-05-10 07:00:56 UTC (rev 10521)
@@ -7,4 +7,5 @@
 12_be_better_at_honouring_user_kdm_theming.diff
 13_kdm_override_docs.diff
 14_correct_kde4home_for_kstartupconfig4.diff
+20_use_dejavu_as_default_font.diff
 97_fix_target_link_libraries.diff

Modified: branches/kde4/packages/kdebase-workspace/debian/rules
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/rules	2008-05-09 20:38:15 UTC (rev 10520)
+++ branches/kde4/packages/kdebase-workspace/debian/rules	2008-05-10 07:00:56 UTC (rev 10521)
@@ -6,8 +6,8 @@
 #	-DINSTALL_PRINTER_APPLET=TRUE
 
 DEB_CMAKE_EXTRA_FLAGS += -DKDE4_KDM_PAM_SERVICE=kdm
-DEB_DH_MAKESHLIBS_ARGS_libplasma1 := -V'libplasma1 (>= 4:4.0.72)'
-DEB_DH_MAKESHLIBS_ARGS_libkwineffects1 := -V'libkwineffects1 (>= 4:4.0.72)'
+DEB_DH_MAKESHLIBS_ARGS_libplasma1 := -V'libplasma1 (>= 4:4.0.73)'
+DEB_DH_MAKESHLIBS_ARGS_libkwineffects1 := -V'libkwineffects1 (>= 4:4.0.73)'
 
 DEB_DH_SHLIBDEPS_ARGS_kdebase-workspace-bin := -- -xksysguard

More information about the pkg-kde-commits mailing list