rev 11598 - in branches/kde4/packages/systemsettings/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Wed Jul 16 13:36:35 UTC 2008
Author: modax-guest
Date: 2008-07-16 13:36:34 +0000 (Wed, 16 Jul 2008)
New Revision: 11598
Added:
branches/kde4/packages/systemsettings/debian/README.source
branches/kde4/packages/systemsettings/debian/changelog
branches/kde4/packages/systemsettings/debian/compat
branches/kde4/packages/systemsettings/debian/control
branches/kde4/packages/systemsettings/debian/copyright
branches/kde4/packages/systemsettings/debian/patches/
branches/kde4/packages/systemsettings/debian/patches/20_use_dejavu_as_default_font.diff
branches/kde4/packages/systemsettings/debian/patches/97_fix_target_link_libraries.diff
branches/kde4/packages/systemsettings/debian/patches/orig_tar_gz.diff
branches/kde4/packages/systemsettings/debian/patches/series
branches/kde4/packages/systemsettings/debian/rules
Log:
* systemsettings targeted for unstable/lenny release.
* Original tarball generation procedure explained in debian/README.source
* Building verified/tested.
* NOT tested under KDE3.
Added: branches/kde4/packages/systemsettings/debian/README.source
===================================================================
--- branches/kde4/packages/systemsettings/debian/README.source (rev 0)
+++ branches/kde4/packages/systemsettings/debian/README.source 2008-07-16 13:36:34 UTC (rev 11598)
@@ -0,0 +1,12 @@
+Original tarball for this package should be generated from the respective
+version of the kdebase-workspace source package like this:
+
+tar xzfv kdebase-workspace_$version.orig.tar.gz
+< resulting output directory should be of the form kdebase-workspace-$version
+ otherwise upstream version from debian/changelog will/might be used >
+mv /path/to/the/systemsettings/debian kdebase-workspace-$version
+cd kdebase-workspace-$version && debian/rules get-orig-source
+
+Source directory will be renamed to systemsettings-$version and
+tarball will be generated as systemsettings_$version.orig.tar.gz
+
Added: branches/kde4/packages/systemsettings/debian/changelog
===================================================================
--- branches/kde4/packages/systemsettings/debian/changelog (rev 0)
+++ branches/kde4/packages/systemsettings/debian/changelog 2008-07-16 13:36:34 UTC (rev 11598)
@@ -0,0 +1,16 @@
+systemsettings (4.0.98-0r3) UNRELEASED; urgency=low
+
+ * Split off systemsettings and a few important kcm modules from
+ kdebase-workspace tarball. Release for unstable.
+
+ +++ Changes by Modestas Vainius:
+
+ * Use version without epoch so it will be always lower than the one of the
+ original package from kdebase-workspace source.
+ * Implement get-orig-source debian/rules target which generate
+ systemsettings tarball from kdebase-workspace tarball.
+ * Keep needed patches from kdebase-workspace.
+ * Take control, copyright from kdebase-workspace and clean them up.
+ * Replace X11_LIBRARIES with X11_X11_LIB (97_fix_target_link_libraries.diff)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 16 Jul 2008 14:39:20 +0300
Added: branches/kde4/packages/systemsettings/debian/compat
===================================================================
--- branches/kde4/packages/systemsettings/debian/compat (rev 0)
+++ branches/kde4/packages/systemsettings/debian/compat 2008-07-16 13:36:34 UTC (rev 11598)
@@ -0,0 +1 @@
+6
Added: branches/kde4/packages/systemsettings/debian/control
===================================================================
--- branches/kde4/packages/systemsettings/debian/control (rev 0)
+++ branches/kde4/packages/systemsettings/debian/control 2008-07-16 13:36:34 UTC (rev 11598)
@@ -0,0 +1,22 @@
+Source: systemsettings
+Section: kde
+Priority: optional
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Modestas Vainius <modestas at vainius.eu>
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.4.5), kdepimlibs5-dev (>= 4:4.0.98),
+ libstrigiqtdbusclient-dev (>= 0.5.8-2), libstreamanalyzer-dev, libqimageblitz-dev (>= 1:0.0.4-2),
+ libfontconfig-dev, libx11-dev
+Standards-Version: 3.7.3
+Homepage: http://www.kde.org/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/systemsettings
+Vcs-Svn: svn://svn.debian.org/pkg-kde/branches/kde4/packages/systemsettings
+
+Package: systemsettings
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase-workspace-bin (<= 4:4.0.98-1)
+Description: KDE 4 System Settings
+ System Settings is an improved user interface for configuring the desktop
+ and other aspects of the system. This package also contains a few
+ modules for configuring appearance of KDE 4 applications.
Added: branches/kde4/packages/systemsettings/debian/copyright
===================================================================
--- branches/kde4/packages/systemsettings/debian/copyright (rev 0)
+++ branches/kde4/packages/systemsettings/debian/copyright 2008-07-16 13:36:34 UTC (rev 11598)
@@ -0,0 +1,251 @@
+This package was debianized by the Debian Qt/KDE Maintainers on
+Fri, 11 May 2007 17:23:33 +0200.
+
+It was downloaded from ftp://ftp.kde.org
+
+Upstream Author: The KDE development team <kde-core-devel at kde.org>
+Numerous people, too many to count, have contributed to kdelibs as a
+whole. The KDE project tries to make an extensive list of people who contributed
+to KDE at http://www.kde.org/people/credits/
+
+Copyright:
+Unless something else is mentioned, copyright is
+(C) 1996-2008, The K Desktop Enviroment project http://www.kde.org
+
+
+
+License:
+
+Unless something else is mentioned, the code files in this package are under
+the GNU General Public License:
+
+ | This program is free software; you can redistribute it and/or modify
+ | it under the terms of the GNU General Public License as published by
+ | the Free Software Foundation; version 2 dated June, 1991.
+ |
+ | This package is distributed in the hope that it will be useful,
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ | GNU General Public License for more details.
+ |
+ | You should have received a copy of the GNU General Public License
+ | along with this program; if not, write to the Free Software Foundation,
+ | Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ The full text of the GNU General Public License version 2 is available on
+ Debian systems in /usr/share/common-licenses/GPL-2.
+
+
+The following table tries to detail the copyright/license information of the files that
+are not under the directories detailed above.
+
+ file ~ license ~ copyright holder
+------~---------~------------------
+
+Files
+
+ CMakeLists.txt ~ unspec ~ unspec
+ config-unix.h.cmake ~ unspec ~ unspec
+ ConfigureChecks.cmake ~ unspec ~ unspec
+ config-workspace.h.cmake ~ unspec ~ unspec
+ config-X11.h.cmake ~ unspec ~ unspec
+ COPYING ~ unspec ~ unspec
+ COPYING-DOCS ~ unspec ~ unspec
+ COPYING.LIB ~ unspec ~ unspec
+
+
+Files under kcontrol/
+
+ kcontrol/colors/CMakeLists.txt ~ unspec ~ unspec
+ kcontrol/colors/colorscm.cpp ~ unspec ~ Copyright (c) Mark Donohoe 1997
+ kcontrol/colors/colorscm.h ~ unspec ~ Copyright (c) Mark Donohoe 1997
+ kcontrol/colors/colors.desktop ~ unspec ~ unspec
+ kcontrol/colors/cr128-app-colors.png ~ unspec ~ unspec
+ kcontrol/colors/cr16-app-colors.png ~ unspec ~ unspec
+ kcontrol/colors/cr22-app-colors.png ~ unspec ~ unspec
+ kcontrol/colors/cr32-app-colors.png ~ unspec ~ unspec
+ kcontrol/colors/cr48-app-colors.png ~ unspec ~ unspec
+ kcontrol/colors/cr64-app-colors.png ~ unspec ~ unspec
+ kcontrol/colors/crsc-app-colors.svgz ~ unspec ~ unspec
+ kcontrol/colors/kcolortreewidget.cpp ~ unspec ~ Olivier Goffart
+ kcontrol/colors/kcolortreewidget.h ~ unspec ~ Olivier Goffart
+ kcontrol/colors/Messages.sh ~ unspec ~ unspec
+ kcontrol/colors/stdclient_bitmaps.h ~ unspec ~ unspec
+ kcontrol/colors/widgetcanvas.cpp ~ unspec ~ Copyright (c) Mark Donohoe 1998
+ kcontrol/colors/widgetcanvas.h ~ unspec ~ Copyright (c) Mark Donohoe 1998
+ kcontrol/fonts/CMakeLists.txt ~ unspec ~ unspec
+ kcontrol/fonts/cr128-app-fonts.png ~ unspec ~ unspec
+ kcontrol/fonts/cr16-app-fonts.png ~ unspec ~ unspec
+ kcontrol/fonts/cr22-app-fonts.png ~ unspec ~ unspec
+ kcontrol/fonts/cr32-app-fonts.png ~ unspec ~ unspec
+ kcontrol/fonts/cr48-app-fonts.png ~ unspec ~ unspec
+ kcontrol/fonts/cr64-app-fonts.png ~ unspec ~ unspec
+ kcontrol/fonts/crsc-app-fonts.svgz ~ unspec ~ unspec
+ kcontrol/fonts/fonts.cpp ~ unspec ~ Copyright (c) Mark Donohoe 1997, lars Knoll 1999, Rik Hemsley 2000
+ kcontrol/fonts/fonts.desktop ~ unspec ~ unspec
+ kcontrol/fonts/fonts.h ~ unspec ~ Copyright (c) Mark Donohoe 1997, Lars Knoll 1999
+ kcontrol/fonts/kxftconfig.cpp ~ LGPLv2h ~ Copyright (c) 2002 Craig Drummond <craig at kde.org>
+ kcontrol/fonts/kxftconfig.h ~ LGPLv2h ~ Copyright (c) 2002 Craig Drummond <craig at kde.org>
+ kcontrol/fonts/Messages.sh ~ unspec ~ unspec
+ kcontrol/krdb/ad/* ~ unspec ~ unspec
+ kcontrol/krdb/AUTHORS ~ unspec ~ unspec
+ kcontrol/krdb/CMakeLists.txt ~ unspec ~ unspec
+ kcontrol/krdb/kcmdisplayrc.upd ~ unspec ~ unspec
+ kcontrol/krdb/kcs/* ~ unspec ~ unspec
+ kcontrol/krdb/krdb.cpp ~ GPL ~ ** Copyright (C) 1998 by Mark Donohoe
+ ** Copyright (C) 1999 by Dirk A. Mueller (reworked for KDE 2.0)
+ ** Copyright (C) 2001 by Matthias Ettrich (add support for GTK applications )
+ ** Copyright (C) 2001 by Waldo Bastian <bastian at kde.org>
+ ** Copyright (C) 2002 by Karol Szwed <gallium at kde.org>
+ kcontrol/krdb/krdb.h ~ GPLv2 ~ Copyright (c) 2001 Waldo Bastian <bastian at kde.org>
+ kcontrol/krdb/Messages.sh ~ unspec ~ unspec
+ kcontrol/krdb/pics/* ~ unspec ~ unspec
+ kcontrol/krdb/themes/* ~ unspec ~ unspec
+ kcontrol/kthememanager/CMakeLists.txt ~ unspec ~ unspec
+ kcontrol/kthememanager/cr128-app-kthememgr.png ~ unspec ~ unspec
+ kcontrol/kthememanager/cr16-app-kthememgr.png ~ unspec ~ unspec
+ kcontrol/kthememanager/cr22-app-kthememgr.png ~ unspec ~ unspec
+ kcontrol/kthememanager/cr32-app-kthememgr.png ~ unspec ~ unspec
+ kcontrol/kthememanager/cr48-app-kthememgr.png ~ unspec ~ unspec
+ kcontrol/kthememanager/cr64-app-kthememgr.png ~ unspec ~ unspec
+ kcontrol/kthememanager/installktheme.desktop ~ unspec ~ unspec
+ kcontrol/kthememanager/kdeinstallktheme ~ unspec ~ unspec
+ kcontrol/kthememanager/knewthemedlg.cpp ~ GPLv2h ~ Copyright (C) 2003 Lukas Tinkl <lukas at kde.org>
+ kcontrol/kthememanager/knewthemedlg.h ~ GPLv2h ~ Copyright (C) 2003 Lukas Tinkl <lukas at kde.org>
+ kcontrol/kthememanager/ktheme.cpp ~ GPLv2h ~ Copyright (C) 2003 Lukas Tinkl <lukas at kde.org>
+ kcontrol/kthememanager/kthemedlg.ui ~ unspec ~ unspec
+ kcontrol/kthememanager/kthemedlg.ui.h ~ unspec ~ unspec
+ kcontrol/kthememanager/ktheme.h ~ GPLv2h ~ Copyright (C) 2003 Lukas Tinkl <lukas at kde.org>
+ kcontrol/kthememanager/kthememanager.cpp ~ GPLv2h ~ Copyright (C) 2003 Lukas Tinkl <lukas at kde.org>
+ kcontrol/kthememanager/kthememanager.desktop ~ unspec ~ unspec
+ kcontrol/kthememanager/kthememanager.h ~ GPLv2h ~ Copyright (C) 2003 Lukas Tinkl <lukas at kde.org>
+ kcontrol/kthememanager/Messages.sh ~ unspec ~ unspec
+ kcontrol/kthememanager/NEWS ~ unspec ~ unspec
+ kcontrol/kthememanager/newthemewidget.ui ~ unspec ~ unspec
+ kcontrol/kthememanager/README ~ unspec ~ unspec
+ kcontrol/kthememanager/TODO ~ unspec ~ unspec
+ kcontrol/PURPOSE ~ unspec ~ unspec
+ kcontrol/style/CMakeLists.txt ~ unspec ~ unspec
+ kcontrol/style/cr16-app-style.png ~ unspec ~ unspec
+ kcontrol/style/cr22-app-style.png ~ unspec ~ unspec
+ kcontrol/style/cr32-app-style.png ~ unspec ~ unspec
+ kcontrol/style/cr48-app-style.png ~ unspec ~ unspec
+ kcontrol/style/cr64-app-style.png ~ unspec ~ unspec
+ kcontrol/style/kcmstyle.cpp ~ GPLv2 ~ * Copyright (C) 2002 Karol Szwed <gallium at kde.org>
+ * Copyright (C) 2002 Daniel Molkentin <molkentin at kde.org>
+ * Copyright (C) 2007 Urs Wolfer <uwolfer @ kde.org>
+ * Portions Copyright (C) 2000 TrollTech AS.
+ kcontrol/style/kcmstyle.h ~ GPLv2 ~ * Copyright (C) 2002 Karol Szwed <gallium at kde.org>
+ Copyright (C) 2002 Daniel Molkentin <molkentin at kde.org>
+ Copyright (C) 2007 Urs Wolfer <uwolfer @ kde.org>
+ Portions Copyright (C) TrollTech AS.
+ Copyright (C) 1997-2002 kcmdisplay Authors.
+ kcontrol/style/keramik/CMakeLists.txt ~ unspec ~ unspec
+ kcontrol/style/keramik/keramikconf.cpp ~ MIT ~ Copyright (c) 2003 Maksim Orlovich <maksim.orlovich at kdemail.net>
+ kcontrol/style/keramik/keramikconf.h ~ MIT ~ Copyright (c) 2003 Maksim Orlovich <maksim.orlovich at kdemail.net>
+ kcontrol/style/keramik/Messages.sh ~ unspec ~ unspec
+ kcontrol/style/menupreview.cpp ~ GPLv2 ~ * Copyright (C) 2002 Karol Szwed <gallium at kde.org>
+ kcontrol/style/menupreview.h ~ GPLv2 ~ * Copyright (C) 2002 Karol Szwed <gallium at kde.org>
+ kcontrol/style/Messages.sh ~ unspec ~ unspec
+ kcontrol/style/styleconfdialog.cpp ~ GPLv2 ~ Copyright (c) 2003 Maksim Orlovich <maksim.orlovich at kdemail.net>
+ kcontrol/style/styleconfdialog.h ~ GPLv2 ~ Copyright (c) 2003 Maksim Orlovich <maksim.orlovich at kdemail.net>
+ kcontrol/style/style.desktop ~ unspec ~ unspec
+ kcontrol/style/stylepreview.ui ~ unspec ~ unspec
+ kcontrol/TODO ~ unspec ~ unspec
+
+
+Files under systemsettings/
+
+ systemsettings/AUTHOR ~ unspec ~ unspec
+ systemsettings/categories/* ~ unspec ~ unspec
+ systemsettings/CMakeLists.txt ~ unspec ~ unspec
+ systemsettings/HACKING ~ unspec ~ unspec
+ systemsettings/hi128-app-systemsettings.png ~ unspec ~ unspec
+ systemsettings/hi16-app-systemsettings.png ~ unspec ~ unspec
+ systemsettings/hi22-app-systemsettings.png ~ unspec ~ unspec
+ systemsettings/hi32-app-systemsettings.png ~ unspec ~ unspec
+ systemsettings/hi48-app-systemsettings.png ~ unspec ~ unspec
+ systemsettings/hi64-app-systemsettings.png ~ unspec ~ unspec
+
+ systemsettings/kcmodulemenu.cpp ~ LGPLv2h ~ * Copyright (C) 2005 Benjamin C Meyer (ben+kcmodulemenu at meyerhome dot net)
+ systemsettings/kcmodulemenu.h ~ LGPLv2h ~ * Copyright (C) 2005 Benjamin C Meyer (ben+kcmodulemenu at meyerhome dot net)
+ systemsettings/kcmsearch.cpp ~ GPLv2h ~ * Copyright (C) 2005 Benjamin C Meyer
+ systemsettings/kcmsearch.h ~ GPLv2h ~ * Copyright (C) 2005 Benjamin C Meyer
+ systemsettings/kcmultiwidget.cpp ~ LGPLv2 ~ Copyright (c) 2000 Matthias Elter <elter at kde.org>
+ Copyright (c) 2003 Daniel Molkentin <molkentin at kde.org>
+ Copyright (c) 2003 Matthias Kretz <kretz at kde.org>
+ Copyright (c) 2004 Frans Englich <englich at kde.org>
+ systemsettings/kcmultiwidget.h ~ LGPLv2 ~ Copyright (c) 2000 Matthias Elter <elter at kde.org>
+ Copyright (c) 2003 Daniel Molkentin <molkentin at kde.org>
+ Copyright (c) 2003 Matthias Kretz <kretz at kde.org>
+ systemsettings/kicongrouppage.cpp ~ LGPLv2h ~ Copyright (c) 2007 Michael D. Stemle, Jr. <manchicken at notsosoft.net>
+ systemsettings/kicongrouppage.h ~ LGPLv2h ~ Copyright (c) 2007 Michael D. Stemle, Jr. <manchicken at notsosoft.net>
+ systemsettings/LAYOUT.html ~ unspec ~ unspec
+ systemsettings/main.cpp ~ GPLv2h ~ * Copyright (C) 2005 Benjamin C Meyer
+ systemsettings/mainwindow.cpp ~ GPLv2h ~ * Copyright (C) 2005 Benjamin C Meyer (ben+systempreferences at meyerhome dot net)
+ systemsettings/mainwindow.h ~ GPLv2h ~ * Copyright (C) 2005 Benjamin C Meyer (ben+systempreferences at meyerhome dot net)
+ systemsettings/Messages.sh ~ unspec ~ unspec
+ systemsettings/moduleiconitem.cpp ~ GPLv2h ~ * Copyright (C) 2005 Benjamin C Meyer
+ systemsettings/moduleiconitem.h ~ GPLv2h ~ * Copyright (C) 2005 Benjamin C Meyer
+ systemsettings/modulesview.cpp ~ GPLv2h ~ * Copyright (C) 2005 Benjamin C Meyer (ben+systempreferences at meyerhome dot net)
+ systemsettings/modulesview.h ~ GPLv2h ~ * Copyright (C) 2005 Benjamin C Meyer (ben+systempreferences at meyerhome dot net)
+ systemsettings/systemsettings.desktop ~ unspec ~ unspec
+ systemsettings/systemsettingsrc ~ unspec ~ unspec
+ systemsettings/systemsettingsui.rc ~ unspec ~ unspec
+ systemsettings/TODO ~ unspec ~ unspec
+ systemsettings/version.h ~ GPLv2h ~ * Copyright (C) 2005 Benjamin C Meyer (ben+systempreferences at meyerhome dot net)
+
+
+Files under wallpapers/
+
+As you can read in wallpapers/CREDITS:
+ | triplegears.jpg - Jörg Gastner <gastner at t-online.de>
+ | kde_box - francesco at hermanitosverdes.org
+ | default_blue.jpg - Qwertz <kraftw at gmx.de>
+ | seaofconero.jpg - Andrea Rizzi <rizzi at kde.org>
+ | blue-bend.jpg - Everaldo Coelho <everaldo at everaldo.com>
+ |
+ | License: free for commercial and noncommercial usage, distribution and
+ | modification
+ |
+ | The following tiles are courteously provided by Bowie J. Poag / PROPAGANDA:
+ |
+ | Chicken-Songs-2.jpg, No-Ones-Laughing-3.jpg, Time-For-Lunch-2.jpg, Totally-New-Product-1.jpg, Won-Ton-Soup-3.jpg
+ |
+ | License: Copyleft
+
+-------------------------------------------------------------------------------
+
+Legend:
+ - "unspec": The file contains no specific copyright/license notice. This
+ means that the copyright holder is the KDE Development Team (as
+ listed above) and the license is GPLv2, unless specified otherwise.
+ - "GPLv2": The GNU General Public License, version 2.
+ - "GPLv2h": The GNU General Public License, version 2 or (at your
+ option) higher.
+ - "LGPLv2h": The Lesser (or Library) GNU General Public License, version
+ 2 or (at your option).
+ - "LGPLv2": The Lesser (or Library) GNU General Public License, version 2.
+ - "MIT": Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+
+-------------------------------------------------------------------------------
+
+The Debian packaging is (C) 2007-2008, Debian Qt/KDE Maintainers
+<debian-qt-kde at lists.debian.org> and is licensed under the GPL,
+see `/usr/share/common-licenses/GPL'.
+
Added: branches/kde4/packages/systemsettings/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- branches/kde4/packages/systemsettings/debian/patches/20_use_dejavu_as_default_font.diff (rev 0)
+++ branches/kde4/packages/systemsettings/debian/patches/20_use_dejavu_as_default_font.diff 2008-07-16 13:36:34 UTC (rev 11598)
@@ -0,0 +1,21 @@
+--- a/kcontrol/fonts/fonts.cpp
++++ b/kcontrol/fonts/fonts.cpp
+@@ -513,12 +513,12 @@
+
+ // NOTE: 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", 9);
++ QFont f1("DejaVu Sans Mono", 9);
++ QFont f2("DejaVu Sans", 8);
++ QFont f3("DejaVu Sans", 9, QFont::Bold);
++ QFont f4("DejaVu Sans", 9);
++ QFont f5("DejaVu Sans", 8); // smallestReadableFont
+
+ defaultFontList << f0 << f1 << f5 << f2 << f0 << f3 << f4 << f0;
+
Added: branches/kde4/packages/systemsettings/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/systemsettings/debian/patches/97_fix_target_link_libraries.diff (rev 0)
+++ branches/kde4/packages/systemsettings/debian/patches/97_fix_target_link_libraries.diff 2008-07-16 13:36:34 UTC (rev 11598)
@@ -0,0 +1,33 @@
+--- a/kcontrol/colors/CMakeLists.txt 2008-07-16 13:58:47.000000000 +0300
++++ b/kcontrol/colors/CMakeLists.txt 2008-07-16 14:01:30.000000000 +0300
+@@ -5,7 +5,7 @@
+ kde4_add_ui_files(kcm_colors_PART_SRCS colorsettings.ui preview.ui)
+
+ kde4_add_plugin(kcm_colors ${kcm_colors_PART_SRCS})
+-target_link_libraries(kcm_colors ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
++target_link_libraries(kcm_colors ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KDEUI_LIBS} ${X11_X11_LIB})
+
+ install(TARGETS kcm_colors DESTINATION ${PLUGIN_INSTALL_DIR})
+ install( FILES colors.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+--- a/kcontrol/fonts/CMakeLists.txt 2008-07-16 13:58:47.000000000 +0300
++++ b/kcontrol/fonts/CMakeLists.txt 2008-07-16 14:01:18.000000000 +0300
+@@ -13,7 +13,7 @@
+
+ target_link_libraries(kcm_fonts ${KDE4_KDEUI_LIBS}
+ ${FONTCONFIG_LIBRARIES}
+- ${FREETYPE_LIBRARIES} ${QT_QTXML_LIBRARY} ${X11_LIBRARIES}
++ ${FREETYPE_LIBRARIES} ${QT_QTXML_LIBRARY} ${X11_X11_LIB}
+ )
+
+ install(TARGETS kcm_fonts DESTINATION ${PLUGIN_INSTALL_DIR} )
+--- a/kcontrol/style/CMakeLists.txt 2008-07-16 13:58:47.000000000 +0300
++++ b/kcontrol/style/CMakeLists.txt 2008-07-16 14:00:55.000000000 +0300
+@@ -11,7 +11,7 @@
+
+ kde4_add_plugin(kcm_style ${kcm_style_PART_SRCS})
+
+-target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES})
++target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${X11_X11_LIB})
+
+ install(TARGETS kcm_style DESTINATION ${PLUGIN_INSTALL_DIR})
+
Added: branches/kde4/packages/systemsettings/debian/patches/orig_tar_gz.diff
===================================================================
--- branches/kde4/packages/systemsettings/debian/patches/orig_tar_gz.diff (rev 0)
+++ branches/kde4/packages/systemsettings/debian/patches/orig_tar_gz.diff 2008-07-16 13:36:34 UTC (rev 11598)
@@ -0,0 +1,198 @@
+--- a/CMakeLists.txt 2008-07-16 11:34:45.000000000 +0300
++++ b/CMakeLists.txt 2008-07-16 10:52:16.000000000 +0300
+@@ -1,4 +1,4 @@
+-project(KDEBASE_WORKSPACE)
++project(SYSTEMSETTINGS)
+
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
+@@ -9,9 +9,7 @@
+ find_package(Strigi REQUIRED)
+ find_package(QImageBlitz REQUIRED)
+
+-macro_optional_find_package(USB)
+ macro_optional_find_package(Fontconfig)
+-macro_optional_find_package(OpenGL)
+
+ include (MacroLibrary)
+ include (KDE4Defaults)
+@@ -23,77 +21,17 @@
+ if (NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+ set(EXPORT_XCURSOR_PATH "export XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"")
+ endif (NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+- configure_file (startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY)
+- configure_file (safestartkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/safestartkde @ONLY)
+ endif (NOT WIN32)
+ configure_file (config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h )
+
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1)
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
+-set( backgroundlib_SRCS
+- ${CMAKE_CURRENT_SOURCE_DIR}/kcontrol/kdm/background/bgrender.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/kcontrol/kdm/background/bgsettings.cpp
+-)
+-
+-set( kcmbackgroundlib_SRCS
+- ${CMAKE_CURRENT_SOURCE_DIR}/kcontrol/kdm/background/bgdialog.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/kcontrol/kdm/background/bgadvanced.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/kcontrol/kdm/background/bgmonitor.cpp
+- ${CMAKE_CURRENT_SOURCE_DIR}/kcontrol/kdm/background/bgwallpaper.cpp
+-)
+-
+-include_directories(
+- ${CMAKE_CURRENT_BINARY_DIR}
+- ${CMAKE_CURRENT_SOURCE_DIR}/kdm
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs
+- ${CMAKE_CURRENT_SOURCE_DIR}/libs/kworkspace
+-)
+-# libs
+-add_subdirectory(cmake)
+-add_subdirectory(libs)
+-
+ # system settings (kcontrol replacement)
+ macro_optional_add_subdirectory( systemsettings )
+
+-# core apps
+-macro_optional_add_subdirectory( kcheckpass )
+-macro_optional_add_subdirectory( kscreensaver )
+-macro_optional_add_subdirectory( solid )
+-macro_optional_add_subdirectory( ksmserver )
+-macro_optional_add_subdirectory( kcminit )
+-macro_optional_add_subdirectory( ksplash )
+-macro_optional_add_subdirectory( ksysguard )
+-macro_optional_add_subdirectory( klipper )
+-macro_optional_add_subdirectory( kmenuedit )
+-macro_optional_add_subdirectory( krunner )
+-macro_optional_add_subdirectory( kwin )
+-macro_optional_add_subdirectory( plasma )
+-macro_optional_add_subdirectory( kstartupconfig )
+-
+-macro_optional_add_subdirectory( khotkeys )
+-
+ # apps we need to figure out what to do with
+ macro_optional_add_subdirectory( kcontrol )
+-macro_optional_add_subdirectory( ksystraycmd )
+-# data
+-macro_optional_add_subdirectory( cursors )
+-macro_optional_add_subdirectory( doc )
+-macro_optional_add_subdirectory( wallpapers )
+-
+-if(X11_Xau_FOUND AND X11_Xdmcp_FOUND)
+- add_subdirectory( kdm )
+-else(X11_Xau_FOUND AND X11_Xdmcp_FOUND)
+- MESSAGE(STATUS "Xau lib or Xdmcp lib was missing. kdm will not compile")
+-endif(X11_Xau_FOUND AND X11_Xdmcp_FOUND)
+-
+-SET(krunner_DEPENDS "plasma")
+-
+-########### install files ###############
+-if (NOT WIN32)
+- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/startkde DESTINATION ${BIN_INSTALL_DIR})
+- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/safestartkde DESTINATION ${BIN_INSTALL_DIR})
+-endif (NOT WIN32)
+
+ if(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ macro_display_feature_log()
+--- a/kcontrol/CMakeLists.txt 2008-07-16 11:34:45.000000000 +0300
++++ b/kcontrol/CMakeLists.txt 2008-07-16 11:42:09.000000000 +0300
+@@ -2,43 +2,6 @@
+
+ set(libkxftconfig_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/fonts/kxftconfig.cpp )
+
+-
+-if( X11_Xrandr_FOUND )
+- add_subdirectory( randr )
+-endif(X11_Xrandr_FOUND )
+-
+-if(X11_Xkb_FOUND)
+- add_subdirectory( kxkb )
+- add_subdirectory( keyboard )
+-endif(X11_Xkb_FOUND)
+-
+-add_subdirectory( bell )
+-
+-add_subdirectory( input )
+-add_subdirectory( kdm )
+-add_subdirectory( launch )
+-add_subdirectory( dateandtime )
+ add_subdirectory( colors )
+-add_subdirectory( energy )
+ add_subdirectory( fonts )
+-add_subdirectory( krdb )
+ add_subdirectory( style )
+-add_subdirectory( screensaver )
+-add_subdirectory( keys )
+-if(X11_Xinerama_FOUND)
+- add_subdirectory( xinerama )
+-endif(X11_Xinerama_FOUND)
+-
+-#TODO needs porting to what changed in KDE4 + please also rethink if it's really needed/useful to provide a duplicated nav-hierachy for colors, fonts, etc. - thx :)
+-#add_subdirectory( kthememanager )
+-
+-add_subdirectory( hardware )
+-add_subdirectory( access )
+-add_subdirectory(autostart)
+-
+-if(FONTCONFIG_FOUND AND FREETYPE_FOUND)
+- add_subdirectory( kfontinst )
+-endif(FONTCONFIG_FOUND AND FREETYPE_FOUND)
+-
+-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(KSMCARD_SUBDIR)")
+-
+--- a/ConfigureChecks.cmake 2008-01-05 01:55:50.000000000 +0200
++++ b/ConfigureChecks.cmake 2008-07-16 13:52:14.000000000 +0300
+@@ -1,44 +1,9 @@
+-include(UnixAuth)
++include(CheckFunctionExists)
+ include(CheckTypeSize)
+ include(FindPkgConfig)
+
+ macro_optional_find_package(XKB) # kxkb, kdm
+
+-if (PAM_FOUND)
+- set(KDE4_COMMON_PAM_SERVICE "kde" CACHE STRING "The PAM service to use unless overridden for a particular app.")
+-
+- macro(define_pam_service APP)
+- string(TOUPPER ${APP}_PAM_SERVICE var)
+- set(cvar KDE4_${var})
+- set(${cvar} "${KDE4_COMMON_PAM_SERVICE}" CACHE STRING "The PAM service for ${APP}.")
+- mark_as_advanced(${cvar})
+- set(${var} "\"${${cvar}}\"")
+- endmacro(define_pam_service)
+-
+- macro(install_pam_service APP)
+- string(TOUPPER KDE4_${APP}_PAM_SERVICE cvar)
+- install(CODE "
+-set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
+-if (NOT DESTDIR_VALUE)
+- exec_program(\"${CMAKE_SOURCE_DIR}/workspace/mkpamserv\" ARGS ${${cvar}} RETURN_VALUE ret)
+- if (NOT ret)
+- exec_program(\"${CMAKE_SOURCE_DIR}/workspace/mkpamserv\" ARGS -P ${${cvar}}-np)
+- endif (NOT ret)
+-endif (NOT DESTDIR_VALUE)
+- ")
+- endmacro(install_pam_service)
+-
+- define_pam_service(KDM)
+- define_pam_service(kcheckpass)
+- define_pam_service(kscreensaver)
+-
+-else (PAM_FOUND)
+-
+- macro(install_pam_service APP)
+- endmacro(install_pam_service)
+-
+-endif (PAM_FOUND)
+-
+ find_program(some_x_program NAMES iceauth xrdb xterm)
+ if (NOT some_x_program)
+ set(some_x_program /usr/bin/xrdb)
+--- a/kcontrol/style/CMakeLists.txt 2008-07-16 14:30:56.000000000 +0300
++++ b/kcontrol/style/CMakeLists.txt 2008-07-16 14:31:01.000000000 +0300
+@@ -1,5 +1,4 @@
+ KDE4_NO_ENABLE_FINAL(styles)
+-add_subdirectory( keramik )
+
+ include_directories( ${QIMAGEBLITZ_INCLUDES} )
+
Added: branches/kde4/packages/systemsettings/debian/patches/series
===================================================================
--- branches/kde4/packages/systemsettings/debian/patches/series (rev 0)
+++ branches/kde4/packages/systemsettings/debian/patches/series 2008-07-16 13:36:34 UTC (rev 11598)
@@ -0,0 +1,2 @@
+20_use_dejavu_as_default_font.diff
+97_fix_target_link_libraries.diff
Added: branches/kde4/packages/systemsettings/debian/rules
===================================================================
--- branches/kde4/packages/systemsettings/debian/rules (rev 0)
+++ branches/kde4/packages/systemsettings/debian/rules 2008-07-16 13:36:34 UTC (rev 11598)
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+
+CURDIR_NAME := $(notdir $(CURDIR))
+CURDIR_UPSTREAMVERSION = $(shell echo "$(CURDIR_NAME)" | sed 's/^.*-\([^-]\+\)$$/\1/' | grep -v 'kdebase-workspace')
+CHANGELOG_UPSTREAMVERSION = $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(.*\)-.*/\1/')
+UPSTREAMVERSION := $(if $(CURDIR_UPSTREAMVERSION),$(CURDIR_UPSTREAMVERSION),$(CHANGELOG_UPSTREAMVERSION))
+DIR_NAME := systemsettings-$(UPSTREAMVERSION)
+TARBALL_NAME := systemsettings_$(UPSTREAMVERSION).orig.tar.gz
+ORIG_TAR_GZ_PATCH := debian/patches/orig_tar_gz.diff
+
+include debian/cdbs/kde.mk
+
+get-orig-source: clean
+ # Remove unnecessary top level directories
+ find . -maxdepth 1 -mindepth 1 -type d -a ! \( \
+ -name debian -o \
+ -name systemsettings -o \
+ -name kcontrol \) -exec rm -rf {} \;
+ # Remove unnecesary kcms
+ find kcontrol -maxdepth 1 -mindepth 1 -type d -a ! \( \
+ -name krdb -o \
+ -name fonts -o \
+ -name colors -o \
+ -name style \) -exec rm -rf {} \;
+ # Remove kcontrol/style/keramik
+ rm -rf kcontrol/style/keramik
+ # Remove unnecessary top level files
+ find . -maxdepth 1 -mindepth 1 -type f -a ! \( \
+ -name CMakeLists.txt -o \
+ -name "config-*.h.cmake" -o \
+ -name "ConfigureChecks.cmake" -o \
+ -name "COPYING*" \) -exec rm -rf {} \;
+ # Apply orig_tar_gz patch
+ if [ -f "$(ORIG_TAR_GZ_PATCH)" ]; then patch -p1 --no-backup-if-mismatch -r /dev/null < "$(ORIG_TAR_GZ_PATCH)"; fi
+ # Create a tarball as ../$(TARBALL_NAME)
+ cd .. && \
+ if [ "$(DIR_NAME)" != "$(CURDIR_NAME)" ]; then mv "$(CURDIR_NAME)" "$(DIR_NAME)"; fi && \
+ tar cz --exclude=debian -f "$(TARBALL_NAME)" "$(DIR_NAME)"
Property changes on: branches/kde4/packages/systemsettings/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the pkg-kde-commits
mailing list