openSUSE Commits

Download

commit@lists.opensuse.org

November 2009

1 participants
480 discussions

commit kdeartwork4 for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kdeartwork4 for openSUSE:Factory checked in at Wed Nov 4 11:33:58 CET 2009. -------- --- KDE/kdeartwork4/kdeartwork4-noarch.changes 2009-09-25 00:15:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeartwork4/kdeartwork4-noarch.changes 2009-11-04 11:32:59.658346000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 21:58:24 CET 2009 - dmueller(a)suse.de + +- update to 4.3.3 + * see http://kde.org/announcements/changelogs/changelog4_3_2to4_3_3.php for details + +------------------------------------------------------------------- kdeartwork4.changes: same change calling whatdependson for head-i586 Old: ---- kdeartwork-4.3.1.tar.bz2 New: ---- kdeartwork-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeartwork4-noarch.spec ++++++ --- /var/tmp/diff_new_pack.tVSrE0/_old 2009-11-04 11:33:09.000000000 +0100 +++ /var/tmp/diff_new_pack.tVSrE0/_new 2009-11-04 11:33:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdeartwork4-noarch (Version 4.3.1) +# spec file for package kdeartwork4-noarch (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,8 @@ Group: System/GUI/KDE Summary: kdeartwork base package Url: http://www.kde.org -Version: 4.3.1 -Release: 2 +Version: 4.3.3 +Release: 1 Source0: kdeartwork-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ kdeartwork4.spec ++++++ --- /var/tmp/diff_new_pack.tVSrE0/_old 2009-11-04 11:33:09.000000000 +0100 +++ /var/tmp/diff_new_pack.tVSrE0/_new 2009-11-04 11:33:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdeartwork4 (Version 4.3.1) +# spec file for package kdeartwork4 (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,8 @@ Group: System/GUI/KDE Summary: kdeartwork base package Url: http://www.kde.org -Version: 4.3.1 -Release: 2 +Version: 4.3.3 +Release: 1 Source0: kdeartwork-%version.tar.bz2 Patch: 4_3_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ 4_3_BRANCH.diff ++++++ ++++ 17014 lines (skipped) ++++ between KDE/kdeartwork4/4_3_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdeartwork4/4_3_BRANCH.diff ++++++ kdeartwork-4.3.1.tar.bz2 -> kdeartwork-4.3.3.tar.bz2 ++++++ KDE/kdeartwork4/kdeartwork-4.3.1.tar.bz2 /mounts/work_src_done/STABLE/kdeartwork4/kdeartwork-4.3.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeedu4 for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kdeedu4 for openSUSE:Factory checked in at Wed Nov 4 11:31:19 CET 2009. -------- --- KDE/kdeedu4/kdeedu4-noarch.changes 2009-09-25 00:21:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeedu4/kdeedu4-noarch.changes 2009-11-04 11:30:11.809973000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 22:00:39 CET 2009 - dmueller(a)suse.de + +- update to 4.3.3 + * see http://kde.org/announcements/changelogs/changelog4_3_2to4_3_3.php for details + +------------------------------------------------------------------- kdeedu4.changes: same change calling whatdependson for head-i586 Old: ---- kdeedu-4.3.1.tar.bz2 New: ---- kdeedu-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeedu4-noarch.spec ++++++ --- /var/tmp/diff_new_pack.mwcFGN/_old 2009-11-04 11:30:29.000000000 +0100 +++ /var/tmp/diff_new_pack.mwcFGN/_new 2009-11-04 11:30:29.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdeedu4-noarch (Version 4.3.1) +# spec file for package kdeedu4-noarch (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,8 +27,8 @@ Group: System/GUI/KDE Summary: General Data for KDE Education Applications Url: http://edu.kde.org -Version: 4.3.1 -Release: 3 +Version: 4.3.3 +Release: 1 Source0: kdeedu-%version.tar.bz2 Patch0: 4_3_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kdeedu4.spec ++++++ --- /var/tmp/diff_new_pack.mwcFGN/_old 2009-11-04 11:30:29.000000000 +0100 +++ /var/tmp/diff_new_pack.mwcFGN/_new 2009-11-04 11:30:29.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdeedu4 (Version 4.3.1) +# spec file for package kdeedu4 (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -39,8 +39,8 @@ Group: System/GUI/KDE Summary: General Data for KDE Education Applications Url: http://edu.kde.org -Version: 4.3.1 -Release: 3 +Version: 4.3.3 +Release: 1 Source0: kdeedu-%version.tar.bz2 Patch0: 4_3_BRANCH.diff Patch1: marble-designer-plugin.diff ++++++ 4_3_BRANCH.diff ++++++ ++++ 7141 lines (skipped) ++++ between KDE/kdeedu4/4_3_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdeedu4/4_3_BRANCH.diff ++++++ kdeedu-4.3.1.tar.bz2 -> kdeedu-4.3.3.tar.bz2 ++++++ KDE/kdeedu4/kdeedu-4.3.1.tar.bz2 /mounts/work_src_done/STABLE/kdeedu4/kdeedu-4.3.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegames4 for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kdegames4 for openSUSE:Factory checked in at Wed Nov 4 11:29:31 CET 2009. -------- --- KDE/kdegames4/kdegames4-carddecks.changes 2009-09-25 00:23:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegames4/kdegames4-carddecks.changes 2009-11-04 11:28:29.456214000 +0100 @@ -1,0 +2,11 @@ +Mon Nov 2 22:01:16 CET 2009 - dmueller(a)suse.de + +- update to 4.3.3 + * see http://kde.org/announcements/changelogs/changelog4_3_2to4_3_3.php for details + +------------------------------------------------------------------- +Fri Oct 30 19:53:39 UTC 2009 - coolo(a)novell.com + +- fix summary of kblocks + +------------------------------------------------------------------- kdegames4.changes: same change calling whatdependson for head-i586 Old: ---- kdegames-4.3.1.tar.bz2 New: ---- kdegames-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegames4-carddecks.spec ++++++ --- /var/tmp/diff_new_pack.vHEn5W/_old 2009-11-04 11:28:56.000000000 +0100 +++ /var/tmp/diff_new_pack.vHEn5W/_new 2009-11-04 11:28:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdegames4-carddecks (Version 4.3.1) +# spec file for package kdegames4-carddecks (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,8 @@ Group: System/GUI/KDE Summary: Default Card Decks for KDE Games Url: http://www.kde.org -Version: 4.3.1 -Release: 3 +Version: 4.3.3 +Release: 1 Source0: kdegames-%version.tar.bz2 Patch0: 4_3_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kdegames4.spec ++++++ --- /var/tmp/diff_new_pack.vHEn5W/_old 2009-11-04 11:28:56.000000000 +0100 +++ /var/tmp/diff_new_pack.vHEn5W/_new 2009-11-04 11:28:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdegames4 (Version 4.3.1) +# spec file for package kdegames4 (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,8 +26,8 @@ Group: System/GUI/KDE Summary: General Data for KDE Games Url: http://www.kde.org -Version: 4.3.1 -Release: 3 +Version: 4.3.3 +Release: 1 Source0: kdegames-%version.tar.bz2 Patch: 4_3_BRANCH.diff Patch1: desktop-files.diff @@ -314,7 +314,7 @@ %package -n kblocks License: LGPL v2.1 or later Group: Amusements/Games/Strategy/Real Time -Summary: KBlocks - classic falling blocks game +Summary: Classic Falling Blocks Game %kde4_runtime_requires %description -n kblocks ++++++ 4_3_BRANCH.diff ++++++ ++++ 11043 lines (skipped) ++++ between KDE/kdegames4/4_3_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdegames4/4_3_BRANCH.diff ++++++ kdegames-4.3.1.tar.bz2 -> kdegames-4.3.3.tar.bz2 ++++++ KDE/kdegames4/kdegames-4.3.1.tar.bz2 /mounts/work_src_done/STABLE/kdegames4/kdegames-4.3.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Wed Nov 4 11:28:45 CET 2009. -------- --- kernel-source/kernel-debug.changes 2009-10-26 15:54:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2009-11-04 04:05:58.000000000 +0100 @@ -2 +2 @@ -Mon Oct 26 14:53:34 CET 2009 - jbeulich(a)novell.com +Tue Nov 3 15:40:19 CET 2009 - mmarek(a)suse.cz @@ -4 +4,3 @@ -- Update Xen patches to 2.6.31.4. Fix Xen KMP build. +- config.conf: remove the ec2 flavor from kernel-syms, most KMPs + don't make any sense on ec2 + (http://lists.opensuse.org/opensuse-kernel/2009-11/msg00001.html) @@ -7 +9,92 @@ -Fri Oct 23 11:15:38 CEST 2009 - mmarek(a)suse.cz +Mon Nov 2 16:09:13 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: obsolete also brocade-bfa-kmp. + +------------------------------------------------------------------- +Mon Nov 2 16:04:13 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-source.spec.in: add split-modules to the src.rpm. + +------------------------------------------------------------------- +Mon Nov 2 13:18:55 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: obsolete enic-kmp and fnic-kmp. + +------------------------------------------------------------------- +Mon Nov 2 12:49:08 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: obsolete kmps by their full name, not + just the foo-kmp virtual dependency (bnc#472410). + +------------------------------------------------------------------- +Thu Oct 29 06:29:38 CET 2009 - tonyj(a)suse.de + +- Update ppc/ps3 config for CONFIG_UTRACE + +------------------------------------------------------------------- +Thu Oct 29 01:37:02 CET 2009 - tonyj(a)suse.de + +- patches.trace/utrace-core: Update for SP1 (FATE# 304321) + +------------------------------------------------------------------- +Wed Oct 28 22:51:38 CET 2009 - nfbrown(a)suse.de + +- patches.fixes/nfsd-acl.patch: nfsd: Fix sort_pacl in + fs/nfsd/nf4acl.c to actually sort groups (bnc#549748). + +------------------------------------------------------------------- +Wed Oct 28 14:51:28 CET 2009 - jdelvare(a)suse.de + +- Update config files: + CONFIG_NTFS_FS=n + We handle NTFS through FUSE these days. + +------------------------------------------------------------------- +Tue Oct 27 17:15:40 CET 2009 - jbohac(a)suse.cz + +- Update config files: + CONFIG_NETLABEL=y + CONFIG_SECURITY_NETWORK_XFRM=y + (fate#307284) + +------------------------------------------------------------------- +Tue Oct 27 16:45:20 CET 2009 - jkosina(a)suse.de + +- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu: + fix compilation failure for configs with CONFIG_SMP=n and + CONFIG_FAR_GROUP_SCHED=y + +------------------------------------------------------------------- +Tue Oct 27 15:08:26 CET 2009 - jbeulich(a)novell.com + +- Update config files (MINIX_FS=m globally, NTFS_FS off for -ec2). +- supported.conf: Add fs/minix. + +------------------------------------------------------------------- +Tue Oct 27 14:35:26 CET 2009 - jkosina(a)suse.de + +- patches.fixes/percpu-allow-pcpu_alloc-to-be-called-with-IRQs-off: + percpu: allow pcpu_alloc() to be called with IRQs off + (bnc#548119). +- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu: + Update to newer version which is going to be merged upstream. + +------------------------------------------------------------------- +Fri Oct 23 18:17:21 CEST 2009 - jeffm(a)suse.com + +- Update to 2.6.32-rc5-git3. + +------------------------------------------------------------------- +Fri Oct 23 15:11:53 CEST 2009 - mmarek(a)suse.cz + +- Update config files: set NR_CPUS back to 2048 for ia64/vanilla + until there is a fix in mainline. + +------------------------------------------------------------------- +Fri Oct 23 15:11:09 CEST 2009 - mmarek(a)suse.cz + +- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu: + fix for !CONFIG_SMP. + +------------------------------------------------------------------- +Fri Oct 23 12:53:53 CEST 2009 - mmarek(a)suse.cz @@ -13 +106 @@ -Thu Oct 22 21:42:15 CEST 2009 - sdietrich(a)suse.de +Thu Oct 22 18:38:47 CEST 2009 - jeffm(a)suse.com @@ -15 +108,3 @@ -- supported.conf: add drivers/md/raid6_pq +- Re-enabled NR_CPUS=4096 on ia64. +- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu: + sched: move rq_weight data array out of .percpu (bnc#548119). @@ -18 +113 @@ -Tue Oct 20 23:10:09 CEST 2009 - trenn(a)suse.de +Tue Oct 20 15:27:25 CEST 2009 - jbeulich(a)novell.com @@ -20,2 +115,5 @@ -- patches.arch/x86_amd_fix_erratum_63.patch: x86/amd-iommu: - Workaround for erratum 63 (bnc#548274). +- Update x86-64 Xen config file (NR_CPUS=512). +- Refresh a few Xen patches. +- rpm/kernel-binary.spec.in: Handle -ec2 flavor. +- rpm/package-descriptions: Describe -ec2 flavor. +- rpm/post.sh: Handle -ec2 flavor. @@ -24 +122 @@ -Tue Oct 20 22:57:50 CEST 2009 - trenn(a)suse.de +Tue Oct 20 14:47:55 CEST 2009 - jbeulich(a)novell.com @@ -26,3 +124 @@ -- patches.arch/x86_mce_therm_suppress_msgs.patch: X86: - Suppress hundreds of Intel thermal MCE messages on high temps - (bnc#533556). +- patches.fixes/use-totalram_pages: Delete. @@ -31 +127 @@ -Tue Oct 20 15:35:27 CEST 2009 - jeffm(a)suse.com +Tue Oct 20 14:45:22 CEST 2009 - jbeulich(a)novell.com @@ -33,3 +129,5 @@ -- patches.fixes/drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it: - drm/r128: Add test for initialisation to all ioctls that - require it (bnc#548071 CVE-2009-3620). +- config.conf: Add -ec2 configs (fate#305273) +- Add ec2 config files. +- patches.xen/xen-unpriv-build: No need to build certain bits + when building non-privileged kernel. +- supported.conf: Add fs/nls/nls_base. @@ -38 +136 @@ -Wed Oct 14 18:31:53 CEST 2009 - tiwai(a)suse.de +Mon Oct 19 15:24:25 CEST 2009 - jeffm(a)suse.com @@ -40,2 +138,2 @@ -- patches.drivers/alsa-hda-alc662-capture-fix: ALSA: hda - - Fix capture source checks for ALC662/663 codecs (bnc#546918). +- Temporarily reduce NR_CPUS to 2048 on ia64 to avoid build + failures (bnc#548119) @@ -44 +142 @@ -Wed Oct 14 18:22:43 CEST 2009 - gregkh(a)suse.de +Mon Oct 19 15:21:26 CEST 2009 - mmarek(a)suse.cz @@ -46,5 +144,2 @@ -- Update to 2.6.31.4 - - security fixes - - bugfixes - - obsoletes: - - patches.drivers/alsa-hda-2.6.32-rc1-toshiba-fix +- rpm/kernel-binary.spec.in: [s390x] ignore errors from + dwarfextract for now. @@ -53 +148 @@ -Tue Oct 13 16:11:20 CEST 2009 - tiwai(a)suse.de +Fri Oct 16 19:18:25 CEST 2009 - jeffm(a)suse.com @@ -55,2 +150 @@ -- patches.drivers/alsa-hda-nvidia-hdmi-full-fmts: Refresh. Enable - all formats/rates as default. +- Update config files. @@ -59 +153 @@ -Tue Oct 13 15:54:12 CEST 2009 - tiwai(a)suse.de +Fri Oct 16 17:01:11 CEST 2009 - jeffm(a)suse.com @@ -61,7 +155 @@ -- patches.drivers/alsa-hda-nvidia-hdmi-full-fmts: ALSA: hda - - Add full rates/formats support for Nvidia HDMI. -- patches.drivers/alsa-hda-realtek-overflow-fix: ALSA: hda - - Fix overflow of spec->init_verbs in patch_realtek.c. -- patches.drivers/alsa-hda-stac9228-dell-fix: ALSA: hda - Fix - volume-knob setup for Dell laptops with STAC9228 (bnc#545013). -- patches.drivers/alsa-hda-stac9228-fsc-fix: Refresh. +- Update to 2.6.32-rc5. @@ -70 +158 @@ -Tue Oct 13 01:11:05 CEST 2009 - gregkh(a)suse.de +Fri Oct 16 16:45:53 CEST 2009 - mmarek(a)suse.de @@ -72,3 +160,2 @@ -- Update config files. -- patches.drivers/samsung-laptop-driver.patch: Samsung laptop - driver. +- patches.rpmify/ia64-sn-fix-percpu-warnings: ia64/sn: fix + percpu warnings. @@ -77 +164 @@ -Mon Oct 12 16:14:42 CEST 2009 - trenn(a)suse.de +Fri Oct 16 15:51:56 CEST 2009 - mmarek(a)suse.de @@ -79,10 +166,2 @@ -- patches.arch/amd_magny_cour_topology_fix.patch: x86: Fix CPU - llc_shared_map information for AMD Magny-Cours (bnc#545615). -- patches.arch/amd_magny_cour_topology_fix_1.patch: x86, sched: - Workaround broken sched domain creation for AMD Magny-Cours - (bnc#545615). -- patches.arch/amd_magny_cour_topology_fix_2.patch: x86, mcheck: ++++ 185 more lines (skipped) ++++ between kernel-source/kernel-debug.changes ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes kernel-default.changes: same change kernel-desktop.changes: same change New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-ec2.changes 2009-11-04 04:06:04.000000000 +0100 @@ -0,0 +1,15470 @@ +------------------------------------------------------------------- +Tue Nov 3 15:40:19 CET 2009 - mmarek(a)suse.cz + +- config.conf: remove the ec2 flavor from kernel-syms, most KMPs + don't make any sense on ec2 + (http://lists.opensuse.org/opensuse-kernel/2009-11/msg00001.html) + +------------------------------------------------------------------- +Mon Nov 2 16:09:13 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: obsolete also brocade-bfa-kmp. + +------------------------------------------------------------------- +Mon Nov 2 16:04:13 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-source.spec.in: add split-modules to the src.rpm. + +------------------------------------------------------------------- +Mon Nov 2 13:18:55 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: obsolete enic-kmp and fnic-kmp. + +------------------------------------------------------------------- +Mon Nov 2 12:49:08 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: obsolete kmps by their full name, not + just the foo-kmp virtual dependency (bnc#472410). + +------------------------------------------------------------------- +Thu Oct 29 06:29:38 CET 2009 - tonyj(a)suse.de + +- Update ppc/ps3 config for CONFIG_UTRACE + +------------------------------------------------------------------- +Thu Oct 29 01:37:02 CET 2009 - tonyj(a)suse.de + +- patches.trace/utrace-core: Update for SP1 (FATE# 304321) + +------------------------------------------------------------------- +Wed Oct 28 22:51:38 CET 2009 - nfbrown(a)suse.de + +- patches.fixes/nfsd-acl.patch: nfsd: Fix sort_pacl in + fs/nfsd/nf4acl.c to actually sort groups (bnc#549748). + +------------------------------------------------------------------- +Wed Oct 28 14:51:28 CET 2009 - jdelvare(a)suse.de + +- Update config files: + CONFIG_NTFS_FS=n + We handle NTFS through FUSE these days. + +------------------------------------------------------------------- +Tue Oct 27 17:15:40 CET 2009 - jbohac(a)suse.cz + +- Update config files: + CONFIG_NETLABEL=y + CONFIG_SECURITY_NETWORK_XFRM=y + (fate#307284) + +------------------------------------------------------------------- +Tue Oct 27 16:45:20 CET 2009 - jkosina(a)suse.de + +- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu: + fix compilation failure for configs with CONFIG_SMP=n and + CONFIG_FAR_GROUP_SCHED=y + +------------------------------------------------------------------- +Tue Oct 27 15:08:26 CET 2009 - jbeulich(a)novell.com + +- Update config files (MINIX_FS=m globally, NTFS_FS off for -ec2). +- supported.conf: Add fs/minix. + +------------------------------------------------------------------- +Tue Oct 27 14:35:26 CET 2009 - jkosina(a)suse.de + +- patches.fixes/percpu-allow-pcpu_alloc-to-be-called-with-IRQs-off: + percpu: allow pcpu_alloc() to be called with IRQs off + (bnc#548119). +- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu: + Update to newer version which is going to be merged upstream. + +------------------------------------------------------------------- +Fri Oct 23 18:17:21 CEST 2009 - jeffm(a)suse.com + +- Update to 2.6.32-rc5-git3. + +------------------------------------------------------------------- +Fri Oct 23 15:11:53 CEST 2009 - mmarek(a)suse.cz + +- Update config files: set NR_CPUS back to 2048 for ia64/vanilla + until there is a fix in mainline. + +------------------------------------------------------------------- +Fri Oct 23 15:11:09 CEST 2009 - mmarek(a)suse.cz + +- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu: + fix for !CONFIG_SMP. + +------------------------------------------------------------------- +Fri Oct 23 12:53:53 CEST 2009 - mmarek(a)suse.cz + +- patches.suse/Cleanup-and-make-boot-splash-work-with-KMS.patch: + Cleanup and make boot splash work with KMS (bnc#544645). + +------------------------------------------------------------------- +Thu Oct 22 18:38:47 CEST 2009 - jeffm(a)suse.com + +- Re-enabled NR_CPUS=4096 on ia64. +- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu: + sched: move rq_weight data array out of .percpu (bnc#548119). + +------------------------------------------------------------------- +Tue Oct 20 15:27:25 CEST 2009 - jbeulich(a)novell.com + +- Update x86-64 Xen config file (NR_CPUS=512). +- Refresh a few Xen patches. +- rpm/kernel-binary.spec.in: Handle -ec2 flavor. +- rpm/package-descriptions: Describe -ec2 flavor. +- rpm/post.sh: Handle -ec2 flavor. + +------------------------------------------------------------------- +Tue Oct 20 14:47:55 CEST 2009 - jbeulich(a)novell.com + +- patches.fixes/use-totalram_pages: Delete. + +------------------------------------------------------------------- +Tue Oct 20 14:45:22 CEST 2009 - jbeulich(a)novell.com + +- config.conf: Add -ec2 configs (fate#305273) +- Add ec2 config files. +- patches.xen/xen-unpriv-build: No need to build certain bits + when building non-privileged kernel. +- supported.conf: Add fs/nls/nls_base. + +------------------------------------------------------------------- +Mon Oct 19 15:24:25 CEST 2009 - jeffm(a)suse.com + +- Temporarily reduce NR_CPUS to 2048 on ia64 to avoid build + failures (bnc#548119) + +------------------------------------------------------------------- +Mon Oct 19 15:21:26 CEST 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: [s390x] ignore errors from + dwarfextract for now. + +------------------------------------------------------------------- +Fri Oct 16 19:18:25 CEST 2009 - jeffm(a)suse.com + +- Update config files. + +------------------------------------------------------------------- +Fri Oct 16 17:01:11 CEST 2009 - jeffm(a)suse.com + +- Update to 2.6.32-rc5. + +------------------------------------------------------------------- +Fri Oct 16 16:45:53 CEST 2009 - mmarek(a)suse.de + +- patches.rpmify/ia64-sn-fix-percpu-warnings: ia64/sn: fix + percpu warnings. + +------------------------------------------------------------------- +Fri Oct 16 15:51:56 CEST 2009 - mmarek(a)suse.de + +- Update config files: disable MTD_GPIO_ADDR, VME_CA91CX42 and + VME_TSI148 on ia64 to fix build. + +------------------------------------------------------------------- +Fri Oct 16 14:19:01 CEST 2009 - jbeulich(a)novell.com + +- patches.xen/xen3-patch-2.6.32-rc4: Fix AGP for PowerPC. + +------------------------------------------------------------------- +Fri Oct 16 12:08:06 CEST 2009 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.32-rc4 and c/s 938. +- config.conf: Re-enable Xen. +- Update x86 config files. + +------------------------------------------------------------------- +Tue Oct 13 02:29:26 CEST 2009 - jeffm(a)suse.com + +- patches.rpmify/staging-missing-sched.h: Added missing sites. + +------------------------------------------------------------------- +Mon Oct 12 23:08:39 CEST 2009 - jeffm(a)suse.com + +- patches.rpmify/staging-missing-sched.h: staging: Complete + sched.h removal from interrupt.h. + +------------------------------------------------------------------- +Mon Oct 12 21:05:07 CEST 2009 - jeffm(a)suse.de + +- patches.apparmor/ptrace_may_access-fix: apparmor: + ptrace_may_access -> ptrace_access_check. + ++++ 15273 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-ec2.changes --- kernel-source/kernel-kdump.changes 2009-10-26 15:54:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-kdump.changes 2009-11-04 04:06:06.000000000 +0100 @@ -2 +2 @@ -Mon Oct 26 14:53:34 CET 2009 - jbeulich(a)novell.com +Tue Nov 3 15:40:19 CET 2009 - mmarek(a)suse.cz @@ -4 +4,3 @@ -- Update Xen patches to 2.6.31.4. Fix Xen KMP build. +- config.conf: remove the ec2 flavor from kernel-syms, most KMPs + don't make any sense on ec2 + (http://lists.opensuse.org/opensuse-kernel/2009-11/msg00001.html) @@ -7 +9,92 @@ -Fri Oct 23 11:15:38 CEST 2009 - mmarek(a)suse.cz +Mon Nov 2 16:09:13 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: obsolete also brocade-bfa-kmp. + +------------------------------------------------------------------- +Mon Nov 2 16:04:13 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-source.spec.in: add split-modules to the src.rpm. + +------------------------------------------------------------------- +Mon Nov 2 13:18:55 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: obsolete enic-kmp and fnic-kmp. + +------------------------------------------------------------------- +Mon Nov 2 12:49:08 CET 2009 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: obsolete kmps by their full name, not + just the foo-kmp virtual dependency (bnc#472410). + +------------------------------------------------------------------- +Thu Oct 29 06:29:38 CET 2009 - tonyj(a)suse.de + +- Update ppc/ps3 config for CONFIG_UTRACE + +------------------------------------------------------------------- +Thu Oct 29 01:37:02 CET 2009 - tonyj(a)suse.de + +- patches.trace/utrace-core: Update for SP1 (FATE# 304321) + +------------------------------------------------------------------- +Wed Oct 28 22:51:38 CET 2009 - nfbrown(a)suse.de + +- patches.fixes/nfsd-acl.patch: nfsd: Fix sort_pacl in + fs/nfsd/nf4acl.c to actually sort groups (bnc#549748). + +------------------------------------------------------------------- +Wed Oct 28 14:51:28 CET 2009 - jdelvare(a)suse.de + +- Update config files: + CONFIG_NTFS_FS=n + We handle NTFS through FUSE these days. + +------------------------------------------------------------------- +Tue Oct 27 17:15:40 CET 2009 - jbohac(a)suse.cz + +- Update config files: + CONFIG_NETLABEL=y + CONFIG_SECURITY_NETWORK_XFRM=y + (fate#307284) + +------------------------------------------------------------------- +Tue Oct 27 16:45:20 CET 2009 - jkosina(a)suse.de + +- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu: + fix compilation failure for configs with CONFIG_SMP=n and + CONFIG_FAR_GROUP_SCHED=y + +------------------------------------------------------------------- +Tue Oct 27 15:08:26 CET 2009 - jbeulich(a)novell.com + +- Update config files (MINIX_FS=m globally, NTFS_FS off for -ec2). +- supported.conf: Add fs/minix. + +------------------------------------------------------------------- +Tue Oct 27 14:35:26 CET 2009 - jkosina(a)suse.de + +- patches.fixes/percpu-allow-pcpu_alloc-to-be-called-with-IRQs-off: + percpu: allow pcpu_alloc() to be called with IRQs off + (bnc#548119). +- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu: + Update to newer version which is going to be merged upstream. + +------------------------------------------------------------------- +Fri Oct 23 18:17:21 CEST 2009 - jeffm(a)suse.com + +- Update to 2.6.32-rc5-git3. + +------------------------------------------------------------------- +Fri Oct 23 15:11:53 CEST 2009 - mmarek(a)suse.cz + +- Update config files: set NR_CPUS back to 2048 for ia64/vanilla + until there is a fix in mainline. + +------------------------------------------------------------------- +Fri Oct 23 15:11:09 CEST 2009 - mmarek(a)suse.cz + +- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu: + fix for !CONFIG_SMP. + +------------------------------------------------------------------- +Fri Oct 23 12:53:53 CEST 2009 - mmarek(a)suse.cz @@ -13 +106 @@ -Thu Oct 22 21:42:15 CEST 2009 - sdietrich(a)suse.de +Thu Oct 22 18:38:47 CEST 2009 - jeffm(a)suse.com @@ -15 +108,3 @@ -- supported.conf: add drivers/md/raid6_pq +- Re-enabled NR_CPUS=4096 on ia64. +- patches.fixes/sched-move-rq_weight-data-array-out-of-percpu: + sched: move rq_weight data array out of .percpu (bnc#548119). @@ -18 +113 @@ -Tue Oct 20 23:10:09 CEST 2009 - trenn(a)suse.de +Tue Oct 20 15:27:25 CEST 2009 - jbeulich(a)novell.com @@ -20,2 +115,5 @@ -- patches.arch/x86_amd_fix_erratum_63.patch: x86/amd-iommu: - Workaround for erratum 63 (bnc#548274). +- Update x86-64 Xen config file (NR_CPUS=512). +- Refresh a few Xen patches. +- rpm/kernel-binary.spec.in: Handle -ec2 flavor. +- rpm/package-descriptions: Describe -ec2 flavor. +- rpm/post.sh: Handle -ec2 flavor. @@ -24 +122 @@ -Tue Oct 20 22:57:50 CEST 2009 - trenn(a)suse.de +Tue Oct 20 14:47:55 CEST 2009 - jbeulich(a)novell.com @@ -26,3 +124 @@ -- patches.arch/x86_mce_therm_suppress_msgs.patch: X86: - Suppress hundreds of Intel thermal MCE messages on high temps - (bnc#533556). +- patches.fixes/use-totalram_pages: Delete. @@ -31 +127 @@ -Tue Oct 20 15:35:27 CEST 2009 - jeffm(a)suse.com +Tue Oct 20 14:45:22 CEST 2009 - jbeulich(a)novell.com @@ -33,3 +129,5 @@ -- patches.fixes/drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it: - drm/r128: Add test for initialisation to all ioctls that - require it (bnc#548071 CVE-2009-3620). +- config.conf: Add -ec2 configs (fate#305273) +- Add ec2 config files. +- patches.xen/xen-unpriv-build: No need to build certain bits + when building non-privileged kernel. +- supported.conf: Add fs/nls/nls_base. @@ -38 +136 @@ -Wed Oct 14 18:31:53 CEST 2009 - tiwai(a)suse.de +Mon Oct 19 15:24:25 CEST 2009 - jeffm(a)suse.com @@ -40,2 +138,2 @@ -- patches.drivers/alsa-hda-alc662-capture-fix: ALSA: hda - - Fix capture source checks for ALC662/663 codecs (bnc#546918). +- Temporarily reduce NR_CPUS to 2048 on ia64 to avoid build + failures (bnc#548119) @@ -44 +142 @@ -Wed Oct 14 18:22:43 CEST 2009 - gregkh(a)suse.de +Mon Oct 19 15:21:26 CEST 2009 - mmarek(a)suse.cz @@ -46,5 +144,2 @@ -- Update to 2.6.31.4 - - security fixes - - bugfixes - - obsoletes: - - patches.drivers/alsa-hda-2.6.32-rc1-toshiba-fix +- rpm/kernel-binary.spec.in: [s390x] ignore errors from + dwarfextract for now. @@ -53 +148 @@ -Tue Oct 13 16:11:20 CEST 2009 - tiwai(a)suse.de +Fri Oct 16 19:18:25 CEST 2009 - jeffm(a)suse.com @@ -55,2 +150 @@ -- patches.drivers/alsa-hda-nvidia-hdmi-full-fmts: Refresh. Enable - all formats/rates as default. +- Update config files. @@ -59 +153 @@ -Tue Oct 13 15:54:12 CEST 2009 - tiwai(a)suse.de +Fri Oct 16 17:01:11 CEST 2009 - jeffm(a)suse.com @@ -61,7 +155 @@ -- patches.drivers/alsa-hda-nvidia-hdmi-full-fmts: ALSA: hda - - Add full rates/formats support for Nvidia HDMI. -- patches.drivers/alsa-hda-realtek-overflow-fix: ALSA: hda - - Fix overflow of spec->init_verbs in patch_realtek.c. -- patches.drivers/alsa-hda-stac9228-dell-fix: ALSA: hda - Fix - volume-knob setup for Dell laptops with STAC9228 (bnc#545013). -- patches.drivers/alsa-hda-stac9228-fsc-fix: Refresh. +- Update to 2.6.32-rc5. @@ -70 +158 @@ -Tue Oct 13 01:11:05 CEST 2009 - gregkh(a)suse.de +Fri Oct 16 16:45:53 CEST 2009 - mmarek(a)suse.de @@ -72,3 +160,2 @@ -- Update config files. -- patches.drivers/samsung-laptop-driver.patch: Samsung laptop - driver. +- patches.rpmify/ia64-sn-fix-percpu-warnings: ia64/sn: fix + percpu warnings. @@ -77 +164 @@ -Mon Oct 12 16:14:42 CEST 2009 - trenn(a)suse.de +Fri Oct 16 15:51:56 CEST 2009 - mmarek(a)suse.de @@ -79,10 +166,2 @@ -- patches.arch/amd_magny_cour_topology_fix.patch: x86: Fix CPU - llc_shared_map information for AMD Magny-Cours (bnc#545615). -- patches.arch/amd_magny_cour_topology_fix_1.patch: x86, sched: - Workaround broken sched domain creation for AMD Magny-Cours - (bnc#545615). -- patches.arch/amd_magny_cour_topology_fix_2.patch: x86, mcheck: ++++ 185 more lines (skipped) ++++ between kernel-source/kernel-kdump.changes ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-kdump.changes kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change calling whatdependson for head-i586 New: ---- kernel-ec2.changes kernel-ec2.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:40.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-debug (Version 2.6.31.4) +# spec file for package kernel-debug (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ # norootforbuild %define srcversion 2.6.31 -%define patchversion 2.6.31.4 +%define patchversion 2.6.32-rc5-git3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor debug %define build_kdump (%build_flavor == "kdump") -%define build_xen (%build_flavor == "xen") +%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion @@ -48,8 +48,8 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %endif @@ -86,9 +86,11 @@ %endif %if %build_xen %ifarch %ix86 +%if %build_flavor != "ec2" Provides: kernel-xenpae = %version Obsoletes: kernel-xenpae <= %version %endif +%endif #!BuildIgnore: xen %endif Provides: %name-nongpl @@ -159,26 +161,30 @@ NoSource: 120 # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor # sles10 / 11.0 -Obsoletes: uvcvideo-kmp +Obsoletes: uvcvideo-kmp-%build_flavor # 10.3 -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp +Obsoletes: adm8211-kmp-%build_flavor +Obsoletes: rt2x00-kmp-%build_flavor +Obsoletes: rfswitch-kmp-%build_flavor # 11.0 -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: btusb-kmp +Obsoletes: atl2-kmp-%build_flavor +Obsoletes: wlan-ng-kmp-%build_flavor +Obsoletes: et131x-kmp-%build_flavor +Obsoletes: ivtv-kmp-%build_flavor +Obsoletes: at76_usb-kmp-%build_flavor +Obsoletes: pcc-acpi-kmp-%build_flavor +Obsoletes: btusb-kmp-%build_flavor +# sle11-ga +Obsoletes: enic-kmp-%build_flavor +Obsoletes: fnic-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor # sle11 -Obsoletes: ocfs2-kmp +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -Obsoletes: quickcam-kmp < 0.6.7 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -381,7 +387,7 @@ cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -444,7 +450,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:40.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-default (Version 2.6.31.4) +# spec file for package kernel-default (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ # norootforbuild %define srcversion 2.6.31 -%define patchversion 2.6.31.4 +%define patchversion 2.6.32-rc5-git3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor default %define build_kdump (%build_flavor == "kdump") -%define build_xen (%build_flavor == "xen") +%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion @@ -48,8 +48,8 @@ Name: kernel-default Summary: The Standard Kernel -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %endif @@ -86,9 +86,11 @@ %endif %if %build_xen %ifarch %ix86 +%if %build_flavor != "ec2" Provides: kernel-xenpae = %version Obsoletes: kernel-xenpae <= %version %endif +%endif #!BuildIgnore: xen %endif Provides: %name-nongpl @@ -175,26 +177,30 @@ NoSource: 120 # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor # sles10 / 11.0 -Obsoletes: uvcvideo-kmp +Obsoletes: uvcvideo-kmp-%build_flavor # 10.3 -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp +Obsoletes: adm8211-kmp-%build_flavor +Obsoletes: rt2x00-kmp-%build_flavor +Obsoletes: rfswitch-kmp-%build_flavor # 11.0 -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: btusb-kmp +Obsoletes: atl2-kmp-%build_flavor +Obsoletes: wlan-ng-kmp-%build_flavor +Obsoletes: et131x-kmp-%build_flavor +Obsoletes: ivtv-kmp-%build_flavor +Obsoletes: at76_usb-kmp-%build_flavor +Obsoletes: pcc-acpi-kmp-%build_flavor +Obsoletes: btusb-kmp-%build_flavor +# sle11-ga +Obsoletes: enic-kmp-%build_flavor +Obsoletes: fnic-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor # sle11 -Obsoletes: ocfs2-kmp +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -Obsoletes: quickcam-kmp < 0.6.7 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -396,7 +402,7 @@ cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -459,7 +465,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:40.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-desktop (Version 2.6.31.4) +# spec file for package kernel-desktop (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ # norootforbuild %define srcversion 2.6.31 -%define patchversion 2.6.31.4 +%define patchversion 2.6.32-rc5-git3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor desktop %define build_kdump (%build_flavor == "kdump") -%define build_xen (%build_flavor == "xen") +%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion @@ -48,8 +48,8 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %endif @@ -86,9 +86,11 @@ %endif %if %build_xen %ifarch %ix86 +%if %build_flavor != "ec2" Provides: kernel-xenpae = %version Obsoletes: kernel-xenpae <= %version %endif +%endif #!BuildIgnore: xen %endif Provides: %name-nongpl @@ -159,26 +161,30 @@ NoSource: 120 # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor # sles10 / 11.0 -Obsoletes: uvcvideo-kmp +Obsoletes: uvcvideo-kmp-%build_flavor # 10.3 -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp +Obsoletes: adm8211-kmp-%build_flavor +Obsoletes: rt2x00-kmp-%build_flavor +Obsoletes: rfswitch-kmp-%build_flavor # 11.0 -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: btusb-kmp +Obsoletes: atl2-kmp-%build_flavor +Obsoletes: wlan-ng-kmp-%build_flavor +Obsoletes: et131x-kmp-%build_flavor +Obsoletes: ivtv-kmp-%build_flavor +Obsoletes: at76_usb-kmp-%build_flavor +Obsoletes: pcc-acpi-kmp-%build_flavor +Obsoletes: btusb-kmp-%build_flavor +# sle11-ga +Obsoletes: enic-kmp-%build_flavor +Obsoletes: fnic-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor # sle11 -Obsoletes: ocfs2-kmp +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -Obsoletes: quickcam-kmp < 0.6.7 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -391,7 +397,7 @@ cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -454,7 +460,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor ++++++ kernel-ec2.spec ++++++ ++++ 763 lines (skipped) ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:40.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-kdump (Version 2.6.31.4) +# spec file for package kernel-kdump (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ # norootforbuild %define srcversion 2.6.31 -%define patchversion 2.6.31.4 +%define patchversion 2.6.32-rc5-git3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor kdump %define build_kdump (%build_flavor == "kdump") -%define build_xen (%build_flavor == "xen") +%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion @@ -48,8 +48,8 @@ Name: kernel-kdump Summary: kernel for kdump -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %endif @@ -86,9 +86,11 @@ %endif %if %build_xen %ifarch %ix86 +%if %build_flavor != "ec2" Provides: kernel-xenpae = %version Obsoletes: kernel-xenpae <= %version %endif +%endif #!BuildIgnore: xen %endif Provides: %name-nongpl @@ -159,26 +161,30 @@ NoSource: 120 # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor # sles10 / 11.0 -Obsoletes: uvcvideo-kmp +Obsoletes: uvcvideo-kmp-%build_flavor # 10.3 -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp +Obsoletes: adm8211-kmp-%build_flavor +Obsoletes: rt2x00-kmp-%build_flavor +Obsoletes: rfswitch-kmp-%build_flavor # 11.0 -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: btusb-kmp +Obsoletes: atl2-kmp-%build_flavor +Obsoletes: wlan-ng-kmp-%build_flavor +Obsoletes: et131x-kmp-%build_flavor +Obsoletes: ivtv-kmp-%build_flavor +Obsoletes: at76_usb-kmp-%build_flavor +Obsoletes: pcc-acpi-kmp-%build_flavor +Obsoletes: btusb-kmp-%build_flavor +# sle11-ga +Obsoletes: enic-kmp-%build_flavor +Obsoletes: fnic-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor # sle11 -Obsoletes: ocfs2-kmp +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -Obsoletes: quickcam-kmp < 0.6.7 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -383,7 +389,7 @@ cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -446,7 +452,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:40.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-pae (Version 2.6.31.4) +# spec file for package kernel-pae (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ # norootforbuild %define srcversion 2.6.31 -%define patchversion 2.6.31.4 +%define patchversion 2.6.32-rc5-git3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor pae %define build_kdump (%build_flavor == "kdump") -%define build_xen (%build_flavor == "xen") +%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion @@ -48,8 +48,8 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %endif @@ -86,9 +86,11 @@ %endif %if %build_xen %ifarch %ix86 +%if %build_flavor != "ec2" Provides: kernel-xenpae = %version Obsoletes: kernel-xenpae <= %version %endif +%endif #!BuildIgnore: xen %endif Provides: %name-nongpl @@ -163,26 +165,30 @@ NoSource: 120 # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor # sles10 / 11.0 -Obsoletes: uvcvideo-kmp +Obsoletes: uvcvideo-kmp-%build_flavor # 10.3 -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp +Obsoletes: adm8211-kmp-%build_flavor +Obsoletes: rt2x00-kmp-%build_flavor +Obsoletes: rfswitch-kmp-%build_flavor # 11.0 -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: btusb-kmp +Obsoletes: atl2-kmp-%build_flavor +Obsoletes: wlan-ng-kmp-%build_flavor +Obsoletes: et131x-kmp-%build_flavor +Obsoletes: ivtv-kmp-%build_flavor +Obsoletes: at76_usb-kmp-%build_flavor +Obsoletes: pcc-acpi-kmp-%build_flavor +Obsoletes: btusb-kmp-%build_flavor +# sle11-ga +Obsoletes: enic-kmp-%build_flavor +Obsoletes: fnic-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor # sle11 -Obsoletes: ocfs2-kmp +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -Obsoletes: quickcam-kmp < 0.6.7 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -391,7 +397,7 @@ cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -454,7 +460,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:40.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 2.6.31.4) +# spec file for package kernel-ppc64 (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ # norootforbuild %define srcversion 2.6.31 -%define patchversion 2.6.31.4 +%define patchversion 2.6.32-rc5-git3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor ppc64 %define build_kdump (%build_flavor == "kdump") -%define build_xen (%build_flavor == "xen") +%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion @@ -48,8 +48,8 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %endif @@ -86,9 +86,11 @@ %endif %if %build_xen %ifarch %ix86 +%if %build_flavor != "ec2" Provides: kernel-xenpae = %version Obsoletes: kernel-xenpae <= %version %endif +%endif #!BuildIgnore: xen %endif Provides: %name-nongpl @@ -163,26 +165,30 @@ NoSource: 120 # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor # sles10 / 11.0 -Obsoletes: uvcvideo-kmp +Obsoletes: uvcvideo-kmp-%build_flavor # 10.3 -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp +Obsoletes: adm8211-kmp-%build_flavor +Obsoletes: rt2x00-kmp-%build_flavor +Obsoletes: rfswitch-kmp-%build_flavor # 11.0 -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: btusb-kmp +Obsoletes: atl2-kmp-%build_flavor +Obsoletes: wlan-ng-kmp-%build_flavor +Obsoletes: et131x-kmp-%build_flavor +Obsoletes: ivtv-kmp-%build_flavor +Obsoletes: at76_usb-kmp-%build_flavor +Obsoletes: pcc-acpi-kmp-%build_flavor +Obsoletes: btusb-kmp-%build_flavor +# sle11-ga +Obsoletes: enic-kmp-%build_flavor +Obsoletes: fnic-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor # sle11 -Obsoletes: ocfs2-kmp +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -Obsoletes: quickcam-kmp < 0.6.7 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -391,7 +397,7 @@ cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -454,7 +460,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor ++++++ kernel-ps3.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:40.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ps3 (Version 2.6.31.4) +# spec file for package kernel-ps3 (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ # norootforbuild %define srcversion 2.6.31 -%define patchversion 2.6.31.4 +%define patchversion 2.6.32-rc5-git3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor ps3 %define build_kdump (%build_flavor == "kdump") -%define build_xen (%build_flavor == "xen") +%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion @@ -48,8 +48,8 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %endif @@ -86,9 +86,11 @@ %endif %if %build_xen %ifarch %ix86 +%if %build_flavor != "ec2" Provides: kernel-xenpae = %version Obsoletes: kernel-xenpae <= %version %endif +%endif #!BuildIgnore: xen %endif Provides: %name-nongpl @@ -159,26 +161,30 @@ NoSource: 120 # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor # sles10 / 11.0 -Obsoletes: uvcvideo-kmp +Obsoletes: uvcvideo-kmp-%build_flavor # 10.3 -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp +Obsoletes: adm8211-kmp-%build_flavor +Obsoletes: rt2x00-kmp-%build_flavor +Obsoletes: rfswitch-kmp-%build_flavor # 11.0 -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: btusb-kmp +Obsoletes: atl2-kmp-%build_flavor +Obsoletes: wlan-ng-kmp-%build_flavor +Obsoletes: et131x-kmp-%build_flavor +Obsoletes: ivtv-kmp-%build_flavor +Obsoletes: at76_usb-kmp-%build_flavor +Obsoletes: pcc-acpi-kmp-%build_flavor +Obsoletes: btusb-kmp-%build_flavor +# sle11-ga +Obsoletes: enic-kmp-%build_flavor +Obsoletes: fnic-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor # sle11 -Obsoletes: ocfs2-kmp +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -Obsoletes: quickcam-kmp < 0.6.7 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -383,7 +389,7 @@ cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -446,7 +452,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:40.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 2.6.31.4) +# spec file for package kernel-s390 (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ # norootforbuild %define srcversion 2.6.31 -%define patchversion 2.6.31.4 +%define patchversion 2.6.32-rc5-git3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor s390 %define build_kdump (%build_flavor == "kdump") -%define build_xen (%build_flavor == "xen") +%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion @@ -48,8 +48,8 @@ Name: kernel-s390 Summary: The Standard Kernel -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %endif @@ -86,9 +86,11 @@ %endif %if %build_xen %ifarch %ix86 +%if %build_flavor != "ec2" Provides: kernel-xenpae = %version Obsoletes: kernel-xenpae <= %version %endif +%endif #!BuildIgnore: xen %endif Provides: %name-nongpl @@ -163,26 +165,30 @@ NoSource: 120 # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor # sles10 / 11.0 -Obsoletes: uvcvideo-kmp +Obsoletes: uvcvideo-kmp-%build_flavor # 10.3 -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp +Obsoletes: adm8211-kmp-%build_flavor +Obsoletes: rt2x00-kmp-%build_flavor +Obsoletes: rfswitch-kmp-%build_flavor # 11.0 -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: btusb-kmp +Obsoletes: atl2-kmp-%build_flavor +Obsoletes: wlan-ng-kmp-%build_flavor +Obsoletes: et131x-kmp-%build_flavor +Obsoletes: ivtv-kmp-%build_flavor +Obsoletes: at76_usb-kmp-%build_flavor +Obsoletes: pcc-acpi-kmp-%build_flavor +Obsoletes: btusb-kmp-%build_flavor +# sle11-ga +Obsoletes: enic-kmp-%build_flavor +Obsoletes: fnic-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor # sle11 -Obsoletes: ocfs2-kmp +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -Obsoletes: quickcam-kmp < 0.6.7 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -384,7 +390,7 @@ cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -447,7 +453,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:41.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.31.4) +# spec file for package kernel-source (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 2.6.31 -%define patchversion 2.6.31.4 +%define patchversion 2.6.32-rc5-git3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define src_install_dir usr/src/linux-%kernelrelease%variant @@ -28,8 +28,8 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %endif @@ -61,6 +61,7 @@ Source38: README.KSYMS Source40: source-timestamp Source44: find-provides +Source45: split-modules Source46: modversions Source47: extract-modaliases Source48: macros.kernel-source ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:41.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 2.6.31.4) +# spec file for package kernel-syms (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:41.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-trace (Version 2.6.31.4) +# spec file for package kernel-trace (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ # norootforbuild %define srcversion 2.6.31 -%define patchversion 2.6.31.4 +%define patchversion 2.6.32-rc5-git3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor trace %define build_kdump (%build_flavor == "kdump") -%define build_xen (%build_flavor == "xen") +%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion @@ -48,8 +48,8 @@ Name: kernel-trace Summary: The Realtime Linux Kernel -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %endif @@ -86,9 +86,11 @@ %endif %if %build_xen %ifarch %ix86 +%if %build_flavor != "ec2" Provides: kernel-xenpae = %version Obsoletes: kernel-xenpae <= %version %endif +%endif #!BuildIgnore: xen %endif Provides: %name-nongpl @@ -159,26 +161,30 @@ NoSource: 120 # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor # sles10 / 11.0 -Obsoletes: uvcvideo-kmp +Obsoletes: uvcvideo-kmp-%build_flavor # 10.3 -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp +Obsoletes: adm8211-kmp-%build_flavor +Obsoletes: rt2x00-kmp-%build_flavor +Obsoletes: rfswitch-kmp-%build_flavor # 11.0 -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: btusb-kmp +Obsoletes: atl2-kmp-%build_flavor +Obsoletes: wlan-ng-kmp-%build_flavor +Obsoletes: et131x-kmp-%build_flavor +Obsoletes: ivtv-kmp-%build_flavor +Obsoletes: at76_usb-kmp-%build_flavor +Obsoletes: pcc-acpi-kmp-%build_flavor +Obsoletes: btusb-kmp-%build_flavor +# sle11-ga +Obsoletes: enic-kmp-%build_flavor +Obsoletes: fnic-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor # sle11 -Obsoletes: ocfs2-kmp +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -Obsoletes: quickcam-kmp < 0.6.7 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -380,7 +386,7 @@ cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -443,7 +449,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:41.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-vanilla (Version 2.6.31.4) +# spec file for package kernel-vanilla (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ # norootforbuild %define srcversion 2.6.31 -%define patchversion 2.6.31.4 +%define patchversion 2.6.32-rc5-git3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor vanilla %define build_kdump (%build_flavor == "kdump") -%define build_xen (%build_flavor == "xen") +%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion @@ -48,8 +48,8 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %endif @@ -86,9 +86,11 @@ %endif %if %build_xen %ifarch %ix86 +%if %build_flavor != "ec2" Provides: kernel-xenpae = %version Obsoletes: kernel-xenpae <= %version %endif +%endif #!BuildIgnore: xen %endif Provides: %name-nongpl @@ -167,26 +169,30 @@ NoSource: 120 # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor # sles10 / 11.0 -Obsoletes: uvcvideo-kmp +Obsoletes: uvcvideo-kmp-%build_flavor # 10.3 -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp +Obsoletes: adm8211-kmp-%build_flavor +Obsoletes: rt2x00-kmp-%build_flavor +Obsoletes: rfswitch-kmp-%build_flavor # 11.0 -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: btusb-kmp +Obsoletes: atl2-kmp-%build_flavor +Obsoletes: wlan-ng-kmp-%build_flavor +Obsoletes: et131x-kmp-%build_flavor +Obsoletes: ivtv-kmp-%build_flavor +Obsoletes: at76_usb-kmp-%build_flavor +Obsoletes: pcc-acpi-kmp-%build_flavor +Obsoletes: btusb-kmp-%build_flavor +# sle11-ga +Obsoletes: enic-kmp-%build_flavor +Obsoletes: fnic-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor # sle11 -Obsoletes: ocfs2-kmp +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -Obsoletes: quickcam-kmp < 0.6.7 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -388,7 +394,7 @@ cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -451,7 +457,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:41.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xen (Version 2.6.31.4) +# spec file for package kernel-xen (Version 2.6.32) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ # norootforbuild %define srcversion 2.6.31 -%define patchversion 2.6.31.4 +%define patchversion 2.6.32-rc5-git3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor xen %define build_kdump (%build_flavor == "kdump") -%define build_xen (%build_flavor == "xen") +%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion @@ -48,8 +48,8 @@ Name: kernel-xen Summary: The Xen Kernel -Version: 2.6.31.4 -Release: 3 +Version: 2.6.32 +Release: 1 %if %using_buildservice %else %endif @@ -86,9 +86,11 @@ %endif %if %build_xen %ifarch %ix86 +%if %build_flavor != "ec2" Provides: kernel-xenpae = %version Obsoletes: kernel-xenpae <= %version %endif +%endif #!BuildIgnore: xen %endif Provides: %name-nongpl @@ -159,26 +161,30 @@ NoSource: 120 # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor # sles10 / 11.0 -Obsoletes: uvcvideo-kmp +Obsoletes: uvcvideo-kmp-%build_flavor # 10.3 -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp +Obsoletes: adm8211-kmp-%build_flavor +Obsoletes: rt2x00-kmp-%build_flavor +Obsoletes: rfswitch-kmp-%build_flavor # 11.0 -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: btusb-kmp +Obsoletes: atl2-kmp-%build_flavor +Obsoletes: wlan-ng-kmp-%build_flavor +Obsoletes: et131x-kmp-%build_flavor +Obsoletes: ivtv-kmp-%build_flavor +Obsoletes: at76_usb-kmp-%build_flavor +Obsoletes: pcc-acpi-kmp-%build_flavor +Obsoletes: btusb-kmp-%build_flavor +# sle11-ga +Obsoletes: enic-kmp-%build_flavor +Obsoletes: fnic-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor # sle11 -Obsoletes: ocfs2-kmp +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -Obsoletes: quickcam-kmp < 0.6.7 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name # Will modules not listed in supported.conf abort the kernel build (0/1)? @@ -383,7 +389,7 @@ cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -446,7 +452,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:41.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:41.000000000 +0100 @@ -13,6 +13,7 @@ +i386 i386/pae +i386 i386/debug +i386 i386/xen ++i386 -syms i386/ec2 +i386 i386/vanilla +i386 -syms i386/trace @@ -24,6 +25,7 @@ +x86_64 x86_64/default +x86_64 x86_64/desktop +x86_64 x86_64/xen ++x86_64 -syms x86_64/ec2 +x86_64 x86_64/debug +x86_64 x86_64/vanilla +x86_64 -syms x86_64/trace ++++++ config.tar.bz2 ++++++ ++++ 31036 lines of diff (skipped) ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:42.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:42.000000000 +0100 @@ -25,7 +25,7 @@ %define build_flavor @FLAVOR@ %define build_kdump (%build_flavor == "kdump") -%define build_xen (%build_flavor == "xen") +%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") %define build_ps3 (%build_flavor == "ps3") @@ -95,9 +95,11 @@ %endif %if %build_xen %ifarch %ix86 +%if %build_flavor != "ec2" Provides: kernel-xenpae = %version Obsoletes: kernel-xenpae <= %version %endif +%endif #!BuildIgnore: xen %endif @@ -173,26 +175,30 @@ # The following KMPs have been integrated into the kernel package. # sles10 / 10.3 -Obsoletes: iwlwifi-kmp -Obsoletes: ipw3945-kmp +Obsoletes: iwlwifi-kmp-%build_flavor +Obsoletes: ipw3945-kmp-%build_flavor # sles10 / 11.0 -Obsoletes: uvcvideo-kmp +Obsoletes: uvcvideo-kmp-%build_flavor # 10.3 -Obsoletes: adm8211-kmp -Obsoletes: rt2x00-kmp -Obsoletes: rfswitch-kmp +Obsoletes: adm8211-kmp-%build_flavor +Obsoletes: rt2x00-kmp-%build_flavor +Obsoletes: rfswitch-kmp-%build_flavor # 11.0 -Obsoletes: atl2-kmp -Obsoletes: wlan-ng-kmp -Obsoletes: et131x-kmp -Obsoletes: ivtv-kmp -Obsoletes: at76_usb-kmp -Obsoletes: pcc-acpi-kmp -Obsoletes: btusb-kmp +Obsoletes: atl2-kmp-%build_flavor +Obsoletes: wlan-ng-kmp-%build_flavor +Obsoletes: et131x-kmp-%build_flavor +Obsoletes: ivtv-kmp-%build_flavor +Obsoletes: at76_usb-kmp-%build_flavor +Obsoletes: pcc-acpi-kmp-%build_flavor +Obsoletes: btusb-kmp-%build_flavor +# sle11-ga +Obsoletes: enic-kmp-%build_flavor +Obsoletes: fnic-kmp-%build_flavor +Obsoletes: brocade-bfa-kmp-%build_flavor # sle11 -Obsoletes: ocfs2-kmp +Obsoletes: ocfs2-kmp-%build_flavor # 11.1 -Obsoletes: quickcam-kmp < 0.6.7 +Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -425,7 +431,7 @@ cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then - dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" mkdir -p %buildroot/usr/share/man/man9 @@ -500,7 +506,7 @@ if [ -x "$(which dwarfextract 2>/dev/null)" -a \ -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then find %buildroot -name "*.ko" > kofiles.list - dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list + dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi %endif ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:42.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:42.000000000 +0100 @@ -64,6 +64,7 @@ Source38: README.KSYMS Source40: source-timestamp Source44: find-provides +Source45: split-modules Source46: modversions Source47: extract-modaliases Source48: macros.kernel-source ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:43.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:43.000000000 +0100 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:43.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:43.000000000 +0100 @@ -1 +1 @@ -6000 +6144 ++++++ package-descriptions ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:43.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:43.000000000 +0100 @@ -101,3 +101,11 @@ This kernel can be used both as the domain0 ("xen0") and as an unprivileged ("xenU") kernel. +=== kernel-ec2 === +The Amazon EC2 Xen Kernel + +The Linux kernel for Xen paravirtualization. + +This kernel can only be used both as an unprivileged ("xenU") +kernel (for Amazon EC2). + ++++++ patches.apparmor.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor.diff new/patches.apparmor/apparmor.diff --- old/patches.apparmor/apparmor.diff 2009-09-08 18:49:15.000000000 +0200 +++ new/patches.apparmor/apparmor.diff 2009-10-12 21:05:10.000000000 +0200 @@ -78,7 +78,7 @@ #define AUDIT_ANOM_PROMISCUOUS 1700 /* Device changed promiscuous mode */ --- a/security/Kconfig +++ b/security/Kconfig -@@ -132,6 +132,7 @@ config LSM_MMAP_MIN_ADDR +@@ -162,6 +162,7 @@ config LSM_MMAP_MIN_ADDR source security/selinux/Kconfig source security/smack/Kconfig source security/tomoyo/Kconfig @@ -96,9 +96,9 @@ # always enable default capabilities obj-y += commoncap.o min_addr.o -@@ -20,6 +21,7 @@ ifeq ($(CONFIG_AUDIT),y) - obj-$(CONFIG_SECURITY_SMACK) += lsm_audit.o - endif +@@ -18,6 +19,7 @@ obj-$(CONFIG_SECURITY_SELINUX) += selin + obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o + obj-$(CONFIG_AUDIT) += lsm_audit.o obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o +obj-$(CONFIG_SECURITY_APPARMOR) += apparmor/built-in.o obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/ptrace_may_access-fix new/patches.apparmor/ptrace_may_access-fix --- old/patches.apparmor/ptrace_may_access-fix 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.apparmor/ptrace_may_access-fix 2009-10-12 21:05:10.000000000 +0200 @@ -0,0 +1,30 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: apparmor: ptrace_may_access -> ptrace_access_check + + This patch adjusts to a security_operations API change in the 2.6.32 kernel. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + security/apparmor/lsm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/security/apparmor/lsm.c ++++ b/security/apparmor/lsm.c +@@ -68,7 +68,7 @@ static void apparmor_cred_free(struct cr + } + + +-static int apparmor_ptrace_may_access(struct task_struct *child, ++static int apparmor_ptrace_access_check(struct task_struct *child, + unsigned int mode) + { + return aa_ptrace(current, child, mode); +@@ -673,7 +673,7 @@ static int apparmor_socket_shutdown(stru + static struct security_operations apparmor_ops = { + .name = "apparmor", + +- .ptrace_may_access = apparmor_ptrace_may_access, ++ .ptrace_access_check = apparmor_ptrace_access_check, + .ptrace_traceme = apparmor_ptrace_traceme, + .capget = apparmor_capget, + .sysctl = apparmor_sysctl, ++++++ patches.arch.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch new/patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch --- old/patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch 2009-10-12 19:54:29.000000000 +0200 @@ -18,7 +18,7 @@ --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -687,6 +687,11 @@ and is between 256 and 4096 characters. +@@ -691,6 +691,11 @@ and is between 256 and 4096 characters. eata= [HW,SCSI] @@ -32,7 +32,7 @@ --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c -@@ -120,6 +120,8 @@ static struct acpi_ec { +@@ -118,6 +118,8 @@ static struct acpi_ec { spinlock_t curr_lock; } *boot_ec, *first_ec; @@ -41,7 +41,7 @@ static int EC_FLAGS_MSI; /* Out-of-spec MSI controller */ /* -------------------------------------------------------------------------- -@@ -898,6 +900,8 @@ static int ec_install_handlers(struct ac +@@ -754,6 +756,8 @@ static int ec_install_handlers(struct ac &acpi_ec_gpe_handler, ec); if (ACPI_FAILURE(status)) return -ENODEV; @@ -50,7 +50,7 @@ acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME); acpi_enable_gpe(NULL, ec->gpe); status = acpi_install_address_space_handler(ec->handle, -@@ -1114,3 +1118,14 @@ static void __exit acpi_ec_exit(void) +@@ -1034,3 +1038,14 @@ static void __exit acpi_ec_exit(void) return; } #endif /* 0 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi-export-hotplug_execute new/patches.arch/acpi-export-hotplug_execute --- old/patches.arch/acpi-export-hotplug_execute 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/acpi-export-hotplug_execute 2009-10-12 19:54:29.000000000 +0200 @@ -13,7 +13,7 @@ --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c -@@ -803,6 +803,7 @@ acpi_status acpi_os_hotplug_execute(acpi +@@ -782,6 +782,7 @@ acpi_status acpi_os_hotplug_execute(acpi { return __acpi_os_execute(0, function, context, 1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_srat-pxm-rev-store.patch new/patches.arch/acpi_srat-pxm-rev-store.patch --- old/patches.arch/acpi_srat-pxm-rev-store.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/acpi_srat-pxm-rev-store.patch 2009-10-12 19:54:29.000000000 +0200 @@ -22,7 +22,7 @@ --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c -@@ -42,6 +42,8 @@ static int pxm_to_node_map[MAX_PXM_DOMAI +@@ -44,6 +44,8 @@ static int pxm_to_node_map[MAX_PXM_DOMAI static int node_to_pxm_map[MAX_NUMNODES] = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL }; @@ -31,7 +31,7 @@ int pxm_to_node(int pxm) { if (pxm < 0) -@@ -266,6 +268,7 @@ static int __init acpi_parse_srat(struct +@@ -268,6 +270,7 @@ static int __init acpi_parse_srat(struct return -EINVAL; srat = (struct acpi_table_srat *)table; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_thermal_passive_blacklist.patch new/patches.arch/acpi_thermal_passive_blacklist.patch --- old/patches.arch/acpi_thermal_passive_blacklist.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/acpi_thermal_passive_blacklist.patch 2009-10-12 19:54:29.000000000 +0200 @@ -16,7 +16,7 @@ #include <asm/uaccess.h> #include <linux/thermal.h> #include <acpi/acpi_bus.h> -@@ -1356,6 +1357,66 @@ static void acpi_thermal_guess_offset(st +@@ -1358,6 +1359,66 @@ static void acpi_thermal_guess_offset(st tz->kelvin_offset = 2732; } @@ -83,7 +83,7 @@ static int acpi_thermal_add(struct acpi_device *device) { int result = 0; -@@ -1387,6 +1448,18 @@ static int acpi_thermal_add(struct acpi_ +@@ -1389,6 +1450,18 @@ static int acpi_thermal_add(struct acpi_ if (result) goto free_memory; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch new/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch --- old/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch 2009-10-12 19:54:29.000000000 +0200 @@ -30,7 +30,7 @@ --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c -@@ -1404,6 +1404,21 @@ static int __init dmi_ignore_irq0_timer_ +@@ -1303,6 +1303,21 @@ static int __init dmi_ignore_irq0_timer_ return 0; } @@ -52,7 +52,7 @@ /* * If your system is blacklisted here, but you find that acpi=force * works for you, please contact linux-acpi(a)vger.kernel.org -@@ -1563,6 +1578,32 @@ static struct dmi_system_id __initdata a +@@ -1462,6 +1477,32 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), }, }, @@ -85,7 +85,7 @@ {} }; -@@ -1763,6 +1804,18 @@ static int __init parse_acpi(char *arg) +@@ -1662,6 +1703,18 @@ static int __init parse_acpi(char *arg) } early_param("acpi", parse_acpi); @@ -106,7 +106,7 @@ { --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c -@@ -333,6 +333,9 @@ int __init acpi_table_init(void) +@@ -339,6 +339,9 @@ int __init acpi_table_init(void) { acpi_status status; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/add_support_for_hpet_msi_intr_remap.patch new/patches.arch/add_support_for_hpet_msi_intr_remap.patch --- old/patches.arch/add_support_for_hpet_msi_intr_remap.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/add_support_for_hpet_msi_intr_remap.patch 2009-10-12 19:54:29.000000000 +0200 @@ -41,7 +41,7 @@ int intr_remapping_enabled; static int disable_intremap; -@@ -351,6 +353,16 @@ int flush_irte(int irq) +@@ -343,6 +345,16 @@ int flush_irte(int irq) return rc; } @@ -58,7 +58,7 @@ struct intel_iommu *map_ioapic_to_ir(int apic) { int i; -@@ -478,6 +490,36 @@ int set_ioapic_sid(struct irte *irte, in +@@ -470,6 +482,36 @@ int set_ioapic_sid(struct irte *irte, in return 0; } @@ -141,7 +141,7 @@ { struct acpi_dmar_hardware_unit *drhd; struct acpi_dmar_device_scope *scope; -@@ -765,6 +835,17 @@ static int ir_parse_ioapic_scope(struct +@@ -765,6 +835,17 @@ static int ir_parse_ioapic_scope(struct drhd->address); ir_parse_one_ioapic_scope(scope, iommu); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/add_x86_support_for_hpet_msi_intr_remap.patch new/patches.arch/add_x86_support_for_hpet_msi_intr_remap.patch --- old/patches.arch/add_x86_support_for_hpet_msi_intr_remap.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/add_x86_support_for_hpet_msi_intr_remap.patch 2009-10-12 19:54:29.000000000 +0200 @@ -54,7 +54,7 @@ * Some broken BIOSes advertise HPET at 0x0. We really do not --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c -@@ -3254,7 +3254,8 @@ void destroy_irq(unsigned int irq) +@@ -3211,7 +3211,8 @@ void destroy_irq(unsigned int irq) * MSI message composition */ #ifdef CONFIG_PCI_MSI @@ -64,7 +64,7 @@ { struct irq_cfg *cfg; int err; -@@ -3288,7 +3289,10 @@ static int msi_compose_msg(struct pci_de +@@ -3245,7 +3246,10 @@ static int msi_compose_msg(struct pci_de irte.dest_id = IRTE_DEST(dest); /* Set source-id of interrupt request */ @@ -76,7 +76,7 @@ modify_irte(irq, &irte); -@@ -3453,7 +3457,7 @@ static int setup_msi_irq(struct pci_dev +@@ -3410,7 +3414,7 @@ static int setup_msi_irq(struct pci_dev int ret; struct msi_msg msg; @@ -85,7 +85,7 @@ if (ret < 0) return ret; -@@ -3586,7 +3590,7 @@ int arch_setup_dmar_msi(unsigned int irq +@@ -3543,7 +3547,7 @@ int arch_setup_dmar_msi(unsigned int irq int ret; struct msi_msg msg; @@ -94,7 +94,7 @@ if (ret < 0) return ret; dmar_msi_write(irq, &msg); -@@ -3626,6 +3630,19 @@ static int hpet_msi_set_affinity(unsigne +@@ -3583,6 +3587,19 @@ static int hpet_msi_set_affinity(unsigne #endif /* CONFIG_SMP */ @@ -114,7 +114,7 @@ static struct irq_chip hpet_msi_type = { .name = "HPET_MSI", .unmask = hpet_msi_unmask, -@@ -3637,20 +3654,36 @@ static struct irq_chip hpet_msi_type = { +@@ -3594,20 +3611,36 @@ static struct irq_chip hpet_msi_type = { .retrigger = ioapic_retrigger_irq, }; @@ -165,7 +165,7 @@ #ifdef CONFIG_PCI_MSI static unsigned long hpet_num_timers; #endif -@@ -468,7 +469,7 @@ static int hpet_msi_next_event(unsigned +@@ -538,7 +539,7 @@ static int hpet_msi_next_event(unsigned static int hpet_setup_msi_irq(unsigned int irq) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/amd_magny_cour_topology_fix_1.patch new/patches.arch/amd_magny_cour_topology_fix_1.patch --- old/patches.arch/amd_magny_cour_topology_fix_1.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/amd_magny_cour_topology_fix_1.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -From: Andreas Herrmann <andreas.herrmann3(a)amd.com> -Subject: x86, sched: Workaround broken sched domain creation for AMD Magny-Cours -References: bnc#545615 -Patch-Mainline: yes -Commit-ID: 5a925b4282d7f805deafde62001a83dbaf8be275 - -Signed-off-by: Thomas Renninger <trenn(a)suse.de> - -Current sched domain creation code can't handle multi-node processors. -When switching to power_savings scheduling errors show up and -system might hang later on (due to broken sched domain hierarchy): - - # echo 0 >> /sys/devices/system/cpu/sched_mc_power_savings - CPU0 attaching sched-domain: - domain 0: span 0-5 level MC - groups: 0 1 2 3 4 5 - domain 1: span 0-23 level NODE - groups: 0-5 6-11 18-23 12-17 - ... - # echo 1 >> /sys/devices/system/cpu/sched_mc_power_savings - CPU0 attaching sched-domain: - domain 0: span 0-11 level MC - groups: 0 1 2 3 4 5 6 7 8 9 10 11 - ERROR: parent span is not a superset of domain->span - domain 1: span 0-5 level CPU - ERROR: domain->groups does not contain CPU0 - groups: 6-11 (__cpu_power = 12288) - ERROR: groups don't span domain->span - domain 2: span 0-23 level NODE - groups: - ERROR: domain->cpu_power not set - - ERROR: groups don't span domain->span - ... - -Fixing all aspects of power-savings scheduling for Magny-Cours needs -some larger changes in the sched domain creation code. - -As a short-term and temporary workaround avoid the problems by -extending "the worst possible hack" ;-( -and always use llc_shared_map on AMD Magny-Cours when MC domain span -is calculated. - -With this I get: - - # echo 1 >> /sys/devices/system/cpu/sched_mc_power_savings - CPU0 attaching sched-domain: - domain 0: span 0-5 level MC - groups: 0 1 2 3 4 5 - domain 1: span 0-5 level CPU - groups: 0-5 (__cpu_power = 6144) - domain 2: span 0-23 level NODE - groups: 0-5 (__cpu_power = 6144) 6-11 (__cpu_power = 6144) 18-23 (__cpu_power = 6144) 12-17 (__cpu_power = 6144) - ... - -I.e. no errors during sched domain creation, no system hangs, and also -mc_power_savings scheduling works to a certain extend. - -Cc: Peter Zijlstra <a.p.zijlstra(a)chello.nl> -Signed-off-by: Andreas Herrmann <andreas.herrmann3(a)amd.com> -Signed-off-by: H. Peter Anvin <hpa(a)zytor.com> - -diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c -index 2fecda6..c36cc14 100644 ---- a/arch/x86/kernel/smpboot.c -+++ b/arch/x86/kernel/smpboot.c -@@ -434,7 +434,8 @@ const struct cpumask *cpu_coregroup_mask(int cpu) - * For perf, we return last level cache shared map. - * And for power savings, we return cpu_core_map - */ -- if (sched_mc_power_savings || sched_smt_power_savings) -+ if ((sched_mc_power_savings || sched_smt_power_savings) && -+ !(cpu_has(c, X86_FEATURE_AMD_DCM))) - return cpu_core_mask(cpu); - else - return c->llc_shared_map; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/amd_magny_cour_topology_fix_2.patch new/patches.arch/amd_magny_cour_topology_fix_2.patch --- old/patches.arch/amd_magny_cour_topology_fix_2.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/amd_magny_cour_topology_fix_2.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -From: Andreas Herrmann <andreas.herrmann3(a)amd.com> -Subject: x86, mcheck: Use correct cpumask for shared bank4 -References: bnc#545615 -Patch-Mainline: yes -Commit-ID: cb9805ab5b97079f69a21b6b4e344a69d5c96157 - -Signed-off-by: Thomas Renninger <trenn(a)suse.de> - -This fixes threshold_bank4 support on multi-node processors. - -The correct mask to use is llc_shared_map, representing an internal -node on Magny-Cours. - -We need to create 2 sets of symlinks for sibling shared banks -- one -set for each internal node, symlinks of each set should target the -first core on same internal node. - -Currently only one set is created where all symlinks are targeting -the first core of the entire socket. - -Signed-off-by: Andreas Herrmann <andreas.herrmann3(a)amd.com> -Signed-off-by: H. Peter Anvin <hpa(a)zytor.com> - -diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c -index ddae216..1fecba4 100644 ---- a/arch/x86/kernel/cpu/mcheck/mce_amd.c -+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c -@@ -489,12 +489,14 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) - int i, err = 0; - struct threshold_bank *b = NULL; - char name[32]; -+ struct cpuinfo_x86 *c = &cpu_data(cpu); -+ - - sprintf(name, "threshold_bank%i", bank); - - #ifdef CONFIG_SMP - if (cpu_data(cpu).cpu_core_id && shared_bank[bank]) { /* symlink */ -- i = cpumask_first(cpu_core_mask(cpu)); -+ i = cpumask_first(c->llc_shared_map); - - /* first core not up yet */ - if (cpu_data(i).cpu_core_id) -@@ -514,7 +516,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) - if (err) - goto out; - -- cpumask_copy(b->cpus, cpu_core_mask(cpu)); -+ cpumask_copy(b->cpus, c->llc_shared_map); - per_cpu(threshold_banks, cpu)[bank] = b; - - goto out; -@@ -539,7 +541,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) - #ifndef CONFIG_SMP - cpumask_setall(b->cpus); - #else -- cpumask_copy(b->cpus, cpu_core_mask(cpu)); -+ cpumask_copy(b->cpus, c->llc_shared_map); - #endif - - per_cpu(threshold_banks, cpu)[bank] = b; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/amd_magny_cour_topology_fix_3.patch new/patches.arch/amd_magny_cour_topology_fix_3.patch --- old/patches.arch/amd_magny_cour_topology_fix_3.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/amd_magny_cour_topology_fix_3.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,107 +0,0 @@ -From: Andreas Herrmann <andreas.herrmann3(a)amd.com> -Subject: x86, cacheinfo: Fixup L3 cache information for AMD multi-node processors -References: bnc#545615 -Patch-Mainline: yes -Commit-ID: a326e948c538e8ce998f30d92e146ecea8a30421 - -Signed-off-by: Thomas Renninger <trenn(a)suse.de> - -L3 cache size, associativity and shared_cpu information need to be -adapted to show information for an internal node instead of the -entire physical package. - -Signed-off-by: Andreas Herrmann <andreas.herrmann3(a)amd.com> -Signed-off-by: H. Peter Anvin <hpa(a)zytor.com> - ---- - arch/x86/kernel/cpu/intel_cacheinfo.c | 34 +++++++++++++++++++++++----------- - 1 file changed, 23 insertions(+), 11 deletions(-) - -Index: linux-2.6.31-openSUSE-11.2/arch/x86/kernel/cpu/intel_cacheinfo.c -=================================================================== ---- linux-2.6.31-openSUSE-11.2.orig/arch/x86/kernel/cpu/intel_cacheinfo.c -+++ linux-2.6.31-openSUSE-11.2/arch/x86/kernel/cpu/intel_cacheinfo.c -@@ -241,7 +241,7 @@ amd_cpuid4(int leaf, union _cpuid4_leaf_ - case 0: - if (!l1->val) - return; -- assoc = l1->assoc; -+ assoc = assocs[l1->assoc]; - line_size = l1->line_size; - lines_per_tag = l1->lines_per_tag; - size_in_kb = l1->size_in_kb; -@@ -249,7 +249,7 @@ amd_cpuid4(int leaf, union _cpuid4_leaf_ - case 2: - if (!l2.val) - return; -- assoc = l2.assoc; -+ assoc = assocs[l2.assoc]; - line_size = l2.line_size; - lines_per_tag = l2.lines_per_tag; - /* cpu_data has errata corrections for K7 applied */ -@@ -258,10 +258,14 @@ amd_cpuid4(int leaf, union _cpuid4_leaf_ - case 3: - if (!l3.val) - return; -- assoc = l3.assoc; -+ assoc = assocs[l3.assoc]; - line_size = l3.line_size; - lines_per_tag = l3.lines_per_tag; - size_in_kb = l3.size_encoded * 512; -+ if (boot_cpu_has(X86_FEATURE_AMD_DCM)) { -+ size_in_kb = size_in_kb >> 1; -+ assoc = assoc >> 1; -+ } - break; - default: - return; -@@ -270,18 +274,14 @@ amd_cpuid4(int leaf, union _cpuid4_leaf_ - eax->split.is_self_initializing = 1; - eax->split.type = types[leaf]; - eax->split.level = levels[leaf]; -- if (leaf == 3) -- eax->split.num_threads_sharing = -- current_cpu_data.x86_max_cores - 1; -- else -- eax->split.num_threads_sharing = 0; -+ eax->split.num_threads_sharing = 0; - eax->split.num_cores_on_die = current_cpu_data.x86_max_cores - 1; - - -- if (assoc == 0xf) -+ if (assoc == 0xffff) - eax->split.is_fully_associative = 1; - ebx->split.coherency_line_size = line_size - 1; -- ebx->split.ways_of_associativity = assocs[assoc] - 1; -+ ebx->split.ways_of_associativity = assoc - 1; - ebx->split.physical_line_partition = lines_per_tag - 1; - ecx->split.number_of_sets = (size_in_kb * 1024) / line_size / - (ebx->split.ways_of_associativity + 1) - 1; -@@ -514,7 +514,7 @@ unsigned int __cpuinit init_intel_cachei - static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info); - #define CPUID4_INFO_IDX(x, y) (&((per_cpu(cpuid4_info, x))[y])) - --#ifdef CONFIG_SMP -+#if defined (CONFIG_SMP) && !defined(CONFIG_XEN) - static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index) - { - struct _cpuid4_info *this_leaf, *sibling_leaf; -@@ -522,6 +522,18 @@ static void __cpuinit cache_shared_cpu_m - int index_msb, i; - struct cpuinfo_x86 *c = &cpu_data(cpu); - -+ if ((index == 3) && (c->x86_vendor == X86_VENDOR_AMD)) { -+ struct cpuinfo_x86 *d; -+ for_each_online_cpu(i) { -+ if (!per_cpu(cpuid4_info, i)) -+ continue; -+ d = &cpu_data(i); -+ this_leaf = CPUID4_INFO_IDX(i, index); -+ cpumask_copy(to_cpumask(this_leaf->shared_cpu_map), -+ d->llc_shared_map); -+ } -+ return; -+ } - this_leaf = CPUID4_INFO_IDX(cpu, index); - num_threads_sharing = 1 + this_leaf->eax.split.num_threads_sharing; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/amd_magny_cour_topology_fix.patch new/patches.arch/amd_magny_cour_topology_fix.patch --- old/patches.arch/amd_magny_cour_topology_fix.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/amd_magny_cour_topology_fix.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,115 +0,0 @@ -From: Andreas Herrmann <andreas.herrmann3(a)amd.com> -Subject: x86: Fix CPU llc_shared_map information for AMD Magny-Cours -References: bnc#545615 -Patch-Mainline: yes -Commit-ID: 4a376ec3a2599c02207cd4cbd5dbf73783548463 - -Signed-off-by: Thomas Renninger <trenn(a)suse.de> - -Construct entire NodeID and use it as cpu_llc_id. Thus internal node -siblings are stored in llc_shared_map. - -Signed-off-by: Andreas Herrmann <andreas.herrmann3(a)amd.com> -Signed-off-by: H. Peter Anvin <hpa(a)zytor.com> - -diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h -index 4a28d22..847fee6 100644 ---- a/arch/x86/include/asm/cpufeature.h -+++ b/arch/x86/include/asm/cpufeature.h -@@ -95,6 +95,7 @@ - #define X86_FEATURE_NONSTOP_TSC (3*32+24) /* TSC does not stop in C states */ - #define X86_FEATURE_CLFLUSH_MONITOR (3*32+25) /* "" clflush reqd with monitor */ - #define X86_FEATURE_EXTD_APICID (3*32+26) /* has extended APICID (8 bits) */ -+#define X86_FEATURE_AMD_DCM (3*32+27) /* multi-node processor */ - - /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ - #define X86_FEATURE_XMM3 (4*32+ 0) /* "pni" SSE-3 */ -diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c -index 0a717fc..a76d2c1 100644 ---- a/arch/x86/kernel/cpu/amd.c -+++ b/arch/x86/kernel/cpu/amd.c -@@ -251,6 +251,64 @@ static int __cpuinit nearby_node(int apicid) - #endif - - /* -+ * Fixup core topology information for AMD multi-node processors. -+ * Assumption 1: Number of cores in each internal node is the same. -+ * Assumption 2: Mixed systems with both single-node and dual-node -+ * processors are not supported. -+ */ -+#ifdef CONFIG_X86_HT -+static void __cpuinit amd_fixup_dcm(struct cpuinfo_x86 *c) -+{ -+#ifdef CONFIG_PCI -+ u32 t, cpn; -+ u8 n, n_id; -+ int cpu = smp_processor_id(); -+ -+ /* fixup topology information only once for a core */ -+ if (cpu_has(c, X86_FEATURE_AMD_DCM)) -+ return; -+ -+ /* check for multi-node processor on boot cpu */ -+ t = read_pci_config(0, 24, 3, 0xe8); -+ if (!(t & (1 << 29))) -+ return; -+ -+ set_cpu_cap(c, X86_FEATURE_AMD_DCM); -+ -+ /* cores per node: each internal node has half the number of cores */ -+ cpn = c->x86_max_cores >> 1; -+ -+ /* even-numbered NB_id of this dual-node processor */ -+ n = c->phys_proc_id << 1; -+ -+ /* -+ * determine internal node id and assign cores fifty-fifty to -+ * each node of the dual-node processor -+ */ -+ t = read_pci_config(0, 24 + n, 3, 0xe8); -+ n = (t>>30) & 0x3; -+ if (n == 0) { -+ if (c->cpu_core_id < cpn) -+ n_id = 0; -+ else -+ n_id = 1; -+ } else { -+ if (c->cpu_core_id < cpn) -+ n_id = 1; -+ else -+ n_id = 0; -+ } -+ -+ /* compute entire NodeID, use llc_shared_map to store sibling info */ -+ per_cpu(cpu_llc_id, cpu) = (c->phys_proc_id << 1) + n_id; -+ -+ /* fixup core id to be in range from 0 to cpn */ -+ c->cpu_core_id = c->cpu_core_id % cpn; -+#endif -+} -+#endif -+ -+/* - * On a AMD dual core setup the lower bits of the APIC id distingush the cores. - * Assumes number of cores is a power of two. - */ -@@ -267,6 +325,9 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c) - c->phys_proc_id = c->initial_apicid >> bits; - /* use socket ID also for last level cache */ - per_cpu(cpu_llc_id, cpu) = c->phys_proc_id; -+ /* fixup topology information on multi-node processors */ -+ if ((c->x86 == 0x10) && (c->x86_model == 9)) -+ amd_fixup_dcm(c); - #endif - } - -@@ -277,7 +338,8 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c) - int node; - unsigned apicid = cpu_has_apic ? hard_smp_processor_id() : c->apicid; - -- node = c->phys_proc_id; -+ node = per_cpu(cpu_llc_id, cpu); -+ - if (apicid_to_node[apicid] != NUMA_NO_NODE) - node = apicid_to_node[apicid]; - if (!node_online(node)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ia64-page-migration new/patches.arch/ia64-page-migration --- old/patches.arch/ia64-page-migration 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/ia64-page-migration 2009-10-12 19:54:29.000000000 +0200 @@ -26,7 +26,7 @@ --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig -@@ -513,6 +513,15 @@ config COMPAT_FOR_U64_ALIGNMENT +@@ -522,6 +522,15 @@ config COMPAT_FOR_U64_ALIGNMENT config IA64_MCA_RECOVERY tristate "MCA recovery from errors other than TLB." @@ -52,13 +52,14 @@ extern void ia64_mca_init(void); extern void ia64_mca_cpu_init(void *); extern void ia64_os_mca_dispatch(void); -@@ -150,10 +151,15 @@ extern void ia64_slave_init_handler(void +@@ -151,11 +152,16 @@ extern void ia64_slave_init_handler(void extern void ia64_mca_cmc_vector_setup(void); extern int ia64_reg_MCA_extension(int (*fn)(void *, struct ia64_sal_os_state *)); extern void ia64_unreg_MCA_extension(void); +extern int ia64_reg_CE_extension(int (*fn)(void *)); +extern void ia64_unreg_CE_extension(void); extern unsigned long ia64_get_rnat(unsigned long *); + extern void ia64_set_psr_mc(void); extern void ia64_mca_printk(const char * fmt, ...) __attribute__ ((format (printf, 1, 2))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/mm-avoid-bad-page-on-lru new/patches.arch/mm-avoid-bad-page-on-lru --- old/patches.arch/mm-avoid-bad-page-on-lru 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/mm-avoid-bad-page-on-lru 2009-10-12 19:54:29.000000000 +0200 @@ -14,14 +14,14 @@ Reviewed-by: Christoph Lameter <cl(a)linux-foundation.org> --- - include/linux/page-flags.h | 15 ++++++++++++++- + include/linux/page-flags.h | 16 +++++++++++++++- mm/migrate.c | 33 +++++++++++++++++++++++++++++++++ mm/vmscan.c | 1 + - 3 files changed, 48 insertions(+), 1 deletion(-) + 3 files changed, 49 insertions(+), 1 deletion(-) --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h -@@ -85,6 +85,7 @@ enum pageflags { +@@ -88,6 +88,7 @@ enum pageflags { PG_private_2, /* If pagecache, has fs aux data */ PG_writeback, /* Page is under writeback */ #ifdef CONFIG_PAGEFLAGS_EXTENDED @@ -29,14 +29,14 @@ PG_head, /* A head page */ PG_tail, /* A tail page */ #else -@@ -158,15 +159,21 @@ static inline int TestSetPage##uname(str - static inline int TestClearPage##uname(struct page *page) \ - { return test_and_clear_bit(PG_##lname, &page->flags); } +@@ -168,14 +169,21 @@ static inline int TestClearPage##uname(s + static inline int __TestClearPage##uname(struct page *page) \ + { return __test_and_clear_bit(PG_##lname, &page->flags); } +#define PAGEFLAGMASK(uname, lname) \ +static inline int PAGEMASK_##uname(void) \ + { return (1 << PG_##lname); } - ++ #define PAGEFLAG(uname, lname) TESTPAGEFLAG(uname, lname) \ - SETPAGEFLAG(uname, lname) CLEARPAGEFLAG(uname, lname) + SETPAGEFLAG(uname, lname) CLEARPAGEFLAG(uname, lname) \ @@ -52,7 +52,7 @@ { return 0; } #define TESTSCFLAG(uname, lname) \ -@@ -372,6 +379,12 @@ static inline void __ClearPageTail(struc +@@ -393,6 +401,12 @@ static inline void __ClearPageTail(struc #endif /* !PAGEFLAGS_EXTENDED */ @@ -75,7 +75,7 @@ /* * Add isolated pages on the list back to the LRU under page lock -@@ -72,6 +73,7 @@ int putback_lru_pages(struct list_head * +@@ -74,6 +75,7 @@ int putback_lru_pages(struct list_head * } return count; } @@ -83,7 +83,7 @@ /* * Restore a potential migration pte to a working pte entry -@@ -693,6 +695,25 @@ unlock: +@@ -700,6 +702,25 @@ unlock: * restored. */ list_del(&page->lru); @@ -106,10 +106,10 @@ + ClearPageMemError(page); + } + + dec_zone_page_state(page, NR_ISOLATED_ANON + + page_is_file_cache(page)); putback_lru_page(page); - } - -@@ -765,6 +786,17 @@ int migrate_pages(struct list_head *from +@@ -781,6 +802,17 @@ int migrate_pages(struct list_head *from } } } @@ -127,7 +127,7 @@ rc = 0; out: if (!swapwrite) -@@ -777,6 +809,7 @@ out: +@@ -793,6 +825,7 @@ out: return nr_failed + retry; } @@ -137,11 +137,11 @@ /* --- a/mm/vmscan.c +++ b/mm/vmscan.c -@@ -1032,6 +1032,7 @@ int isolate_lru_page(struct page *page) +@@ -1046,6 +1046,7 @@ int isolate_lru_page(struct page *page) } return ret; } +EXPORT_SYMBOL(isolate_lru_page); /* - * shrink_inactive_list() is a helper for shrink_zone(). It returns the number + * Are there way too many processes in the direct reclaim path already? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ppc64-xmon-dmesg-printing.patch new/patches.arch/ppc64-xmon-dmesg-printing.patch --- old/patches.arch/ppc64-xmon-dmesg-printing.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/ppc64-xmon-dmesg-printing.patch 2009-10-12 19:54:29.000000000 +0200 @@ -35,7 +35,7 @@ d dump bytes\n\ di dump instructions\n\ df dump float values\n\ -@@ -809,6 +811,9 @@ cmds(struct pt_regs *excp) +@@ -819,6 +821,9 @@ cmds(struct pt_regs *excp) case 'd': dump(); break; @@ -45,7 +45,7 @@ case 'l': symbol_lookup(); break; -@@ -2570,6 +2575,58 @@ static void xmon_print_symbol(unsigned l +@@ -2580,6 +2585,58 @@ static void xmon_print_symbol(unsigned l printf("%s", after); } @@ -101,12 +101,12 @@ + printf("\n"); +} + - #ifdef CONFIG_PPC64 + #ifdef CONFIG_PPC_BOOK3S_64 static void dump_slb(void) { --- a/kernel/printk.c +++ b/kernel/printk.c -@@ -405,6 +405,21 @@ SYSCALL_DEFINE3(syslog, int, type, char +@@ -418,6 +418,21 @@ SYSCALL_DEFINE3(syslog, int, type, char return do_syslog(type, buf, len); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ppc-efika-mpc52xx-ac97.patch new/patches.arch/ppc-efika-mpc52xx-ac97.patch --- old/patches.arch/ppc-efika-mpc52xx-ac97.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/ppc-efika-mpc52xx-ac97.patch 2009-10-12 19:54:29.000000000 +0200 @@ -15,7 +15,7 @@ --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c -@@ -2160,6 +2160,7 @@ static void __init fixup_device_tree_efi +@@ -2252,6 +2252,7 @@ static void __init fixup_device_tree_efi static void __init fixup_device_tree_efika(void) { @@ -23,7 +23,7 @@ int sound_irq[3] = { 2, 2, 0 }; int bcomm_irq[3*16] = { 3,0,0, 3,1,0, 3,2,0, 3,3,0, 3,4,0, 3,5,0, 3,6,0, 3,7,0, -@@ -2215,6 +2216,8 @@ static void __init fixup_device_tree_efi +@@ -2307,6 +2308,8 @@ static void __init fixup_device_tree_efi prom_printf("Adding sound interrupts property\n"); prom_setprop(node, "/builtin/sound", "interrupts", sound_irq, sizeof(sound_irq)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ppc-ipic-suspend-without-83xx-fix new/patches.arch/ppc-ipic-suspend-without-83xx-fix --- old/patches.arch/ppc-ipic-suspend-without-83xx-fix 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/ppc-ipic-suspend-without-83xx-fix 2009-10-12 19:54:29.000000000 +0200 @@ -15,7 +15,7 @@ --- a/arch/powerpc/sysdev/ipic.c +++ b/arch/powerpc/sysdev/ipic.c -@@ -916,6 +916,7 @@ static int ipic_suspend(struct sys_devic +@@ -921,6 +921,7 @@ static int ipic_suspend(struct sys_devic ipic_saved_state.sermr = ipic_read(ipic->regs, IPIC_SERMR); ipic_saved_state.sercr = ipic_read(ipic->regs, IPIC_SERCR); @@ -23,7 +23,7 @@ if (fsl_deep_sleep()) { /* In deep sleep, make sure there can be no * pending interrupts, as this can cause -@@ -926,6 +927,7 @@ static int ipic_suspend(struct sys_devic +@@ -931,6 +932,7 @@ static int ipic_suspend(struct sys_devic ipic_write(ipic->regs, IPIC_SEMSR, 0); ipic_write(ipic->regs, IPIC_SERMR, 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ppc-prom-nodisplay.patch new/patches.arch/ppc-prom-nodisplay.patch --- old/patches.arch/ppc-prom-nodisplay.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/ppc-prom-nodisplay.patch 2009-10-12 19:54:29.000000000 +0200 @@ -38,8 +38,8 @@ --- - arch/powerpc/kernel/prom_init.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) + arch/powerpc/kernel/prom_init.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -51,17 +51,7 @@ #ifdef CONFIG_PPC64 static int __initdata prom_iommu_force_on; static int __initdata prom_iommu_off; -@@ -491,9 +492,7 @@ static int __init prom_setprop(phandle n - static void __init early_cmdline_parse(void) - { - struct prom_t *_prom = &RELOC(prom); --#ifdef CONFIG_PPC64 - const char *opt; --#endif - char *p; - int l = 0; - -@@ -508,6 +507,14 @@ static void __init early_cmdline_parse(v +@@ -570,6 +571,14 @@ static void __init early_cmdline_parse(v #endif /* CONFIG_CMDLINE */ prom_printf("command line: %s\n", RELOC(prom_cmd_line)); @@ -76,7 +66,7 @@ #ifdef CONFIG_PPC64 opt = strstr(RELOC(prom_cmd_line), RELOC("iommu=")); if (opt) { -@@ -2377,6 +2384,7 @@ unsigned long __init prom_init(unsigned +@@ -2469,6 +2478,7 @@ unsigned long __init prom_init(unsigned /* * Initialize display devices */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ppc-vio-modalias.patch new/patches.arch/ppc-vio-modalias.patch --- old/patches.arch/ppc-vio-modalias.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/ppc-vio-modalias.patch 2009-10-12 19:54:29.000000000 +0200 @@ -8,7 +8,7 @@ --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c -@@ -1317,9 +1317,24 @@ static ssize_t devspec_show(struct devic +@@ -1319,9 +1319,24 @@ static ssize_t devspec_show(struct devic return sprintf(buf, "%s\n", of_node ? of_node->full_name : "none"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86_64-hpet-64bit-timer.patch new/patches.arch/x86_64-hpet-64bit-timer.patch --- old/patches.arch/x86_64-hpet-64bit-timer.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/x86_64-hpet-64bit-timer.patch 2009-10-12 19:54:29.000000000 +0200 @@ -1,4 +1,3 @@ - From: Jiri Bohac <jbohac(a)suse.cz> Subject: allow 64-bit mode for HPET Timer0 References: bnc#456700 @@ -35,18 +34,19 @@ This patch allows the Timer0 to be configured in 64-bit mode on x86_64 when a hpet64 command-line option is specified. +Updated-by: Jeff Mahoney <jeffm(a)suse.com> Signed-off-by: Jiri Bohac <jbohac(a)suse.cz> --- Documentation/kernel-parameters.txt | 2 - arch/x86/kernel/hpet.c | 90 ++++++++++++++++++++++++++++++++---- - 2 files changed, 82 insertions(+), 10 deletions(-) + arch/x86/kernel/hpet.c | 88 ++++++++++++++++++++++++++++++++---- + 2 files changed, 81 insertions(+), 9 deletions(-) --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -497,6 +497,8 @@ and is between 256 and 4096 characters. - Range: 0 - 8192 - Default: 64 + Range: 0 - 8192 + Default: 64 + hpet64 [X86-64,HPET] enable 64-bit mode of the HPET timer (bnc#456700) + @@ -97,7 +97,7 @@ #endif static inline void hpet_set_mapping(void) -@@ -100,6 +128,17 @@ static int __init disable_hpet(char *str +@@ -103,6 +131,17 @@ static int __init disable_hpet(char *str } __setup("nohpet", disable_hpet); @@ -115,7 +115,7 @@ static inline int is_hpet_capable(void) { return !boot_hpet_disable && hpet_address; -@@ -172,6 +211,7 @@ static void hpet_reserve_platform_timers +@@ -212,6 +251,7 @@ static void hpet_reserve_platform_timers * Common hpet info */ static unsigned long hpet_period; @@ -123,7 +123,7 @@ static void hpet_legacy_set_mode(enum clock_event_mode mode, struct clock_event_device *evt); -@@ -223,10 +263,38 @@ static void hpet_enable_legacy_int(void) +@@ -278,10 +318,38 @@ static void hpet_enable_legacy_int(void) hpet_legacy_int_enabled = 1; } @@ -162,7 +162,7 @@ /* * The mult factor is defined as (include/linux/clockchips.h) -@@ -266,20 +334,22 @@ static void hpet_set_mode(enum clock_eve +@@ -328,9 +396,10 @@ static void hpet_set_mode(enum clock_eve /* Make sure we use edge triggered interrupts */ cfg &= ~HPET_TN_LEVEL; cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC | @@ -170,18 +170,21 @@ + HPET_TN_SETVAL | + (hpet_legacy_use_64_bits ? 0 : HPET_TN_32BIT); hpet_writel(cfg, HPET_Tn_CFG(timer)); - /* - * The first write after writing TN_SETVAL to the - * config register sets the counter value, the second - * write sets the period. - */ - hpet_writel(cmp, HPET_Tn_CMP(timer)); + hpet_write_value(cmp, HPET_Tn_CMP(timer)); udelay(1); + /* + * HPET on AMD 81xx needs a second write (with HPET_TN_SETVAL +@@ -339,7 +408,7 @@ static void hpet_set_mode(enum clock_eve + * (See AMD-8111 HyperTransport I/O Hub Data Sheet, + * Publication # 24674) + */ - hpet_writel((unsigned long) delta, HPET_Tn_CMP(timer)); + hpet_write_value((unsigned long) delta, HPET_Tn_CMP(timer)); + hpet_start_counter(); + hpet_print_config(); break; - +@@ -347,7 +416,8 @@ static void hpet_set_mode(enum clock_eve case CLOCK_EVT_MODE_ONESHOT: cfg = hpet_readl(HPET_Tn_CFG(timer)); cfg &= ~HPET_TN_PERIODIC; @@ -191,7 +194,7 @@ hpet_writel(cfg, HPET_Tn_CFG(timer)); break; -@@ -315,11 +385,11 @@ static void hpet_set_mode(enum clock_eve +@@ -376,11 +446,11 @@ static void hpet_set_mode(enum clock_eve static int hpet_next_event(unsigned long delta, struct clock_event_device *evt, int timer) { @@ -206,7 +209,7 @@ hpet_readl(HPET_Tn_CMP(timer)); /* pre-read for bnc#433746 */ /* -@@ -327,9 +397,9 @@ static int hpet_next_event(unsigned long +@@ -388,9 +458,9 @@ static int hpet_next_event(unsigned long * what we wrote hit the chip before we compare it to the * counter. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86_64-unwind-annotations new/patches.arch/x86_64-unwind-annotations --- old/patches.arch/x86_64-unwind-annotations 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/x86_64-unwind-annotations 2009-10-12 19:54:29.000000000 +0200 @@ -189,7 +189,7 @@ movl $1,%ebx movl $MSR_GS_BASE,%ecx rdmsr -@@ -691,7 +696,7 @@ ENTRY(\label) +@@ -685,7 +690,7 @@ ENTRY(\label) subq $REST_SKIP, %rsp CFI_ADJUST_CFA_OFFSET REST_SKIP call save_rest @@ -198,7 +198,7 @@ leaq 8(%rsp), \arg /* pt_regs pointer */ call \func jmp ptregscall_common -@@ -708,12 +713,12 @@ END(\label) +@@ -702,12 +707,12 @@ END(\label) ENTRY(ptregscall_common) DEFAULT_FRAME 1 8 /* offset 8: return address */ RESTORE_TOP_OF_STACK %r11, 8 @@ -217,7 +217,7 @@ ret $REST_SKIP /* pop extended registers */ CFI_ENDPROC END(ptregscall_common) -@@ -802,10 +807,12 @@ END(interrupt) +@@ -796,10 +801,12 @@ END(interrupt) /* 0(%rsp): ~(interrupt number) */ .macro interrupt func @@ -233,7 +233,7 @@ call \func .endm -@@ -1034,10 +1041,10 @@ ENTRY(\sym) +@@ -1028,10 +1035,10 @@ ENTRY(\sym) INTR_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */ @@ -247,7 +247,7 @@ movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym -@@ -1052,8 +1059,10 @@ ENTRY(\sym) +@@ -1046,8 +1053,10 @@ ENTRY(\sym) PARAVIRT_ADJUST_EXCEPTION_FRAME pushq $-1 /* ORIG_RAX: no syscall to restart */ CFI_ADJUST_CFA_OFFSET 8 @@ -259,7 +259,7 @@ TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ -@@ -1069,8 +1078,10 @@ ENTRY(\sym) +@@ -1063,8 +1072,10 @@ ENTRY(\sym) PARAVIRT_ADJUST_EXCEPTION_FRAME pushq $-1 /* ORIG_RAX: no syscall to restart */ CFI_ADJUST_CFA_OFFSET 8 @@ -271,7 +271,7 @@ TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ -@@ -1087,10 +1098,10 @@ END(\sym) +@@ -1081,10 +1092,10 @@ END(\sym) ENTRY(\sym) XCPT_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME @@ -285,7 +285,7 @@ movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ -@@ -1105,10 +1116,10 @@ END(\sym) +@@ -1099,10 +1110,10 @@ END(\sym) ENTRY(\sym) XCPT_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME @@ -299,7 +299,7 @@ TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ -@@ -1467,7 +1478,7 @@ paranoidzeroentry machine_check *machine +@@ -1461,7 +1472,7 @@ paranoidzeroentry machine_check *machine /* ebx: no swapgs flag */ ENTRY(paranoid_exit) @@ -308,7 +308,7 @@ DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF testl %ebx,%ebx /* swapgs needed? */ -@@ -1517,25 +1528,24 @@ END(paranoid_exit) +@@ -1511,25 +1522,24 @@ END(paranoid_exit) * returns in "no swapgs flag" in %ebx. */ ENTRY(error_entry) @@ -350,7 +350,7 @@ xorl %ebx,%ebx testl $3,CS+8(%rsp) je error_kernelspace -@@ -1544,7 +1554,6 @@ error_swapgs: +@@ -1538,7 +1548,6 @@ error_swapgs: error_sti: TRACE_IRQS_OFF ret @@ -358,7 +358,7 @@ /* * There are two places in the kernel that can potentially fault with -@@ -1554,6 +1563,7 @@ error_sti: +@@ -1548,6 +1557,7 @@ error_sti: * compat mode. Check for these here too. */ error_kernelspace: @@ -366,7 +366,7 @@ incl %ebx leaq irq_return(%rip),%rcx cmpq %rcx,RIP+8(%rsp) -@@ -1564,6 +1574,7 @@ error_kernelspace: +@@ -1558,6 +1568,7 @@ error_kernelspace: cmpq $gs_change,RIP+8(%rsp) je error_swapgs jmp error_sti @@ -374,7 +374,7 @@ END(error_entry) -@@ -1592,10 +1603,10 @@ ENTRY(nmi) +@@ -1586,10 +1597,10 @@ ENTRY(nmi) INTR_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME pushq_cfi $-1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86_agpgart-g33-stoeln-fix-2.patch new/patches.arch/x86_agpgart-g33-stoeln-fix-2.patch --- old/patches.arch/x86_agpgart-g33-stoeln-fix-2.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/x86_agpgart-g33-stoeln-fix-2.patch 2009-10-12 19:54:29.000000000 +0200 @@ -58,7 +58,7 @@ --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c -@@ -577,6 +577,13 @@ static void intel_i830_init_gtt_entries( +@@ -705,6 +705,13 @@ static void intel_i830_init_gtt_entries( } else { switch (gmch_ctrl & I855_GMCH_GMS_MASK) { case I855_GMCH_GMS_STOLEN_1M: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86_amd_fix_erratum_63.patch new/patches.arch/x86_amd_fix_erratum_63.patch --- old/patches.arch/x86_amd_fix_erratum_63.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/x86_amd_fix_erratum_63.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,84 +0,0 @@ -From: Joerg Roedel <joerg.roedel(a)amd.com> -Subject: x86/amd-iommu: Workaround for erratum 63 -References: bnc#548274 -Patch-mainline: in the queue of the IOMMU AMD maintainer - - There is an erratum for IOMMU hardware which documents - undefined behavior when forwarding SMI requests from - peripherals and the DTE of that peripheral has a sysmgt - value of 01b. This problem caused weird IO_PAGE_FAULTS in my - case. - This patch implements the suggested workaround for that - erratum into the AMD IOMMU driver. The erratum is - documented with number 63. - - Cc: stable(a)kernel.org - Signed-off-by: Joerg Roedel <joerg.roedel(a)amd.com> - -Signed-off-by: Thomas Renninger <trenn(a)suse.de> - -diff --git a/arch/x86/include/asm/amd_iommu.h b/arch/x86/include/asm/amd_iommu.h -index bdf96f1..9dbd403 100644 ---- a/arch/x86/include/asm/amd_iommu.h -+++ b/arch/x86/include/asm/amd_iommu.h -@@ -30,6 +30,7 @@ extern irqreturn_t amd_iommu_int_handler(int irq, void *data); - extern void amd_iommu_flush_all_domains(void); - extern void amd_iommu_flush_all_devices(void); - extern void amd_iommu_shutdown(void); -+extern void amd_iommu_apply_erratum_63(u16 devid); - #else - static inline int amd_iommu_init(void) { return -ENODEV; } - static inline void amd_iommu_detect(void) { } -diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c -index 6c99f50..f95dfe5 100644 ---- a/arch/x86/kernel/amd_iommu.c -+++ b/arch/x86/kernel/amd_iommu.c -@@ -1114,6 +1114,8 @@ static void __detach_device(struct protection_domain *domain, u16 devid) - amd_iommu_dev_table[devid].data[1] = 0; - amd_iommu_dev_table[devid].data[2] = 0; - -+ amd_iommu_apply_erratum_63(devid); -+ - /* decrease reference counter */ - domain->dev_cnt -= 1; - -diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c -index c1b17e9..498c8c7 100644 ---- a/arch/x86/kernel/amd_iommu_init.c -+++ b/arch/x86/kernel/amd_iommu_init.c -@@ -509,6 +509,26 @@ static void set_dev_entry_bit(u16 devid, u8 bit) - amd_iommu_dev_table[devid].data[i] |= (1 << _bit); - } - -+static int get_dev_entry_bit(u16 devid, u8 bit) -+{ -+ int i = (bit >> 5) & 0x07; -+ int _bit = bit & 0x1f; -+ -+ return (amd_iommu_dev_table[devid].data[i] & (1 << _bit)) >> _bit; -+} -+ -+ -+void amd_iommu_apply_erratum_63(u16 devid) -+{ -+ int sysmgt; -+ -+ sysmgt = get_dev_entry_bit(devid, DEV_ENTRY_SYSMGT1) | -+ (get_dev_entry_bit(devid, DEV_ENTRY_SYSMGT2) << 1); -+ -+ if (sysmgt == 0x01) -+ set_dev_entry_bit(devid, DEV_ENTRY_IW); -+} -+ - /* Writes the specific IOMMU for a device into the rlookup table */ - static void __init set_iommu_for_device(struct amd_iommu *iommu, u16 devid) - { -@@ -537,6 +557,8 @@ static void __init set_dev_entry_from_acpi(struct amd_iommu *iommu, - if (flags & ACPI_DEVFLAG_LINT1) - set_dev_entry_bit(devid, DEV_ENTRY_LINT1_PASS); - -+ amd_iommu_apply_erratum_63(devid); -+ - set_iommu_for_device(iommu, devid); - } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86_mce_therm_suppress_msgs.patch new/patches.arch/x86_mce_therm_suppress_msgs.patch --- old/patches.arch/x86_mce_therm_suppress_msgs.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/x86_mce_therm_suppress_msgs.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -From: Thomas Renninger <trenn(a)suse.de> -Subject: X86: Suppress hundreds of Intel thermal MCE messages on high temps -Patch-mainline: Still to be submitted -References: bnc#533556 - -The real bug is this line: - if (!(was_throttled ^ is_throttled) && -The interrupts happening and the read out MSR seem to tell that -the CPU gets throttled and unthrottled all the time. -Thus current implementation results in hundreds of "above threshold" -messages per minute and the following workaround to fix that: - time_before64(tmp_jiffs, __get_cpu_var(next_check))) -is useless. -This patch is more or less a revert to back to implementation in -older kernels. -The message: - printk(KERN_INFO "CPU%d: Temperature/speed normal\n", cpu); -is not needed as it is suppressed anyway on the machine I tested. - -Signed-off-by: Thomas Renninger <trenn(a)suse.de> - ---- - arch/x86/kernel/cpu/mcheck/therm_throt.c | 16 ++++------------ - 1 file changed, 4 insertions(+), 12 deletions(-) - -Index: linux-2.6.31-openSUSE-11.2/arch/x86/kernel/cpu/mcheck/therm_throt.c -=================================================================== ---- linux-2.6.31-openSUSE-11.2.orig/arch/x86/kernel/cpu/mcheck/therm_throt.c -+++ linux-2.6.31-openSUSE-11.2/arch/x86/kernel/cpu/mcheck/therm_throt.c -@@ -36,7 +36,6 @@ - - static DEFINE_PER_CPU(__u64, next_check) = INITIAL_JIFFIES; - static DEFINE_PER_CPU(unsigned long, thermal_throttle_count); --static DEFINE_PER_CPU(bool, thermal_throttle_active); - - static atomic_t therm_throt_en = ATOMIC_INIT(0); - -@@ -97,31 +96,24 @@ static int therm_throt_process(int curr) - { - unsigned int cpu = smp_processor_id(); - __u64 tmp_jiffs = get_jiffies_64(); -- bool was_throttled = __get_cpu_var(thermal_throttle_active); -- bool is_throttled = __get_cpu_var(thermal_throttle_active) = curr; - -- if (is_throttled) -+ if (curr) - __get_cpu_var(thermal_throttle_count)++; - -- if (!(was_throttled ^ is_throttled) && -- time_before64(tmp_jiffs, __get_cpu_var(next_check))) -+ if (time_before64(tmp_jiffs, __get_cpu_var(next_check))) - return 0; - - __get_cpu_var(next_check) = tmp_jiffs + CHECK_INTERVAL; - - /* if we just entered the thermal event */ -- if (is_throttled) { -+ if (curr) { - printk(KERN_CRIT "CPU%d: Temperature above threshold, " -- "cpu clock throttled (total events = %lu)\n", -+ "cpu clock temporarily throttled (total events = %lu)\n", - cpu, __get_cpu_var(thermal_throttle_count)); - - add_taint(TAINT_MACHINE_CHECK); - return 1; - } -- if (was_throttled) { -- printk(KERN_INFO "CPU%d: Temperature/speed normal\n", cpu); -- return 1; -- } - - return 0; - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86-self-ptrace.patch new/patches.arch/x86-self-ptrace.patch --- old/patches.arch/x86-self-ptrace.patch 2009-10-20 23:10:13.000000000 +0200 +++ new/patches.arch/x86-self-ptrace.patch 2009-10-12 19:54:29.000000000 +0200 @@ -17,7 +17,7 @@ --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c -@@ -1490,6 +1490,17 @@ asmregparm long syscall_trace_enter(stru +@@ -1486,6 +1486,17 @@ asmregparm long syscall_trace_enter(stru /* do the secure computing check first */ secure_computing(regs->orig_ax); @@ -35,7 +35,7 @@ if (unlikely(test_thread_flag(TIF_SYSCALL_EMU))) ret = -1L; -@@ -1520,6 +1531,9 @@ asmregparm long syscall_trace_enter(stru +@@ -1516,6 +1527,9 @@ asmregparm long syscall_trace_enter(stru asmregparm void syscall_trace_leave(struct pt_regs *regs) { ++++++ patches.drivers.tar.bz2 ++++++ ++++ 17542 lines of diff (skipped) ++++++ patches.fixes.tar.bz2 ++++++ ++++ 3156 lines of diff (skipped) ++++++ patches.kernel.org.tar.bz2 ++++++ kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: byte 11, line 1 ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/arm-arch_include_asm-fix.diff new/patches.rpmify/arm-arch_include_asm-fix.diff --- old/patches.rpmify/arm-arch_include_asm-fix.diff 2009-09-08 18:49:15.000000000 +0200 +++ new/patches.rpmify/arm-arch_include_asm-fix.diff 2009-10-16 17:30:07.000000000 +0200 @@ -13,7 +13,7 @@ --- a/arch/arm/Makefile +++ b/arch/arm/Makefile -@@ -234,7 +234,7 @@ archprepare: maketools +@@ -247,7 +247,7 @@ archprepare: maketools PHONY += maketools FORCE maketools: include/linux/version.h FORCE @@ -22,7 +22,7 @@ # Convert bzImage to zImage bzImage: zImage -@@ -245,7 +245,7 @@ zImage Image xipImage bootpImage uImage: +@@ -258,7 +258,7 @@ zImage Image xipImage bootpImage uImage: zinstall install: vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/buildhost new/patches.rpmify/buildhost --- old/patches.rpmify/buildhost 2009-09-08 18:49:15.000000000 +0200 +++ new/patches.rpmify/buildhost 2009-10-16 17:30:07.000000000 +0200 @@ -6,12 +6,12 @@ Signed-off-by: Andreas Gruenbacher <agruen(a)suse.de> - scripts/mkcompile_h | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) + scripts/mkcompile_h | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h -@@ -62,16 +62,9 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\} +@@ -64,20 +64,9 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\" echo \#define LINUX_COMPILE_TIME \"`date +%T`\" @@ -19,9 +19,13 @@ - echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" - - if [ -x /bin/dnsdomainname ]; then -- echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname | $UTS_TRUNCATE`\" +- domain=`dnsdomainname 2> /dev/null` - elif [ -x /bin/domainname ]; then -- echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\" +- domain=`domainname 2> /dev/null` +- fi +- +- if [ -n "$domain" ]; then +- echo \#define LINUX_COMPILE_DOMAIN \"`echo $domain | $UTS_TRUNCATE`\" - else - echo \#define LINUX_COMPILE_DOMAIN - fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/cloneconfig.diff new/patches.rpmify/cloneconfig.diff --- old/patches.rpmify/cloneconfig.diff 2009-09-08 18:49:15.000000000 +0200 +++ new/patches.rpmify/cloneconfig.diff 2009-10-16 17:30:07.000000000 +0200 @@ -12,7 +12,7 @@ --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile -@@ -65,6 +65,22 @@ allnoconfig: $(obj)/conf +@@ -95,6 +95,22 @@ allnoconfig: $(obj)/conf allmodconfig: $(obj)/conf $< -m $(Kconfig) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ia64-sn-fix-percpu-warnings new/patches.rpmify/ia64-sn-fix-percpu-warnings --- old/patches.rpmify/ia64-sn-fix-percpu-warnings 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/ia64-sn-fix-percpu-warnings 2009-10-16 17:30:07.000000000 +0200 @@ -0,0 +1,36 @@ +Subject: [-next] ia64/sn: fix percpu warnings +Date: Wed, 14 Oct 2009 22:10:03 -0000 +From: Randy Dunlap <randy.dunlap(a)oracle.com> +X-Patchwork-Id: 53873 + +Fix percpu types warning in ia64/sn: + +arch/ia64/sn/kernel/setup.c:74: error: conflicting types for '__pcpu_scope___sn_cnodeid_to_nasid' +arch/ia64/include/asm/sn/arch.h:74: error: previous declaration of '__pcpu_scope___sn_cnodeid_to_nasid' was here + +Signed-off-by: Randy Dunlap <randy.dunlap(a)oracle.com> +Cc: Jes Sorensen <jes(a)sgi.com> +Acked-by: Tejun Heo <tj(a)kernel.org> +Acked-by: Michal Marek <mmarek(a)suse.cz> + +--- +arch/ia64/include/asm/sn/arch.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +-- +To unsubscribe from this list: send the line "unsubscribe linux-kernel" in +the body of a message to majordomo(a)vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html +Please read the FAQ at http://www.tux.org/lkml/ + +--- linux-next-20091014.orig/arch/ia64/include/asm/sn/arch.h ++++ linux-next-20091014/arch/ia64/include/asm/sn/arch.h +@@ -71,7 +71,7 @@ DECLARE_PER_CPU(struct sn_hub_info_s, __ + * Compact node ID to nasid mappings kept in the per-cpu data areas of each + * cpu. + */ +-DECLARE_PER_CPU(short, __sn_cnodeid_to_nasid[MAX_COMPACT_NODES]); ++DECLARE_PER_CPU(short [MAX_COMPACT_NODES], __sn_cnodeid_to_nasid); + #define sn_cnodeid_to_nasid (&__get_cpu_var(__sn_cnodeid_to_nasid[0])) + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/no-include-asm new/patches.rpmify/no-include-asm --- old/patches.rpmify/no-include-asm 2009-09-08 18:49:15.000000000 +0200 +++ new/patches.rpmify/no-include-asm 2009-10-16 17:30:07.000000000 +0200 @@ -18,7 +18,7 @@ --- a/Makefile +++ b/Makefile -@@ -960,7 +960,11 @@ ifneq ($(KBUILD_SRC),) +@@ -965,7 +965,11 @@ ifneq ($(KBUILD_SRC),) fi; $(Q)if [ ! -d include2 ]; then \ mkdir -p include2; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rtl8192su-build-fix new/patches.rpmify/rtl8192su-build-fix --- old/patches.rpmify/rtl8192su-build-fix 2009-09-08 18:49:15.000000000 +0200 +++ new/patches.rpmify/rtl8192su-build-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1,87 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: rtl8192su: compile fixes - - This driver needs real help. - -Acked-by: Jeff Mahoney <jeffm(a)suse.com> ---- - drivers/staging/rtl8192su/Makefile | 1 - - drivers/staging/rtl8192su/r8192U_core.c | 22 ++++++++-------------- - 2 files changed, 8 insertions(+), 15 deletions(-) - ---- a/drivers/staging/rtl8192su/Makefile -+++ b/drivers/staging/rtl8192su/Makefile -@@ -2,7 +2,6 @@ NIC_SELECT = RTL8192SU - - EXTRA_CFLAGS += -std=gnu89 - EXTRA_CFLAGS += -O2 --EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y - - EXTRA_CFLAGS += -DJACKSON_NEW_RX - EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TURBO ---- a/drivers/staging/rtl8192su/r8192U_core.c -+++ b/drivers/staging/rtl8192su/r8192U_core.c -@@ -24,14 +24,7 @@ - * Jerry chuang <wlanfae(a)realtek.com> - */ - --#ifndef CONFIG_FORCE_HARD_FLOAT --double __floatsidf (int i) { return i; } --unsigned int __fixunsdfsi (double d) { return d; } --double __adddf3(double a, double b) { return a+b; } --double __addsf3(float a, float b) { return a+b; } --double __subdf3(double a, double b) { return a-b; } --double __extendsfdf2(float a) {return a;} --#endif -+#include <linux/vmalloc.h> - - #undef LOOP_TEST - #undef DUMP_RX -@@ -1715,7 +1708,7 @@ static int rtl8192_rx_initiate(struct ne - } - // printk("nomal packet IN request!\n"); - usb_fill_bulk_urb(entry, priv->udev, -- usb_rcvbulkpipe(priv->udev, 3), skb->tail, -+ usb_rcvbulkpipe(priv->udev, 3), skb_tail_pointer(skb), - RX_URB_SIZE, rtl8192_rx_isr, skb); - info = (struct rtl8192_rx_info *) skb->cb; - info->urb = entry; -@@ -1745,7 +1738,7 @@ static int rtl8192_rx_initiate(struct ne - break; - } - usb_fill_bulk_urb(entry, priv->udev, -- usb_rcvbulkpipe(priv->udev, 9), skb->tail, -+ usb_rcvbulkpipe(priv->udev, 9), skb_tail_pointer(skb), - RX_URB_SIZE, rtl8192_rx_isr, skb); - info = (struct rtl8192_rx_info *) skb->cb; - info->urb = entry; -@@ -2135,7 +2128,8 @@ static void rtl8192_rx_isr(struct urb *u - } - - usb_fill_bulk_urb(urb, priv->udev, -- usb_rcvbulkpipe(priv->udev, out_pipe), skb->tail, -+ usb_rcvbulkpipe(priv->udev, out_pipe), -+ skb_tail_pointer(skb), - RX_URB_SIZE, rtl8192_rx_isr, skb); - - info = (struct rtl8192_rx_info *) skb->cb; -@@ -2143,7 +2137,7 @@ static void rtl8192_rx_isr(struct urb *u - info->dev = dev; - info->out_pipe = out_pipe; - -- urb->transfer_buffer = skb->tail; -+ urb->transfer_buffer = skb_tail_pointer(skb); - urb->context = skb; - skb_queue_tail(&priv->rx_queue, skb); - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) -@@ -2356,8 +2350,8 @@ struct sk_buff *DrvAggr_Aggregation(stru - /* Subframe drv Tx descriptor and firmware info setting */ - skb = pSendList->tx_agg_frames[i]; - tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); -- tx_agg_desc = (tx_desc_819x_usb_aggr_subframe *)agg_skb->tail; -- tx_fwinfo = (tx_fwinfo_819x_usb *)(agg_skb->tail + sizeof(tx_desc_819x_usb_aggr_subframe)); -+ tx_agg_desc = (tx_desc_819x_usb_aggr_subframe *)agg_skb_tail_pointer(skb); -+ tx_fwinfo = (tx_fwinfo_819x_usb *)(agg_skb_tail_pointer(skb) + sizeof(tx_desc_819x_usb_aggr_subframe)); - - memset(tx_fwinfo,0,sizeof(tx_fwinfo_819x_usb)); - /* DWORD 0 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/spin_is_contended-fix new/patches.rpmify/spin_is_contended-fix --- old/patches.rpmify/spin_is_contended-fix 2009-09-08 18:49:15.000000000 +0200 +++ new/patches.rpmify/spin_is_contended-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1,169 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: [PATCH] spin_is_contended Kconfig fixes - - include/linux/spinlock.h contains the following chunk: - #ifdef CONFIG_GENERIC_LOCKBREAK - #define spin_is_contended(lock) ((lock)->break_lock) - #else - #define spin_is_contended(lock) __raw_spin_is_contended(&(lock)->raw_lock) - #endif - - __raw_spin_is_contended() is only implemented on mips and x86. - - Prior to a recent commit against btrfs, spin_needbreak was the only - user of spin_is_contended, and it returns 0 when !CONFIG_PREEMPT. The - architecture Kconfigs reflect that, depending on PREEMPT to enable - GENERIC_LOCKBREAK. With the btrfs changes, this is causing build - failures on anything !x86 (and mips, but I don't build on mips). - - Now that there is another user of spin_is_contended, the PREEMPT - dependency is obsolete. This removes the dependency. - - This patch also adds GENERIC_LOCKBREAK entries to architectures that - didn't have it and offer SMP support. - - The removal of the SPARC64 dependency isn't an oversight - SMP is - supported for 32-bit sparc, so it would run into the same problem. - -Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> ---- - arch/alpha/Kconfig | 5 +++++ - arch/arm/Kconfig | 2 +- - arch/blackfin/Kconfig | 5 +++++ - arch/ia64/Kconfig | 2 +- - arch/m32r/Kconfig | 2 +- - arch/parisc/Kconfig | 2 +- - arch/powerpc/Kconfig | 2 +- - arch/s390/Kconfig | 2 +- - arch/sh/Kconfig | 7 ++++++- - arch/sparc/Kconfig | 2 +- - 10 files changed, 23 insertions(+), 8 deletions(-) - ---- a/arch/alpha/Kconfig -+++ b/arch/alpha/Kconfig -@@ -25,6 +25,11 @@ config MMU - config RWSEM_GENERIC_SPINLOCK - bool - -+config GENERIC_LOCKBREAK -+ bool -+ default y -+ depends on SMP -+ - config RWSEM_XCHGADD_ALGORITHM - bool - default y ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -111,7 +111,7 @@ config GENERIC_IRQ_PROBE - config GENERIC_LOCKBREAK - bool - default y -- depends on SMP && PREEMPT -+ depends on SMP - - config RWSEM_GENERIC_SPINLOCK - bool ---- a/arch/blackfin/Kconfig -+++ b/arch/blackfin/Kconfig -@@ -17,6 +17,11 @@ config RWSEM_GENERIC_SPINLOCK - config RWSEM_XCHGADD_ALGORITHM - def_bool n - -+config GENERIC_LOCKBREAK -+ bool -+ default y -+ depends on SMP -+ - config BLACKFIN - def_bool y - select HAVE_FUNCTION_GRAPH_TRACER ---- a/arch/ia64/Kconfig -+++ b/arch/ia64/Kconfig -@@ -62,7 +62,7 @@ config IOMMU_HELPER - config GENERIC_LOCKBREAK - bool - default y -- depends on SMP && PREEMPT -+ depends on SMP - - config RWSEM_XCHGADD_ALGORITHM - bool ---- a/arch/m32r/Kconfig -+++ b/arch/m32r/Kconfig -@@ -243,7 +243,7 @@ config IRAM_SIZE - config GENERIC_LOCKBREAK - bool - default y -- depends on SMP && PREEMPT -+ depends on SMP - - config RWSEM_GENERIC_SPINLOCK - bool ---- a/arch/parisc/Kconfig -+++ b/arch/parisc/Kconfig -@@ -33,7 +33,7 @@ config STACK_GROWSUP - config GENERIC_LOCKBREAK - bool - default y -- depends on SMP && PREEMPT -+ depends on SMP - - config RWSEM_GENERIC_SPINLOCK - def_bool y ---- a/arch/powerpc/Kconfig -+++ b/arch/powerpc/Kconfig -@@ -78,7 +78,7 @@ config RWSEM_XCHGADD_ALGORITHM - config GENERIC_LOCKBREAK - bool - default y -- depends on SMP && PREEMPT -+ depends on SMP - - config ARCH_HAS_ILOG2_U32 - bool ---- a/arch/s390/Kconfig -+++ b/arch/s390/Kconfig -@@ -63,7 +63,7 @@ config NO_DMA - config GENERIC_LOCKBREAK - bool - default y -- depends on SMP && PREEMPT -+ depends on SMP - - config PGSTE - bool ---- a/arch/sh/Kconfig -+++ b/arch/sh/Kconfig -@@ -48,6 +48,11 @@ config RWSEM_GENERIC_SPINLOCK - config RWSEM_XCHGADD_ALGORITHM - bool - -+config GENERIC_LOCKBREAK -+ bool -+ default y -+ depends on SMP -+ - config GENERIC_BUG - def_bool y - depends on BUG && SUPERH32 -@@ -98,7 +103,7 @@ config GENERIC_CMOS_UPDATE - - config GENERIC_LOCKBREAK - def_bool y -- depends on SMP && PREEMPT -+ depends on SMP - - config SYS_SUPPORTS_PM - bool ---- a/arch/sparc/Kconfig -+++ b/arch/sparc/Kconfig -@@ -306,7 +306,7 @@ config US3_MC - config GENERIC_LOCKBREAK - bool - default y -- depends on SPARC64 && SMP && PREEMPT -+ depends on SMP - - choice - prompt "SPARC64 Huge TLB Page Size" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/staging-missing-sched.h new/patches.rpmify/staging-missing-sched.h --- old/patches.rpmify/staging-missing-sched.h 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/staging-missing-sched.h 2009-10-16 17:30:07.000000000 +0200 @@ -0,0 +1,22 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: [PATCH] staging: Complete sched.h removal from interrupt.h + + Commit d43c36dc removed sched.h from interrupt.h and distributed sched.h + to users which needed it. Since make all{mod,yes}config skips staging, + these drivers were missed. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + drivers/staging/b3dfg/b3dfg.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/staging/b3dfg/b3dfg.c ++++ b/drivers/staging/b3dfg/b3dfg.c +@@ -33,6 +33,7 @@ + #include <linux/cdev.h> + #include <linux/list.h> + #include <linux/poll.h> ++#include <linux/sched.h> + #include <linux/wait.h> + #include <linux/mm.h> + #include <linux/uaccess.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/tsi148-dependency new/patches.rpmify/tsi148-dependency --- old/patches.rpmify/tsi148-dependency 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/tsi148-dependency 2009-10-16 17:30:07.000000000 +0200 @@ -0,0 +1,21 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: [PATCH] vme/tsi148: Depend on VIRT_TO_BUS + + This driver depends on virt_to_bus working correctly, but it doesn't + exist on ppc64 (and probably other arches). + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + drivers/staging/vme/bridges/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/staging/vme/bridges/Kconfig ++++ b/drivers/staging/vme/bridges/Kconfig +@@ -8,6 +8,7 @@ config VME_CA91CX42 + + config VME_TSI148 + tristate "Tempe" ++ depends on VIRT_TO_BUS + help + If you say Y here you get support for the Tundra TSI148 VME bridge + chip. ++++++ patches.suse.tar.bz2 ++++++ ++++ 5955 lines of diff (skipped) ++++++ patches.trace.tar.bz2 ++++++ ++++ 3557 lines of diff (skipped) ++++++ patches.xen.tar.bz2 ++++++ ++++ 38213 lines of diff (skipped) ++++++ post.sh ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:47.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:47.000000000 +0100 @@ -26,7 +26,7 @@ suffix= case @FLAVOR@ in - kdump|ps3|xen*|vanilla) + kdump|ps3|xen*|ec2|vanilla) suffix=-@FLAVOR@ ;; esac ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:47.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:47.000000000 +0100 @@ -27,10 +27,11 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## - patches.kernel.org/patch-2.6.31.1 - patches.kernel.org/patch-2.6.31.1-2 - patches.kernel.org/patch-2.6.31.2-3 - patches.kernel.org/patch-2.6.31.3-4 + patches.kernel.org/patch-2.6.32-rc1 + patches.kernel.org/patch-2.6.32-rc1-rc3 + patches.kernel.org/patch-2.6.32-rc3-rc4 + patches.kernel.org/patch-2.6.32-rc4-rc5 + patches.kernel.org/patch-2.6.32-rc5-git3 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -44,8 +45,10 @@ patches.kernel.org/md-section-conflict patches.kernel.org/gdth-section-conflict patches.kernel.org/arch-include-asm-fixes - patches.rpmify/spin_is_contended-fix patches.rpmify/arm-arch_include_asm-fix.diff + patches.rpmify/tsi148-dependency + patches.rpmify/staging-missing-sched.h + patches.rpmify/ia64-sn-fix-percpu-warnings ######################################################## # kABI consistency patches @@ -97,24 +100,13 @@ ######################################################## # Scheduler / Core ######################################################## - patches.suse/smtnice-disable ++needs_update-32 patches.suse/smtnice-disable patches.suse/setuid-dumpable-wrongdir - patches.suse/sysctl-add-affinity_load_balancing ++needs_update-32 patches.suse/sysctl-add-affinity_load_balancing patches.fixes/seccomp-disable-tsc-option patches.suse/self-ptrace.patch - - ######################################################## - # PI / Futex - ######################################################## - patches.fixes/futex-correct-futex_wait_requeue_pi-commentary - patches.fixes/futex-detect-mismatched-requeue-targets - patches.fixes/futex-correct-futex_wait_requeue_pi-commentary_2 - patches.fixes/futex-correct-queue_me-and-unqueue_me-commentary - patches.fixes/futex-make-function-kernel-doc-commentary-consistent - patches.fixes/futex-correct-futex_q-woken-state-commentary - patches.fixes/futex-fix-wakeup-race - patches.fixes/futex-add-memory-barrier-commentary - + patches.fixes/percpu-allow-pcpu_alloc-to-be-called-with-IRQs-off + patches.fixes/sched-move-rq_weight-data-array-out-of-percpu ######################################################## # Architecture-specific patches. These used to be all @@ -144,24 +136,17 @@ # Intel 64 # "the architecture with too many names" # TAWTMN - patches.arch/x86_mce_therm_suppress_msgs.patch - patches.arch/x86_amd_fix_erratum_63.patch ######################################################## # x86_64/i386 biarch ######################################################## patches.arch/x86-self-ptrace.patch patches.arch/x86-hpet-pre-read -+needs_update patches.arch/x86_64-hpet-64bit-timer.patch + patches.arch/x86_64-hpet-64bit-timer.patch patches.arch/add_support_for_hpet_msi_intr_remap.patch patches.arch/add_x86_support_for_hpet_msi_intr_remap.patch - patches.arch/amd_magny_cour_topology_fix.patch - patches.arch/amd_magny_cour_topology_fix_1.patch - patches.arch/amd_magny_cour_topology_fix_2.patch - patches.arch/amd_magny_cour_topology_fix_3.patch - ######################################################## # x86_64/4096CPUS - from SGI ######################################################## @@ -210,7 +195,7 @@ ######################################################## patches.arch/s390-add-FREE_PTE_NR - patches.arch/s390-08-02-zfcp-gpn-align-fix.diff ++needs_update-32 patches.arch/s390-08-02-zfcp-gpn-align-fix.diff ######################################################## @@ -224,9 +209,9 @@ patches.fixes/grab-swap-token-oops patches.suse/mm-do-not-disable-memory-hotplug-when-hibernation-is-enabled.patch - patches.suse/osync-error ++needs_update-32 patches.suse/osync-error patches.fixes/remount-no-shrink-dcache - patches.suse/reiser4-sync_inodes ++needs_update-32 patches.suse/reiser4-sync_inodes patches.suse/reiser4-set_page_dirty_notag patches.suse/file-capabilities-disable-by-default.diff @@ -244,7 +229,6 @@ patches.suse/connector-read-mostly patches.suse/kbd-ignore-gfx.patch patches.fixes/ds1682-build-fix - patches.fixes/use-totalram_pages ######################################################## # @@ -261,7 +245,7 @@ patches.arch/acpi_thermal_passive_blacklist.patch patches.arch/acpi-export-hotplug_execute - patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch ++needs_update-32 patches.arch/acpi_ec_provide_non_interrupt_mode_boot_param.patch # Adjust this patch for every new product (at least Enterprise # level) to provide OEMs a safety break so that they can add @@ -297,6 +281,7 @@ ######################################################## # NFS ######################################################## + patches.fixes/nfsd-acl.patch ######################################################## # lockd + statd @@ -320,6 +305,7 @@ ######################################################## # Reiserfs Patches ######################################################## + patches.fixes/reiserfs-replay-honor-ro patches.suse/reiserfs-barrier-default ######################################################## @@ -400,8 +386,6 @@ patches.fixes/scsi-check-host-lookup-failure - patches.suse/block-seperate-rw-inflight-stats - # Remaining SCSI patches (garloff) patches.suse/scsi-error-test-unit-ready-timeout patches.fixes/scsi-scan-blist-update @@ -418,7 +402,6 @@ # DRM/Video ######################################################## patches.drivers/via-unichrome-drm-bugfixes.patch - patches.fixes/drm-r128-add-test-for-initialisation-to-all-ioctls-that-require-it ######################################################## # Network @@ -427,14 +410,12 @@ patches.suse/nameif-track-rename.patch patches.fixes/tg3-fix-default-wol.patch patches.drivers/ehea-modinfo.patch - patches.drivers/tg3_libphy_workaround ++needs_update-32 patches.drivers/tg3_libphy_workaround ######################################################## # Wireless Networking ######################################################## patches.suse/wireless-no-aes-select -+still_needed? patches.fixes/iwl3945-fix-rfkill.patch -+still_needed? patches.fixes/iwlagn-fix-rfkill.patch ######################################################## # iSCSI @@ -446,13 +427,10 @@ ######################################################## # PCI and PCI hotplug ######################################################## - patches.drivers/pci-separate-out-pci_add_dynid - patches.drivers/pci_stub-add-ids-parameter ######################################################## # sysfs / driver core ######################################################## -# patches.suse/devtmpfs.patch ######################################################## # USB @@ -470,54 +448,14 @@ patches.suse/Cleanup-and-make-boot-splash-work-with-KMS.patch patches.drivers/elousb.patch patches.fixes/input-add-acer-aspire-5710-to-nomux.patch - patches.drivers/samsung-laptop-driver.patch ########################################################## # Sound ########################################################## - patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max - - patches.drivers/alsa-midi-01-always-log-message-on-output-overrun - patches.drivers/alsa-midi-02-do-not-send-MIDI-reset-when-closing - patches.drivers/alsa-midi-03-disable-active-sensing-on-close-by-def - patches.drivers/alsa-midi-04-oss-remove-magic-numbers - - # more udpates - patches.drivers/alsa-hda-2.6.32-pre - patches.drivers/alsa-hda-2.6.32-rc1 - patches.drivers/alsa-hda-2.6.32-rc2 - patches.drivers/alsa-hda-alc861-toshiba-fix - patches.drivers/alsa-hda-alc660vd-asus-a7k-fix - patches.drivers/alsa-hda-alc268-automic-fix - patches.drivers/alsa-hda-realtek-overflow-fix - patches.drivers/alsa-hda-nvidia-hdmi-full-fmts - patches.drivers/alsa-hda-stac9228-fsc-fix - patches.drivers/alsa-hda-stac9228-dell-fix - patches.drivers/alsa-hda-alc662-capture-fix - - patches.drivers/alsa-ctxfi-01-Native-timer-support-for-emu20k2 - patches.drivers/alsa-ctxfi-03-Simple-code-clean-up - patches.drivers/alsa-ctxfi-04-fix-surround-side-mute - - patches.drivers/alsa-ice-01-Patch-for-suspend-resume-for-Audiotrak - patches.drivers/alsa-ice-02-Fix-section-mismatch - - patches.drivers/alsa-usb-01-Use-the-new-TLV_DB_MINMAX-type - patches.drivers/alsa-usb-02-Correct-bogus-volume-dB-information - patches.drivers/alsa-usb-03-Xonar-U1-digital-output-support - patches.drivers/alsa-usb-04-use-multiple-input-URBs - patches.drivers/alsa-usb-05-use-multiple-output-URBs - patches.drivers/alsa-usb-06-add-MIDI-drain-callback - - # backported from 2.6.32 for OSSP - patches.drivers/implement-register_chrdev - patches.drivers/sound-request-char-major-aliases-for-oss-devices - patches.drivers/sound-make-oss-device-number-claiming-optional ######################################################## # Other driver fixes ######################################################## - patches.rpmify/rtl8192su-build-fix patches.fixes/ieee1394-sbp2_long_sysfs_ieee1394_id.patch patches.fixes/parport-mutex @@ -547,9 +485,6 @@ +needs_update patches.suse/dm-mpath-requeue-for-stopped-queue patches.suse/dm-mpath-null-pgs patches.fixes/dm-table-switch-to-readonly - patches.fixes/scsi_dh-add-the-interface-scsi_dh_set_params.patch - patches.fixes/scsi_dh-Provide-set_params-interface-in-emc-device-handler.patch - patches.fixes/scsi_dh-Use-scsi_dh_set_params-in-multipath.patch ######################################################## @@ -567,6 +502,7 @@ # AppArmor ########################################################## patches.apparmor/apparmor.diff + patches.apparmor/ptrace_may_access-fix patches.apparmor/security-default-lsm ######################################################## @@ -580,8 +516,8 @@ patches.suse/kdb-common patches.suse/kdb-x86 patches.suse/kdb-ia64 -+still_needed? patches.suse/kdb-serial-8250 - patches.fixes/kdb-fix-stack-overflow.patch + patches.suse/kdb-build-fixes + patches.suse/kdb-x86-build-fixes ######################################################## # Other patches for debugging @@ -601,7 +537,6 @@ ######################################################## patches.suse/cgroup-disable-memory.patch -+29 patches.suse/kdb-sysctl-context ######################################################## # Tracing ######################################################## @@ -625,7 +560,7 @@ patches.trace/utrace-core - patches.fixes/nfs-write.c-bug-removal.patch ++needs_update-32 patches.fixes/nfs-write.c-bug-removal.patch patches.fixes/ia64-configure-HAVE_UNSTABLE_SCHED_CLOCK-for-SGI_SN.patch ######################################################## @@ -649,9 +584,6 @@ patches.suse/linux-2.6.29-touchkit.patch patches.suse/uvcvideo-ignore-hue-control-for-5986-0241.patch - # devtmpfs - patches.suse/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch - ######################################################## # You'd better have a good reason for adding a patch # below here. @@ -726,11 +658,8 @@ patches.xen/xen3-patch-2.6.29 patches.xen/xen3-patch-2.6.30 patches.xen/xen3-patch-2.6.31 - patches.xen/xen3-patch-2.6.31.1 - patches.xen/xen3-patch-2.6.31.1-2 - patches.xen/xen3-patch-2.6.31.3-4 + patches.xen/xen3-patch-2.6.32-rc4 patches.xen/xen3-seccomp-disable-tsc-option - patches.xen/xen3-use-totalram_pages patches.xen/xen3-kdb-x86 patches.xen/xen3-stack-unwind patches.xen/xen3-x86_64-unwind-annotations @@ -756,6 +685,7 @@ patches.xen/xen-configurable-guest-devices patches.xen/xen-netback-nr-irqs patches.xen/xen-netback-notify-multi + patches.xen/xen-unpriv-build patches.xen/xen-x86-panic-no-reboot patches.xen/xen-x86-dcr-fallback patches.xen/xen-x86-consistent-nmi ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:47.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:47.000000000 +0100 @@ -1,3 +1,3 @@ -2009-10-26 14:54:00 +0100 -GIT Revision: f3b1885534a9fa50463d441109b673bb22c7362b -GIT Branch: openSUSE-11.2 +2009-11-03 15:41:35 +0100 +GIT Revision: ad0b82d093b6344f9f80e96b41a695610f7fa6eb +GIT Branch: master ++++++ supported.conf ++++++ --- /var/tmp/diff_new_pack.xbolWE/_old 2009-11-04 11:26:47.000000000 +0100 +++ /var/tmp/diff_new_pack.xbolWE/_new 2009-11-04 11:26:47.000000000 +0100 @@ -757,8 +757,6 @@ kernel/drivers/md/raid1 kernel/drivers/md/raid10 kernel/drivers/md/raid456 - kernel/drivers/md/raid6_pq - kernel/drivers/media/common/ir-common kernel/drivers/media/common/saa7146 # driver for generic saa7146-based hardware kernel/drivers/media/common/saa7146_vv # video4linux driver for saa7146-based hardware @@ -1928,12 +1926,14 @@ +external kernel/fs/jfs/jfs # The Journaled Filesystem (JFS), supported by IBM kernel/fs/lockd/lockd +base kernel/fs/mbcache + kernel/fs/minix kernel/fs/msdos/msdos kernel/fs/ncpfs/ncpfs kernel/fs/nfs_common/nfs_acl kernel/fs/nfsd/nfsd kernel/fs/nfs/nfs kernel/fs/nls/nls_ascii + kernel/fs/nls/nls_base kernel/fs/nls/nls_cp1250 kernel/fs/nls/nls_cp1251 kernel/fs/nls/nls_cp1255 @@ -1974,7 +1974,6 @@ kernel/fs/nls/nls_koi8-u kernel/fs/nls/nls_utf8 kernel/fs/novfs/novfs - kernel/fs/ntfs/ntfs # NTFS 1.2/3.x driver - Copyright (c) 2001-2003 Anton Altaparmakov # ocfs2 is provided separately in the ocfs2 KMP package - kernel/fs/ocfs2/cluster/ocfs2_nodemanager - kernel/fs/ocfs2/dlm/ocfs2_dlm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdemultimedia4 for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kdemultimedia4 for openSUSE:Factory checked in at Wed Nov 4 11:28:15 CET 2009. -------- --- KDE/kdemultimedia4/kdemultimedia4.changes 2009-09-24 21:57:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2009-11-02 22:03:16.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 22:02:55 CET 2009 - dmueller(a)suse.de + +- update to 4.3.3 + * see http://kde.org/announcements/changelogs/changelog4_3_2to4_3_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdemultimedia-4.3.1.tar.bz2 New: ---- kdemultimedia-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.wfL3QL/_old 2009-11-04 11:27:10.000000000 +0100 +++ /var/tmp/diff_new_pack.wfL3QL/_new 2009-11-04 11:27:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdemultimedia4 (Version 4.3.1) +# spec file for package kdemultimedia4 (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,8 +31,8 @@ Group: System/GUI/KDE Summary: kdemultimedia base package Url: http://www.kde.org -Version: 4.3.1 -Release: 2 +Version: 4.3.3 +Release: 1 Source0: kdemultimedia-%version.tar.bz2 Patch0: 4_3_BRANCH.diff Patch1: kmix-autostart.diff ++++++ 4_3_BRANCH.diff ++++++ ++++ 1362 lines (skipped) ++++ between KDE/kdemultimedia4/4_3_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdemultimedia4/4_3_BRANCH.diff ++++++ kdemultimedia-4.3.1.tar.bz2 -> kdemultimedia-4.3.3.tar.bz2 ++++++ Files old/kdemultimedia-4.3.1/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.3.3/doc/dragonplayer/index.cache.bz2 differ Files old/kdemultimedia-4.3.1/doc/juk/index.cache.bz2 and new/kdemultimedia-4.3.3/doc/juk/index.cache.bz2 differ Files old/kdemultimedia-4.3.1/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.3.3/doc/kmix/index.cache.bz2 differ Files old/kdemultimedia-4.3.1/doc/kscd/index.cache.bz2 and new/kdemultimedia-4.3.3/doc/kscd/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/dragonplayer/misc/dragonplayer-opendvd.desktop new/kdemultimedia-4.3.3/dragonplayer/misc/dragonplayer-opendvd.desktop --- old/kdemultimedia-4.3.1/dragonplayer/misc/dragonplayer-opendvd.desktop 2009-07-21 17:21:02.000000000 +0200 +++ new/kdemultimedia-4.3.3/dragonplayer/misc/dragonplayer-opendvd.desktop 2009-10-02 10:20:27.000000000 +0200 @@ -12,6 +12,7 @@ Name[da]=Åbn med videoafspiller (Dragon Player) Name[de]=Mit dem Videoabspieler öffnen (Dragon Player) Name[el]=Άνοιγμα με αναπαραγωγέα βίντεο (Dragon) +Name[en_GB]=Open with Video Player (Dragon Player) Name[es]=Abrir con el reproductor de vídeo (Dragon Player) Name[et]=Ava videomängijas (Dragoni mängija) Name[eu]=Ireki bideo erreproduzitzailearekin (Dragon erreproduzitzailea) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/dragonplayer/misc/dragonplayer.desktop new/kdemultimedia-4.3.3/dragonplayer/misc/dragonplayer.desktop --- old/kdemultimedia-4.3.1/dragonplayer/misc/dragonplayer.desktop 2009-07-08 16:47:18.000000000 +0200 +++ new/kdemultimedia-4.3.3/dragonplayer/misc/dragonplayer.desktop 2009-10-02 10:20:27.000000000 +0200 @@ -4,26 +4,49 @@ Name=Dragon Player Name[ar]=مشغل دراجن Name[bg]=Програма за видео Dragon +Name[ca]=Dragon Player Name[cs]=Přehrávač Dragon +Name[da]=Dragon Player +Name[de]=Dragon Player Name[el]=Αναπαραγωγέας Dragon +Name[en_GB]=Dragon Player +Name[es]=Dragon Player Name[et]=Dragoni mängija Name[eu]=Dragon erreproduzitzailea +Name[fr]=Dragon Player +Name[ga]=Dragon Player +Name[gl]=Dragon Player Name[he]=נגן Dragon Name[hne]=ड्रेगन प्लेयर +Name[hu]=Dragon Player Name[is]=Dragon spilari +Name[it]=Dragon Player +Name[ja]=Dragon Player Name[km]=កម្មវិធីចាក់ Dragon Name[ko]=Dragon 플레이어 Name[ku]=Lêdarê Dragon +Name[lt]=Dragon Player +Name[lv]=Dragon Player +Name[nb]=Dragon Player Name[nds]=Drakenspeler +Name[nl]=Dragon Player +Name[nn]=Dragon Player Name[pa]=ਡਰੈਗਨ ਪਲੇਅਰ Name[pl]=Odtwarzacz Dragon Player +Name[pt]=Dragon Player +Name[pt_BR]=Dragon Player +Name[ro]=Dragon Player +Name[ru]=Dragon Player +Name[sl]=Dragon Player Name[sr]=Змајев плејер Name[sr@latin]=Zmajev plejer Name[sv]=Dragon videospelare Name[th]=โปรแกรมเล่นสื่อ Dragon Player +Name[tr]=Dragon Player Name[uk]=Програвач Dragon Name[wa]=Djouweu Dragon Name[x-test]=xxDragon Playerxx +Name[zh_CN]=Dragon Player Name[zh_TW]=神龍播放器 GenericName=Video Player GenericName[ar]=مشغل فيديو @@ -33,6 +56,7 @@ GenericName[da]=Videoafspiller GenericName[de]=Video-Wiedergabe GenericName[el]=Αναπαραγωγέας βίντεο +GenericName[en_GB]=Video Player GenericName[es]=Reproductor de vídeo GenericName[et]=Videomängija GenericName[eu]=Bideo erreproduzitzailea @@ -58,7 +82,7 @@ GenericName[pa]=ਵੀਡਿਓ ਪਲੇਅਰ GenericName[pl]=Odtwarzacz wideo GenericName[pt]=Leitor de Vídeo -GenericName[pt_BR]=Reprodutor de Vídeo +GenericName[pt_BR]=Reprodutor de vídeo GenericName[ro]=Program de redare video GenericName[ru]=Видеопроигрыватель GenericName[sl]=Predvajalnik videov diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/dragonplayer/misc/dragonplayer_part.desktop new/kdemultimedia-4.3.3/dragonplayer/misc/dragonplayer_part.desktop --- old/kdemultimedia-4.3.1/dragonplayer/misc/dragonplayer_part.desktop 2009-07-21 17:21:02.000000000 +0200 +++ new/kdemultimedia-4.3.3/dragonplayer/misc/dragonplayer_part.desktop 2009-10-02 10:20:27.000000000 +0200 @@ -9,6 +9,7 @@ Name[da]=Dragon Player-part Name[de]=Dragon-Player-KPart Name[el]=Τμήμα αναπαραγωγέα Dragon +Name[en_GB]=Dragon Player Part Name[es]=Parte de Dragon Player Name[et]=Dragoni mängija komponent Name[eu]=Dragon erreproduzitzailearen zatia @@ -40,6 +41,7 @@ Name[sr@latin]=Zmajev plejer deo Name[sv]=Dragon videodelprogram Name[th]=ส่วนเล่นสื่อ Dragon Player +Name[tr]=Dragon Player Part Name[uk]=Складова програвача Dragon Name[wa]=Pårt do Djouweu Dragon Name[x-test]=xxDragon Player Partxx @@ -53,6 +55,7 @@ Comment[da]=Videoafspiller som kan indlejres Comment[de]=Eingebettete Video-Wiedergabe Comment[el]=Ενσωματώσιμος αναπαραγωγέας βίντεο +Comment[en_GB]=Embeddable Video Player Comment[es]=Reproductor de vídeo empotrable Comment[et]=Põimitav videomängija Comment[eu]=Bideo erreproduzitzaile kapsulagarria @@ -77,7 +80,7 @@ Comment[pa]=ਇੰਬੈੱਡ ਹੋਣਯੋਗ ਵੀਡਿਓ ਪਲੇਅਰ Comment[pl]=Wbudowywalny odtwarzacz wideo Comment[pt]=Leitor de Vídeo Incorporado -Comment[pt_BR]=Reprodutor de Vídeo Embutível +Comment[pt_BR]=Reprodutor de vídeo incorporado Comment[ro]=Program de redare multimedia încorporabil Comment[ru]=Встраиваемый видеопроигрыватель Comment[sl]=Vgradni predvajalnik videov diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/dragonplayer/misc/dragonplayer_play_dvd.desktop new/kdemultimedia-4.3.3/dragonplayer/misc/dragonplayer_play_dvd.desktop --- old/kdemultimedia-4.3.1/dragonplayer/misc/dragonplayer_play_dvd.desktop 2009-05-19 14:06:59.000000000 +0200 +++ new/kdemultimedia-4.3.3/dragonplayer/misc/dragonplayer_play_dvd.desktop 2009-10-02 10:20:27.000000000 +0200 @@ -13,6 +13,7 @@ Name[da]=Afspil dvd med Dragon Player Name[de]=DVD mit dem Dragon Player abspielen Name[el]=Αναπαραγωγή DVD με το Dragon +Name[en_GB]=Play DVD with Dragon Player Name[es]=Reproducir el DVD con Dragon Player Name[et]=Esita DVD Dragoni mängijaga Name[eu]=Erreproduzitu DVDa Dragon erreproduzitzialearekin @@ -37,7 +38,7 @@ Name[pa]=ਡਰੈਗਨ ਪਲੇਅਰ ਨਾਲ DVD ਚਲਾਓ Name[pl]=Odtwórz DVD za pomocą Dragon Playera Name[pt]=Reproduzir o DVD com o Dragon Player -Name[pt_BR]=Reproduza um DVD com o Dragon Player +Name[pt_BR]=Reproduzir o DVD com o Dragon Player Name[ro]=Redare DVD cu Dragon Player Name[ru]=Воспроизведение DVD в Dragon Player Name[sl]=Predvajaj DVD z Dragon Player diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/juk/juk.cpp new/kdemultimedia-4.3.3/juk/juk.cpp --- old/kdemultimedia-4.3.1/juk/juk.cpp 2009-03-10 13:26:10.000000000 +0100 +++ new/kdemultimedia-4.3.3/juk/juk.cpp 2009-10-30 13:30:24.000000000 +0100 @@ -484,10 +484,12 @@ delete m_systemTray; m_systemTray = 0; - CoverManager::shutdown(); - delete m_splitter; m_splitter = 0; + + // Playlists depend on CoverManager, so CoverManager should shutdown as + // late as possible + CoverManager::shutdown(); } void JuK::slotQuit() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/juk/juk.desktop new/kdemultimedia-4.3.3/juk/juk.desktop --- old/kdemultimedia-4.3.1/juk/juk.desktop 2009-07-08 16:47:19.000000000 +0200 +++ new/kdemultimedia-4.3.3/juk/juk.desktop 2009-10-02 10:20:27.000000000 +0200 @@ -8,15 +8,70 @@ Comment= Terminal=false Name=JuK +Name[ar]=JuK +Name[be]=JuK +Name[bg]=JuK Name[bn]=জুক +Name[br]=JuK +Name[ca]=JuK +Name[cs]=JuK +Name[cy]=JuK +Name[da]=JuK +Name[de]=JuK +Name[el]=JuK +Name[en_GB]=JuK +Name[eo]=JuK +Name[es]=JuK +Name[et]=JuK +Name[eu]=JuK +Name[fi]=JuK +Name[fr]=JuK +Name[ga]=JuK +Name[gl]=JuK +Name[he]=JuK Name[hi]=ज्यूक Name[hne]=ज्यूक +Name[hu]=JuK +Name[is]=JuK +Name[it]=JuK +Name[ja]=JuK +Name[kk]=JuK +Name[km]=JuK +Name[ko]=JuK +Name[ku]=JuK +Name[lt]=JuK +Name[lv]=JuK +Name[mk]=JuK +Name[ms]=JuK +Name[nb]=JuK +Name[nds]=JuK Name[ne]=जुक +Name[nl]=JuK +Name[nn]=JuK +Name[oc]=JuK Name[pa]=ਜੂਕ +Name[pl]=JuK +Name[pt]=JuK +Name[pt_BR]=JuK +Name[ro]=JuK +Name[ru]=JuK +Name[sk]=JuK +Name[sl]=JuK Name[sr]=Џук Name[sr@latin]=Juk Name[sv]=Juk +Name[ta]=JuK +Name[tg]=JuK +Name[th]=JuK +Name[tr]=JuK +Name[uk]=JuK +Name[uz]=JuK +Name[uz@cyrillic]=JuK +Name[wa]=JuK Name[x-test]=xxJuKxx +Name[zh_CN]=JuK +Name[zh_HK]=JuK +Name[zh_TW]=JuK GenericName=Music Player GenericName[ar]=مشغل الموسيقى GenericName[bg]=Музикален плеър @@ -27,6 +82,7 @@ GenericName[da]=Musikafspiller GenericName[de]=Audio-Wiedergabe GenericName[el]=Αναπαραγωγέας μουσικής +GenericName[en_GB]=Music Player GenericName[eo]=Muzika ludilo GenericName[es]=Reproductor de música GenericName[et]=Muusika mängija @@ -60,7 +116,7 @@ GenericName[pa]=ਮੀਡਿਆ ਪਲੇਅਰ GenericName[pl]=Odtwarzacz muzyki GenericName[pt]=Leitor de Música -GenericName[pt_BR]=Reprodutor de Música +GenericName[pt_BR]=Reprodutor de música GenericName[ro]=Program de redare muzică GenericName[ru]=Музыкальный проигрыватель GenericName[sk]=Prehrávač hudby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/juk/juk.notifyrc new/kdemultimedia-4.3.3/juk/juk.notifyrc --- old/kdemultimedia-4.3.1/juk/juk.notifyrc 2009-07-29 13:11:39.000000000 +0200 +++ new/kdemultimedia-4.3.3/juk/juk.notifyrc 2009-10-02 10:20:27.000000000 +0200 @@ -8,6 +8,7 @@ Comment[da]=Musikafspiller Comment[de]=Audio-Wiedergabe Comment[el]=Αναπαραγωγέας μουσικής +Comment[en_GB]=Music Player Comment[es]=Reproductor de música Comment[et]=Muusika mängija Comment[eu]=Musika erreproduzitzailea @@ -44,15 +45,70 @@ Comment[zh_CN]=音乐播放器 Comment[zh_TW]=音樂播放器 Name=JuK +Name[ar]=JuK +Name[be]=JuK +Name[bg]=JuK Name[bn]=জুক +Name[br]=JuK +Name[ca]=JuK +Name[cs]=JuK +Name[cy]=JuK +Name[da]=JuK +Name[de]=JuK +Name[el]=JuK +Name[en_GB]=JuK +Name[eo]=JuK +Name[es]=JuK +Name[et]=JuK +Name[eu]=JuK +Name[fi]=JuK +Name[fr]=JuK +Name[ga]=JuK +Name[gl]=JuK +Name[he]=JuK Name[hi]=ज्यूक Name[hne]=ज्यूक +Name[hu]=JuK +Name[is]=JuK +Name[it]=JuK +Name[ja]=JuK +Name[kk]=JuK +Name[km]=JuK +Name[ko]=JuK +Name[ku]=JuK +Name[lt]=JuK +Name[lv]=JuK +Name[mk]=JuK +Name[ms]=JuK +Name[nb]=JuK +Name[nds]=JuK Name[ne]=जुक +Name[nl]=JuK +Name[nn]=JuK +Name[oc]=JuK Name[pa]=ਜੂਕ +Name[pl]=JuK +Name[pt]=JuK +Name[pt_BR]=JuK +Name[ro]=JuK +Name[ru]=JuK +Name[sk]=JuK +Name[sl]=JuK Name[sr]=Џук Name[sr@latin]=Juk Name[sv]=Juk +Name[ta]=JuK +Name[tg]=JuK +Name[th]=JuK +Name[tr]=JuK +Name[uk]=JuK +Name[uz]=JuK +Name[uz@cyrillic]=JuK +Name[wa]=JuK Name[x-test]=xxJuKxx +Name[zh_CN]=JuK +Name[zh_HK]=JuK +Name[zh_TW]=JuK [Event/coverDownloaded] Name=Cover Successfully Downloaded @@ -63,6 +119,7 @@ Name[da]=Download af omslag gennemført Name[de]=Titelbild erfolgreich heruntergeladen Name[el]=Επιτυχής ανάκτηση εξωφύλλου +Name[en_GB]=Cover Successfully Downloaded Name[es]=La carátula se ha descargado con éxito Name[et]=Kaanepilt on edukalt alla laaditud Name[eu]=Azala ongi deskargatuta @@ -105,6 +162,7 @@ Comment[da]=En ønsket omslag er blevet downloadet Comment[de]=Ein angefordertes Titelbild wurde heruntergeladen Comment[el]=Ένα ζητούμενο εξώφυλλο έχει ληφθεί +Comment[en_GB]=A requested cover has been downloaded Comment[es]=Se ha descargado la carátula solicitada Comment[et]=Soovitud kaanepilt on alla laaditud Comment[eu]=Eskatutako azala deskargatu da @@ -126,7 +184,7 @@ Comment[pa]=ਮੰਗਿਆ ਕਵਰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਗਿਆ Comment[pl]=Okładka została pobrana Comment[pt]=Foi obtida uma cópia pedida -Comment[pt_BR]=Uma capa requisitada foi baixada +Comment[pt_BR]=Uma capa solicitada foi baixada Comment[ro]=O copertă cerută a fost descărcată Comment[ru]=Запрошенная обложка была загружена Comment[sl]=Zahtevan ovitek je bil uspešno pridobljen @@ -150,6 +208,7 @@ Name[da]=Download af omslag mislykkedes Name[de]=Herunterladen des Titelbildes fehlgeschlagen Name[el]=Αποτυχία λήψης εξωφύλλου +Name[en_GB]=Cover Failed to Download Name[es]=Fallo al descargar la carátula Name[et]=Kaanepildi allalaadimine nurjus Name[eu]=Huts egin du azala deskargatzean @@ -159,7 +218,7 @@ Name[he]=אין אפשרות להוריד את העטיפה Name[hu]=Nem sikerült letölteni a kért lemezborítót Name[is]=Niðurhal umslags mistókst -Name[it]=Lo scaricamento della copertina è fallito +Name[it]=Lo scaricamento della copertina non è riuscito Name[ja]=カバーのダウンロードに失敗 Name[km]=បានបរាជ័យក្នុងការទាញយកគម្រប Name[ko]=표지 그림을 다운로드할 수 없습니다 @@ -192,6 +251,7 @@ Comment[da]=Download af et ønsket omslag mislykkedes Comment[de]=Ein angefordertes Titelbild konnte nicht heruntergeladen werden Comment[el]=Αποτυχία λήψης ενός ζητούμενου εξώφυλλου +Comment[en_GB]=A requested cover has failed to download Comment[es]=Fallo al descargar la carátula solicitada Comment[et]=Soovitud kaanepildi allalaadimine nurjus Comment[eu]=Huts egin du eskatutako azala deskargatzean @@ -201,7 +261,7 @@ Comment[he]=אין אפשרות להוריד את העטיפה המבוקשת Comment[hu]=A kért lemezborító letöltése nem sikerült Comment[is]=Umslagi sem beðið var um mistókst að hala niður -Comment[it]=Lo scaricamento di una copertina richiesta è fallito +Comment[it]=Lo scaricamento di una copertina richiesta non è riuscito Comment[ja]=要求されたカバーをダウンロードできませんでした Comment[km]=គម្របដែលបានស្នើបានបរាជ័យក្នុងការទាញយក Comment[ko]=요청한 표지 그림을 다운로드할 수 없습니다 @@ -213,7 +273,7 @@ Comment[pa]=ਮੰਗਿਆ ਕਵਰ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ Comment[pl]=Pobieranie okładki nie powiodło się Comment[pt]=Não foi possível obter uma dada capa -Comment[pt_BR]=Falha ao baixar uma capa requisitada +Comment[pt_BR]=Falha ao baixar uma capa solicitada Comment[ro]=O copertă cerută nu s-a putut descărca Comment[ru]=Не удалось загрузить запрошенную обложку Comment[sl]=Zahtevan ovitek ni bil uspešno pridobljen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/juk/jukservicemenu.desktop new/kdemultimedia-4.3.3/juk/jukservicemenu.desktop --- old/kdemultimedia-4.3.1/juk/jukservicemenu.desktop 2009-06-23 13:16:40.000000000 +0200 +++ new/kdemultimedia-4.3.3/juk/jukservicemenu.desktop 2009-10-02 10:20:27.000000000 +0200 @@ -15,6 +15,7 @@ Name[da]=Tilføj til JuK-samling Name[de]=Zur JuK-Sammlung hinzufügen Name[el]=Προσθήκη στη συλλογή του JuK +Name[en_GB]=Add to JuK Collection Name[eo]=Aldoni al JuK-kolekto Name[es]=Añadir a colección de JuK Name[et]=Lisa JuKi kollektsiooni @@ -47,7 +48,7 @@ Name[pa]=ਜੂਕ ਭੰਡਾਰ 'ਚ ਸ਼ਾਮਲ Name[pl]=Dodaj do kolekcji JuK Name[pt]=Adicionar à Colecção do JuK -Name[pt_BR]=Adicionar à Coleção do Juk +Name[pt_BR]=Adicionar à coleção do JuK Name[ro]=Adaugă în colecția JuK Name[ru]=Добавить в коллекцию JuK Name[sk]=Pridať do kolekcie JuK diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/juk/main.cpp new/kdemultimedia-4.3.3/juk/main.cpp --- old/kdemultimedia-4.3.1/juk/main.cpp 2009-02-18 17:29:44.000000000 +0100 +++ new/kdemultimedia-4.3.3/juk/main.cpp 2009-10-30 13:30:24.000000000 +0100 @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) { KAboutData aboutData("juk", 0, ki18n("JuK"), - "3.3", ki18n(description), KAboutData::License_GPL, + "3.3.1", ki18n(description), KAboutData::License_GPL, ki18n("© 2002 - 2009, Scott Wheeler"), KLocalizedString(), "http://developer.kde.org/~wheeler/juk.html"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/juk/playermanager.cpp new/kdemultimedia-4.3.3/juk/playermanager.cpp --- old/kdemultimedia-4.3.1/juk/playermanager.cpp 2009-03-18 11:00:18.000000000 +0100 +++ new/kdemultimedia-4.3.3/juk/playermanager.cpp 2009-10-30 13:30:24.000000000 +0100 @@ -71,7 +71,6 @@ // later, just disable it here. -- mpyne // setup(); new PlayerAdaptor( this ); - QDBusConnection::sessionBus().registerObject("/Player", this); } PlayerManager::~PlayerManager() @@ -404,7 +403,12 @@ // user moves the slider all the way to the end, therefore see if we can keep playing // and if we can, do so. Otherwise, stop. Note that this slot should // only be called by the currently "main" output path (i.e. not from the - // crossfading one) + // crossfading one). However life isn't always so nice apparently, so do some + // sanity-checking. + + Phonon::MediaObject *mediaObject = qobject_cast<Phonon::MediaObject *>(sender()); + if(mediaObject != m_media[m_curOutputPath]) + return; m_playlistInterface->playNext(); m_file = m_playlistInterface->currentFile(); @@ -557,6 +561,8 @@ if(m_sliderAction->volumeSlider()) m_sliderAction->volumeSlider()->setAudioOutput(m_output[0]); + + QDBusConnection::sessionBus().registerObject("/Player", this); } void PlayerManager::slotUpdateSliders() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kioslave/audiocd/data/audiocd.desktop new/kdemultimedia-4.3.3/kioslave/audiocd/data/audiocd.desktop --- old/kdemultimedia-4.3.1/kioslave/audiocd/data/audiocd.desktop 2009-04-05 22:01:02.000000000 +0200 +++ new/kdemultimedia-4.3.3/kioslave/audiocd/data/audiocd.desktop 2009-10-30 13:30:24.000000000 +0100 @@ -10,6 +10,7 @@ Name[da]=Lyd-cd-browser Name[de]=Audio-CDs ansehen Name[el]=Περιηγητής CD μουσικής +Name[en_GB]=Audio CD Browser Name[es]=Explorador de CD de audio Name[et]=Heliplaadi sirvija Name[eu]=Audio CD arakatzailea @@ -34,7 +35,7 @@ Name[pa]=ਆਡੀਓ CD ਬਰਾਊਜ਼ਰ Name[pl]=Przeglądarka audio CD Name[pt]=Navegador de CDs de Áudio -Name[pt_BR]=Navegador de CDs de Áudio +Name[pt_BR]=Navegador de CDs de áudio Name[ro]=Navigator CD-uri audio Name[ru]=Просмотр звуковых CD Name[sl]=Brskalnik po glasbenih CD-jih diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop new/kdemultimedia-4.3.3/kioslave/audiocd/kcmaudiocd/audiocd.desktop --- old/kdemultimedia-4.3.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2009-08-27 10:19:11.000000000 +0200 +++ new/kdemultimedia-4.3.3/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2009-10-02 10:20:27.000000000 +0200 @@ -20,6 +20,7 @@ Name[da]=Lyd-cd'er Name[de]=Audio-CDs Name[el]=CD μουσικής +Name[en_GB]=Audio CDs Name[eo]=Sonaj KD Name[es]=CD de audio Name[et]=Heliplaadid @@ -28,6 +29,7 @@ Name[fi]=Ääni-CD:t Name[fr]=CD audio Name[ga]=Dlúthdhioscaí Fuaime +Name[gl]=Audio CDs Name[he]=תקליטורי שמע Name[hi]=ऑडियो सीडी Name[hne]=आडियो सीडी @@ -43,6 +45,7 @@ Name[lt]=Audio CD Name[lv]=Audio diski Name[mk]=Аудио ЦД-а +Name[ms]=Audio CDs Name[nb]=Lyd-CD-er Name[nds]=Klang-CDs Name[ne]=अडियो सीडी @@ -51,7 +54,7 @@ Name[pa]=ਆਡੀਓ CD Name[pl]=Przeglądarka audio CD Name[pt]=CDs de Áudio -Name[pt_BR]=CDs de Áudio +Name[pt_BR]=CDs de áudio Name[ro]=CD-uri audio Name[ru]=Звуковые CD Name[se]=Jietna-CD:at @@ -85,6 +88,7 @@ Comment[da]=Indstilling af IO-slave til lyd-cd'er Comment[de]=Einrichtung des Ein-/Ausgabemoduls für Audio-CDs Comment[el]=Ρύθμιση Audiocd IO Slave +Comment[en_GB]=Audiocd IO Slave Configuration Comment[eo]=Agordo de la son-KD-a IO-sklavo Comment[es]=Configuración del esclavo de E/S de audiocd Comment[et]=Audio CD IO mooduli seadistamine @@ -117,7 +121,7 @@ Comment[pa]=ਆਡੀਓ ਸੀਡੀ IO ਸਲੇਵ ਸੰਰਚਨਾ Comment[pl]=Konfiguracja procedury we/wy dla audio CD Comment[pt]=Configuração do IO Slave de CDs-Áudio -Comment[pt_BR]=Configuração do IO Slave Audiocd +Comment[pt_BR]=Configuração do IO Slave audiocd Comment[ro]=Configurează dispozitivul I/O pentru CD audio Comment[ru]=Настройка протокола AudioCD Comment[se]=Heivet SO-šláva jietna-CD:aid várás @@ -140,6 +144,7 @@ Keywords=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate Keywords[ar]=قرص مدمج صوتى، صوت، قرص مدمج، Ogg ، Vorbis ،الترميز، CDDA ،معدل البت Keywords[bg]=аудио,диск,компактдиск,КД,кодек,музика,Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate +Keywords[bn]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate Keywords[br]=CD klevet,CD,Ogg,Vorbis,Kodadur,CDDA,Feur Keywords[ca]=Àudio CD,CD,Ogg,Vorbis,Codificació,CDDA,Taxa de bits Keywords[cs]=Zvukové CD,CD,Ogg,Vorbis,Kódování,CDDA,Bitrate,CDDB @@ -147,6 +152,7 @@ Keywords[da]=Lyd-cd,CD,Ogg,Vorbis,Indkodning,CDDA,Bitrate Keywords[de]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate,MP3 Keywords[el]=CD μουσικής,CD,Ogg,Vorbis,Κωδικοποίηση,CDDA,Ρυθμός bit +Keywords[en_GB]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate Keywords[eo]=Sona KD,KD,Ogg,Vorbis,Kodado,CDDA,Bitkvanto Keywords[es]=CD de audio,CD,Ogg,Vorbis,Codificación,CDDA,Tasa de bits Keywords[et]=audio,heli,CD,Ogg,Vorbis,kodeering,CDDA,bitikiirus @@ -156,16 +162,21 @@ Keywords[fr]=CD audio,CD,Ogg,Vorbis,Encodage,CDDA,débit Keywords[ga]=Dlúthdhiosca Fuaime,Dlúthdhiosca,Ogg,Vorbis,Ionchódú,CDDA,Ráta Giotán Keywords[gl]=Audio CD,CD,Ogg,Vorbis,Codificación,CDDA,Taxa de Bits +Keywords[he]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate Keywords[hi]=ऑडियो सीडी,सीडी,ऑग,वॉर्बिस,एनकोडिंग,सीडीडीए,बिटरेट Keywords[hne]=आडियो सीडी,सीडी,ओग,वार्बिस,एनकोडिंग,सीडीडीए,बिटरेट Keywords[hu]=hang-CD,CD,Ogg,Vorbis,kódolás,CDDA,bitráta +Keywords[is]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate Keywords[it]=CD Audio,CD,Ogg,Vorbis,Codifica,CDDA,Bitrate Keywords[ja]=オーディオ CD,CD,Ogg,Vorbis,エンコーディング,CDDA,ビットレート +Keywords[kk]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate Keywords[km]=ស៊ីឌីអូឌីយ៉ូស៊ីឌី, Ogg, Vorbis, ការអ៊ិនកូដ, CDDA, អត្រាប៊ីត Keywords[ko]=오디오 CD,CD,Ogg,인코딩,CDDA +Keywords[ku]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate Keywords[lt]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate,įkodavimas Keywords[lv]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate,Kodēšana,Bitātrums Keywords[mk]=Аудио CD,CD,Ogg,Vorbis,Кодирање,CDDA,Брзина во битови +Keywords[ms]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate Keywords[nb]=Audio CD,CD,Ogg,Vorbis,Koding,CDDA,Bitrate Keywords[nds]=Audio-CD,Klang-CD,CD,Ogg,Vorbis,Koderen,CDDA,Bitrate Keywords[ne]=अडियो सीडी,सीडी,अग,भर्बिस,सङ्केतन,सीडीडीए,बिट्रेट @@ -174,7 +185,7 @@ Keywords[pa]=ਆਡੀਓ CD,CD,Ogg,Vorbis,ਇਕੋਡਿੰਗ,CDDA,ਬਿੱਟਰੇਟ Keywords[pl]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate, Kodowanie Keywords[pt]=CD Áudio,CD,Ogg,Vorbis,Codificação,CDDA,Taxa -Keywords[pt_BR]=CD de Áudio,CD,Ogg,Vorbis,Codificação,CDDA,Taxa de Bits +Keywords[pt_BR]=CD de áudio,CD,Ogg,Vorbis,Codificação,CDDA,Taxa de bits Keywords[ro]=CD audio,ogg,vorbis,codare,CDDA,rată de bit Keywords[ru]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate,битрейт Keywords[sk]=zvukové CD,CD,Ogg,Vorbis,kódovanie,CDDA,bitová frekvencia @@ -190,5 +201,7 @@ Keywords[wa]=plake lazer odio,CD,Ogg,Vorbis,Ecôdaedje,Encoding,CDDA,Bitrate,roedeur des bits Keywords[x-test]=xxAudio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitratexx Keywords[zh_CN]=Audio CD,音频 CD,CD,Ogg,Vorbis,Encding,编码,CDDA,Bitrate,码率 +Keywords[zh_HK]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate +Keywords[zh_TW]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate Categories=Qt;KDE;X-KDE-settings-sound; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp new/kdemultimedia-4.3.3/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp --- old/kdemultimedia-4.3.1/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp 2008-10-23 01:05:13.000000000 +0200 +++ new/kdemultimedia-4.3.3/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp 2009-10-02 10:20:27.000000000 +0200 @@ -78,6 +78,8 @@ } EncoderVorbis::~EncoderVorbis(){ + vorbis_info_clear(&d->vi); + vorbis_comment_clear(&d->vc); delete d; } @@ -172,21 +174,15 @@ while(int result=ogg_stream_pageout(&d->os,&d->og)) { if (!result) break; - QByteArray output; - char * oggheader = reinterpret_cast<char *>(d->og.header); char * oggbody = reinterpret_cast<char *>(d->og.body); if (d->og.header_len) { - output.setRawData(oggheader, d->og.header_len); - ioslave->data(output); - output.clear(); + ioslave->data(QByteArray::fromRawData(oggheader, d->og.header_len)); } if (d->og.body_len) { - output.setRawData(oggbody, d->og.body_len); - ioslave->data(output); - output.clear(); + ioslave->data(QByteArray::fromRawData(oggbody, d->og.body_len)); } processed += d->og.header_len + d->og.body_len; } @@ -252,21 +248,15 @@ if (!result) break; - QByteArray output; - char * oggheader = reinterpret_cast<char *>(d->og.header); char * oggbody = reinterpret_cast<char *>(d->og.body); if (d->og.header_len) { - output.setRawData(oggheader, d->og.header_len); - ioslave->data(output); - output.clear(); + ioslave->data(QByteArray::fromRawData(oggheader, d->og.header_len)); } if (d->og.body_len) { - output.setRawData(oggbody, d->og.body_len); - ioslave->data(output); - output.clear(); + ioslave->data(QByteArray::fromRawData(oggbody, d->og.body_len)); } } return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui new/kdemultimedia-4.3.3/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui --- old/kdemultimedia-4.3.1/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui 2009-04-28 15:47:53.000000000 +0200 +++ new/kdemultimedia-4.3.3/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui 2009-10-02 10:20:27.000000000 +0200 @@ -305,7 +305,7 @@ <property name="maximum" > <number>10000</number> </property> - <property name="precision" > + <property name="decimals" > <number>1</number> </property> <property name="whatsThis" stdset="0" > diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kmix/kmix.desktop new/kdemultimedia-4.3.3/kmix/kmix.desktop --- old/kdemultimedia-4.3.1/kmix/kmix.desktop 2009-07-21 17:21:03.000000000 +0200 +++ new/kdemultimedia-4.3.3/kmix/kmix.desktop 2009-10-30 13:30:24.000000000 +0100 @@ -16,6 +16,7 @@ GenericName[da]=Lydmikser GenericName[de]=Lautstärkeregler GenericName[el]=Μείκτης ήχου +GenericName[en_GB]=Sound Mixer GenericName[eo]=Sonmiksilo GenericName[es]=Mezclador de audio GenericName[et]=Helimikser @@ -49,7 +50,7 @@ GenericName[pa]=ਸਾਊਂਡ ਮਿਕਸਰ GenericName[pl]=Ustawienia głośności GenericName[pt]=Mistura de Áudio -GenericName[pt_BR]=Mixer de Som +GenericName[pt_BR]=Mixer de som GenericName[ro]=Mixer de sunet GenericName[ru]=Звуковой микшер GenericName[se]=Jietnamixer @@ -74,17 +75,71 @@ Name=KMix Name[af]=Kmix Name[ar]=مازج كدى +Name[be]=KMix +Name[bg]=KMix Name[bn]=কে-মিক্স +Name[br]=KMix +Name[ca]=KMix +Name[cs]=KMix +Name[cy]=KMix +Name[da]=KMix +Name[de]=KMix +Name[el]=KMix +Name[en_GB]=KMix +Name[eo]=KMix +Name[es]=KMix +Name[et]=KMix +Name[eu]=KMix +Name[fi]=KMix +Name[fr]=KMix +Name[ga]=KMix +Name[gl]=KMix +Name[he]=KMix Name[hi]=के-मिक्स Name[hne]=के-मिक्स +Name[hr]=KMix +Name[hu]=KMix +Name[is]=KMix +Name[it]=KMix +Name[ja]=KMix +Name[kk]=KMix +Name[km]=KMix +Name[ko]=KMix +Name[ku]=KMix +Name[lt]=KMix +Name[lv]=KMix +Name[mk]=KMix +Name[ms]=KMix +Name[nb]=KMix +Name[nds]=KMix Name[ne]=केडीई मिक्स +Name[nl]=KMix +Name[nn]=KMix +Name[oc]=KMix Name[pa]=ਕੇ-ਮਿਕਸ -Name[sr]=К‑мискета +Name[pl]=KMix +Name[pt]=KMix +Name[pt_BR]=KMix +Name[ro]=KMix +Name[ru]=KMix +Name[se]=KMix +Name[sk]=KMix +Name[sl]=KMix +Name[sr]=К‑миксета Name[sr@latin]=K‑mikseta Name[sv]=Kmix Name[ta]=கேமிக்ஸ் Name[tg]=KОмезиш +Name[th]=KMix +Name[tr]=KMix +Name[uk]=KMix +Name[uz]=KMix +Name[uz@cyrillic]=KMix +Name[wa]=KMix +Name[xh]=KMix Name[x-test]=xxKMixxx +Name[zh_CN]=KMix +Name[zh_HK]=KMix Name[zh_TW]=KMix 混音器 X-KDE-StartupNotify=true X-DBUS-StartupType=Unique diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kmix/kmix.notifyrc new/kdemultimedia-4.3.3/kmix/kmix.notifyrc --- old/kdemultimedia-4.3.1/kmix/kmix.notifyrc 2009-07-29 13:11:39.000000000 +0200 +++ new/kdemultimedia-4.3.3/kmix/kmix.notifyrc 2009-10-02 10:20:27.000000000 +0200 @@ -8,6 +8,7 @@ Comment[da]=Lydmikser Comment[de]=Lautstärkeregler Comment[el]=Μείκτης ήχου +Comment[en_GB]=Sound Mixer Comment[eo]=Sonmiksilo Comment[es]=Mezclador de sonido Comment[et]=Helimikser @@ -34,7 +35,7 @@ Comment[pa]=ਸਾਊਂਡ ਮਿਕਸਰ Comment[pl]=Mikser dźwięku Comment[pt]=Mistura de Som -Comment[pt_BR]=Mixer de Som +Comment[pt_BR]=Mixer de som Comment[ro]=Mixer de sunet Comment[ru]=Звуковой микшер Comment[se]=Jietnamixer @@ -59,6 +60,7 @@ Name[da]=Erstatning for lydenhed Name[de]=Ausweichgerät für Audio Name[el]=Αναπληρωματική συσκευή ήχου +Name[en_GB]=Audio Device Fallback Name[eo]=Sonaparata malantaŭiro Name[es]=Dispositivo de audio alternativo Name[et]=Varuheliseade @@ -83,7 +85,7 @@ Name[pa]=ਆਡੀਓ ਜੰਤਰ ਫਾਲਬੈਕ Name[pl]=Domyślne urządzenia audio Name[pt]=Dispositivo Alternativo de Áudio: -Name[pt_BR]=Dispositivo de Áudio para "Fallback" +Name[pt_BR]=Dispositivo de áudio alternativo Name[ro]=Dispozitiv audio de rezervă Name[ru]=Звуковое устройство по умолчанию Name[sl]=Zasilna zvočna naprava @@ -105,6 +107,7 @@ Comment[da]=Bekendtgørelse af automatisk erstatning hvis den foretrukne enhed er utilgængelig Comment[de]=Benachrichtigung bei automatischem Wechsel zum Ausweichgerät, wenn das bevorzugte Gerät nicht verfügbar ist Comment[el]=Ειδοποίηση αυτόματης χρήσης της αναπληρωματικής συσκευής ήχου, αν η προκαθορισμένη δεν είναι διαθέσιμη +Comment[en_GB]=Notification on automatic fallback if the preferred device is unavailable Comment[es]=Notificación sobre la selección automática de un dispositivo de audio alternativo si el dispositivo preferido no está disponibles Comment[et]=Automaatne varuvariant, kui eelistatud seade pole saadaval Comment[eu]=Jakinarazi atzera automatikoki itzultzean hobetsitako gailua erabilgarria ez badago diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kmix/kmix_autostart.desktop new/kdemultimedia-4.3.3/kmix/kmix_autostart.desktop --- old/kdemultimedia-4.3.1/kmix/kmix_autostart.desktop 2009-07-21 17:21:03.000000000 +0200 +++ new/kdemultimedia-4.3.3/kmix/kmix_autostart.desktop 2009-10-30 13:30:24.000000000 +0100 @@ -21,6 +21,7 @@ GenericName[da]=Lydmikser GenericName[de]=Lautstärkeregler GenericName[el]=Μείκτης ήχου +GenericName[en_GB]=Sound Mixer GenericName[eo]=Sonmiksilo GenericName[es]=Mezclador de audio GenericName[et]=Helimikser @@ -54,7 +55,7 @@ GenericName[pa]=ਸਾਊਂਡ ਮਿਕਸਰ GenericName[pl]=Ustawienia głośności GenericName[pt]=Mistura de Áudio -GenericName[pt_BR]=Mixer de Som +GenericName[pt_BR]=Mixer de som GenericName[ro]=Mixer de sunet GenericName[ru]=Звуковой микшер GenericName[se]=Jietnamixer @@ -79,16 +80,70 @@ Name=KMix Name[af]=Kmix Name[ar]=مازج كدى +Name[be]=KMix +Name[bg]=KMix Name[bn]=কে-মিক্স +Name[br]=KMix +Name[ca]=KMix +Name[cs]=KMix +Name[cy]=KMix +Name[da]=KMix +Name[de]=KMix +Name[el]=KMix +Name[en_GB]=KMix +Name[eo]=KMix +Name[es]=KMix +Name[et]=KMix +Name[eu]=KMix +Name[fi]=KMix +Name[fr]=KMix +Name[ga]=KMix +Name[gl]=KMix +Name[he]=KMix Name[hi]=के-मिक्स Name[hne]=के-मिक्स +Name[hr]=KMix +Name[hu]=KMix +Name[is]=KMix +Name[it]=KMix +Name[ja]=KMix +Name[kk]=KMix +Name[km]=KMix +Name[ko]=KMix +Name[ku]=KMix +Name[lt]=KMix +Name[lv]=KMix +Name[mk]=KMix +Name[ms]=KMix +Name[nb]=KMix +Name[nds]=KMix Name[ne]=केडीई मिक्स +Name[nl]=KMix +Name[nn]=KMix +Name[oc]=KMix Name[pa]=ਕੇ-ਮਿਕਸ -Name[sr]=К‑мискета +Name[pl]=KMix +Name[pt]=KMix +Name[pt_BR]=KMix +Name[ro]=KMix +Name[ru]=KMix +Name[se]=KMix +Name[sk]=KMix +Name[sl]=KMix +Name[sr]=К‑миксета Name[sr@latin]=K‑mikseta Name[sv]=Kmix Name[ta]=கேமிக்ஸ் Name[tg]=KОмезиш +Name[th]=KMix +Name[tr]=KMix +Name[uk]=KMix +Name[uz]=KMix +Name[uz@cyrillic]=KMix +Name[wa]=KMix +Name[xh]=KMix Name[x-test]=xxKMixxx +Name[zh_CN]=KMix +Name[zh_HK]=KMix Name[zh_TW]=KMix 混音器 Categories=Qt;KDE;AudioVideo;Mixer; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kmix/kmixapplet.desktop new/kdemultimedia-4.3.3/kmix/kmixapplet.desktop --- old/kdemultimedia-4.3.1/kmix/kmixapplet.desktop 2009-07-08 16:47:19.000000000 +0200 +++ new/kdemultimedia-4.3.3/kmix/kmixapplet.desktop 2009-10-02 10:20:27.000000000 +0200 @@ -10,6 +10,7 @@ Name[da]=Lydmikser Name[de]=Lautstärkeregler Name[el]=Μείκτης ήχου +Name[en_GB]=Sound Mixer Name[eo]=Sonmiksilo Name[es]=Mezclador de sonido Name[et]=Helimikser @@ -43,7 +44,7 @@ Name[pa]=ਸਾਊਂਡ ਮਿਕਸਰ Name[pl]=Mikser dźwięku Name[pt]=Mistura de Áudio -Name[pt_BR]=Mixer de Som +Name[pt_BR]=Mixer de som Name[ro]=Mixer de sunet Name[ru]=Звуковой микшер Name[sk]=Zvukový mixér @@ -72,6 +73,7 @@ Comment[da]=Viser og giver dig mulighed for at styre lydstyrker Comment[de]=Zeigt Ihnen die Lautstärkeregler und lässt Sie die Lautstärke kontrollieren Comment[el]=Εμφανίζει και σας επιτρέπει να αλλάξετε την ένταση του ήχου +Comment[en_GB]=Shows and let you control sound volumes Comment[eo]=Montras kaj permesas kontroli al vi la sonajn laŭtecojn Comment[es]=Muestra y le deja controlar los volúmenes de sonido Comment[et]=Näitab ja võimaldab kontrollida helitugevust diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kmix/kmixctrl_restore.desktop new/kdemultimedia-4.3.3/kmix/kmixctrl_restore.desktop --- old/kdemultimedia-4.3.1/kmix/kmixctrl_restore.desktop 2009-06-09 18:09:32.000000000 +0200 +++ new/kdemultimedia-4.3.3/kmix/kmixctrl_restore.desktop 2009-10-02 10:20:27.000000000 +0200 @@ -12,6 +12,7 @@ Name[da]=Genskab mikserindstillinger Name[de]=Lautstärkeeinstellungen wiederherstellen Name[el]=Αποκατάσταση ρυθμίσεων μείκτη +Name[en_GB]=Restore Mixer Settings Name[eo]=Restarigi la miksilan agordon Name[es]=Restaurar las opciones del mezclador Name[et]=Mikseri seadistuste taastamine @@ -45,7 +46,7 @@ Name[pa]=ਮਿਕਸਰ ਸੈਟਿੰਗ ਰੀਸਟੋਰ Name[pl]=Odtwarzanie ustawień miksera Name[pt]=Repor a Configuração do Volume -Name[pt_BR]=Restaurar Configurações do Mixer +Name[pt_BR]=Restaurar configurações do Mixer Name[ro]=Reface setările mixerului Name[ru]=Восстановление настроек микшера Name[se]=Máhcat mixerheivehusat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kmix/restore_kmix_volumes.desktop new/kdemultimedia-4.3.3/kmix/restore_kmix_volumes.desktop --- old/kdemultimedia-4.3.1/kmix/restore_kmix_volumes.desktop 2009-06-03 13:54:46.000000000 +0200 +++ new/kdemultimedia-4.3.3/kmix/restore_kmix_volumes.desktop 2009-10-02 10:20:27.000000000 +0200 @@ -15,6 +15,7 @@ Name[da]=Genskab mikserlydstyrke Name[de]=Lautstärken wiederherstellen Name[el]=Επαναφορά των εντάσεων του μείκτη +Name[en_GB]=Restore Mixer Volumes Name[eo]=Restarigi la miksilajn laŭtecojn Name[es]=Restaurar los volúmenes del mezclador Name[et]=Mikseri helitugevuste taastamine @@ -46,7 +47,7 @@ Name[pa]=ਮਿਕਸਰ ਵਾਲੀਅਮ ਰੀ-ਸਟੋਰ ਕਰੋ Name[pl]=Odtwarzanie głośności miksera Name[pt]=Repor os Volumes -Name[pt_BR]=Restaurar Volumes do Mixer +Name[pt_BR]=Restaurar volumes do Mixer Name[ro]=Reface volumele mixerului Name[ru]=Восстановление настроек микшера Name[sk]=Obnoviť nastavenia mixéra diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kscd/kscd-play-audiocd.desktop new/kdemultimedia-4.3.3/kscd/kscd-play-audiocd.desktop --- old/kdemultimedia-4.3.1/kscd/kscd-play-audiocd.desktop 2009-07-29 13:11:39.000000000 +0200 +++ new/kdemultimedia-4.3.3/kscd/kscd-play-audiocd.desktop 2009-10-02 10:20:23.000000000 +0200 @@ -14,6 +14,7 @@ Name[da]=Afspil lyd-cd med KsCD Name[de]=Audio-CD mit KsCD abspielen Name[el]=Αναπαραγωγή CD ήχου με το KsCD +Name[en_GB]=Play Audio CD with KsCD Name[es]=Reproducir el CD de audio con KsCD Name[et]=Audio-CD esitamine KsCD-ga Name[fr]=Lire les CD audio avec KsCD @@ -22,7 +23,7 @@ Name[he]=נגן תקליטור מוזיקה באמצעות KsCD Name[hu]=Hang-CD-lejátszás a KsCD-vel Name[is]=Spila hljóðdisk með KsCD -Name[it]=Rirpoduci i CD audio con KsCD +Name[it]=Riproduci i CD audio con KsCD Name[ja]=KsCD でオーディオ CD を再生 Name[km]=ចាក់ស៊ីឌីអូឌីយ៉ូដោយប្រើ KsCD Name[lv]=Atskaņot Audio CD izmantojot KsCD programmu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kscd/kscd.cpp new/kdemultimedia-4.3.3/kscd/kscd.cpp --- old/kdemultimedia-4.3.1/kscd/kscd.cpp 2008-10-23 01:05:11.000000000 +0200 +++ new/kdemultimedia-4.3.3/kscd/kscd.cpp 2009-10-02 10:20:23.000000000 +0200 @@ -745,7 +745,7 @@ { writeSettings(); KConfigGroup config(KApplication::kApplication()->sessionConfig(), i18nc("General option in the configuration dialog","General")); - config.writeEntry(i18n("Show"), isVisible()); + //config.writeEntry(i18n("Show"), isVisible()); return true; } @@ -866,8 +866,12 @@ if (kapp->isSessionRestored()) { + // The user has no way to show it if it's hidden - so why start it hidden? +#if 0 KConfigGroup group(KApplication::kApplication()->sessionConfig(), "General"); - if (group.readEntry("Show", false)){ + if (group.readEntry("Show", false)) +#endif + { k->show(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/kscd/kscd.desktop new/kdemultimedia-4.3.3/kscd/kscd.desktop --- old/kdemultimedia-4.3.1/kscd/kscd.desktop 2009-07-08 16:47:17.000000000 +0200 +++ new/kdemultimedia-4.3.3/kscd/kscd.desktop 2009-10-30 13:30:23.000000000 +0100 @@ -11,6 +11,7 @@ GenericName[da]=Cd-afspiller GenericName[de]=CD-Wiedergabe GenericName[el]=Αναπαραγωγέας CD +GenericName[en_GB]=CD Player GenericName[eo]=KD-ludilo GenericName[es]=Reproductor de CD GenericName[et]=CD mängija @@ -23,6 +24,7 @@ GenericName[he]=נגן תקליטורים GenericName[hi]=सीडी प्लेयर GenericName[hne]=सीडी प्लेयर +GenericName[hr]=CD Player GenericName[hu]=CD-lejátszó GenericName[is]=CD spilari GenericName[it]=Lettore CD @@ -69,14 +71,71 @@ GenericName[zh_TW]=CD 播放器 Name=KsCD Name[af]=Kscd +Name[ar]=KsCD +Name[be]=KsCD +Name[bg]=KsCD Name[bn]=কে-এস-সিডি +Name[br]=KsCD +Name[ca]=KsCD +Name[cs]=KsCD +Name[cy]=KsCD +Name[da]=KsCD +Name[de]=KsCD +Name[el]=KsCD +Name[en_GB]=KsCD +Name[eo]=KsCD +Name[es]=KsCD +Name[et]=KsCD +Name[eu]=KsCD +Name[fi]=KsCD +Name[fr]=KsCD +Name[ga]=KsCD +Name[gl]=KsCD +Name[he]=KsCD Name[hi]==के-एससीडी Name[hne]==के-एससीडी +Name[hr]=KsCD +Name[hu]=KsCD +Name[is]=KsCD +Name[it]=KsCD +Name[ja]=KsCD +Name[kk]=KsCD +Name[km]=KsCD +Name[ko]=KsCD +Name[ku]=KsCD +Name[lt]=KsCD +Name[lv]=KsCD +Name[mk]=KsCD +Name[ms]=KsCD +Name[nb]=KsCD +Name[nds]=KsCD +Name[ne]=KsCD +Name[nl]=KsCD +Name[nn]=KsCD +Name[pa]=KsCD +Name[pl]=KsCD +Name[pt]=KsCD +Name[pt_BR]=KsCD +Name[ro]=KsCD +Name[ru]=KsCD +Name[se]=KsCD +Name[sk]=KsCD +Name[sl]=KsCD Name[sr]=КсЦД +Name[sr@latin]=KsCD Name[sv]=Kscd Name[ta]=Ksகுறுந்தகடு Name[tg]=KsДиски Фишурда +Name[th]=KsCD +Name[tr]=KsCD +Name[uk]=KsCD +Name[uz]=KsCD +Name[uz@cyrillic]=KsCD +Name[wa]=KsCD +Name[xh]=KsCD Name[x-test]=xxKsCDxx +Name[zh_CN]=KsCD +Name[zh_HK]=KsCD Name[zh_TW]=KsCD 播放器 Exec=kscd -caption "%c" %i X-DocPath=kscd/index.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/libkcddb/kcmcddb/libkcddb.desktop new/kdemultimedia-4.3.3/libkcddb/kcmcddb/libkcddb.desktop --- old/kdemultimedia-4.3.1/libkcddb/kcmcddb/libkcddb.desktop 2009-07-21 17:21:03.000000000 +0200 +++ new/kdemultimedia-4.3.3/libkcddb/kcmcddb/libkcddb.desktop 2009-10-02 10:20:27.000000000 +0200 @@ -18,6 +18,7 @@ Name[da]=CDDB-hentning Name[de]=CDDB-Abfrage Name[el]=Ανάκτηση CDDB +Name[en_GB]=CDDB Retrieval Name[eo]=CDDB-serĉo Name[es]=Descarga de CDDB Name[et]=CDDB ülekanded @@ -48,6 +49,7 @@ Name[ne]=सीडीडीबी पुनः प्राप्ति Name[nl]=CDDB-informatie Name[nn]=CDDB-henting +Name[oc]=CDDB Retrieval Name[pa]=CDDB ਪਰਾਪਤੀ Name[pl]=Pobieranie z CDDB Name[pt]=Transferência de CDDB @@ -81,6 +83,7 @@ GenericName[da]=CDDB-indstilling GenericName[de]=CDDB-Einrichtung GenericName[el]=Ρύθμιση CDDB +GenericName[en_GB]=CDDB Configuration GenericName[eo]=CDDB-agordo GenericName[es]=Configuración de CDDB GenericName[et]=CDDB seadistamine @@ -130,6 +133,7 @@ GenericName[uz]=CDDB moslamasi GenericName[uz@cyrillic]=CDDB мосламаси GenericName[wa]=Apontiaedje di CDDB +GenericName[xh]=CDDB Configuration GenericName[x-test]=xxCDDB Configurationxx GenericName[zh_CN]=CDDB 配置 GenericName[zh_HK]=CDDB 設定 @@ -144,6 +148,7 @@ Comment[da]=Indstil at hente via CDDB Comment[de]=CDDB-Abfrage einrichten Comment[el]=Ρύθμιση της ανάκτησης CDDB +Comment[en_GB]=Configure the CDDB Retrieval Comment[eo]=Agordi la CDDB-serĉon Comment[es]=Configurar la descarga de CDDB Comment[et]=CDDB ülekannete seadistamine @@ -175,7 +180,7 @@ Comment[pa]=CDDB ਪ੍ਰਾਪਤੀ ਦੀ ਸੰਰਚਨਾ Comment[pl]=Konfiguracja pobierania danych z CDDB Comment[pt]=Configurar a Transferência de CDDB -Comment[pt_BR]=Configurar a Recuperação do CDDB +Comment[pt_BR]=Configurar a recuperação do CDDB Comment[ro]=Configurează căutarea CDDB Comment[ru]=Настройка CDDB Comment[sk]=Nastavenie CDDB @@ -195,13 +200,69 @@ Comment[zh_TW]=CDDB 取得資訊設定 Keywords=cddb +Keywords[ar]=cddb +Keywords[be]=cddb +Keywords[bg]=cddb +Keywords[bn]=cddb +Keywords[br]=cddb +Keywords[ca]=cddb +Keywords[cs]=cddb +Keywords[cy]=cddb +Keywords[da]=cddb +Keywords[de]=cddb +Keywords[el]=cddb +Keywords[en_GB]=cddb +Keywords[eo]=cddb +Keywords[es]=cddb +Keywords[et]=cddb +Keywords[eu]=cddb +Keywords[fi]=cddb +Keywords[fr]=cddb +Keywords[ga]=cddb +Keywords[gl]=cddb +Keywords[he]=cddb Keywords[hi]=सीडीडीबी Keywords[hne]=सीडीडीबी +Keywords[hu]=cddb +Keywords[is]=cddb +Keywords[it]=cddb +Keywords[ja]=cddb +Keywords[kk]=cddb +Keywords[km]=cddb +Keywords[ko]=cddb +Keywords[ku]=cddb +Keywords[lt]=cddb +Keywords[lv]=cddb +Keywords[mk]=cddb +Keywords[ms]=cddb +Keywords[nb]=cddb Keywords[nds]=CDDB Keywords[ne]=सीडीडीबी +Keywords[nl]=cddb +Keywords[nn]=cddb +Keywords[oc]=cddb +Keywords[pa]=cddb +Keywords[pl]=cddb +Keywords[pt]=cddb +Keywords[pt_BR]=cddb +Keywords[ro]=cddb +Keywords[ru]=cddb +Keywords[sk]=cddb +Keywords[sl]=cddb Keywords[sr]=CDDB,ЦДДБ Keywords[sr@latin]=CDDB,CDDB +Keywords[sv]=cddb Keywords[ta]=குறுந்தகடு தகவல்தளம் +Keywords[tg]=cddb +Keywords[th]=cddb +Keywords[tr]=cddb +Keywords[uk]=cddb +Keywords[uz]=cddb +Keywords[uz@cyrillic]=cddb +Keywords[wa]=cddb Keywords[x-test]=xxcddbxx +Keywords[zh_CN]=cddb +Keywords[zh_HK]=cddb +Keywords[zh_TW]=cddb Categories=Qt;KDE;X-KDE-settings-sound; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/mplayerthumbs/src/configuration/main.cpp new/kdemultimedia-4.3.3/mplayerthumbs/src/configuration/main.cpp --- old/kdemultimedia-4.3.1/mplayerthumbs/src/configuration/main.cpp 2009-05-06 12:14:51.000000000 +0200 +++ new/kdemultimedia-4.3.3/mplayerthumbs/src/configuration/main.cpp 2009-10-02 10:20:27.000000000 +0200 @@ -33,7 +33,7 @@ int main(int argc, char **argv) { - KAboutData about("MPlayerThumbsConfig", 0, ki18n(I18N_NOOP("MPlayerThumbs Configuration Utility")), version, ki18n(description), + KAboutData about("MPlayerThumbsConfig", "mplayerthumbsconfig", ki18n(I18N_NOOP("MPlayerThumbs Configuration Utility")), version, ki18n(description), KAboutData::License_GPL, ki18n("(C) 2006 Marco Gulino")); about.addAuthor( ki18n("Marco Gulino"), KLocalizedString(), "marco(a)kmobiletools.org" ); KCmdLineArgs::init(argc, argv, &about); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/mplayerthumbs/src/mplayervideobackend.cpp new/kdemultimedia-4.3.3/mplayerthumbs/src/mplayervideobackend.cpp --- old/kdemultimedia-4.3.1/mplayerthumbs/src/mplayervideobackend.cpp 2009-05-06 12:14:51.000000000 +0200 +++ new/kdemultimedia-4.3.3/mplayerthumbs/src/mplayervideobackend.cpp 2009-10-02 10:20:27.000000000 +0200 @@ -121,8 +121,12 @@ KMD5 md5builder(previewingFile->getFilePath().toLatin1() ); QString md5file=md5builder.hexDigest().data(); QString tmpDirPath = tmpdir->name() + md5file + QDir::separator(); - args << "-nocache" << "-idx" /*@TODO check if it's too slow..*/ << "-ao" << "null"/*"-nosound" << */<< "-speed" << "99" /*<< "-sstep" << "5"*/ - << "-vo" << QString("jpeg:outdir=%1").arg(tmpDirPath ) << "-vf" << QString("scale=%1:%2").arg(scalingWidth).arg(scalingHeight); + args << "-nocache" + // << "-idx" /*@TODO check if it's too slow..*/ Update: probably yes... + << "-ao" << "null"/*"-nosound" << */<< "-speed" << "99" /*<< "-sstep" << "5"*/ + << "-vo" << QString("jpeg:outdir=%1").arg(tmpDirPath ) +// << "-vf" << QString("scale=%1:%2").arg(scalingWidth).arg(scalingHeight) // This is probably just a waste of resources, as KDE API suggests to not scale the image. + ; args+=customargs; if (! startAndWaitProcess(args) ) return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/mplayerthumbs/src/servicesfactory.cpp new/kdemultimedia-4.3.3/mplayerthumbs/src/servicesfactory.cpp --- old/kdemultimedia-4.3.1/mplayerthumbs/src/servicesfactory.cpp 2009-05-08 16:12:03.000000000 +0200 +++ new/kdemultimedia-4.3.3/mplayerthumbs/src/servicesfactory.cpp 2009-10-30 13:30:24.000000000 +0100 @@ -37,16 +37,21 @@ VideoBackendIFace *ServicesFactory::videoBackend(PreviewingFile* previewingFile, MPlayerThumbsCfg* cfg) { kDebug(DBG_AREA) << "videopreview: backend: " << cfg->backend() << endl; switch(cfg->backend() ) { - case VideoBackendIFace::MPlayer: - kDebug(DBG_AREA) << "videopreview: Selected mplayer backend\n"; - return new MPlayerVideoBackend(previewingFile, cfg); - break; #ifdef PHONON_API case VideoBackendIFace::Phonon: kDebug(DBG_AREA) << "videopreview: Selected phonon backend\n"; return new PhononBackend(previewingFile, cfg); break; + case VideoBackendIFace::MPlayer: +#else + #ifdef __GNUC__ + #warning using mplayer as only backend + #endif + default: #endif + kDebug(DBG_AREA) << "videopreview: Selected mplayer backend\n"; + return new MPlayerVideoBackend(previewingFile, cfg); + break; } // Well, we should never be here... return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/mplayerthumbs/src/videopreview.desktop new/kdemultimedia-4.3.3/mplayerthumbs/src/videopreview.desktop --- old/kdemultimedia-4.3.1/mplayerthumbs/src/videopreview.desktop 2009-07-29 13:11:39.000000000 +0200 +++ new/kdemultimedia-4.3.3/mplayerthumbs/src/videopreview.desktop 2009-10-02 10:20:27.000000000 +0200 @@ -8,6 +8,7 @@ Name[da]=Videofiler (MPlayerThumbs) Name[de]=Videodateien (MPlayerThumbs) Name[el]=Αρχεία βίντεο (MPlayerThumbs) +Name[en_GB]=Video Files (MPlayerThumbs) Name[es]=Archivos de vídeo (MPlayerThumbs) Name[et]=Videofailid (MPlayerThumbs) Name[fr]=Fichiers vidéo (MPlayerThumbs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/strigi-analyzer/avi/kfile_avi.desktop new/kdemultimedia-4.3.3/strigi-analyzer/avi/kfile_avi.desktop --- old/kdemultimedia-4.3.1/strigi-analyzer/avi/kfile_avi.desktop 2009-05-14 19:27:36.000000000 +0200 +++ new/kdemultimedia-4.3.3/strigi-analyzer/avi/kfile_avi.desktop 2009-10-02 10:20:23.000000000 +0200 @@ -12,6 +12,7 @@ Name[da]=AVI-info Name[de]=AVI-Info Name[el]=Πληροφορίες AVI +Name[en_GB]=AVI Info Name[eo]=AVI informo Name[es]=Información de AVI Name[et]=AVI info @@ -19,6 +20,7 @@ Name[fa]=اطلاعات AVI Name[fi]=AVI-tiedot Name[fr]=Informations AVI +Name[ga]=AVI Info Name[gl]=Información AVI Name[he]=מידע AVI Name[hi]=एवीआई जानकारी @@ -35,6 +37,7 @@ Name[lt]=AVI informacija Name[lv]=AVI informācija Name[mk]=AVI информации +Name[ms]=AVI Info Name[nb]=AVI informasjon Name[nds]=AVI-Info Name[ne]=AVI सूचना diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/strigi-analyzer/flac/kfile_flac.desktop new/kdemultimedia-4.3.3/strigi-analyzer/flac/kfile_flac.desktop --- old/kdemultimedia-4.3.1/strigi-analyzer/flac/kfile_flac.desktop 2009-03-10 13:26:09.000000000 +0100 +++ new/kdemultimedia-4.3.3/strigi-analyzer/flac/kfile_flac.desktop 2009-10-02 10:20:24.000000000 +0200 @@ -11,6 +11,7 @@ Name[da]=FLAC-Info Name[de]=FLAC-Info Name[el]=Πληροφορίες FLAC +Name[en_GB]=FLAC Info Name[eo]=FLAC informo Name[es]=Información de FLAC Name[et]=FLAC info @@ -18,6 +19,7 @@ Name[fa]=اطلاعات FLAC Name[fi]=FLAC-tiedot Name[fr]=Informations FLAC +Name[ga]=FLAC Info Name[gl]=Información FLAC Name[he]=מידע FLAC Name[hi]=फ्लैक जानकारी diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/strigi-analyzer/mp3/kfile_mp3.desktop new/kdemultimedia-4.3.3/strigi-analyzer/mp3/kfile_mp3.desktop --- old/kdemultimedia-4.3.1/strigi-analyzer/mp3/kfile_mp3.desktop 2009-07-08 16:47:17.000000000 +0200 +++ new/kdemultimedia-4.3.3/strigi-analyzer/mp3/kfile_mp3.desktop 2009-10-02 10:20:23.000000000 +0200 @@ -13,6 +13,7 @@ Name[da]=MP3-info Name[de]=MP3-Info Name[el]=Πληροφορίες MP3 +Name[en_GB]=MP3 Info Name[eo]=MP3 informo Name[es]=Información de MP3 Name[et]=MP3 info @@ -38,6 +39,7 @@ Name[lv]=MP3 informācija Name[mai]=एमपी3 इन्फो Name[mk]=MP3 информации +Name[ms]=MP3 Info Name[nb]=MP3 informasjon Name[nds]=MP3-Info Name[ne]=MP3 सूचना @@ -50,6 +52,7 @@ Name[ro]=Informații MP3 Name[ru]=Сведения о MP3 Name[se]=MP3-dieđut +Name[sk]=MP3 Info Name[sl]=Podatki o MP3 Name[sr]=Подаци о МП3 Name[sr@latin]=Podaci o MP3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/strigi-analyzer/mpc/kfile_mpc.desktop new/kdemultimedia-4.3.3/strigi-analyzer/mpc/kfile_mpc.desktop --- old/kdemultimedia-4.3.1/strigi-analyzer/mpc/kfile_mpc.desktop 2009-05-27 21:54:59.000000000 +0200 +++ new/kdemultimedia-4.3.3/strigi-analyzer/mpc/kfile_mpc.desktop 2009-10-02 10:20:23.000000000 +0200 @@ -6,8 +6,10 @@ Name[br]=Titouroù Musepack Name[ca]=Informació Musepack Name[cs]=Musepack info +Name[da]=Musepack Info Name[de]=Musepack-Info Name[el]=Πληροφορίες Musepack +Name[en_GB]=Musepack Info Name[eo]=Musepack informo Name[es]=Información de Musepack Name[et]=Musepacki info @@ -42,6 +44,7 @@ Name[pt_BR]=Informações Musepack Name[ro]=Informații Musepack Name[ru]=Сведения о Musepack +Name[sk]=Musepack Info Name[sl]=Podatki o Musepack Name[sr]=Подаци о мјузпаку Name[sr@latin]=Podaci o Musepacku diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/strigi-analyzer/ogg/kfile_ogg.desktop new/kdemultimedia-4.3.3/strigi-analyzer/ogg/kfile_ogg.desktop --- old/kdemultimedia-4.3.1/strigi-analyzer/ogg/kfile_ogg.desktop 2009-05-14 19:27:36.000000000 +0200 +++ new/kdemultimedia-4.3.3/strigi-analyzer/ogg/kfile_ogg.desktop 2009-10-02 10:20:24.000000000 +0200 @@ -12,6 +12,7 @@ Name[da]=OGG-info Name[de]=OGG-Info Name[el]=Πληροφορίες OGG +Name[en_GB]=OGG Info Name[eo]=OGG informo Name[es]=Información de OGG Name[et]=OGG info @@ -19,6 +20,7 @@ Name[fa]=اطلاعات OGG Name[fi]=OGG-tiedot Name[fr]=Informations Ogg Vorbis +Name[ga]=OGG Info Name[gl]=Información OGG Name[he]=מידע OGG Name[hi]=ऑग जानकारी @@ -35,6 +37,7 @@ Name[lt]=OGG informacija Name[lv]=OGG informācija Name[mk]=OGG информации +Name[ms]=OGG Info Name[nb]=OGG informasjon Name[nds]=Ogg-Info Name[ne]=अग सूचना @@ -47,6 +50,7 @@ Name[ro]=Informații OGG Name[ru]=Сведения об OGG Name[se]=OGG-dieđut +Name[sk]=OGG Info Name[sl]=Podatki o OGG Name[sr]=Подаци о ОГГ‑у Name[sr@latin]=Podaci o OGG‑u diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/strigi-analyzer/sid/kfile_sid.desktop new/kdemultimedia-4.3.3/strigi-analyzer/sid/kfile_sid.desktop --- old/kdemultimedia-4.3.1/strigi-analyzer/sid/kfile_sid.desktop 2009-03-10 13:26:09.000000000 +0100 +++ new/kdemultimedia-4.3.3/strigi-analyzer/sid/kfile_sid.desktop 2009-10-02 10:20:23.000000000 +0200 @@ -10,6 +10,7 @@ Name[da]=SID-info Name[de]=SID-Info Name[el]=Πληροφορίες SID +Name[en_GB]=SID Info Name[eo]=SID informo Name[es]=Información de SID Name[et]=SID info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/strigi-analyzer/theora/kfile_theora.desktop new/kdemultimedia-4.3.3/strigi-analyzer/theora/kfile_theora.desktop --- old/kdemultimedia-4.3.1/strigi-analyzer/theora/kfile_theora.desktop 2009-03-10 13:26:09.000000000 +0100 +++ new/kdemultimedia-4.3.3/strigi-analyzer/theora/kfile_theora.desktop 2009-10-02 10:20:24.000000000 +0200 @@ -7,8 +7,10 @@ Name[br]=Titouroù diwar-benn theora Name[ca]=Informació theora Name[cs]=theora info +Name[da]=theora Info Name[de]=Theora-Info Name[el]=Πληροφορίες theora +Name[en_GB]=theora Info Name[eo]=theora informo Name[es]=Información de Theora Name[et]=Theora info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.1/strigi-analyzer/wav/kfile_wav.desktop new/kdemultimedia-4.3.3/strigi-analyzer/wav/kfile_wav.desktop --- old/kdemultimedia-4.3.1/strigi-analyzer/wav/kfile_wav.desktop 2009-05-14 19:27:36.000000000 +0200 +++ new/kdemultimedia-4.3.3/strigi-analyzer/wav/kfile_wav.desktop 2009-10-02 10:20:26.000000000 +0200 @@ -11,6 +11,7 @@ Name[da]=WAV-info Name[de]=WAV-Info Name[el]=Πληροφορίες WAV +Name[en_GB]=WAV Info Name[eo]=WAV informo Name[es]=Información de WAV Name[et]=WAV info @@ -18,6 +19,7 @@ Name[fa]=اطلاعات WAV Name[fi]=WAV-tiedot Name[fr]=Informations Wave +Name[ga]=WAV Info Name[gl]=Información WAV Name[he]=מידע WAV Name[hi]=वेव जानकारी @@ -34,6 +36,7 @@ Name[lt]=WAV informacija Name[lv]=WAV informācija Name[mk]=WAV информации +Name[ms]=WAV Info Name[nb]=WAV informasjon Name[nds]=WAV-Info Name[ne]=वाभ सूचना @@ -46,6 +49,7 @@ Name[ro]=Informații WAV Name[ru]=Сведения о WAV Name[se]=WAV-dieđut +Name[sk]=WAV Info Name[sl]=Podatki o WAV Name[sr]=Подаци о ВАВ‑у Name[sr@latin]=Podaci o WAV‑u ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4 for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kdepim4 for openSUSE:Factory checked in at Wed Nov 4 11:26:51 CET 2009. -------- --- KDE/kdepim4/kdepim4.changes 2009-10-17 18:57:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepim4/kdepim4.changes 2009-11-02 22:04:19.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 22:04:13 CET 2009 - dmueller(a)suse.de + +- update to 4.3.3 + * see http://kde.org/announcements/changelogs/changelog4_3_2to4_3_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdepim-4.3.1.tar.bz2 ktimetracker-r1035759.diff New: ---- kdepim-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.0Tr6Iv/_old 2009-11-04 11:26:19.000000000 +0100 +++ /var/tmp/diff_new_pack.0Tr6Iv/_new 2009-11-04 11:26:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdepim4 (Version 4.3.1) +# spec file for package kdepim4 (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -36,8 +36,8 @@ Group: System/GUI/KDE Summary: Base package of kdepim Url: http://www.kde.org -Version: 4.3.1 -Release: 4 +Version: 4.3.3 +Release: 1 Source0: kdepim-%version.tar.bz2 Patch: 4_3_BRANCH.diff Patch1: akregator-useragent.diff @@ -45,7 +45,6 @@ Patch7: knode-kontact-default.diff Patch10: dont-install-private-shlib-namelinks.diff Patch11: nntpjobs.diff -Patch12: ktimetracker-r1035759.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Suggests: akregator @@ -92,7 +91,6 @@ %patch7 #%patch10 %patch11 -%patch12 %build %ifarch ppc64 ++++++ 4_3_BRANCH.diff ++++++ ++++ 11298 lines (skipped) ++++ between KDE/kdepim4/4_3_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdepim4/4_3_BRANCH.diff ++++++ kdepim-4.3.1.tar.bz2 -> kdepim-4.3.3.tar.bz2 ++++++ KDE/kdepim4/kdepim-4.3.1.tar.bz2 /mounts/work_src_done/STABLE/kdepim4/kdepim-4.3.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdevplatform for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kdevplatform for openSUSE:Factory checked in at Wed Nov 4 11:25:22 CET 2009. -------- --- KDE/kdevplatform/kdevplatform.changes 2009-08-22 00:49:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdevplatform/kdevplatform.changes 2009-11-03 23:04:44.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 3 21:33:01 UTC 2009 - beineri(a)opensuse.org + +- update to 0.9.96 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdevplatform-0.9.95.tar.bz2 New: ---- kdevplatform-0.9.96.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevplatform.spec ++++++ --- /var/tmp/diff_new_pack.1hKxBc/_old 2009-11-04 11:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.1hKxBc/_new 2009-11-04 11:23:25.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdevplatform (Version 0.9.95) +# spec file for package kdevplatform (Version 0.9.96) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: Development/Tools/IDE Summary: Base Package for Integrated Development Environments Url: http://www.kdevelop.org -Version: 0.9.95 +Version: 0.9.96 Release: 1 Source0: kdevplatform-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -148,7 +148,6 @@ %_libdir/libkdevplatformshell.so.* %_libdir/libkdevplatformutil.so.* %_libdir/libkdevplatformvcs.so.* -%_libdir/libkdevplatformveritas.so.* %_libdir/libsublime.so.* %_libdir/libkdevplatformdebugger.so.* %_libdir/libkdevplatformtests.so.* @@ -168,7 +167,6 @@ %_kde4_modules/kdevexecute.so %_kde4_modules/kdevfilemanager.so %_kde4_modules/kdevgenericmanager.so -%_kde4_modules/kdevgit.so %_kde4_modules/kdevkonsoleview.so %_kde4_modules/kdevproblemreporter.so %_kde4_modules/kdevprojectmanagerview.so @@ -183,7 +181,6 @@ %_kde_share_dir/apps/kdevcontextbrowser %_kde_share_dir/apps/kdevcvs %_kde_share_dir/apps/kdevfilemanager -%_kde_share_dir/apps/kdevgit %_kde_share_dir/apps/kdevproblemreporter %_kde_share_dir/apps/kdevprojectmanagerview %_kde_share_dir/apps/kdevquickopen @@ -202,7 +199,6 @@ %_kde_share_dir/services/kdevexecute.desktop %_kde_share_dir/services/kdevfilemanager.desktop %_kde_share_dir/services/kdevgenericmanager.desktop -%_kde_share_dir/services/kdevgit.desktop %_kde_share_dir/services/kdevkonsoleview.desktop %_kde_share_dir/services/kdevproblemreporter.desktop %_kde_share_dir/services/kdevprojectmanagerview.desktop @@ -212,27 +208,32 @@ %_kde_share_dir/services/kdevstandardoutputview.desktop %_kde_share_dir/services/kdevsubversion.desktop %_kde_share_dir/servicetypes/kdevelopplugin.desktop -%_libdir/libkdevplatformveritas.so /usr/share/icons/hicolor/22x22/actions/run-clean.png /usr/share/icons/hicolor/22x22/actions/run-install.png %_kde4_modules/kdevappwizard.so %_kde_share_dir/apps/kdevappwizard %_kde_share_dir/services/kdevappwizard.desktop -/usr/share/kde4/apps/kdevcodegen -/usr/share/kde4/apps/kdevdebugger -/usr/share/kde4/apps/kdevdocumentswitcher -/usr/share/kde4/apps/kdevmercurial -/usr/share/kde4/services/kdevdocumentswitcher.desktop -/usr/share/kde4/services/kdevmercurial.desktop +%_kde_share_dir/apps/kdevcodegen +%_kde_share_dir/apps/kdevdebugger +%_kde_share_dir/apps/kdevdocumentswitcher +%_kde_share_dir/apps/kdevmercurial +%_kde_share_dir/services/kdevdocumentswitcher.desktop +%_kde_share_dir/services/kdevmercurial.desktop %if %suse_version > 1100 %_kde4_modules/kdevclassbrowser.so -/usr/share/kde4/apps/kdevclassbrowser -/usr/share/kde4/services/kdevclassbrowser.desktop +%_kde_share_dir/apps/kdevclassbrowser +%_kde_share_dir/services/kdevclassbrowser.desktop %endif %_kde4_modules/kdevopenwith.so %_kde4_modules/kdevpatchreview.so -/usr/share/kde4/apps/kdevpatchreview -/usr/share/kde4/services/kdevopenwith.desktop -/usr/share/kde4/services/kdevpatchreview.desktop +%_kde_share_dir/apps/kdevpatchreview +%_kde_share_dir/services/kdevopenwith.desktop +%_kde_share_dir/services/kdevpatchreview.desktop +%_kde4_modules/kdevdocumentview.so +%_kde4_modules/kdevgrepview.so +%_kde_share_dir/apps/kdevdocumentview +%_kde_share_dir/apps/kdevgrepview +%_kde_share_dir/services/kdevdocumentview.desktop +%_kde_share_dir/services/kdevgrepview.desktop %changelog ++++++ kdevplatform-0.9.95.tar.bz2 -> kdevplatform-0.9.96.tar.bz2 ++++++ ++++ 33160 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4-runtime for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at Wed Nov 4 11:20:10 CET 2009. -------- --- KDE/kdepim4-runtime/kdepim4-runtime.changes 2009-09-24 18:32:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepim4-runtime/kdepim4-runtime.changes 2009-11-02 22:04:55.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 22:04:52 CET 2009 - dmueller(a)suse.de + +- update to 4.3.3 + * see http://kde.org/announcements/changelogs/changelog4_3_2to4_3_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdepim-runtime-4.3.1.tar.bz2 New: ---- kdepim-runtime-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.irnkQb/_old 2009-11-04 11:19:35.000000000 +0100 +++ /var/tmp/diff_new_pack.irnkQb/_new 2009-11-04 11:19:35.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdepim4-runtime (Version 4.3.1) +# spec file for package kdepim4-runtime (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -36,8 +36,8 @@ Group: System/GUI/KDE Summary: Base package of kdepim Url: http://www.kde.org -Version: 4.3.1 -Release: 2 +Version: 4.3.3 +Release: 1 Source0: kdepim-runtime-%version.tar.bz2 Patch: 4_3_BRANCH.diff Patch5: disable-nepomuk-agents.diff ++++++ 4_3_BRANCH.diff ++++++ ++++ 777 lines (skipped) ++++ between KDE/kdepim4-runtime/4_3_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdepim4-runtime/4_3_BRANCH.diff ++++++ kdepim-runtime-4.3.1.tar.bz2 -> kdepim-runtime-4.3.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/agents/nepomuk_contact_feeder/nepomukcontactfeeder.desktop new/kdepim-runtime-4.3.3/agents/nepomuk_contact_feeder/nepomukcontactfeeder.desktop --- old/kdepim-runtime-4.3.1/agents/nepomuk_contact_feeder/nepomukcontactfeeder.desktop 2009-08-27 10:18:29.000000000 +0200 +++ new/kdepim-runtime-4.3.3/agents/nepomuk_contact_feeder/nepomukcontactfeeder.desktop 2009-10-02 10:20:43.000000000 +0200 @@ -5,6 +5,7 @@ Name[da]=Nepomuk kontakt-feeder Name[de]=Kontakte-Modul für Nepomuk Name[el]=Τροφοδότης επαφών Nepomuk +Name[en_GB]=Nepomuk Contact Feeder Name[es]=Proveedor de contactos de Nepomuk Name[et]=Nepomuki kontaktide söötur Name[fr]=Connecteur Nepomuk pour les contacts @@ -33,12 +34,14 @@ Name[uk]=Передавач контактів Nepomuk Name[x-test]=xxNepomuk Contact Feederxx Name[zh_CN]=Nepomuk 联系人采集器 +Name[zh_TW]=Nepomuk Contact Feeder Comment=Extension to push contacts into Nepomuk Comment[ar]=امتداد لدفع جهات الإتصال داخل نبومك Comment[ca]=Extensió per a introduir contactes en el Nepomuk Comment[da]=Udvidelse til at skubbe kontakter ind i Nepomuk Comment[de]=Erweiterung zur Übergabe von Kontakten an Nepomuk Comment[el]=Επέκταση για την τροφοδοσία επαφών στο Nepomuk +Comment[en_GB]=Extension to push contacts into Nepomuk Comment[es]=Extensión para introducir contactos en Nepomuk Comment[et]=Laiendus kontaktide edastamiseks Nepomukile Comment[fr]=Extension pour fournir les contacts à Nepomuk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/agents/nepomuk_email_feeder/nepomukemailfeeder.desktop new/kdepim-runtime-4.3.3/agents/nepomuk_email_feeder/nepomukemailfeeder.desktop --- old/kdepim-runtime-4.3.1/agents/nepomuk_email_feeder/nepomukemailfeeder.desktop 2009-08-27 10:18:29.000000000 +0200 +++ new/kdepim-runtime-4.3.3/agents/nepomuk_email_feeder/nepomukemailfeeder.desktop 2009-10-02 10:20:43.000000000 +0200 @@ -5,6 +5,7 @@ Name[da]=Nepomuk e-mail-feeder Name[de]=E-Mail-Modul für Nepomuk Name[el]=Τροφοδότης EMail του Nepomuk +Name[en_GB]=Nepomuk EMail Feeder Name[es]=Proveedor de correos electrónicos de Nepomuk Name[et]=Nepomuki e-kirjade söötur Name[fr]=Connecteur Nepomuk pour les courriels @@ -33,12 +34,14 @@ Name[uk]=Передавач пошти Nepomuk Name[x-test]=xxNepomuk EMail Feederxx Name[zh_CN]=Nepomuk 邮件采集器 +Name[zh_TW]=Nepomuk EMail Feeder Comment=Extension to push emails into Nepomuk Comment[ar]=امتداد لدفع البريد الإلكتروني داخل نبومك Comment[ca]=Extensió per a introduir correus en el Nepomuk Comment[da]=Udvidelse til at skubbe e-mail ind i Nepomuk Comment[de]=Erweiterung zur Übergabe von E-Mails an Nepomuk Comment[el]=Επέκταση για την τροφοδοσία email στο Nepomuk +Comment[en_GB]=Extension to push emails into Nepomuk Comment[es]=Extensión para introducir correos electrónicos en Nepomuk Comment[et]=Laiendus e-kirjade edastamiseks Nepomukile Comment[fr]=Extension pour fournir les courriels à Nepomuk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/agents/strigifeeder/strigifeeder.desktop new/kdepim-runtime-4.3.3/agents/strigifeeder/strigifeeder.desktop --- old/kdepim-runtime-4.3.1/agents/strigifeeder/strigifeeder.desktop 2009-07-29 13:11:55.000000000 +0200 +++ new/kdepim-runtime-4.3.3/agents/strigifeeder/strigifeeder.desktop 2009-10-30 13:30:43.000000000 +0100 @@ -5,6 +5,7 @@ Name[da]=Strigi-feeder Name[de]=Modul für Strigi Name[el]=Τροφοδότης Strigi +Name[en_GB]=Strigi Feeder Name[es]=Proveedor de datos de Strigi Name[et]=Strigi söötur Name[fr]=Connecteur Strigi @@ -23,7 +24,7 @@ Name[nn]=Strigi-matar Name[pa]=ਸਟਰੀਗੀ ਫੀਡਰ Name[pl]=Obsługa Strigi -Name[pt]=Alimentação do Strigi +Name[pt]=Fonte do Strigi Name[pt_BR]=Alimentador do Strigi Name[ro]=Alimentator Strigi Name[ru]=Поддержка Strigi @@ -33,12 +34,14 @@ Name[uk]=Передавач Strigi Name[x-test]=xxStrigi Feederxx Name[zh_CN]=Strigi 采集器 +Name[zh_TW]=Strigi Feeder Comment=Strigi-based fulltext search Comment[ar]=بحث كامل النص معتمد على سراتجي Comment[ca]=Motor de cerca per text sencer basat en el Strigi Comment[da]=Strigi-baseret fuldtekst-søgning Comment[de]=Strigi-basierte Volltextsuche Comment[el]=Αναζήτηση κειμένου βασισμένη στο Strigi +Comment[en_GB]=Strigi-based fulltext search Comment[es]=Búsqueda de texto completo basada en Strigi Comment[et]=Strigi-põhine täistekstiotsing Comment[fr]=Recherche en texte intégral avec Strigi @@ -57,7 +60,7 @@ Comment[nl]=In teksten zoeken met behulp van Strigi Comment[nn]=Strigi-basert fulltekstsøk Comment[pl]=Oparte na Strigi wyszukiwanie pełnotekstowe -Comment[pt]=Um motor de busca por texto completo baseado no Strigi +Comment[pt]=Pesquisa por texto completo baseada no Strigi Comment[pt_BR]=Pesquisa por texto completo baseada no Strigi Comment[ro]=Căutare integrală de text bazată pe Strigi Comment[ru]=Полнотекстовый поиск посредством Strigi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/akonadi_next/tests/descendantentitiesproxymodeltest.cpp new/kdepim-runtime-4.3.3/akonadi_next/tests/descendantentitiesproxymodeltest.cpp --- old/kdepim-runtime-4.3.1/akonadi_next/tests/descendantentitiesproxymodeltest.cpp 2009-06-24 18:19:58.000000000 +0200 +++ new/kdepim-runtime-4.3.3/akonadi_next/tests/descendantentitiesproxymodeltest.cpp 2009-10-02 10:20:48.000000000 +0200 @@ -465,5 +465,5 @@ } -QTEST_KDEMAIN(DescendantEntitiesProxyModelTest, GUI) +QTEST_KDEMAIN_CORE(DescendantEntitiesProxyModelTest) #include "descendantentitiesproxymodeltest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/akonadi_next/tests/selectionproxymodeltest.cpp new/kdepim-runtime-4.3.3/akonadi_next/tests/selectionproxymodeltest.cpp --- old/kdepim-runtime-4.3.1/akonadi_next/tests/selectionproxymodeltest.cpp 2009-06-24 18:19:58.000000000 +0200 +++ new/kdepim-runtime-4.3.3/akonadi_next/tests/selectionproxymodeltest.cpp 2009-10-02 10:20:48.000000000 +0200 @@ -202,6 +202,6 @@ }; -QTEST_KDEMAIN(SelectionProxyModelTest, GUI) +QTEST_KDEMAIN_CORE(SelectionProxyModelTest) #include "selectionproxymodeltest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/akonadiconsole/akonadiconsole.desktop new/kdepim-runtime-4.3.3/akonadiconsole/akonadiconsole.desktop --- old/kdepim-runtime-4.3.1/akonadiconsole/akonadiconsole.desktop 2009-07-29 13:11:55.000000000 +0200 +++ new/kdepim-runtime-4.3.3/akonadiconsole/akonadiconsole.desktop 2009-10-02 10:20:47.000000000 +0200 @@ -6,6 +6,7 @@ Name[da]=Akonadi-konsol Name[de]=Akonadi-Konsole Name[el]=Κονσόλα Akonadi +Name[en_GB]=Akonadi Console Name[es]=Consola de Akonadi Name[et]=Akonadi konsool Name[fr]=Console Akonadi @@ -45,6 +46,7 @@ Comment[da]=Akonadi håndterings- og fejlretningskonsol Comment[de]=Akonadi-Konsole zur Verwaltung und Fehlersuche Comment[el]=Κονσόλα διαχείρισης και αποσφαλμάτωσης του Akonadi +Comment[en_GB]=Akonadi Management and Debugging Console Comment[es]=Consola de gestión y depuración de Akonadi Comment[et]=Akonadi haldamise ja silumise konsool Comment[fr]=Console de gestion et de déboguage pour Akonadi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/kcm/kcm_akonadi.desktop new/kdepim-runtime-4.3.3/kcm/kcm_akonadi.desktop --- old/kdepim-runtime-4.3.1/kcm/kcm_akonadi.desktop 2009-08-27 10:18:30.000000000 +0200 +++ new/kdepim-runtime-4.3.3/kcm/kcm_akonadi.desktop 2009-10-30 13:30:44.000000000 +0100 @@ -20,10 +20,12 @@ Name[da]=Konfiguration af Akonadi Name[de]=Akonadi-Einrichtung Name[el]=Ρυθμίσεις του Akonadi +Name[en_GB]=Akonadi Configuration Name[es]=Configuración de Akonadi Name[et]=Akonadi seadistused Name[fr]=Configuration d'Akonadi Name[gl]=Configuración do Akonadi +Name[hu]=Akonadi-beállítások Name[it]=Configurazione di Akonadi Name[km]=ការកំណត់រចនាសម្ព័ន្ធ Akonadi Name[lv]=Akonadi konfigurācija @@ -49,6 +51,7 @@ Comment[da]=Konfiguration af Akonadi - framework til håndtering af personlig information (PIM) Comment[de]=Einrichtung des persönlichen Informationsmanagement von Akonadi Comment[el]=Ρύθμιση του διαχειριστή προσωπικών πληροφοριών του Akonadi +Comment[en_GB]=Configuration of the Akonadi Personal Information Management framework Comment[es]=Configuración de la infraestructura para administración de información personal Akonadi Comment[et]=Akonadi personaalse teabe halduse (PIM) raamistiku seadistused Comment[fr]=Configuration du gestionnaire d'informations personnelles Akonadi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/kcm/kcm_akonadi_resources.desktop new/kdepim-runtime-4.3.3/kcm/kcm_akonadi_resources.desktop --- old/kdepim-runtime-4.3.1/kcm/kcm_akonadi_resources.desktop 2009-07-29 13:11:55.000000000 +0200 +++ new/kdepim-runtime-4.3.3/kcm/kcm_akonadi_resources.desktop 2009-10-02 10:20:50.000000000 +0200 @@ -18,6 +18,7 @@ Name[da]=Akonadi ressourcekonfiguration Name[de]=Einrichtung der Akonadi-Ressourcen Name[el]=Ρυθμίσεις πόρων του Akonadi +Name[en_GB]=Akonadi Resources Configuration Name[es]=Configuración de recursos de Akonadi Name[et]=Akonadi ressursside seadistused Name[fr]=Configuration des ressources Akonadi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/kcm/kcm_akonadi_server.desktop new/kdepim-runtime-4.3.3/kcm/kcm_akonadi_server.desktop --- old/kdepim-runtime-4.3.1/kcm/kcm_akonadi_server.desktop 2009-07-29 13:11:55.000000000 +0200 +++ new/kdepim-runtime-4.3.3/kcm/kcm_akonadi_server.desktop 2009-10-02 10:20:50.000000000 +0200 @@ -18,6 +18,7 @@ Name[da]=Konfiguration af Akonadi-server Name[de]=Einrichtung des Akonadi-Servers Name[el]=Ρυθμίσεις εξυπηρετητή του Akonadi +Name[en_GB]=Akonadi Server Configuration Name[es]=Configuración del servidor Akonadi Name[et]=Akonadi serveri seadistused Name[fr]=Configuration du serveur Akonadi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/kresources/kabc/akonadi.desktop new/kdepim-runtime-4.3.3/kresources/kabc/akonadi.desktop --- old/kdepim-runtime-4.3.1/kresources/kabc/akonadi.desktop 2009-08-27 10:18:29.000000000 +0200 +++ new/kdepim-runtime-4.3.3/kresources/kabc/akonadi.desktop 2009-10-02 10:20:45.000000000 +0200 @@ -6,6 +6,7 @@ Name[da]=Akonadi-adressebøger Name[de]=Akonadi-Adressbücher Name[el]=Βιβλία διευθύνσεων του Akonadi +Name[en_GB]=Akonadi Address Books Name[es]=Libreta de direcciones Akonadi Name[et]=Akonadi aadressiraamatud Name[fr]=Carnet d'adresses Akonadi @@ -40,6 +41,7 @@ Comment[da]=Giver adgang til kontakter lagret i Akonadi adressebogs-mapper Comment[de]=Ermöglicht den Zugriff auf Kontakte, die in Akonadi-Adressbuch-Ordnern gespeichert sind. Comment[el]=Προσφέρει πρόσβαση σε επαφές αποθηκευμένες σε φακέλους βιβλίων διευθύνσεων του Akonadi +Comment[en_GB]=Provides access to contacts stored in Akonadi address book folders Comment[es]=Provee acceso a los contactos almacenados en carpetas de la libreta de direcciones de Akonadi Comment[et]=Võimaldab kasutada Akonadi aadressiraamatukaustadesse salvestatud kontakte Comment[fr]=Fourni l'accès aux contacts stockés dans les dossiers du carnet d'adresses Akonadi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/kresources/kcal/akonadi.desktop new/kdepim-runtime-4.3.3/kresources/kcal/akonadi.desktop --- old/kdepim-runtime-4.3.1/kresources/kcal/akonadi.desktop 2009-08-27 10:18:29.000000000 +0200 +++ new/kdepim-runtime-4.3.3/kresources/kcal/akonadi.desktop 2009-10-02 10:20:46.000000000 +0200 @@ -1,15 +1,49 @@ [Desktop Entry] Name=Akonadi Name[ar]=اكوندا +Name[ca]=Akonadi +Name[cs]=Akonadi +Name[da]=Akonadi Name[de]=Akonadi-Ressource +Name[el]=Akonadi +Name[en_GB]=Akonadi +Name[es]=Akonadi +Name[et]=Akonadi +Name[fr]=Akonadi +Name[ga]=Akonadi +Name[gl]=Akonadi +Name[hu]=Akonadi +Name[it]=Akonadi +Name[ja]=Akonadi +Name[km]=Akonadi +Name[ko]=Akonadi +Name[lt]=Akonadi +Name[lv]=Akonadi +Name[mai]=Akonadi +Name[nb]=Akonadi +Name[nds]=Akonadi +Name[nl]=Akonadi +Name[nn]=Akonadi Name[pa]=ਅਕੌਂਡੀ +Name[pl]=Akonadi +Name[pt]=Akonadi +Name[pt_BR]=Akonadi +Name[ro]=Akonadi +Name[ru]=Akonadi +Name[sl]=Akonadi +Name[sv]=Akonadi +Name[tr]=Akonadi +Name[uk]=Akonadi Name[x-test]=xxAkonadixx +Name[zh_CN]=Akonadi +Name[zh_TW]=Akonadi Comment=Provides access to calendars stored in Akonadi calendar folders Comment[ar]=يوفر الوصول للتقويمات المحفوظة في مجلد تقويم اكوندا Comment[ca]=Proporciona l'accés als calendaris emmagatzemats en carpetes de calendari de l'Akonadi Comment[da]=Giver adgang til kalendere lagret i Akonadi kalender-mapper Comment[de]=Ermöglicht den Zugriff auf Kalender, die in Akonadi-Ordnern gespeichert sind. Comment[el]=Προσφέρει πρόσβαση σε ημερολόγια αποθηκευμένα σε φακέλους ημερολογίου του Akonadi +Comment[en_GB]=Provides access to calendars stored in Akonadi calendar folders Comment[es]=Provee acceso a calendarios almacenados en carpetas de calendario de Akonadi Comment[et]=Võimaldab kasutada Akonadi kalendrikaustadesse salvestatud kalendreid Comment[fr]=Fourni l'accès aux calendriers stockés dans les dossiers de calendrier Akonadi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/plugins/akonadi_serializer_kcal.desktop new/kdepim-runtime-4.3.3/plugins/akonadi_serializer_kcal.desktop --- old/kdepim-runtime-4.3.1/plugins/akonadi_serializer_kcal.desktop 2009-08-27 10:18:29.000000000 +0200 +++ new/kdepim-runtime-4.3.3/plugins/akonadi_serializer_kcal.desktop 2009-10-30 13:30:43.000000000 +0100 @@ -47,7 +47,7 @@ Comment[ga]=Breiseán srathóra Akonadi le haghaidh imeachtaí, tascanna, agus iontrálacha dialainne Comment[gl]=Un engadido de serialización de Akonadi para eventos, tarefas e entradas do diario Comment[hu]=Akonadi-modul események, feladatok és naplóbejegyzések kezeléséhez -Comment[it]=Un'estensione di Akonadi per la serializzazione di eventi, compiti e diari +Comment[it]=Un'estensione di Akonadi per la serializzazione di eventi, attività e diari Comment[ja]=イベント、タスク、日記のエントリのための Akonadi シリアライザプラグイン Comment[km]=កម្មវិធីជំនួយកម្មវិធីបោះពុម្ព Akonadi សម្រាប់ធាតុព្រឹត្តិការណ៍ ភារកិច្ច និងទិនានុប្បវត្តិ Comment[lt]=Akonadi serializatoriaus įskiepis įvykiams, užduotims ir dienoraščio įrašams diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/plugins/akonadi_serializer_microblog.desktop new/kdepim-runtime-4.3.3/plugins/akonadi_serializer_microblog.desktop --- old/kdepim-runtime-4.3.1/plugins/akonadi_serializer_microblog.desktop 2009-08-27 10:18:29.000000000 +0200 +++ new/kdepim-runtime-4.3.3/plugins/akonadi_serializer_microblog.desktop 2009-10-30 13:30:43.000000000 +0100 @@ -11,7 +11,9 @@ Name[fr]=Sérialiseur Microblog Name[ga]=Srathóir Micreabhlagadóireachta Name[gl]=Serializador de Microblog +Name[hu]=Microblog-leképező modul Name[it]=Serializzatore microblog +Name[km]=Microblog Serializer Name[lv]=Mikroblogu serializētājs Name[nb]=Mikroblogg-serialisering Name[nds]=Lüttdaagbook-Reegmoduul @@ -41,6 +43,7 @@ Comment[fr]=Un module externe Akonadi pour la sérialisation Microblog Comment[ga]=Breiseán srathóra Akonadi le haghaidh micreabhlagadóireachta Comment[gl]=Un engadido de serialización de Akonadi para Microblog +Comment[hu]=Akonadi-leképező modul a Microbloghoz Comment[it]=Un'estensione di Akonadi per la serializzazione di microblog Comment[km]=កម្មវិធីជំនួយកម្មវិធីដាក់លេខសៀរៀល Akonadi សម្រាប់ Microblog Comment[lv]=Akonadi Microblog serializēšanas spraudnis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/birthdays/birthdaysresource.desktop new/kdepim-runtime-4.3.3/resources/birthdays/birthdaysresource.desktop --- old/kdepim-runtime-4.3.1/resources/birthdays/birthdaysresource.desktop 2009-08-27 10:18:30.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/birthdays/birthdaysresource.desktop 2009-10-30 13:30:45.000000000 +0100 @@ -5,10 +5,12 @@ Name[da]=Fødselsdag og mærkedage Name[de]=Geburtstage und Jahrestage Name[el]=Γενέθλια & επέτειοι +Name[en_GB]=Birthdays & Anniversaries Name[es]=Cumpleaños y aniversarios Name[et]=Sünni- ja aastapäevad Name[fr]=Anniversaires et fêtes Name[gl]=Cumpreanos e aniversarios +Name[hu]=Születésnapok és évfordulók Name[is]=Afmælis- & merkisdagar Name[it]=Compleanni e anniversari Name[ja]=誕生日と記念日 @@ -36,10 +38,12 @@ Comment[da]=Giver adgang til fødsels- og mærkedage-datoer for kontakter i din adressebog som kalenderbegivenheder Comment[de]=Ermöglicht den Zugriff auf Geburtstage und Jahrestage von Kontakten aus dem KDE-Adressbuch in Form von Kalendereinträgen. Comment[el]=Προσφέρει πρόσβαση σε γενέθλια και επετείους επαφών του βιβλίου διευθύνσεών σας ως γεγονότα ημερολογίου +Comment[en_GB]=Provides access to birthday and anniversary dates of contacts in your address book as calendar events Comment[es]=Provee acceso a las fechas de cumpleaños y aniversarios de los contactos en la libreta de direcciones como eventos de calendario Comment[et]=Võimaldab kasutada KDE aadressiraamatusse kalendrisündmustena salvestatud kontaktide sünni- ja aastapäevi Comment[fr]=Fourni l'accès aux dates d'anniversaire et de fête des contacts du carnet d'adresses KDE comme des évènements du calendrier Comment[gl]=Permite acceder ás datas de cumpreanos e aniversarios dos contactos do caderno de enderezos como eventos do calendario +Comment[hu]=Hozzáférést biztosít a névjegyekben tárolt születésnapokhoz és évfordulókhoz a címjegyzékekben (naptári eseményként) Comment[it]=Consente l'accesso alle date di nascita ed agli anniversari dei contatti della rubrica di KDE come eventi di calendario. Comment[ja]=アドレス帳にカレンダーイベントとして保存されている誕生日と記念日へのアクセスを提供します Comment[km]=ផ្ដល់សិទ្ធិចូលដំណើរការទៅកាន់កាលបរិច្ឆេទថ្ងៃខួបកំណើតនៃទំនាក់ទំនងនៅក្នុងសៀវភៅអាសយដ្ឋាន KDE ជាព្រឹត្តិការណ៍ប្រតិទិន diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/distlist/distlistresource.desktop new/kdepim-runtime-4.3.3/resources/distlist/distlistresource.desktop --- old/kdepim-runtime-4.3.1/resources/distlist/distlistresource.desktop 2009-08-27 10:18:30.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/distlist/distlistresource.desktop 2009-10-30 13:30:45.000000000 +0100 @@ -5,11 +5,13 @@ Name[da]=Distributionsliste-fil Name[de]=Verteilerlistendatei Name[el]=Αρχείο λίστας διανομής +Name[en_GB]=Distribution List File Name[es]=Archivo de lista de distribución Name[et]=Postiloendi fail Name[fr]=Fichier de liste de distribution Name[ga]=Comhad Liosta Dáilte Name[gl]=Ficheiro de lista de distribución +Name[hu]=Címlistafájl Name[is]=Dreifilistaskrá Name[it]=File lista di distribuzione Name[ja]=配布リストファイル @@ -37,11 +39,13 @@ Comment[da]=Indlæser data fra en distributionsliste-fil Comment[de]=Daten werden aus einer Verteilerlistendatei geladen Comment[el]=Φόρτωση δεδομένων από ένα αρχείο λίστας διανομής +Comment[en_GB]=Loads data from a distribution list file Comment[es]=Carga datos desde un archivo de lista de distribución. Comment[et]=Andmete laadimine postiloendi failist Comment[fr]=Charger les données depuis un fichier de liste de distribution Comment[ga]=Breiseán a luchtaíonn sonraí ó chomhad liosta dáilte Comment[gl]=Carrega datos desde un ficheiro de lista de distribución +Comment[hu]=Adatbetöltés címlistafájlból Comment[it]=Carica dati da un file contenente una lista di distribuzione Comment[ja]=配布リストファイルからデータを読み込みます Comment[km]=ផ្ទុកទិន្នន័យពីឯកសារបញ្ជីចែកចាយ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/ical/icalresource.desktop new/kdepim-runtime-4.3.3/resources/ical/icalresource.desktop --- old/kdepim-runtime-4.3.1/resources/ical/icalresource.desktop 2009-08-27 10:18:31.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/ical/icalresource.desktop 2009-10-02 10:21:00.000000000 +0200 @@ -6,6 +6,7 @@ Name[da]=iCal-kalenderfil Name[de]=ICal-Kalenderdatei Name[el]=Αρχείο ημερολογίου ICal +Name[en_GB]=ICal Calendar File Name[es]=Archivo de calendario ICal Name[et]=ICali kalendrifail Name[fr]=Fichier de calendrier au format ICal @@ -43,6 +44,7 @@ Comment[da]=Indlæser data fra en iCal-fil Comment[de]=Daten werden aus einer lokalen iCal-Datei geladen Comment[el]=Φόρτωση δεδομένων από ένα αρχείο iCal +Comment[en_GB]=Loads data from an iCal file Comment[es]=Carga datos de un archivo iCal local Comment[et]=Andmete laadimine iCal-failist Comment[fr]=Charge des données depuis un fichier au format iCal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/ical/notesresource.desktop new/kdepim-runtime-4.3.3/resources/ical/notesresource.desktop --- old/kdepim-runtime-4.3.1/resources/ical/notesresource.desktop 2009-08-27 10:18:31.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/ical/notesresource.desktop 2009-10-30 13:30:49.000000000 +0100 @@ -3,18 +3,22 @@ Name[af]=Notas Name[ar]=ملاحظات Name[be]=Заметкі +Name[bg]=Notes Name[br]=Notennoù +Name[ca]=Notes Name[cs]=Poznámky Name[cy]=Nodiadau Name[da]=Noter Name[de]=Notizen Name[el]=Σημειώσεις +Name[en_GB]=Notes Name[eo]=Notoj Name[es]=Notas Name[et]=Sedelid Name[eu]=Oharrak Name[fa]=یادداشتها Name[fi]=Muistio +Name[fr]=Notes Name[fy]=Notysjes Name[ga]=Nótaí Name[gl]=Notas @@ -55,6 +59,7 @@ Name[uk]=Примітки Name[uz]=Yozma xotira Name[uz@cyrillic]=Ёзма хотира +Name[wa]=Notes Name[x-test]=xxNotesxx Name[zh_CN]=便笺 Name[zh_TW]=備忘錄 @@ -64,11 +69,13 @@ Comment[da]=Indlæser data fra en notes-fil Comment[de]=Lädt Daten aus einer Notizen-Datei Comment[el]=Φόρτωση δεδομένων από ένα αρχείο σημειώσεων +Comment[en_GB]=Loads data from a notes file Comment[es]=Carga datos desde un archivo de notas Comment[et]=Andmete laadimine sedelite failist Comment[fr]=Charge des données depuis un fichier notes Comment[ga]=Breiseán a luchtaíonn sonraí ó chomhad nótaí Comment[gl]=Carrega datos desde un ficheiro de notas +Comment[hu]=Adatbetöltés feljegyzésfájlból Comment[it]=Carica dati da un file contenente note Comment[ja]=メモファイルからデータを読み込みます Comment[km]=ផ្ទុកទិន្នន័យពីឯកសារចំណាំ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/imap/imapresource.desktop new/kdepim-runtime-4.3.3/resources/imap/imapresource.desktop --- old/kdepim-runtime-4.3.1/resources/imap/imapresource.desktop 2009-07-29 13:11:55.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/imap/imapresource.desktop 2009-10-30 13:30:44.000000000 +0100 @@ -2,30 +2,49 @@ Name=Akonadi Imap Name[ar]=اكوندا IMAP Name[ca]=Akonadi imap +Name[cs]=Akonadi Imap +Name[da]=Akonadi Imap Name[de]=Akonadi-Imap +Name[el]=Akonadi Imap +Name[en_GB]=Akonadi Imap Name[es]=Imap de Akonadi +Name[et]=Akonadi Imap Name[fr]=Imap Akonadi Name[ga]=IMAP Akonadi Name[gl]=Imap de Akonadi +Name[hu]=Akonadi IMAP +Name[is]=Akonadi Imap +Name[it]=Akonadi Imap +Name[km]=Akonadi Imap +Name[lv]=Akonadi Imap +Name[nb]=Akonadi Imap Name[nds]=Akonadi-IMAP +Name[nl]=Akonadi Imap Name[nn]=Akonadi-IMAP Name[pa]=ਅਕੌਂਡੀ imap +Name[pl]=Akonadi Imap Name[pt]=IMAP do Akonadi Name[pt_BR]=IMAP Akonadi +Name[ru]=Akonadi Imap Name[sv]=Akonadi IMAP +Name[tr]=Akonadi Imap +Name[uk]=Akonadi Imap Name[x-test]=xxAkonadi Imapxx Name[zh_CN]=Akonadi IMAP +Name[zh_TW]=Akonadi Imap Comment=Connects to an IMAP-server. Based on the KIMAP from kdepimlibs. Comment[ar]=يتصل بخادم IMAP بالإعتماد على KIMAP من kdepimlibs. Comment[ca]=Connecta a un servidor IMAP. Basat en KIMAP de kdepimlibs. Comment[da]=Forbinder til en IMAP-server. Baseret på KIMAP fra kdepimlibs. Comment[de]=Verbindet zu einem IMAP-Server. Basiert auf der KIMAP-Bibliothek der kdepimlibs. Comment[el]=Σύνδεση με έναν διακομηστή IMAP. Βασισμένο στη βιβλιοθήκη IMAP του kdepimlibs. +Comment[en_GB]=Connects to an IMAP-server. Based on the KIMAP from kdepimlibs. Comment[es]=Conecta con un servidor IMAP. Basado en KIMAP de kdepimlibs Comment[et]=Ühendumine IMAP-serveriga. Tugineb KIMAP-ile kdepimlibs'ist. Comment[fr]=Connexion à un serveur IMAP en utilisant la librairie KIMAP de kdepimlibs. Comment[ga]=Breiseán a bhunaíonn ceangal le freastalaí IMAP. Bunaithe ar KIMAP as kdepimlibs. Comment[gl]=Conecta cun servidor de IMAP. Baseado en KIMAP de kdepimlibs. +Comment[hu]=IMAP-kiszolgálók kezelését végzi, a kdepimlibs KIMAP modulján alapul. Comment[it]=Si connette ad un server IMAP. Basato sulla libreria KIMAP di kdepimlibs. Comment[km]=តភ្ជាប់លើម៉ាស៊ីនបម្រើ IMAP ។ មានមូលដ្ឋានលើ KIMAP ពី kdepimlibs ។ Comment[lv]=Pieslēdzas IMAP serverim. Balstīts uz KIMAP bibliotēku no kdepimlibs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/kabc/kabcresource.desktop new/kdepim-runtime-4.3.3/resources/kabc/kabcresource.desktop --- old/kdepim-runtime-4.3.1/resources/kabc/kabcresource.desktop 2009-08-27 10:18:30.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/kabc/kabcresource.desktop 2009-10-30 13:30:46.000000000 +0100 @@ -5,11 +5,13 @@ Name[da]=KDE's adressebog (traditionel) Name[de]=KDE-Adressbuch (herkömmlich) Name[el]=Βιβλίο διευθύνσεων του KDE (παραδοσιακό) +Name[en_GB]=KDE Address Book (traditional) Name[es]=Libreta de direcciones de KDE (tradicional) Name[et]=KDE aadressiraamat (traditsiooniline) Name[fr]=Carnet d'adresse KDE (traditionnel) Name[ga]=Leabhar Seoltaí KDE (traidisiúnta) Name[gl]=Caderno de enderezos do KDE (tradicional) +Name[hu]=KDE címjegyzék (hagyományos) Name[it]=Rubrica indirizzi di KDE (tradizionale) Name[ja]=KDE アドレス帳 (従来のタイプ) Name[km]=សៀវភៅអាសយដ្ឋាន KDE (បុរាណ) @@ -35,11 +37,13 @@ Comment[da]=Indlæser data fra en traditionel KDE adressebogsressource Comment[de]=Lädt Daten aus einer herkömmlichen KDE-Adressbuch-Ressource Comment[el]=Φόρτωση δεδομένων από έναν παραδοσιακό πόρο βιβλίου διευθύνσεων του KDE +Comment[en_GB]=Loads data from a traditional KDE address book resource Comment[es]=Carga datos desde un recurso tradicional de libreta de direcciones de KDE Comment[et]=Andmete laadimine traditsioonilisest KDE aadressiraamatu ressursist Comment[fr]=Charge des données depuis un carnet d'adresses KDE traditionnel Comment[ga]=Breiseán a luchtaíonn sonraí ó acmhainn thraidisiúnta leabhair seoltaí KDE Comment[gl]=Carrega datos desde un recurso de caderno de enderezos do KDE +Comment[hu]=Adatbetöltés egy hagyományos KDE címjegyzékből Comment[it]=Carica dati da una tradizionale risorsa rubrica di KDE Comment[ja]=従来の KDE アドレス帳リソースからデータを読み込みます Comment[km]=ផ្ទុកទិន្នន័យពីធនធានសៀវភៅអាសយដ្ឋាន KDE បុរាណ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/kcal/kcalresource.desktop new/kdepim-runtime-4.3.3/resources/kcal/kcalresource.desktop --- old/kdepim-runtime-4.3.1/resources/kcal/kcalresource.desktop 2009-07-29 13:11:56.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/kcal/kcalresource.desktop 2009-10-02 10:21:01.000000000 +0200 @@ -6,6 +6,7 @@ Name[da]=KDE-kalender (traditionel) Name[de]=KDE-Kalender (herkömmlich) Name[el]=Ημερολόγιο KDE (παραδοσιακό) +Name[en_GB]=KDE Calendar (traditional) Name[es]=Calendario de KDE (tradicional) Name[et]=KDE kalender (traditsiooniline) Name[fr]=Calendrier KDE (traditionnel) @@ -42,6 +43,7 @@ Comment[da]=Indlæser data fra en traditionel KDE kalenderressource Comment[de]=Lädt Daten aus einer herkömmlichen KDE-Kalender-Ressource Comment[el]=Φόρτωση δεδομένων από έναν παραδοσιακό πόρο ημερολογίου του KDE +Comment[en_GB]=Loads data from a traditional KDE calendar resource Comment[es]=Carga datos desde un recurso tradicional de Calendario de KDE Comment[et]=Andmete laadimine traditsioonilisest KDE kalendri ressursist Comment[fr]=Charge des données depuis un calendrier KDE traditionnel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/knut/knutresource.desktop new/kdepim-runtime-4.3.3/resources/knut/knutresource.desktop --- old/kdepim-runtime-4.3.1/resources/knut/knutresource.desktop 2009-07-29 13:11:55.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/knut/knutresource.desktop 2009-10-02 10:20:52.000000000 +0200 @@ -1,13 +1,48 @@ [Desktop Entry] Name=Knut +Name[ar]=Knut +Name[ca]=Knut +Name[cs]=Knut +Name[da]=Knut +Name[de]=Knut +Name[el]=Knut +Name[en_GB]=Knut +Name[es]=Knut +Name[et]=Knut +Name[fr]=Knut +Name[ga]=Knut +Name[gl]=Knut +Name[hu]=Knut +Name[it]=Knut +Name[ja]=Knut +Name[km]=Knut +Name[ko]=Knut +Name[lt]=Knut +Name[lv]=Knut +Name[nb]=Knut +Name[nds]=Knut +Name[nl]=Knut +Name[nn]=Knut Name[pa]=ਕੇ-ਨੁਟ +Name[pl]=Knut +Name[pt]=Knut +Name[pt_BR]=Knut +Name[ro]=Knut +Name[ru]=Knut +Name[sl]=Knut +Name[sv]=Knut +Name[tr]=Knut +Name[uk]=Knut Name[x-test]=xxKnutxx +Name[zh_CN]=Knut +Name[zh_TW]=Knut Comment=An agent for debugging purpose Comment[ar]=أداة لتصحيح الأخطاء Comment[ca]=Un agent amb la finalitat de depuració Comment[da]=En agent til fejlretningsformål Comment[de]=Agent für Zwecke der Fehlersuche Comment[el]=Ένας πελάτης με σκοπό την αποσφαλμάτωση +Comment[en_GB]=An agent for debugging purpose Comment[es]=Un agente para depurar Comment[et]=Agent silumiseks Comment[fr]=Un agent à des fins de déboguage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/kolabproxy/kolabproxyresource.desktop new/kdepim-runtime-4.3.3/resources/kolabproxy/kolabproxyresource.desktop --- old/kdepim-runtime-4.3.1/resources/kolabproxy/kolabproxyresource.desktop 2009-08-27 10:18:30.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/kolabproxy/kolabproxyresource.desktop 2009-10-30 13:30:45.000000000 +0100 @@ -5,10 +5,12 @@ Name[da]=Akonadi Kolab-proxy-ressource Name[de]=Akonadi-Proxy-Ressource für Kolab Name[el]=Πόρος διαμεσολαβητή του Akonadi Kolab +Name[en_GB]=Akonadi Kolab Proxy Resource Name[es]=Recurso proxy Kolab de Akonadi Name[et]=Akonadi Kolabi puhverserveri ressurss Name[fr]=Ressource mandaire Kolab Akonadi Name[gl]=Recurso proxy de Kolab do Akonadi +Name[hu]=Akonadi Kolab proxy-erőforrás Name[it]=Risorsa proxy Kolab di Akonadi Name[km]=ធនធានប្រូកស៊ី Akonadi Kolab Name[lv]=Akonadi Kolab starpnieka resurss @@ -31,10 +33,12 @@ Comment[da]=Proxy-ressource til overvågning af groupware-mapper. Comment[de]=Proxy-Ressource zur Überwachung von Arbeitsgruppen-Ordnern. Comment[el]=Πόρος διαμεσολαβητή για την παρακολούθηση των φακέλων groupware. +Comment[en_GB]=Proxy resource to monitor groupware folders. Comment[es]=Recurso de proxy para seguimiento de carpetas groupware. Comment[et]=Puhverserveri ressurss grupitöö kaustade jälgimiseks Comment[fr]=Ressource mandataire permettant de surveiller les dossiers de travail collaboratif Comment[gl]=Recurso de proxy para vixiar cartafoles de traballo en grupo. +Comment[hu]=Proxy-erőforrás csoportmunkamappák figyeléséhez. Comment[it]=Risorsa proxy per controllare cartelle di groupware. Comment[km]=ធនធានប្រូកស៊ីដែលត្រូវត្រួតពិនិត្យត្រត groupware ។ Comment[lv]=Starpnieka resurss grupdarba serveru novērošanai. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/localbookmarks/localbookmarksresource.desktop new/kdepim-runtime-4.3.3/resources/localbookmarks/localbookmarksresource.desktop --- old/kdepim-runtime-4.3.1/resources/localbookmarks/localbookmarksresource.desktop 2009-08-27 10:18:30.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/localbookmarks/localbookmarksresource.desktop 2009-10-30 13:30:46.000000000 +0100 @@ -6,11 +6,13 @@ Name[da]=Lokale bogmærker Name[de]=Lokale Lesezeichen Name[el]=Τοπικοί σελιδοδείκτες +Name[en_GB]=Local Bookmarks Name[es]=Marcadores locales Name[et]=Kohalikud järjehoidjad Name[fr]=Signets locaux Name[ga]=Leabharmharcanna Logánta Name[gl]=Marcadores locais +Name[hu]=Helyi könyvjelzők Name[it]=Segnalibri locali Name[ja]=ローカルブックマーク Name[km]=ចំណាំមូលដ្ឋាន @@ -38,6 +40,7 @@ Comment[da]=Indlæser data fra en lokal bogmærkefil Comment[de]=Daten werden aus einer lokalen Lesezeichen-Datei geladen Comment[el]=Φόρτωση δεδομένων από ένα τοπικό αρχείο σελιδοδεικτών +Comment[en_GB]=Loads data from a local bookmarks file Comment[es]=Carga datos de un archivo de marcadores local Comment[et]=Andmete laadimine kohalikust järjehoidjafailist Comment[fr]=Charge des données depuis un fichier local de signets diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/maildir/maildirresource.desktop new/kdepim-runtime-4.3.3/resources/maildir/maildirresource.desktop --- old/kdepim-runtime-4.3.1/resources/maildir/maildirresource.desktop 2009-07-29 13:11:55.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/maildir/maildirresource.desktop 2009-10-02 10:20:51.000000000 +0200 @@ -1,9 +1,41 @@ [Desktop Entry] Name=Maildir +Name[ar]=Maildir +Name[ca]=Maildir +Name[cs]=Maildir +Name[da]=Maildir +Name[de]=Maildir +Name[el]=Maildir +Name[en_GB]=Maildir +Name[es]=Maildir +Name[et]=Maildir +Name[fr]=Maildir +Name[ga]=Maildir +Name[gl]=Maildir +Name[hu]=Maildir +Name[it]=Maildir +Name[ja]=Maildir Name[km]=ថតសំបុត្រ +Name[ko]=Maildir +Name[lt]=Maildir +Name[lv]=Maildir +Name[nb]=Maildir Name[nds]=Nettpostorner +Name[nl]=Maildir +Name[nn]=Maildir +Name[pa]=Maildir +Name[pl]=Maildir +Name[pt]=Maildir +Name[pt_BR]=Maildir +Name[ro]=Maildir +Name[ru]=Maildir +Name[sl]=Maildir +Name[sv]=Maildir +Name[tr]=Maildir +Name[uk]=Maildir Name[x-test]=xxMaildirxx Name[zh_CN]=邮件目录 +Name[zh_TW]=Maildir Comment=Loads data from a local maildir folder Comment[ar]=تحمل البيانات من مجلد maildir المحلي Comment[ca]=Carregar dades des d'una carpeta «maildir» local @@ -11,6 +43,7 @@ Comment[da]=Indlæser data fra en lokal maildir-mappe Comment[de]=Laden von Daten aus einem lokalen Maildir-Datei Comment[el]=Φόρτωσης δεδομένων από έναν τοπικό φάκελο maildir +Comment[en_GB]=Loads data from a local maildir folder Comment[es]=Carga datos de una carpeta de maildir local. Comment[et]=Andmete laadimine kohalikust maildir-kaustast Comment[fr]=Charge des données d'un dossier au format maildir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/microblog/microblog.desktop new/kdepim-runtime-4.3.3/resources/microblog/microblog.desktop --- old/kdepim-runtime-4.3.1/resources/microblog/microblog.desktop 2009-08-27 10:18:31.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/microblog/microblog.desktop 2009-10-30 13:30:49.000000000 +0100 @@ -5,11 +5,13 @@ Name[da]=Microblog (Twitter og Identi.ca) Name[de]=Microblog (Twitter und Identi.ca) Name[el]=Microblog (Twitter και Identi.ca) +Name[en_GB]=Microblog (Twitter and Identi.ca) Name[es]=Microblog (Twitter e Identi.ca) Name[et]=Mikroblogi (Twitter ja Identi.ca) Name[fr]=Microblog (Twitter et Identi.ca) Name[ga]=Micreabhlagadóireacht (Twitter agus Identi.ca) Name[gl]=Microblog (Twitter e Identi.ca) +Name[hu]=Microblog (Twitter, Identi.ca) Name[it]=Microblog (Twitter e Identi.ca) Name[km]=Microblog (Twitter និង Identi.ca) Name[lv]=Mikroblogi (Twitter un Identi.ca) @@ -34,10 +36,12 @@ Comment[da]=Viser dine microblog-data fra Twitter eller Identi.ca. Comment[de]=Zeigt Microblog-Daten aus Twitter oder Identi.ca an. Comment[el]=Εμφάνιση των δεδομένων σας microblog από το Twitter ή Identi.ca. +Comment[en_GB]=Shows your microblog data from Twitter or Identi.ca. Comment[es]=Muestra sus datos microblog desde Twitter o Identi.ca. Comment[et]=Näitab mikroblogi andmeid Twitterist või Identi.ca-st Comment[fr]=Affiche vos informations de Twitter ou Identi.ca Comment[gl]=Mostra os seus datos de microblog de Twitter ou Identi.ca. +Comment[hu]=Megjeleníti a Twitter vagy az Identi.ca adatait. Comment[it]=Mostra i dati di microblog da Twitter o Identi.ca. Comment[km]=បង្ហាញទិន្នន័យ microblog របស់អ្នកពី Twitter ឬ Identi.ca ។ Comment[lv]=Rāda jūsu mikrobliogu datus no Twitter un Identi.ca. @@ -47,7 +51,7 @@ Comment[nn]=Viser mikrobloggdata frå Twitter eller Identi.ca. Comment[pl]=Pokazuje dane mikroblogów z Twittera lub Identi.ca. Comment[pt]=Mostra os seus dados dos micro-blogs Twitter ou Identi.ca. -Comment[pt_BR]=Exibr os dados do seu microblog do Twitter ou Identi.ca. +Comment[pt_BR]=Exibir os dados do seu microblog do Twitter ou Identi.ca. Comment[ro]=Vă arată datele de microblog de pe Twitter și Identi.ca. Comment[ru]=Показывать ваши данные с микроблогов Twitter или Identi.ca. Comment[sv]=Visar data från din mikrowebbjournal hos Twitter eller Identi.ca. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/nepomuktag/nepomuktagresource.desktop new/kdepim-runtime-4.3.3/resources/nepomuktag/nepomuktagresource.desktop --- old/kdepim-runtime-4.3.1/resources/nepomuktag/nepomuktagresource.desktop 2009-08-27 10:18:31.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/nepomuktag/nepomuktagresource.desktop 2009-10-02 10:21:01.000000000 +0200 @@ -6,6 +6,7 @@ Name[da]=Nepomuk-mærker (virtuelle mapper) Name[de]=Nepomuk-Stichwörter (Virtuelle Ordner) Name[el]=Ετικέτες Nepomuk (εικονικοί φάκελοι) +Name[en_GB]=Nepomuk Tags (Virtual Folders) Name[es]=Etiquetas Nepomuk (Carpetas virtuales) Name[et]=Nepomuki sildid (virtuaalkaustad) Name[fr]=Étiquettes Nepomuk (dossiers virtuels) @@ -41,10 +42,11 @@ Comment[da]=Virtuelle mapper til valg af beskeder som har Nepomuk-mærker. Comment[de]=Virtuelle Ordner zur Auswahl von Nachrichten, die Nepomuk-Stichwörter ethalten. Comment[el]=Εικονικοί φάκελοι για την επιλογή μηνυμάτων με ετικέτες Nepomuk. +Comment[en_GB]=Virtual folders for selecting messages which have Nepomuk Tags. Comment[es]=Carpetas virtuales para seleccionar mensajes que tienen etiquetas Nepomuk. Comment[et]=Virtuaalkaustad Nepomuki siltidega kirjade valimiseks. Comment[fr]=Des dossiers virtuels qui permettent de sélectionner les messages avec des étiquettes Nepomuk. -Comment[gl]=Cartafoles virtuais para escoller mensaxes que teñan Etiquetas de Nepomuk. +Comment[gl]=Cartafoles virtuais para escoller mensaxes que teñan etiquetas de Nepomuk. Comment[hu]=Virtuális mappák adott Nepomuk-címkéket tartalmazó üzenetek megjelenítéséhez. Comment[it]=Cartelle virtuali per la selezione di messaggi con etichette Nepomuk. Comment[ja]=Nepomuk タグの付いたメッセージを選択するための仮想フォルダ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/nntp/nntpresource.desktop new/kdepim-runtime-4.3.3/resources/nntp/nntpresource.desktop --- old/kdepim-runtime-4.3.1/resources/nntp/nntpresource.desktop 2009-08-27 10:18:30.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/nntp/nntpresource.desktop 2009-10-02 10:20:51.000000000 +0200 @@ -6,6 +6,7 @@ Name[da]=Usenet-nyhedsgrupper (NNTP) Name[de]=Usenet Newsgruppen (NNTP) Name[el]=Ομάδες συζήτησης Usenet (NNTP) +Name[en_GB]=Usenet Newsgroups (NNTP) Name[es]=Grupos de noticias Usenet (NNTP) Name[et]=Useneti uudistegrupid (NNTP) Name[fr]=Forum de discussion usenet (NNTP) @@ -14,6 +15,7 @@ Name[is]=Usenet fréttahópar (NNTP) Name[it]=Gruppi di discussione Usenet (NNTP) Name[ja]=Usenet ニュースグループ (NNTP) +Name[km]=Usenet Newsgroups (NNTP) Name[ko]=유즈넷 뉴스그룹 (NNTP) Name[lt]=Usenet naujienų grupės (NNTP) Name[lv]=Usenet interešgrupas (NNTP) @@ -40,6 +42,7 @@ Comment[da]=Muliggør løsning af artikler fra en nyhedsserver Comment[de]=Lesen von Artikeln von einem News-Server Comment[el]=Καθιστά δυνατή την ανάγνωση άρθρων από έναν διακομιστή νέων +Comment[en_GB]=Makes it possible to read articles from a news server Comment[es]=Hace posible leer artículos desde un servidor de noticias Comment[et]=Võimaldab lugeda artikleid uudisteserverist Comment[fr]=Permet de lire des articles depuis un serveur de nouvelles diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/openchange/ocresource.desktop new/kdepim-runtime-4.3.3/resources/openchange/ocresource.desktop --- old/kdepim-runtime-4.3.1/resources/openchange/ocresource.desktop 2009-08-27 10:18:31.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/openchange/ocresource.desktop 2009-10-02 10:20:59.000000000 +0200 @@ -1,14 +1,48 @@ [Desktop Entry] Name=OpenChange Name[ar]=خادم OpenChange +Name[ca]=OpenChange +Name[cs]=OpenChange +Name[da]=OpenChange +Name[de]=OpenChange +Name[el]=OpenChange +Name[en_GB]=OpenChange +Name[es]=OpenChange +Name[et]=OpenChange +Name[fr]=OpenChange +Name[ga]=OpenChange +Name[gl]=OpenChange +Name[hu]=OpenChange +Name[it]=OpenChange +Name[ja]=OpenChange +Name[km]=OpenChange +Name[ko]=OpenChange +Name[lt]=OpenChange +Name[lv]=OpenChange +Name[nb]=OpenChange +Name[nds]=OpenChange +Name[nl]=OpenChange +Name[nn]=OpenChange +Name[pa]=OpenChange +Name[pl]=OpenChange +Name[pt]=OpenChange +Name[pt_BR]=OpenChange +Name[ro]=OpenChange +Name[ru]=OpenChange +Name[sl]=OpenChange Name[sv]=Openchange +Name[tr]=OpenChange +Name[uk]=OpenChange Name[x-test]=xxOpenChangexx +Name[zh_CN]=OpenChange +Name[zh_TW]=OpenChange Comment=Makes it possible to work with an OpenChange / Exchange server Comment[ar]=تمكِن العمل مع خادم OpenChange / Exchange server Comment[ca]=Facilita el treball amb un servidor OpenChange / Exchange Comment[da]=Muliggør at arbejde med en OpenChange-/Exchange-server Comment[de]=Verwendung mit Openchange- und Exchange-Servern Comment[el]=Καθιστά δυνατή τη συνεργασία με ένα διακομιστή OpenChange / Exchange +Comment[en_GB]=Makes it possible to work with an OpenChange / Exchange server Comment[es]=Hace posible trabajar con un servidor OpenChange / Exchange Comment[et]=Võimaldab kasutada OpenChange'i/Exchange'i serverit Comment[fr]=Permet de collaborer avec un serveur OpenChange ou Exchange diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/vcard/vcardresource.desktop new/kdepim-runtime-4.3.3/resources/vcard/vcardresource.desktop --- old/kdepim-runtime-4.3.1/resources/vcard/vcardresource.desktop 2009-08-27 10:18:30.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/vcard/vcardresource.desktop 2009-10-02 10:20:54.000000000 +0200 @@ -6,6 +6,7 @@ Name[da]=VCard-fil Name[de]=VCard-Datei Name[el]=Αρχείο VCard +Name[en_GB]=VCard File Name[es]=Archivo VCard Name[et]=VCard-fail Name[fr]=Fichier VCard @@ -43,6 +44,7 @@ Comment[da]=Indlæser data fra en VCard-fil Comment[de]=Daten werden aus einer Visitenkarten-Datei geladen Comment[el]=Φόρτωση δεδομένων από ένα αρχείο VCard +Comment[en_GB]=Loads data from a VCard file Comment[es]=Carga datos de un archivo VCard Comment[et]=Andmete laadimine VCard-failist Comment[fr]=Charge des données depuis un fichier au format VCard diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/resources/vcarddir/vcarddirresource.desktop new/kdepim-runtime-4.3.3/resources/vcarddir/vcarddirresource.desktop --- old/kdepim-runtime-4.3.1/resources/vcarddir/vcarddirresource.desktop 2009-08-27 10:18:30.000000000 +0200 +++ new/kdepim-runtime-4.3.3/resources/vcarddir/vcarddirresource.desktop 2009-10-02 10:20:54.000000000 +0200 @@ -6,6 +6,7 @@ Name[da]=VCard-mappe Name[de]=VCard-Ordner Name[el]=Κατάλογος VCard +Name[en_GB]=VCard Directory Name[es]=Directorio VCard Name[et]=VCardide kataloog Name[fr]=Dossier VCard @@ -43,6 +44,7 @@ Comment[da]=Indlæser data fra en mappe med VCards Comment[de]=Daten werden aus einem Ordner mit Visitenkarten-Dateien geladen Comment[el]=Φόρτωση δεδομένων από έναν κατάλογο που περιέχει VCard +Comment[en_GB]=Loads data from a directory with VCards Comment[es]=Carga datos de un directorio con archivos VCard Comment[et]=Andmete laadimine VCardide kataloogist Comment[fr]=Charge des données depuis un dossier contenant des fichiers VCard diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/tray/CMakeLists.txt new/kdepim-runtime-4.3.3/tray/CMakeLists.txt --- old/kdepim-runtime-4.3.1/tray/CMakeLists.txt 2009-06-03 13:54:34.000000000 +0200 +++ new/kdepim-runtime-4.3.3/tray/CMakeLists.txt 2009-10-02 10:20:43.000000000 +0200 @@ -1,6 +1,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${QT_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR} - ${LIBKNOTIFICATIONITEM-1_INCLUDE_DIR} ) + ${QT_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR} ) +include_directories( BEFORE ${LIBKNOTIFICATIONITEM-1_INCLUDE_DIR} ) set(tray_sources main.cpp dock.cpp backup.cpp backupassistant.cpp restore.cpp restoreassistant.cpp global.cpp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.3.1/tray/akonaditray.desktop new/kdepim-runtime-4.3.3/tray/akonaditray.desktop --- old/kdepim-runtime-4.3.1/tray/akonaditray.desktop 2009-07-29 13:11:54.000000000 +0200 +++ new/kdepim-runtime-4.3.3/tray/akonaditray.desktop 2009-10-02 10:20:43.000000000 +0200 @@ -4,21 +4,49 @@ Exec=akonaditray Icon=akonadi Name=Akonaditray +Name[ar]=Akonaditray +Name[ca]=Akonaditray +Name[cs]=Akonaditray +Name[da]=Akonaditray Name[de]=Akonadi-Miniprogramm +Name[el]=Akonaditray +Name[en_GB]=Akonaditray +Name[es]=Akonaditray +Name[et]=Akonaditray Name[fr]=Miniature Akonadi +Name[ga]=Akonaditray +Name[gl]=Akonaditray +Name[hu]=Akonaditray +Name[it]=Akonaditray +Name[ja]=Akonaditray +Name[km]=Akonaditray +Name[ko]=Akonaditray Name[lt]=Akondi dėklas +Name[lv]=Akonaditray +Name[nb]=Akonaditray +Name[nds]=Akonaditray Name[nl]=Akonadi-vak +Name[nn]=Akonaditray Name[pa]=ਅਕੌਂਡੀ-ਟਰੇ +Name[pl]=Akonaditray +Name[pt]=Akonaditray +Name[pt_BR]=Akonaditray +Name[ro]=Akonaditray +Name[ru]=Akonaditray Name[sl]=Akonadi v sistemski vrstici Name[sv]=Akonadi-bricka +Name[tr]=Akonaditray +Name[uk]=Akonaditray Name[x-test]=xxAkonaditrayxx Name[zh_CN]=Akonadi 托盘 +Name[zh_TW]=Akonaditray GenericName=Akonadi Tray Utility GenericName[ar]=أداة اكوندا لصينية النظام GenericName[ca]=Utilitat de la safata per a l'Akonadi GenericName[da]=Akonadi-værktøj til statusområdet GenericName[de]=Akonadi für die Kontrollleiste GenericName[el]=Εργαλείο πλαισίου συστήματος του Akonadi +GenericName[en_GB]=Akonadi Tray Utility GenericName[es]=Utilidad de bandeja de sistema de Akonadi GenericName[et]=Akonadi süsteemse salve tööriist GenericName[fr]=Utilitaire miniature Akonadi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdesdk4 for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kdesdk4 for openSUSE:Factory checked in at Wed Nov 4 11:19:23 CET 2009. -------- --- KDE/kdesdk4/kdesdk4.changes 2009-09-24 23:06:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdesdk4/kdesdk4.changes 2009-11-02 22:05:28.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 22:05:23 CET 2009 - dmueller(a)suse.de + +- update to 4.3.3 + * see http://kde.org/announcements/changelogs/changelog4_3_2to4_3_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdesdk-4.3.1.tar.bz2 New: ---- kdesdk-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4.spec ++++++ --- /var/tmp/diff_new_pack.TzkLWh/_old 2009-11-04 11:18:28.000000000 +0100 +++ /var/tmp/diff_new_pack.TzkLWh/_new 2009-11-04 11:18:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdesdk4 (Version 4.3.1) +# spec file for package kdesdk4 (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ Group: System/GUI/KDE Summary: KDE SDK Package Url: http://www.kde.org/ -Version: 4.3.1 -Release: 2 +Version: 4.3.3 +Release: 1 Source0: kdesdk-%version.tar.bz2 Patch: 4_3_BRANCH.diff Patch2: desktop-files.diff ++++++ 4_3_BRANCH.diff ++++++ ++++ 3690 lines (skipped) ++++ between KDE/kdesdk4/4_3_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdesdk4/4_3_BRANCH.diff ++++++ desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.TzkLWh/_old 2009-11-04 11:18:29.000000000 +0100 +++ /var/tmp/diff_new_pack.TzkLWh/_new 2009-11-04 11:18:29.000000000 +0100 @@ -1,8 +1,8 @@ ---- kapptemplate/kapptemplate.desktop 2007/05/20 16:09:33 1.1 -+++ kapptemplate/kapptemplate.desktop 2007/05/20 16:09:46 -@@ -9,4 +9,4 @@ - Terminal=true - Name=KAppTemplate +--- kapptemplate/kapptemplate.desktop 2009/10/03 16:07:43 1.1 ++++ kapptemplate/kapptemplate.desktop 2009/10/03 16:08:29 +@@ -79,4 +79,4 @@ Name[x-test]=xxKAppTemplatexx + Name[zh_CN]=KAppTemplate + Name[zh_TW]=KAppTemplate -Categories=Qt;KDE;Development; +Categories=Qt;KDE;Development;IDE;X-KDE-KDevelopIDE; ++++++ kdesdk-4.3.1.tar.bz2 -> kdesdk-4.3.3.tar.bz2 ++++++ ++++ 4231 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qscintilla for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package qscintilla for openSUSE:Factory checked in at Wed Nov 4 11:18:04 CET 2009. -------- --- KDE/qscintilla/python-qscintilla.changes 2009-07-10 14:52:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/qscintilla/python-qscintilla.changes 2009-11-03 20:22:10.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 3 19:14:22 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- qscintilla.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.SZbF85/_old 2009-11-04 11:17:36.000000000 +0100 +++ /var/tmp/diff_new_pack.SZbF85/_new 2009-11-04 11:17:36.000000000 +0100 @@ -29,7 +29,7 @@ Summary: Python Bindings for the C++ Editor Class Library BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 2.4 -Release: 2 +Release: 3 %define scintilla_version 2.4 Source: QScintilla-gpl-%scintilla_version.tar.bz2 Requires: python-qt4 >= %( echo `rpm -q --queryformat '%{VERSION}' python-qt4`) ++++++ qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.SZbF85/_old 2009-11-04 11:17:36.000000000 +0100 +++ /var/tmp/diff_new_pack.SZbF85/_new 2009-11-04 11:17:36.000000000 +0100 @@ -27,7 +27,7 @@ Summary: C++ Editor Class Library BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 2.4 -Release: 2 +Release: 3 %define scintilla_version 2.4 Source: QScintilla-gpl-%scintilla_version.tar.bz2 Patch: %name.diff ++++++ qscintilla.diff ++++++ --- /var/tmp/diff_new_pack.SZbF85/_old 2009-11-04 11:17:36.000000000 +0100 +++ /var/tmp/diff_new_pack.SZbF85/_new 2009-11-04 11:17:36.000000000 +0100 @@ -1,6 +1,17 @@ ---- Qt3/qscintilla.pro +Index: Qt3/qscintilla.pro +=================================================================== +--- Qt3/qscintilla.pro.orig +++ Qt3/qscintilla.pro -@@ -41,11 +41,8 @@ isEmpty(trans.path) { +@@ -45,7 +45,7 @@ DEFINES = QSCINTILLA_MAKE_DLL QT SCI_LEX + # Handle both Qt v4 and v3. + target.path = $$[QT_INSTALL_LIBS] + isEmpty(target.path) { +- target.path = $(QTDIR)/lib ++ target.path = $(QTDIR_LIB) + } + + header.path = $$[QT_INSTALL_HEADERS] +@@ -61,11 +61,8 @@ isEmpty(trans.path) { trans.path = $(QTDIR)/translations } @@ -11,16 +22,5 @@ -} +qsci.path = $(QTDIR) - target.path = $$[QT_INSTALL_LIBS] - isEmpty(target.path) { ---- Qt3/qscintilla.pro -+++ Qt3/qscintilla.pro -@@ -45,7 +45,7 @@ DEFINES = QSCINTILLA_MAKE_DLL QT SCI_LEXER - # Handle both Qt v4 and v3. - target.path = $$[QT_INSTALL_LIBS] - isEmpty(target.path) { -- target.path = $(QTDIR)/lib -+ target.path = $(QTDIR_LIB) - } + INSTALLS += header trans qsci target - header.path = $$[QT_INSTALL_HEADERS] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

← Newer
1
...
40
41
42
43
44
45
46
47
48
Older →

Jump to page: