Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Wed Mar 9 17:38:32 CET 2011.
-------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2011-02-27 10:18:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2011-03-08 14:08:01.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 8 14:07:59 CET 2011 - [email protected] + +- update to 4.6.1 + * Bugfixes over KDE 4.6.0 + * see http://kde.org/announcements/changelogs/changelog4_6_0to4_6_1.php for details + + +------------------------------------------------------------------- --- KDE/kdebase4-workspace/kdebase4-workspace.changes 2011-02-27 10:18:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-workspace.changes 2011-03-08 14:24:46.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 8 14:07:59 CET 2011 - [email protected] + +- update to 4.6.1 + * Bugfixes over KDE 4.6.0 + * see http://kde.org/announcements/changelogs/changelog4_6_0to4_6_1.php for details +- remove upstreamed patches + +------------------------------------------------------------------- --- KDE/kdebase4-workspace/python-kdebase4.changes 2011-02-27 10:18:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/python-kdebase4.changes 2011-03-08 14:08:02.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 8 14:07:59 CET 2011 - [email protected] + +- update to 4.6.1 + * Bugfixes over KDE 4.6.0 + * see http://kde.org/announcements/changelogs/changelog4_6_0to4_6_1.php for details + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bko265206-plasma-notification-crashfix.diff bnc661844-akonadi-launched-by-calendarwidget.diff build-final.diff kdebase-workspace-4.6.0.tar.bz2 powerdevil_46branchupdate.diff New: ---- kdebase-workspace-4.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.B8i6pU/_old 2011-03-09 17:37:56.000000000 +0100 +++ /var/tmp/diff_new_pack.B8i6pU/_new 2011-03-09 17:37:56.000000000 +0100 @@ -22,8 +22,8 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.6.0 -Release: 7 +Version: 4.6.1 +Release: 1 BuildRequires: libdbusmenu-qt-devel BuildRequires: libkdepimlibs4-devel >= %version BuildRequires: libqimageblitz-devel ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.B8i6pU/_old 2011-03-09 17:37:56.000000000 +0100 +++ /var/tmp/diff_new_pack.B8i6pU/_new 2011-03-09 17:37:56.000000000 +0100 @@ -22,8 +22,8 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.6.0 -Release: 14 +Version: 4.6.1 +Release: 1 BuildRequires: audit-devel BuildRequires: bluez-devel BuildRequires: ConsoleKit-devel @@ -105,10 +105,6 @@ Patch201: plasma-notifications-kill-timer.diff Patch208: kdm-themer-wallpaper-sizes.diff Patch211: disable-python-support.diff -Patch212: build-final.diff -Patch213: bko265206-plasma-notification-crashfix.diff -Patch214: bnc661844-akonadi-launched-by-calendarwidget.diff -Patch215: powerdevil_46branchupdate.diff Patch216: kwin-update-blacklist-11.4.diff Requires: kde4-kgreeter-plugins = %version Requires: kdebase4-workspace-liboxygenstyle = %version @@ -198,10 +194,6 @@ ###KDE45: rediff! - kdm code may have added similar functionality #%patch208 %patch211 -%patch212 -%patch213 -p1 -%patch214 -p1 -%patch215 -p1 %patch216 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.B8i6pU/_old 2011-03-09 17:37:56.000000000 +0100 +++ /var/tmp/diff_new_pack.B8i6pU/_new 2011-03-09 17:37:56.000000000 +0100 @@ -26,8 +26,8 @@ Group: System/GUI/KDE Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ -Version: 4.6.0 -Release: 7 +Version: 4.6.1 +Release: 1 BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libdbusmenu-qt-devel libkdepimlibs4-devel >= %version libqimageblitz-devel BuildRequires: libknotificationitem-devel libsmbclient-devel libxklavier-devel python-kde4-devel >= %version Source0: kdebase-workspace-%version.tar.bz2 ++++++ 4_6_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.B8i6pU/_old 2011-03-09 17:37:56.000000000 +0100 +++ /var/tmp/diff_new_pack.B8i6pU/_new 2011-03-09 17:37:56.000000000 +0100 @@ -5,24 +5,3 @@ @@ -0,0 +1,2 @@ +current HEAD: 1204116 +svn di between //trunk/KDE/kdebase/workspace@1149349 and //trunk/KDE/kdebase/workspace ---- startkde.cmake.orig 2011-01-26 15:21:14.856499000 +0100 -+++ startkde.cmake 2011-01-26 15:21:24.559585000 +0100 -@@ -36,18 +36,6 @@ - # we have to unset this for Darwin since it will screw up KDE's dynamic-loading - unset DYLD_FORCE_FLAT_NAMESPACE - --# Enable lightweight memory corruption checker if not already set --# -- this is for trunk only, we remove it for releases --if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then -- # Extract the first two components of the version from the output. -- glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q') -- -- MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher. -- test $glibc_version \> 2.08 && MALLOC_CHECK_=3 -- -- export MALLOC_CHECK_ --fi -- - # in case we have been started with full pathname spec without being in PATH - bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` - if [ -n "$bindir" ]; then ++++++ kdebase-workspace-4.6.0.tar.bz2 -> kdebase-workspace-4.6.1.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.6.0.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-4.6.1.tar.bz2 differ: char 11, line 1 ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.B8i6pU/_old 2011-03-09 17:37:56.000000000 +0100 +++ /var/tmp/diff_new_pack.B8i6pU/_new 2011-03-09 17:37:56.000000000 +0100 @@ -1,7 +1,5 @@ -Index: kdm/config.def -=================================================================== ---- kdm/config.def.orig 2010-11-21 20:47:03.493842572 +0100 -+++ kdm/config.def 2010-11-21 20:47:30.377718076 +0100 +--- kdm/config.def ++++ kdm/config.def @@ -168,6 +168,9 @@ Core config for 1st local display [X-:0-Core] @@ -12,7 +10,7 @@ Greeter config for 1st local display [X-:0-Greeter] </kdmrc> -@@ -791,6 +794,21 @@ Description: +@@ -791,6 +794,21 @@ <emphasis>Do not</emphasis> change it, you may interfere with future upgrades and this could result in &kdm; failing to run. @@ -34,7 +32,7 @@ Key: PAMService If: defined(USE_PAM) Type: string -@@ -873,10 +891,10 @@ Description: +@@ -873,10 +891,10 @@ Key: PidFile Type: string @@ -48,7 +46,7 @@ Comment: Where &kdm; should store its PID (do not store if empty). Description: -@@ -900,10 +918,10 @@ Description: +@@ -900,10 +918,10 @@ Key: AuthDir Type: path # differs from XDM @@ -62,7 +60,7 @@ Comment: Where to store authorization files. Description: -@@ -929,7 +947,7 @@ Description: +@@ -929,7 +947,7 @@ Key: ExportList Type: list @@ -71,7 +69,7 @@ User: core Instance: #"LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR" Merge: xdm(P_list) -@@ -1073,9 +1091,10 @@ Description: +@@ -1073,9 +1091,10 @@ Key: Enable Type: bool @@ -83,7 +81,7 @@ Comment: & Description: Whether &kdm; should listen to incoming &XDMCP; requests. -@@ -1096,7 +1115,7 @@ Description: +@@ -1096,7 +1115,7 @@ Key: KeyFile Type: string @@ -92,7 +90,7 @@ User: core Instance: #KDMCONF "/kdmkeys" Update: cp_keyfile -@@ -1112,11 +1131,10 @@ Description: +@@ -1112,11 +1131,10 @@ Key: Xaccess Type: string # differs from xdm @@ -107,7 +105,7 @@ Comment: &XDMCP; access control file in the usual XDM-Xaccess format. Description: -@@ -1174,13 +1192,11 @@ Description: +@@ -1174,13 +1192,11 @@ Key: Willing Type: string @@ -123,7 +121,7 @@ Comment: The program which is invoked to dynamically generate replies to &XDMCP; DirectQuery or BroadcastQuery requests. -@@ -1254,7 +1270,7 @@ Type: enum +@@ -1254,7 +1270,7 @@ None/BO_NONE: no boot manager Grub/BO_GRUB: Grub boot manager Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only) @@ -132,7 +130,7 @@ User: core User: greeter Instance: #Grub -@@ -1356,7 +1372,7 @@ Type: string +@@ -1356,7 +1372,7 @@ Default: DEF_SERVER_CMD DDefault: - User: core @@ -141,7 +139,7 @@ Update: upd_servercmd Comment: The command line to start the &X-Server;, without display number and VT spec. -@@ -1369,13 +1385,13 @@ Description: +@@ -1369,13 +1385,13 @@ This string is subject to word splitting. </para><para> The default is something reasonable for the system on which &kdm; was built, @@ -157,7 +155,7 @@ Comment: & Description: Additional arguments for the &X-Server;s for local sessions. -@@ -1474,6 +1490,8 @@ Type: bool +@@ -1474,6 +1490,8 @@ Default: false User: core Instance: #:*/! @@ -166,7 +164,7 @@ Merge: xdm Comment: Restart instead of resetting the local &X-Server; after session exit. -@@ -1548,11 +1566,10 @@ Description: +@@ -1548,11 +1566,10 @@ Key: Resources # XXX strictly speaking this is supposed to be a string list, i think. Type: string @@ -180,7 +178,7 @@ Comment: Specify a file with X-resources for the greeter, chooser and background. The KDE frontend does not use this file, so you do not need it unless you -@@ -1580,12 +1597,11 @@ Description: +@@ -1580,12 +1597,11 @@ Key: Setup Type: string @@ -195,7 +193,7 @@ Comment: A program to run before the greeter is shown. Can be used to start an xconsole or an alternative background generator. Subject to word splitting. -@@ -1601,12 +1617,11 @@ Description: +@@ -1601,12 +1617,11 @@ Key: Startup Type: string @@ -210,7 +208,7 @@ Comment: A program to run before a user session starts. Subject to word splitting. Description: -@@ -1619,12 +1634,11 @@ Description: +@@ -1619,12 +1634,11 @@ Key: Reset Type: string @@ -225,7 +223,7 @@ Comment: A program to run after a user session exits. Subject to word splitting. Description: -@@ -1637,12 +1651,12 @@ Description: +@@ -1637,12 +1651,12 @@ Key: Session Type: string @@ -240,7 +238,7 @@ Comment: The program which is run as the user which logs in. It is supposed to interpret the session argument (see SessionsDirs) and start an appropriate -@@ -1754,10 +1768,11 @@ Description: +@@ -1754,10 +1768,11 @@ Key: AllowRootLogin Type: bool @@ -254,7 +252,7 @@ Merge: xdm Comment: Allow root logins? -@@ -1772,6 +1787,7 @@ User: core +@@ -1772,6 +1787,7 @@ # sensible? Instance: */false Instance: :*/true @@ -262,7 +260,7 @@ Merge: xdm Comment: Allow to log in, when user has set an empty password? -@@ -1783,12 +1799,13 @@ Type: enum +@@ -1783,12 +1799,13 @@ None/SHUT_NONE: no <guilabel>Shutdown...</guilabel> menu entry is shown at all Root/SHUT_ROOT: the <systemitem class="username">root</systemitem> password must be entered to shut down All/SHUT_ALL: everybody can shut down the machine @@ -279,7 +277,7 @@ Comment: & Description: Who is allowed to shut down the system. This applies both to the -@@ -1878,6 +1895,7 @@ Type: bool +@@ -1865,6 +1882,7 @@ Default: false User: dep Instance: #:0/true @@ -287,7 +285,7 @@ Comment: & Description: Enable automatic login. <emphasis>Use with extreme care!</emphasis> -@@ -1911,7 +1929,7 @@ Default: "" +@@ -1898,7 +1916,7 @@ PostProc: PautoLoginX User: core(autoUser) User: greeter @@ -296,7 +294,7 @@ Merge: xdm:autoUser(P_autoUser) Comment: & Description: -@@ -1942,10 +1960,10 @@ Description: +@@ -1929,10 +1947,10 @@ Key: SessionsDirs Type: list @@ -309,7 +307,7 @@ Update: upd_sessionsdirs Comment: The directories containing session type definitions in .desktop format, -@@ -2014,7 +2032,7 @@ Description: +@@ -2001,7 +2019,7 @@ Key: UseSessReg Type: bool @@ -318,7 +316,7 @@ User: core Instance: #*/! Comment: -@@ -2060,7 +2078,8 @@ Type: enum +@@ -2047,7 +2065,8 @@ Clock/LOGO_CLOCK: a neat analog clock Default: Clock User: greeter @@ -328,7 +326,7 @@ Comment: What should be shown in the greeter's logo are: Description: -@@ -2276,7 +2295,7 @@ Description: +@@ -2263,7 +2282,7 @@ Key: HiddenUsers Type: list @@ -337,7 +335,7 @@ User: greeter-c(noUsers) Instance: #*/"root" # depends on {Min,Max}ShowUID -@@ -2422,7 +2441,7 @@ Description: +@@ -2409,7 +2428,7 @@ Key: UseBackground Type: bool @@ -346,7 +344,7 @@ User: greeter Instance: #*/! Comment: -@@ -2582,6 +2601,7 @@ Type: bool +@@ -2569,6 +2588,7 @@ Default: false User: greeter Instance: :0/true @@ -354,7 +352,7 @@ Comment: Enable &kdm;'s built-in xconsole. Note that this can be enabled for only one display at a time. -@@ -2670,9 +2690,9 @@ Description: +@@ -2657,9 +2677,9 @@ Key: Preloader Type: string @@ -366,7 +364,7 @@ Update: upd_preloader Comment: & Description: -@@ -2682,7 +2702,7 @@ Description: +@@ -2669,7 +2689,7 @@ Key: UseTheme Type: bool @@ -375,34 +373,30 @@ User: greeter Instance: */true Comment: & -@@ -2691,9 +2711,10 @@ Description: +@@ -2678,9 +2698,10 @@ Key: Theme Type: string -Default: "" +Default: KDMDATA "/themes/SUSE" User: greeter --Instance: */KDMDATA "/themes/oxygen-air" +-Instance: */KDMDATA "/themes/horos" +Instance: */"" +Update: reset_sec_0_1 Comment: & Description: The theme to use for the greeter. Can point to either a directory or an XML -Index: kdm/kfrontend/CMakeLists.txt -=================================================================== ---- kdm/kfrontend/CMakeLists.txt.orig 2010-11-21 20:47:03.493842572 +0100 -+++ kdm/kfrontend/CMakeLists.txt 2010-11-21 20:47:03.509842471 +0100 -@@ -118,3 +118,5 @@ install(TARGETS kdmctl ${INSTALL_TARGETS +--- kdm/kfrontend/CMakeLists.txt ++++ kdm/kfrontend/CMakeLists.txt +@@ -114,3 +114,5 @@ install(CODE " exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) ") + +install( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/read_sysconfig.sh DESTINATION ${DATA_INSTALL_DIR}/kdm ) -Index: kdm/kfrontend/genkdmconf.c -=================================================================== ---- kdm/kfrontend/genkdmconf.c.orig 2010-11-05 11:47:46.000000000 +0100 -+++ kdm/kfrontend/genkdmconf.c 2010-11-21 20:47:30.144717941 +0100 -@@ -53,6 +53,7 @@ Foundation, Inc., 51 Franklin Street, Fi +--- kdm/kfrontend/genkdmconf.c ++++ kdm/kfrontend/genkdmconf.c +@@ -53,6 +53,7 @@ #include <config.ci> #define RCVERSTR stringify(RCVERMAJOR) "." stringify(RCVERMINOR) @@ -410,7 +404,7 @@ static int old_scripts, no_old_scripts, old_confs, no_old, no_backup, no_in_notice, use_destdir, mixed_scripts; -@@ -60,7 +61,7 @@ static const char *newdir = KDMCONF, *fa +@@ -60,7 +61,7 @@ *oldxdm, *oldkde, *oldkdepfx; static int oldver; @@ -419,7 +413,7 @@ typedef struct StrList { struct StrList *next; -@@ -542,6 +543,7 @@ writeKdmrc(FILE *f) +@@ -542,6 +543,7 @@ const char *cmt; putFqVal("General", "ConfigVersion", RCVERSTR); @@ -427,7 +421,7 @@ for (cs = config; cs; cs = cs->next) { fprintf_(f, "%s[%s]\n", cs->comment ? cs->comment : "\n", cs->name); -@@ -1633,6 +1635,26 @@ upd_servercmd(Entry *ce, Section *cs ATT +@@ -1633,6 +1635,26 @@ ce->written = True; } @@ -454,7 +448,7 @@ #ifdef XDMCP static void cp_keyfile(Entry *ce, Section *cs ATTR_UNUSED) -@@ -2625,7 +2647,7 @@ static int +@@ -2625,7 +2647,7 @@ mergeKdmRcNewer(const char *path, int obsRet) { char *p; @@ -463,7 +457,7 @@ RSection *rootsect, *cs; REntry *ce; int i, j, ma, mi; -@@ -2651,6 +2673,9 @@ mergeKdmRcNewer(const char *path, int ob +@@ -2651,6 +2673,9 @@ p, ma, mi); free(p); @@ -473,7 +467,7 @@ for (cs = rootsect; cs; cs = cs->next) { cp = strrchr(cs->name, '-'); if (!cp) -@@ -2696,7 +2721,7 @@ mergeKdmRcNewer(const char *path, int ob +@@ -2696,7 +2721,7 @@ ; } @@ -482,11 +476,9 @@ return True; } -Index: kdm/kfrontend/kdm_config.c -=================================================================== ---- kdm/kfrontend/kdm_config.c.orig 2010-07-06 08:54:31.000000000 +0200 -+++ kdm/kfrontend/kdm_config.c 2010-11-21 20:47:03.511842363 +0100 -@@ -396,7 +396,7 @@ static const char *kdmrc = KDMCONF "/kdm +--- kdm/kfrontend/kdm_config.c ++++ kdm/kfrontend/kdm_config.c +@@ -396,7 +396,7 @@ static Section *rootsec; static void @@ -495,7 +487,7 @@ { const char *nstr, *dstr, *cstr, *dhost, *dnum, *dclass; char *s, *e, *st, *en, *ek, *sl, *pt; -@@ -406,14 +406,9 @@ readConfig() +@@ -406,14 +406,9 @@ int nlen, dlen, clen, dhostl, dnuml, dclassl; int i, line, sectmoan, restl; File file; @@ -512,7 +504,7 @@ return; for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof; s++) { -@@ -439,7 +434,7 @@ readConfig() +@@ -439,7 +434,7 @@ e--; if (*e != ']') { cursec = 0; @@ -521,7 +513,7 @@ continue; } nstr = sl + 1; -@@ -449,7 +444,7 @@ readConfig() +@@ -449,7 +444,7 @@ !memcmp(nstr, cursec->name, nlen)) { logInfo("Multiple occurrences of section [%.*s] in %s. " @@ -530,7 +522,7 @@ goto secfnd; } if (nstr[0] == 'X' && nstr[1] == '-') { -@@ -505,7 +500,7 @@ readConfig() +@@ -505,7 +500,7 @@ illsec: cursec = 0; logError("Unrecognized section name [%.*s] at %s:%d\n", @@ -539,7 +531,7 @@ continue; newsec: if (!(cursec = Malloc(sizeof(*cursec)))) -@@ -533,7 +528,7 @@ readConfig() +@@ -533,7 +528,7 @@ if (!cursec) { if (sectmoan) { sectmoan = False; @@ -548,7 +540,7 @@ } goto sktoeol; } -@@ -541,13 +536,13 @@ readConfig() +@@ -541,13 +536,13 @@ for (; (s < file.eof) && (*s != '\n'); s++) if (*s == '=') goto haveeq; @@ -564,7 +556,7 @@ goto sktoeol; } if (!isspace(*ek)) -@@ -561,7 +556,7 @@ readConfig() +@@ -561,7 +556,7 @@ if (*s == '\\') { s++; if (s >= file.eof || *s == '\n') { @@ -573,7 +565,7 @@ break; } switch (*s) { -@@ -590,13 +585,13 @@ readConfig() +@@ -590,13 +585,13 @@ goto keyok; } logError("Unrecognized key '%.*s' in section [%.*s] at %s:%d\n", @@ -589,7 +581,7 @@ goto keyfnd; } if (!(curent = Malloc(sizeof(*curent)))) -@@ -612,6 +607,20 @@ readConfig() +@@ -612,6 +607,20 @@ } } @@ -610,10 +602,8 @@ static Entry * findGEnt(int id) { -Index: kdm/kfrontend/read_sysconfig.sh -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ kdm/kfrontend/read_sysconfig.sh 2010-11-21 20:47:03.511842363 +0100 +--- kdm/kfrontend/read_sysconfig.sh ++++ kdm/kfrontend/read_sysconfig.sh @@ -0,0 +1,160 @@ +#!/bin/bash +# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
