rev 10575 - in branches/kde4/packages/kdebase-workspace/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Mon May 12 17:18:35 UTC 2008
Author: modax-guest
Date: 2008-05-12 17:18:35 +0000 (Mon, 12 May 2008)
New Revision: 10575
Modified:
branches/kde4/packages/kdebase-workspace/debian/changelog
branches/kde4/packages/kdebase-workspace/debian/kdm.install
branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
Log:
New snapshot.
Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog 2008-05-12 16:04:31 UTC (rev 10574)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog 2008-05-12 17:18:35 UTC (rev 10575)
@@ -1,8 +1,8 @@
-kdebase-workspace (4:4.0.73+svn806231-1~pre1) UNRELEASED; urgency=low
+kdebase-workspace (4:4.0.73+svn806941-1~pre1) UNRELEASED; urgency=low
* New upstream development snapshot:
- - The latest upstream commit is r806231 by mart
- - Date: Sat, 10 May 2008 18:08:48 -0000
+ - The latest upstream commit is r806941 by lunakl
+ - Date: Mon, 12 May 2008 16:31:33 -0000
* Resolved bugs:
- kdm password field is again reachable without mouse click when using
@@ -11,7 +11,9 @@
+++ Changes by Modestas Vainius:
* Update install files.
- * Resync 97_ patch.
+ * Refresh patches (adopt to upstream changes):
+ * 10_kdm_no_custom
+ * 97_fix_target_link_libraries
+++ Changes by Armin Berres:
@@ -26,7 +28,7 @@
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> Sun, 11 May 2008 22:25:13 +0000
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 12 May 2008 20:00:04 +0300
kdebase-workspace (4:4.0.72-1) experimental; urgency=low
Modified: branches/kde4/packages/kdebase-workspace/debian/kdm.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdm.install 2008-05-12 16:04:31 UTC (rev 10574)
+++ branches/kde4/packages/kdebase-workspace/debian/kdm.install 2008-05-12 17:18:35 UTC (rev 10575)
@@ -24,12 +24,29 @@
usr/share/doc/kde4/HTML/en/kdm/theme-ref.docbook
usr/share/kde4/apps/doc/kdm/README
usr/share/kde4/apps/doc/kdm/greeter.dtd
+usr/share/kde4/apps/kdm/patterns/fish.desktop
+usr/share/kde4/apps/kdm/patterns/fish.png
+usr/share/kde4/apps/kdm/patterns/flowers.desktop
+usr/share/kde4/apps/kdm/patterns/flowers.png
+usr/share/kde4/apps/kdm/patterns/night-rock.desktop
+usr/share/kde4/apps/kdm/patterns/night-rock.jpg
+usr/share/kde4/apps/kdm/patterns/pavement.desktop
+usr/share/kde4/apps/kdm/patterns/pavement.png
+usr/share/kde4/apps/kdm/patterns/rattan.desktop
+usr/share/kde4/apps/kdm/patterns/rattan.png
+usr/share/kde4/apps/kdm/patterns/stonewall2.desktop
+usr/share/kde4/apps/kdm/patterns/stonewall2.png
+usr/share/kde4/apps/kdm/patterns/triangles.desktop
+usr/share/kde4/apps/kdm/patterns/triangles.png
usr/share/kde4/apps/kdm/pics/kdelogo.png
-usr/share/kde4/apps/kdm/pics/shutdown.jpg
+usr/share/kde4/apps/kdm/pics/shutdown.png
usr/share/kde4/apps/kdm/pics/users/default1.png
usr/share/kde4/apps/kdm/pics/users/default2.png
usr/share/kde4/apps/kdm/pics/users/default3.png
usr/share/kde4/apps/kdm/pics/users/root1.png
+usr/share/kde4/apps/kdm/programs/xearth.desktop
+usr/share/kde4/apps/kdm/programs/xglobe.desktop
+usr/share/kde4/apps/kdm/programs/xplanet.desktop
usr/share/kde4/apps/kdm/sessions/9wm.desktop
usr/share/kde4/apps/kdm/sessions/aewm++.desktop
usr/share/kde4/apps/kdm/sessions/aewm.desktop
Modified: branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff 2008-05-12 16:04:31 UTC (rev 10574)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff 2008-05-12 17:18:35 UTC (rev 10575)
@@ -1,6 +1,6 @@
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
-@@ -387,7 +387,6 @@
+@@ -388,7 +388,6 @@
KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
{
int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
@@ -8,11 +8,11 @@
!strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
for (int i = 0; i < sessionTypes.size(); i++)
if (sessionTypes[i].type == type) {
-@@ -416,7 +415,6 @@
+@@ -417,7 +416,6 @@
dsk.readEntry( "Exec" ).toLatin1() );
}
- putSession( "default", i18n("Default"), false, "default" );
-- putSession( "custom", i18n("Custom"), false, "custom" );
- putSession( "failsafe", i18n("Failsafe"), false, "failsafe" );
+ putSession( "default", i18nc("@item:inlistbox session type", "Default"), false, "default" );
+- putSession( "custom", i18nc("@item:inlistbox session type", "Custom"), false, "custom" );
+ putSession( "failsafe", i18nc("@item:inlistbox session type", "Failsafe"), false, "failsafe" );
qSort( sessionTypes );
for (int i = 0; i < sessionTypes.size() && !sessionTypes[i].hid; i++) {
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-12 16:04:31 UTC (rev 10574)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff 2008-05-12 17:18:35 UTC (rev 10575)
@@ -66,8 +66,8 @@
set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp )
kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})
--target_link_libraries(kcm_kwinoptions ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
-+target_link_libraries(kcm_kwinoptions ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTDBUS_LIBRARY})
+-target_link_libraries(kcm_kwinoptions ${KDE4_KDEUI_LIBS})
++target_link_libraries(kcm_kwinoptions ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY})
install(TARGETS kcm_kwinoptions DESTINATION ${PLUGIN_INSTALL_DIR} )
@@ -88,8 +88,8 @@
kde4_add_library(kworkspace SHARED ${kworkspace_LIB_SRCS})
--target_link_libraries(kworkspace ${KDE4_KIO_LIBS} ${X11_LIBRARIES} )
-+target_link_libraries(kworkspace ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_LIBRARIES} )
+-target_link_libraries(kworkspace ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} )
++target_link_libraries(kworkspace ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_LIBRARIES} )
set_target_properties(kworkspace PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kworkspace ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -121,8 +121,8 @@
kde4_add_library(taskmanager SHARED ${taskmanager_LIB_SRCS})
--target_link_libraries(taskmanager ${KDE4_KDE3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS} )
-+target_link_libraries(taskmanager ${KDE4_KDE3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS} ${X11_X11_LIB} )
+-target_link_libraries(taskmanager ${KDE4_KDEUI_LIBS})
++target_link_libraries(taskmanager ${KDE4_KDEUI_LIBS} ${X11_X11_LIB})
if (X11_Xfixes_FOUND)
target_link_libraries(taskmanager ${X11_Xfixes_LIB})
endif (X11_Xfixes_FOUND)
More information about the pkg-kde-commits
mailing list