rev 10817 - in branches/kde4/packages: kdebase-runtime/debian kdebase-runtime/debian/patches kdebase-workspace/debian kdebase-workspace/debian/patches
Fathi Boudra
fabo at alioth.debian.org
Sun Jun 1 10:20:38 UTC 2008
Author: fabo
Date: 2008-06-01 10:20:37 +0000 (Sun, 01 Jun 2008)
New Revision: 10817
Modified:
branches/kde4/packages/kdebase-runtime/debian/changelog
branches/kde4/packages/kdebase-runtime/debian/patches/03_ktrash4.diff
branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff
branches/kde4/packages/kdebase-workspace/debian/changelog
branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
branches/kde4/packages/kdebase-workspace/debian/patches/17_ksysguard_disable_procmon_when_unsupported.diff
branches/kde4/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff
branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
Log:
Update kdebase-runtime and workspace snapshot.
Refresh patches.
Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog 2008-06-01 09:49:18 UTC (rev 10816)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog 2008-06-01 10:20:37 UTC (rev 10817)
@@ -1,8 +1,8 @@
-kdebase-runtime (4:4.0.81+svn814482-1~pre1) UNRELEASED; urgency=low
+kdebase-runtime (4:4.0.81+svn815042-1~pre1) UNRELEASED; urgency=low
* New upstream development snapshot:
- - The latest upstream commit is r813996 by gaurav
- - Date: Thu, 29 May 2008 11:45:17 -0000
+ - The latest upstream commit is r815042 by segato
+ - Date: Sun Jun 1 01:32:12 2008 UTC
* Update install files:
- kdebase-runtime-data.install: 19 new file(s) added; 40 file(s) removed;
- kdebase-runtime.install: 6 new file(s) added;
@@ -12,7 +12,7 @@
* Build depend on libasound2-dev on linux arches.
* Add replaces with kdelibs5* due to moved phonon stuff.
* Bump kdelibs5 build depends version. No longer depend on phonon, it's
- implied via kdelibs5-dev dependancy.
+ implied via kdelibs5-dev dependency.
* !! DO NOT install kaudiodevicelist development files for now. !!
+++ Changes by Ana Beatriz Guerrero Lopez:
Modified: branches/kde4/packages/kdebase-runtime/debian/patches/03_ktrash4.diff
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/03_ktrash4.diff 2008-06-01 09:49:18 UTC (rev 10816)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/03_ktrash4.diff 2008-06-01 10:20:37 UTC (rev 10817)
@@ -1,6 +1,6 @@
--- a/kioslave/trash/CMakeLists.txt
+++ b/kioslave/trash/CMakeLists.txt
-@@ -31,11 +31,11 @@
+@@ -35,11 +35,11 @@
set(ktrash_SRCS ktrash.cpp )
Modified: branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff 2008-06-01 09:49:18 UTC (rev 10816)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff 2008-06-01 10:20:37 UTC (rev 10817)
@@ -180,7 +180,7 @@
--- a/kurifilter-plugins/ikws/CMakeLists.txt
+++ b/kurifilter-plugins/ikws/CMakeLists.txt
@@ -13,7 +13,7 @@
- kde4_add_plugin(kuriikwsfilter WITH_PREFIX ${kuriikwsfilter_PART_SRCS})
+ kde4_add_plugin(kuriikwsfilter ${kuriikwsfilter_PART_SRCS})
-target_link_libraries(kuriikwsfilter ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} )
@@ -189,7 +189,7 @@
install(TARGETS kuriikwsfilter DESTINATION ${PLUGIN_INSTALL_DIR} )
@@ -34,7 +34,7 @@
- kde4_add_plugin(kurisearchfilter WITH_PREFIX ${kurisearchfilter_PART_SRCS})
+ kde4_add_plugin(kurisearchfilter ${kurisearchfilter_PART_SRCS})
-target_link_libraries(kurisearchfilter ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
@@ -201,7 +201,7 @@
+++ b/kurifilter-plugins/localdomain/CMakeLists.txt
@@ -4,7 +4,7 @@
- kde4_add_plugin(localdomainurifilter WITH_PREFIX ${localdomainurifilter_PART_SRCS})
+ kde4_add_plugin(localdomainurifilter ${localdomainurifilter_PART_SRCS})
-target_link_libraries(localdomainurifilter ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(localdomainurifilter ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY})
@@ -211,7 +211,7 @@
--- a/kurifilter-plugins/shorturi/CMakeLists.txt
+++ b/kurifilter-plugins/shorturi/CMakeLists.txt
@@ -9,7 +9,7 @@
- kde4_add_plugin(kshorturifilter WITH_PREFIX ${kshorturifilter_PART_SRCS})
+ kde4_add_plugin(kshorturifilter ${kshorturifilter_PART_SRCS})
-target_link_libraries(kshorturifilter ${KDE4_KIO_LIBS})
Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog 2008-06-01 09:49:18 UTC (rev 10816)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog 2008-06-01 10:20:37 UTC (rev 10817)
@@ -1,8 +1,8 @@
-kdebase-workspace (4:4.0.81+svn814123-1~pre1) UNRELEASED; urgency=low
+kdebase-workspace (4:4.0.81+svn815068-1~pre1) UNRELEASED; urgency=low
* New upstream development snapshot:
- - The latest upstream commit is r814123 by pdamsten
- - Date: Thu, 29 May 2008 12:11:37 -0000
+ - The latest upstream commit is r815068 by aseigo
+ - Date: Sun Jun 1 05:08:28 2008 UTC
+++ Changes by Modestas Vainius:
Modified: branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff 2008-06-01 09:49:18 UTC (rev 10816)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff 2008-06-01 10:20:37 UTC (rev 10817)
@@ -1,6 +1,6 @@
--- a/kdm/kfrontend/CMakeLists.txt
+++ b/kdm/kfrontend/CMakeLists.txt
-@@ -111,5 +111,5 @@
+@@ -109,5 +109,5 @@
## use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
install(CODE "
Modified: branches/kde4/packages/kdebase-workspace/debian/patches/17_ksysguard_disable_procmon_when_unsupported.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/17_ksysguard_disable_procmon_when_unsupported.diff 2008-06-01 09:49:18 UTC (rev 10816)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/17_ksysguard_disable_procmon_when_unsupported.diff 2008-06-01 10:20:37 UTC (rev 10817)
@@ -1,6 +1,6 @@
--- a/libs/ksysguard/processui/CMakeLists.txt
+++ b/libs/ksysguard/processui/CMakeLists.txt
-@@ -4,11 +4,47 @@ include_directories( ${CMAKE_CURRENT_SOU
+@@ -4,11 +4,47 @@
check_include_files(sys/ptrace.h HAVE_SYS_PTRACE_H)
if (HAVE_SYS_PTRACE_H)
@@ -50,7 +50,7 @@
set(processui_LIB_SRCS
ksysguardprocesslist.cpp
ProcessFilter.cc
-@@ -36,11 +72,7 @@ install(TARGETS processui ${INSTALL_TARG
+@@ -36,11 +72,7 @@
#----------------------
@@ -63,7 +63,7 @@
kde4_add_plugin(ksysguardwidgets ${ksysguardwidgets_PART_SRCS})
---- a/libs/ksysguard/processui/KMonitorProcessIO.widgets
+--- /dev/null
+++ b/libs/ksysguard/processui/KMonitorProcessIO.widgets
@@ -0,0 +1,7 @@
+
@@ -75,7 +75,7 @@
+IncludeFile=KMonitorProcessIO.h
--- a/libs/ksysguard/processui/ksysguardprocesslist.cpp
+++ b/libs/ksysguard/processui/ksysguardprocesslist.cpp
-@@ -147,7 +147,11 @@ struct KSysGuardProcessListPrivate {
+@@ -147,7 +147,11 @@
selectTracer = new QAction(i18n("Jump to Process Debugging This One"), q);
window = new QAction(i18n("Show Application Window"), q);
@@ -87,7 +87,7 @@
resume = new QAction(i18n("Resume Stopped Process"), q);
kill = new QAction(i18np("Kill Process", "Kill Processes", 1), q);
kill->setIcon(KIcon("process-stop"));
-@@ -262,8 +266,10 @@ KSysGuardProcessList::KSysGuardProcessLi
+@@ -262,8 +266,10 @@
// Add all the actions to the main widget, and get all the actions to call actionTriggered when clicked
QSignalMapper *signalMapper = new QSignalMapper(this);
QList<QAction *> actions;
@@ -100,7 +100,7 @@
foreach(QAction *action, actions) {
addAction(action);
connect(action, SIGNAL(triggered(bool)), signalMapper, SLOT(map()));
-@@ -386,7 +392,7 @@ void KSysGuardProcessList::showProcessCo
+@@ -386,7 +392,7 @@
if (numProcesses == 1 && !d->mModel.data(realIndex, ProcessModel::WindowIdRole).isNull()) {
d->mProcessContextMenu->addAction(d->window);
}
@@ -109,7 +109,7 @@
d->mProcessContextMenu->addAction(d->monitorio);
}
-@@ -440,6 +446,7 @@ void KSysGuardProcessList::actionTrigger
+@@ -440,6 +446,7 @@
KWindowSystem::activateWindow(wid);
}
}
@@ -117,7 +117,7 @@
} else if(result == d->monitorio) {
QModelIndexList selectedIndexes = d->mUi->treeView->selectionModel()->selectedRows();
if(selectedIndexes.isEmpty()) return; //No processes selected
-@@ -449,6 +456,7 @@ void KSysGuardProcessList::actionTrigger
+@@ -449,6 +456,7 @@
DisplayProcessDlg *dialog = new DisplayProcessDlg( this,process );
dialog->show();
}
@@ -127,7 +127,7 @@
QModelIndexList selectedIndexes = d->mUi->treeView->selectionModel()->selectedRows();
--- a/libs/ksysguard/processui/ksysguard.widgets
+++ b/libs/ksysguard/processui/ksysguard.widgets
-@@ -15,10 +15,3 @@ WhatsThis=A widget for displaying out fr
+@@ -15,10 +15,3 @@
Group=KSysGuard (KDE)
ConstructorArgs=(parent)
IncludeFile=KTextEditVT.h
Modified: 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 2008-06-01 09:49:18 UTC (rev 10816)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/20_use_dejavu_as_default_font.diff 2008-06-01 10:20:37 UTC (rev 10817)
@@ -1,8 +1,8 @@
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
-@@ -513,19 +513,12 @@
+@@ -513,12 +513,12 @@
- // Keep in sync with kdelibs/kdeui/kernel/kglobalsettings.cpp
+ // NOTE: keep in sync with kdelibs/kdeui/kernel/kglobalsettings.cpp
- QFont f0("Sans Serif", 10);
- QFont f1("Monospace", 10);
@@ -10,13 +10,6 @@
- QFont f3("Sans Serif", 9, QFont::Bold);
- QFont f4("Sans Serif", 10);
- QFont f5("Sans Serif", 8); // smallestReadableFont
--
-- f0.setPointSize(10);
-- f1.setPointSize(10);
-- f2.setPointSize(8);
-- f3.setPointSize(9);
-- f4.setPointSize(10);
-- f5.setPointSize(8);
+ QFont f0("DejaVu Sans", 9);
+ QFont f1("DejaVu Sans Mono", 9);
+ QFont f2("DejaVu Sans", 8);
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-06-01 09:49:18 UTC (rev 10816)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff 2008-06-01 10:20:37 UTC (rev 10817)
@@ -513,7 +513,7 @@
kde4_add_library(kfontinstui SHARED ${kfontinstui_LIB_SRCS})
--- a/libs/plasma/CMakeLists.txt
+++ b/libs/plasma/CMakeLists.txt
-@@ -87,6 +87,7 @@
+@@ -90,6 +90,7 @@
target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}
${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
More information about the pkg-kde-commits
mailing list