March 2008 - openSUSE Commits - openSUSE Mailing Lists

commit xorg-x11-driver-video
by root＠Hilbert.suse.de 31 Mar '08

31 Mar '08

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Mon Mar 31 10:50:08 CEST 2008. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-03-23 13:09:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-03-31 09:25:09.093109000 +0200 @@ -1,0 +2,27 @@ +Mon Mar 31 09:39:57 CEST 2008 - sndirsch(a)suse.de + +- xf86-video-intel 2.2.99.902 + * Revert "Use mprotect on unbound AGP memory to attempt to catch + use while unbound." + * Fix 965+ rendering issues with DRI disabled. + * Add a "total" field to intel_idle output (set when any unit is + busy). + * Initial panel fitting changes + * Fixup backlight control and panel fitting property names + * Use combo backlight control rather than pure legacy + * Fix DRI config for NetBSD + * Don't try to build XvMC if DRI is disabled + * Transformed coord computed using floats. Don't move bilinear + composite dst. + * Disable cursors while switching modes + * Fix obviously stray '(' in non-I830_USE_EXA case. + * Fix obviously wrong verification of DRI_SUPPORTS_CLIP_NOTIFY. + * Fix crash triggered by dpms low power mode with hardware + overlay running + * More compile warning fixes. + * xvmc: fix distcheck + * Disable overlay on new mobile chipset + * Disable DRI earlier if fb width > 2048 + * Use xfree() for bios memory + +------------------------------------------------------------------- Old: ---- xf86-video-intel-2.2.99.901.tar.bz2 New: ---- xf86-video-intel-2.2.99.902.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.B26778/_old 2008-03-31 10:49:14.000000000 +0200 +++ /var/tmp/diff_new_pack.B26778/_new 2008-03-31 10:49:14.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.3 -Release: 98 +Release: 102 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -61,7 +61,7 @@ Source42: xf86-video-voodoo-1.2.0.tar.bz2 Source43: xf86-video-impact-0.2.0.tar.bz2 Source44: HALlib-4.1.tar.gz -Source45: xf86-video-intel-2.2.99.901.tar.bz2 +Source45: xf86-video-intel-2.2.99.902.tar.bz2 Source46: xf86-video-ati-6.8.0.tar.bz2 Source48: xf86-video-mga-1.9.100.tar.bz2 Source50: xf86-video-xgi-1.5.0.tar.bz2 @@ -251,6 +251,30 @@ %{_mandir}/man4/* %changelog +* Mon Mar 31 2008 sndirsch(a)suse.de +- xf86-video-intel 2.2.99.902 + * Revert "Use mprotect on unbound AGP memory to attempt to catch + use while unbound." + * Fix 965+ rendering issues with DRI disabled. + * Add a "total" field to intel_idle output (set when any unit is + busy). + * Initial panel fitting changes + * Fixup backlight control and panel fitting property names + * Use combo backlight control rather than pure legacy + * Fix DRI config for NetBSD + * Don't try to build XvMC if DRI is disabled + * Transformed coord computed using floats. Don't move bilinear + composite dst. + * Disable cursors while switching modes + * Fix obviously stray '(' in non-I830_USE_EXA case. + * Fix obviously wrong verification of DRI_SUPPORTS_CLIP_NOTIFY. + * Fix crash triggered by dpms low power mode with hardware + overlay running + * More compile warning fixes. + * xvmc: fix distcheck + * Disable overlay on new mobile chipset + * Disable DRI earlier if fb width > 2048 + * Use xfree() for bios memory * Sun Mar 23 2008 sndirsch(a)suse.de - xf86-video-amd 2.7.7.7 * Implement support for wide and non-standard screen resolutions. @@ -278,7 +302,7 @@ hardware decode is still under work, and would be in next release though). And we have also fixed several Xv relate issues, and with bunch of bug fixes as usual." -* Wed Mar 19 2008 sndirsch(a)suse.de +* Thu Mar 20 2008 sndirsch(a)suse.de - xf86-video-apm 1.2.0 xf86-video-ark 0.7.0 xf86-video-ast 0.85.0 @@ -397,7 +421,7 @@ - xf86-video-mga 1.4.8 * X.Org Bug #13926: Unbreak Xinerama (which finally fixes Novell Bug #331550) -* Mon Jan 14 2008 sndirsch(a)suse.de +* Tue Jan 15 2008 sndirsch(a)suse.de - xf86-video-amd 2.7.7.5 * Trivial patch to fix the ZTV module * Basic OLPC support from Bernardo Innocenti and Jordan Crouse. @@ -439,7 +463,7 @@ - xf86-video-sis 0.9.4 * This release fixes DRI with xorg-server 1.3 and above, which weren't detected properly. -* Thu Nov 15 2007 sndirsch(a)suse.de +* Fri Nov 16 2007 sndirsch(a)suse.de - xf86-video-intel 2.2.0 * Since the 2.1.0 release, over 160 bugs have been resolved. That still leaves 96 open bugs (yay for breaking the 100 barrier), @@ -525,7 +549,7 @@ * Fix video downscaling * Fri Oct 12 2007 sndirsch(a)suse.de - no longer build ATI 6.6.193 driver; replaced by ATI 6.6.3 driver -* Wed Oct 10 2007 sndirsch(a)suse.de +* Thu Oct 11 2007 sndirsch(a)suse.de - xf86-video-ati-6.6.3-compile-cfb.patch xf86-video-ati-6.6.3-if0.patch xf86-video-ati-6.6.3-r128-xvideo.patch @@ -625,7 +649,7 @@ video cards. This driver is based on source code and documentation released by XGI. Much of the original code was written by Thomas Winischhofer. -* Mon Aug 27 2007 sndirsch(a)suse.de +* Tue Aug 28 2007 sndirsch(a)suse.de - xf86-video-unichrome-20070511.tar.bz2/xf86-video-unichrome.diff * via driver from Unichrome Project (renamed to 'unichrome') * Mon Aug 27 2007 sndirsch(a)suse.de @@ -708,7 +732,7 @@ - xf86-video-intel-xvmc_i915_i945-1.diff: * disable subpicture initial. until we really implement it, OSD can't work for now. (related to Bug #296982) -* Wed Aug 08 2007 sndirsch(a)suse.de +* Thu Aug 09 2007 sndirsch(a)suse.de - xf86-video-ati-AGPFastWrite-risk-reduction.diff: * Verbosely warn about the detrimental effects of the AGPFastWrite option. (Bug #298465) @@ -808,7 +832,7 @@ * Work around more MacBook wackiness. Turn off more corrupt the framebuffer mode. Don't mess with the pixel clock for LVDS as long as we're trusting the VBIOS-programmed timings. -* Wed Jul 04 2007 sndirsch(a)suse.de +* Thu Jul 05 2007 sndirsch(a)suse.de - xf86-video-nv.diff: * Put the GPU into don't corrupt the framebuffer mode to work around MacBook wackiness. @@ -817,7 +841,7 @@ * Tue Jul 03 2007 sndirsch(a)suse.de - updated nv driver to release 2.1.1 - obsoletes xf86-video-nv.diff -* Mon Jul 02 2007 sndirsch(a)suse.de +* Tue Jul 03 2007 sndirsch(a)suse.de - xf86-video-nv.diff: * support for GeForce 8400M G * Support configs with BAR1 < total RAM < 256 MB @@ -833,7 +857,7 @@ G80: Mode validation. Disable LVDS modes larger than the native resolution. Disable dual-link TMDS modes for now since they don't work reliably. -* Thu Jun 07 2007 sndirsch(a)suse.de +* Fri Jun 08 2007 sndirsch(a)suse.de - xf86-video-nv-g80.diff: * G80: Rearrange HW video timing computations * G80: LVDS support @@ -894,7 +918,7 @@ * radeon: Link nearest modes by default for clone mode. - obsoletes bug-263199_radeon-mergedfb-crash.diff, xf86-video-ati-6.6.191.diff -* Thu May 17 2007 sndirsch(a)suse.de +* Fri May 18 2007 sndirsch(a)suse.de - updated ATI RANDR1.2 driver (git 20070517) * Thu May 17 2007 sndirsch(a)suse.de - updated nv driver to release 2.0.96 @@ -906,7 +930,7 @@ 4. Only VBE modes are available. 5. No Xinerama information is provided. Use ' Option "Dualhead" "on" ' for configuration. -* Mon May 14 2007 sndirsch(a)suse.de +* Tue May 15 2007 sndirsch(a)suse.de - disabled generation of kernel framebuffer blacklist (Bug #239194, comments #27, #28, #31) * Fri May 11 2007 sndirsch(a)suse.de @@ -1096,10 +1120,10 @@ * fix GXxor corruption on nv4x (Bug #246421) * Hide the cursor in CloseScreen. Otherwise, if we're restoring a graphical framebuffer mode the cursor will still be visible. -* Thu Mar 15 2007 sndirsch(a)suse.de +* Fri Mar 16 2007 sndirsch(a)suse.de - xf86-video-nv-vesafb-vga.diff: * Fix VGA output with vesafb on nv4x and G7x GPUs (Bug #160812) -* Wed Mar 14 2007 sndirsch(a)suse.de +* Thu Mar 15 2007 sndirsch(a)suse.de - intel driver release 1.9.92 (2.0 RC2): * Major changes in this release include moving more code to the X Server, fixing 3D performance regressions, fixing Mac Mini @@ -1240,7 +1264,7 @@ - updated intel modesetting driver (git_2006-12-04) - xf86-video-i810-newdrm.diff: * Add support for the new DRM memory manager -* Sat Dec 02 2006 sndirsch(a)suse.de +* Sun Dec 03 2006 sndirsch(a)suse.de - newdrm.diff obsolete with libdrm 2.3.0 * Fri Dec 01 2006 sndirsch(a)suse.de - bug220197.diff: @@ -1445,7 +1469,7 @@ - removed Requires: xorg-x11-server, since xorg-x11-input-video is already required by xorg-x11-server, which resulted in a fatal dependancy cycle -* Mon Aug 28 2006 sndirsch(a)suse.de +* Tue Aug 29 2006 sndirsch(a)suse.de - radeon-min_dotclock.diff: * check for bogus minclock in VBIOS and set a reasonable value instead (Bug #197847) ++++++ xf86-video-intel-2.2.99.901.tar.bz2 -> xf86-video-intel-2.2.99.902.tar.bz2 ++++++ ++++ 2147 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 OpenOffice_org
by root＠Hilbert.suse.de 30 Mar '08

30 Mar '08

Hello community, here is the log from the commit of package OpenOffice_org checked in at Mon Mar 31 01:17:41 CEST 2008. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2008-03-14 13:18:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org.changes 2008-03-28 18:08:50.000000000 +0100 @@ -1,0 +2,25 @@ +Fri Mar 28 17:33:43 CET 2008 - pmladek(a)suse.cz + +- updated to the milestone ooh680-m12 (2.4rc6 == 2.4-final) +- updated ooo-build to ooo-build-2.4.0.5: + * better support for various formula syntax + * left-mouse click and protected cell crasher [n#371204] + * cell background painting improvements [n#361360, i#3907] + * wrong result of interactive functions, e.g MIN [n#372255] + * better floating-point rounding error fix [n#310706, i#86775] + * more on the localized arg separator stuff [n#358558, n#373479] + * detect the symlinked mozilla wrapper correctly [n#368532, i#87258] + * interference between R1C1 and localized arg separator stuff [n#372494] + * visual feedback for copied cell range [n#367489] + * keys that quits the paste on Enter mode [n#372446] + * output range format in the datapilot regression + * drag&drop with plus/minus signs in Navigator [i#64886, n#129410] + * unopkg wrapper and association with .oxt [n#352574] + * VBA bits: + * support worksheet_deactivate events +- updated branding packaging to the openSUSE >= 11.0 style: + * created branding-upstream subpackage + * moved openSUSE and SLED10 branding to extra packages + * kept compatibility when building for older distros + +------------------------------------------------------------------- --- arch/i386/OpenOffice_org/OpenOffice_org-i18n.changes 2008-03-14 12:54:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org-i18n.changes 2008-03-28 18:07:48.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Mar 28 18:06:44 CET 2008 - pmladek(a)suse.cz + +- updated to the milestone ooh680-m12 (2.4rc6 == 2.4-final) +- updated ooo-build to ooo-build-2.4.0.5: + * more Hungarian translation fixes +- added the branding related changes to be in sync with the main package + +------------------------------------------------------------------- Old: ---- minmem ooh680-m11-binfilter.tar.bz2 ooh680-m11-core.tar.bz2 ooh680-m11-lang.tar.bz2 ooh680-m11-sdk_oo.tar.bz2 ooh680-m11-system.tar.bz2 ooo-build-2.4.0.3.tar.gz New: ---- kde-mime-desktop.tar.bz2 ooh680-m12-binfilter.tar.bz2 ooh680-m12-core.tar.bz2 ooh680-m12-lang.tar.bz2 ooh680-m12-sdk_oo.tar.bz2 ooh680-m12-system.tar.bz2 ooo-build-2.4.0.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-i18n.spec ++++++ --- /var/tmp/diff_new_pack.V12307/_old 2008-03-31 01:16:02.000000000 +0200 +++ /var/tmp/diff_new_pack.V12307/_new 2008-03-31 01:16:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-i18n (Version 2.4.0.3) +# spec file for package OpenOffice_org-i18n (Version 2.4.0.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -72,8 +72,8 @@ %define ooo_prefix %_libdir %define ooo_home ooo-2.0 %define ooo_build_dir build -%define ooo_build_version 2.4.0.3 -%define ooo_build_tag ooh680-m11 +%define ooo_build_version 2.4.0.5 +%define ooo_build_tag ooh680-m12 # source sripts for architectures %ifarch ppc %define ooo_source_script %ooo_build_dir/%ooo_build_tag/LinuxPPCEnv.Set.sh @@ -86,7 +86,7 @@ %endif License: GPL v2 or later; LGPL v2.1 or later Group: Productivity/Office/Suite -Version: 2.4.0.3 +Version: 2.4.0.5 Release: 1 AutoReqProv: on Summary: A Source Package for OpenOffice.org Localizations @@ -133,11 +133,13 @@ Source30: extra_localizations_sources.tar.bz2 # templates that can be used to create a new file on KDE desktop Source31: ooo-kde-templates.tar.bz2 -# branding stuff +%if %suse_version <= 1030 +# branding stuff; has been moved into separate packages in openSUSE-11.0 Source40: openintro_nld.bmp Source41: openabout_nld.bmp Source42: openintro_suse.bmp Source43: openabout_suse.bmp +%endif %if %suse_version <= 1010 # obsolete wrapper, removed in openSUSE 10.2 Source600: OOo-wrapper @@ -158,6 +160,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-af +License: GPL v2 or later; LGPL v2.1 or later Summary: African Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:af) @@ -174,6 +177,7 @@ %package -n OpenOffice_org-ar +License: GPL v2 or later; LGPL v2.1 or later Summary: Arabic Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ar) @@ -188,6 +192,7 @@ %package -n OpenOffice_org-be-BY +License: GPL v2 or later; LGPL v2.1 or later Summary: Belorussian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:be) @@ -202,6 +207,7 @@ %package -n OpenOffice_org-bg +License: GPL v2 or later; LGPL v2.1 or later Summary: Bulgarian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:bg) @@ -226,6 +232,7 @@ %package -n OpenOffice_org-br +License: GPL v2 or later; LGPL v2.1 or later Summary: Breton French Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:br) @@ -237,6 +244,7 @@ %package -n OpenOffice_org-ca +License: GPL v2 or later; LGPL v2.1 or later Summary: Catalan Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ca) @@ -256,6 +264,7 @@ %if %test_build_langs >= 1 %package -n OpenOffice_org-cs +License: GPL v2 or later; LGPL v2.1 or later Summary: Czech Localization Files for OpenOffice.org Group: Productivity/Office/Suite PreReq: coreutils @@ -278,6 +287,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-cy +License: GPL v2 or later; LGPL v2.1 or later Summary: Welsh Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:cy) @@ -294,6 +304,7 @@ %package -n OpenOffice_org-da +License: GPL v2 or later; LGPL v2.1 or later Summary: Danish Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:da) @@ -313,6 +324,7 @@ %if %test_build_langs >= 1 %package -n OpenOffice_org-de +License: GPL v2 or later; LGPL v2.1 or later Summary: German Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:de) @@ -334,6 +346,7 @@ %if %test_build_langs >= 2 %package -n OpenOffice_org-el +License: GPL v2 or later; LGPL v2.1 or later Summary: Greek Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:el) @@ -353,6 +366,7 @@ %package -n OpenOffice_org-en-GB +License: GPL v2 or later; LGPL v2.1 or later Summary: British Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:en_GB) @@ -369,6 +383,7 @@ %package -n OpenOffice_org-en-ZA +License: GPL v2 or later; LGPL v2.1 or later Summary: South Africa English Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:en_ZA) @@ -385,6 +400,7 @@ %package -n OpenOffice_org-es +License: GPL v2 or later; LGPL v2.1 or later Summary: Spanish Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:es) @@ -403,6 +419,7 @@ %package -n OpenOffice_org-et +License: GPL v2 or later; LGPL v2.1 or later Summary: Estonian Localization Files for OpenOffice.org Group: Productivity/Office/Suite PreReq: coreutils @@ -420,6 +437,7 @@ %package -n OpenOffice_org-fi +License: GPL v2 or later; LGPL v2.1 or later Summary: Finnish Localization Files for OpenOffice.org Group: Productivity/Office/Suite PreReq: coreutils @@ -432,6 +450,7 @@ %package -n OpenOffice_org-fr +License: GPL v2 or later; LGPL v2.1 or later Summary: French Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:fr) @@ -450,6 +469,7 @@ %package -n OpenOffice_org-ga +License: GPL v2 or later; LGPL v2.1 or later Summary: Gaelic Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ga) @@ -466,6 +486,7 @@ %package -n OpenOffice_org-gl +License: GPL v2 or later; LGPL v2.1 or later Summary: Galician Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:gl) @@ -477,6 +498,7 @@ %package -n OpenOffice_org-he +License: GPL v2 or later; LGPL v2.1 or later Summary: Hebrew Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:he) @@ -493,6 +515,7 @@ %package -n OpenOffice_org-hi-IN +License: GPL v2 or later; LGPL v2.1 or later Summary: Hindi Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:hi) @@ -510,6 +533,7 @@ %package -n OpenOffice_org-hr +License: GPL v2 or later; LGPL v2.1 or later Summary: Croatian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:hr) @@ -526,6 +550,7 @@ %package -n OpenOffice_org-gu-IN +License: GPL v2 or later; LGPL v2.1 or later Summary: Gujarati Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:gu) @@ -543,6 +568,7 @@ %package -n OpenOffice_org-hu +License: GPL v2 or later; LGPL v2.1 or later Summary: Hungarian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:hu) @@ -559,6 +585,7 @@ %package -n OpenOffice_org-it +License: GPL v2 or later; LGPL v2.1 or later Summary: Italian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:it) @@ -575,6 +602,7 @@ %package -n OpenOffice_org-ja +License: GPL v2 or later; LGPL v2.1 or later Summary: Japanese Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ja) @@ -589,6 +617,7 @@ %package -n OpenOffice_org-ka +License: GPL v2 or later; LGPL v2.1 or later Summary: Georgian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ka) @@ -600,6 +629,7 @@ %package -n OpenOffice_org-km +License: GPL v2 or later; LGPL v2.1 or later Summary: Khmer Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:km) @@ -614,6 +644,7 @@ %package -n OpenOffice_org-ko +License: GPL v2 or later; LGPL v2.1 or later Summary: Korean Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ko) @@ -628,6 +659,7 @@ %package -n OpenOffice_org-lt +License: GPL v2 or later; LGPL v2.1 or later Summary: Lithuanian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:lt) @@ -644,6 +676,7 @@ %package -n OpenOffice_org-mk +License: GPL v2 or later; LGPL v2.1 or later Summary: Macedonian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:mk) @@ -663,6 +696,7 @@ %package -n OpenOffice_org-nb +License: GPL v2 or later; LGPL v2.1 or later Summary: Norwegian Bokmaal Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:nb) @@ -681,6 +715,7 @@ %package -n OpenOffice_org-nl +License: GPL v2 or later; LGPL v2.1 or later Summary: Dutch Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:nl) @@ -697,6 +732,7 @@ %package -n OpenOffice_org-nn +License: GPL v2 or later; LGPL v2.1 or later Summary: Norwegian Nynorsk Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:nn) @@ -713,6 +749,7 @@ %package -n OpenOffice_org-nr +License: GPL v2 or later; LGPL v2.1 or later Summary: Ndebele Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:nr) @@ -729,6 +766,7 @@ %package -n OpenOffice_org-pa-IN +License: GPL v2 or later; LGPL v2.1 or later Summary: Punjabi Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:pa) @@ -743,6 +781,7 @@ %package -n OpenOffice_org-pl +License: GPL v2 or later; LGPL v2.1 or later Summary: Polish Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:pl) @@ -761,6 +800,7 @@ %package -n OpenOffice_org-pt +License: GPL v2 or later; LGPL v2.1 or later Summary: Portuguese Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:pt) @@ -779,6 +819,7 @@ %package -n OpenOffice_org-pt-BR +License: GPL v2 or later; LGPL v2.1 or later Summary: Brazilian Portuguese Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:pt_BR) @@ -795,6 +836,7 @@ %package -n OpenOffice_org-rw +License: GPL v2 or later; LGPL v2.1 or later Summary: Kinyarwanda Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:rw) @@ -811,6 +853,7 @@ %package -n OpenOffice_org-ru +License: GPL v2 or later; LGPL v2.1 or later Summary: Russian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ru) @@ -830,6 +873,7 @@ %package -n OpenOffice_org-sh-YU +License: GPL v2 or later; LGPL v2.1 or later Summary: Latin Serbian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:sh_YU) @@ -841,6 +885,7 @@ %package -n OpenOffice_org-sk +License: GPL v2 or later; LGPL v2.1 or later Summary: Slovak Localization Files for OpenOffice.org Group: Productivity/Office/Suite PreReq: coreutils @@ -860,6 +905,7 @@ %package -n OpenOffice_org-sl +License: GPL v2 or later; LGPL v2.1 or later Summary: Slovene Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:sl) @@ -876,6 +922,7 @@ %package -n OpenOffice_org-sr-CS +License: GPL v2 or later; LGPL v2.1 or later Summary: Serbian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:sr) @@ -890,6 +937,7 @@ %package -n OpenOffice_org-ss +License: GPL v2 or later; LGPL v2.1 or later Summary: Swazi Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ss) @@ -901,6 +949,7 @@ %package -n OpenOffice_org-st +License: GPL v2 or later; LGPL v2.1 or later Summary: Sotho Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:st) @@ -915,6 +964,7 @@ %package -n OpenOffice_org-sv +License: GPL v2 or later; LGPL v2.1 or later Summary: Swedish Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:sv) @@ -931,6 +981,7 @@ %package -n OpenOffice_org-tg +License: GPL v2 or later; LGPL v2.1 or later Summary: Tajiki Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:tg) @@ -942,6 +993,7 @@ %package -n OpenOffice_org-th +License: GPL v2 or later; LGPL v2.1 or later Summary: Thai Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:th) @@ -953,6 +1005,7 @@ %package -n OpenOffice_org-tr +License: GPL v2 or later; LGPL v2.1 or later Summary: Turkish Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:tr) @@ -964,6 +1017,7 @@ %package -n OpenOffice_org-ts +License: GPL v2 or later; LGPL v2.1 or later Summary: Tsonga Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ts) @@ -978,6 +1032,7 @@ %package -n OpenOffice_org-uk +License: GPL v2 or later; LGPL v2.1 or later Summary: Ukrainian Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:uk) @@ -994,6 +1049,7 @@ %package -n OpenOffice_org-ve +License: GPL v2 or later; LGPL v2.1 or later Summary: Venda Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:ve) @@ -1010,6 +1066,7 @@ %package -n OpenOffice_org-vi +License: GPL v2 or later; LGPL v2.1 or later Summary: Vietnamese Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:vi) @@ -1021,6 +1078,7 @@ %package -n OpenOffice_org-xh +License: GPL v2 or later; LGPL v2.1 or later Summary: Xhosa Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:xh) @@ -1035,6 +1093,7 @@ %package -n OpenOffice_org-zh-CN +License: GPL v2 or later; LGPL v2.1 or later Summary: Chinese Simplified Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:zh_CN) @@ -1049,6 +1108,7 @@ %package -n OpenOffice_org-zh-TW +License: GPL v2 or later; LGPL v2.1 or later Summary: Chinese Traditional Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:zh_TW) @@ -1063,6 +1123,7 @@ %package -n OpenOffice_org-zu +License: GPL v2 or later; LGPL v2.1 or later Summary: Zulu Localization Files for OpenOffice.org Group: Productivity/Office/Suite Provides: locale(OpenOffice_org:zu) @@ -1081,6 +1142,7 @@ %endif %package -n OpenOffice_org-icon-themes +License: GPL v2 or later; LGPL v2.1 or later Summary: Icon Themes for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/share/config/images.zip @@ -1150,8 +1212,10 @@ --with-binsuffix=%ooo_bin_suffix \ --with-installed-ooo-dirname=%ooo_home \ --with-distro="$with_distro" \ +%if %suse_version <= 1030 --with-intro-bitmaps="%{S:40} %{S:42}" \ --with-about-bitmaps="%{S:41} %{S:43}" \ +%endif --with-tag=%ooo_build_tag \ --with-lang=%ooo_langs \ --with-poor-help-localizations=%ooo_poor_help_localizations \ @@ -2109,6 +2173,11 @@ %defattr(-,root,root) %changelog +* Fri Mar 28 2008 pmladek(a)suse.cz +- updated to the milestone ooh680-m12 (2.4rc6 == 2.4-final) +- updated ooo-build to ooo-build-2.4.0.5: + * more Hungarian translation fixes +- added the branding related changes to be in sync with the main package * Thu Mar 13 2008 pmladek(a)suse.cz - updated to the milestone ooh680-m11 (2.4rc5) [fate#303312] - updated ooo-build to ooo-build-2.4.0.3 ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.V12307/_old 2008-03-31 01:16:02.000000000 +0200 +++ /var/tmp/diff_new_pack.V12307/_new 2008-03-31 01:16:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org (Version 2.4.0.3) +# spec file for package OpenOffice_org (Version 2.4.0.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -120,11 +120,11 @@ %define ooo_prefix %_libdir %define ooo_home ooo-2.0 %define ooo_build_dir build -%define ooo_build_version 2.4.0.3 -%define ooo_build_tag ooh680-m11 +%define ooo_build_version 2.4.0.5 +%define ooo_build_tag ooh680-m12 License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT Group: Productivity/Office/Suite -Version: 2.4.0.3 +Version: 2.4.0.5 Release: 1 AutoReqProv: on PreReq: coreutils /usr/bin/update-mime-database @@ -137,6 +137,10 @@ Obsoletes: OpenOffice_org-hunspell %endif Obsoletes: OpenOffice_org2-hunspell +%if %suse_version > 1030 +Requires: %{name}-branding > 2 +Requires: %{name}-branding < 3 +%endif %if %suse_version > 1000 Recommends: myspell-american %else @@ -256,11 +260,13 @@ Source30: extra_localizations_sources.tar.bz2 # templates that can be used to create a new file on KDE desktop Source31: ooo-kde-templates.tar.bz2 -# branding stuff +%if %suse_version <= 1030 +# branding stuff; has been moved into separate packages in openSUSE-11.0 Source40: openintro_nld.bmp Source41: openabout_nld.bmp Source42: openintro_suse.bmp Source43: openabout_suse.bmp +%endif # Open XML MIME stuff Source500: ooo-2.0-openxml.xml Source501: openxml-gnome-icons.tar.bz2 @@ -273,6 +279,8 @@ Source512: ooo-2.0-vnd.oasis.opendocument.presentation.desktop Source513: ooo-2.0-vnd.oasis.opendocument.spreadsheet.desktop Source514: ooo-2.0-vnd.oasis.opendocument.text.desktop +# various MIME stuff +Source550: kde-mime-desktop.tar.bz2 %if %suse_version <= 1010 # obsolete wrapper, removed in openSUSE 10.2 Source600: OOo-wrapper @@ -331,6 +339,7 @@ %package base +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Base Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oobase @@ -347,6 +356,7 @@ %package calc +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Calc Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oocalc @@ -362,6 +372,7 @@ %package draw +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Draw Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oodraw @@ -377,6 +388,7 @@ %package math +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Math Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oomath @@ -392,6 +404,7 @@ %package impress +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Impress Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/ooimpress @@ -407,6 +420,7 @@ %package writer +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Writer and Web Group: Productivity/Office/Suite Provides: OpenOffice_org:/usr/bin/oowriter @@ -422,6 +436,7 @@ %package filters +License: GPL v2 or later; LGPL v2.1 or later Summary: Additional Import and Export Filters for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/share/xslt/docbook/DocBookTemplate.stw @@ -451,6 +466,7 @@ %package mailmerge +License: GPL v2 or later; LGPL v2.1 or later Summary: Mail Merge Functionality for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/program/mailmerge.py @@ -466,6 +482,7 @@ %package pyuno +License: GPL v2 or later; LGPL v2.1 or later Summary: Python UNO Bridge for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/program/pyuno.so @@ -486,6 +503,7 @@ %package testtool +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org Test Tool Group: Productivity/Office/Suite Provides: OpenOffice_org:%ooo_prefix/%ooo_home/program/testtool.bin @@ -497,6 +515,7 @@ %package gnome +License: GPL v2 or later; LGPL v2.1 or later Summary: GNOME Extensions for OpenOffice.org Group: Productivity/Office/Suite Provides: ooo:/usr/lib/ooo-1.9/program/libevoab2.so @@ -514,6 +533,7 @@ %package kde +License: GPL v2 or later; LGPL v2.1 or later Summary: KDE Extensions for OpenOffice.org Group: Productivity/Office/Suite Provides: OpenOffice_org17-kde @@ -529,7 +549,10 @@ +%if %suse_version <= 1030 + %package nld +License: GPL v2 or later; LGPL v2.1 or later Summary: NLD Branding for OpenOffice.org Group: Productivity/Office/Suite Requires: %name = %version @@ -544,9 +567,41 @@ +%else + +%package branding-upstream +License: GPL v2 or later; LGPL v2.1 or later +Summary: Original Branding for OpenOffice.org +Group: Productivity/Office/Suite +Provides: %{name}-branding = %{version} +Supplements: branding-upstream +#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/intro.bmp +#BRAND: type: PC bitmap data, Windows 3.x format, 400 x 299 x 24 (BMP) +#BRAND: purpose: "splash" image displayed for a short time, when the application is launching +#BRAND: text: should mention the app name "OpenOffice.org" and the major version "2" +#BRAND: context: no border is being displayed around the splash windows +#BRAND: the picture is overlapped by the progress bar: x,y=212,216; w,h=263,8 +#BRAND: the default progress bar color is 0,0,128 (blue) +#BRAND: the progress bar has 1 pixel width white border +#BRAND: +#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/about.bmp +#BRAND: type: PC bitmap data, Windows 3.x format, 415 x 95 x 24 (BMP) +#BRAND: purpose: displayed on top of the Help/About OpenOffice.org dialog +#BRAND: text: should mention the app name "OpenOffice.org" and the major version "2" +#BRAND: context: there are displayed several lines of some text below the picture +#BRAND: the text is black on a white background + +%description branding-upstream +This package includes the original branding for the OpenOffice.org +office suite. + + + +%endif %if %ooo_build_sdk == yes %package sdk +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org SDK Group: Documentation/HTML Requires: %name = %version @@ -565,6 +620,7 @@ %package sdk-doc +License: GPL v2 or later; LGPL v2.1 or later Summary: OpenOffice.org SDK Documentation Group: Development/Libraries/Other %if %suse_version > 1000 @@ -584,6 +640,7 @@ %if %suse_version <= 1030 %package mono +License: GPL v2 or later; LGPL v2.1 or later Summary: Mono UNO Bridge for OpenOffice.org Group: Productivity/Office/Suite PreReq: mono-core @@ -606,6 +663,7 @@ %if %with_java != no %package officebean +License: GPL v2 or later; LGPL v2.1 or later Summary: OfficeBean Java Bean component for OpenOffice.org Group: Productivity/Office/Suite Provides: %name:/usr/lib/ooo-2.0/program/libofficebean.so @@ -636,6 +694,7 @@ %endif %package devel +License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT Summary: A Free Office Suite (Framework) Group: Productivity/Office/Suite # FIXME: need until the devel package duplicates all the libraries @@ -684,7 +743,7 @@ %if %prepare_build == 0 %setup -D -T -q -n ooo-build-%ooo_build_version %else -%setup -q -n ooo-build-%ooo_build_version -a501 -a510 +%setup -q -n ooo-build-%ooo_build_version -a501 -a510 -a550 %patch0 %patch1 %patch2 @@ -761,8 +820,10 @@ --with-binsuffix=%ooo_bin_suffix \ --with-installed-ooo-dirname=%ooo_home \ --with-distro="$with_distro" \ +%if %suse_version <= 1030 --with-intro-bitmaps="%{S:40} %{S:42}" \ --with-about-bitmaps="%{S:41} %{S:43}" \ +%endif --with-tag=%ooo_build_tag \ --with-lang=%ooo_langs \ --with-poor-help-localizations=%ooo_poor_help_localizations \ @@ -871,6 +932,10 @@ install -m 644 %{S:513} $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application install -m 644 %{S:514} $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application # +# various MIME stuff +mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application +cp -a kde-mime-desktop/* $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application +# # extra fix for SLED %if %sles_version >= 10 # hide the Writer/Web menu entry on SLED10, n#168663 @@ -1001,11 +1066,13 @@ /usr/bin/ooconfig /usr/bin/oofromtemplate /usr/bin/ootool +/usr/bin/unopkg /usr/bin/soffice # this symlink will be updated in %post and %postun %ghost /usr/bin/soffice /usr/sbin/* /usr/share/man/man1/* +/usr/share/applications/ooo-extension-manager.desktop /usr/share/applications/template.desktop %if %suse_version < 930 %dir /usr/share/mime @@ -1089,9 +1156,15 @@ %files -f %ooo_build_dir/kde_list.txt kde %defattr(-,root,root) +%if %suse_version <= 1030 %files -f %ooo_build_dir/nld_list.txt nld %defattr(-,root,root) +%else + +%files -f %ooo_build_dir/upstream_branding_list.txt branding-upstream +%defattr(-,root,root) +%endif %if %ooo_build_sdk == yes %files -f %ooo_build_dir/sdk_list.txt sdk @@ -1122,6 +1195,28 @@ %{_prefix}/bin/dmake %changelog +* Fri Mar 28 2008 pmladek(a)suse.cz +- updated to the milestone ooh680-m12 (2.4rc6 == 2.4-final) +- updated ooo-build to ooo-build-2.4.0.5: + * better support for various formula syntax + * left-mouse click and protected cell crasher [n#371204] + * cell background painting improvements [n#361360, i#3907] + * wrong result of interactive functions, e.g MIN [n#372255] + * better floating-point rounding error fix [n#310706, i#86775] + * more on the localized arg separator stuff [n#358558, n#373479] + * detect the symlinked mozilla wrapper correctly [n#368532, i#87258] + * interference between R1C1 and localized arg separator stuff [n#372494] + * visual feedback for copied cell range [n#367489] + * keys that quits the paste on Enter mode [n#372446] + * output range format in the datapilot regression + * drag&drop with plus/minus signs in Navigator [i#64886, n#129410] + * unopkg wrapper and association with .oxt [n#352574] + * VBA bits: + * support worksheet_deactivate events +- updated branding packaging to the openSUSE >= 11.0 style: + * created branding-upstream subpackage + * moved openSUSE and SLED10 branding to extra packages + * kept compatibility when building for older distros * Thu Mar 13 2008 pmladek(a)suse.cz - updated to the milestone ooh680-m11 (2.4rc5) [fate#303312] - updated ooo-build to ooo-build-2.4.0.3: ++++++ ooh680-m11-binfilter.tar.bz2 -> ooh680-m12-binfilter.tar.bz2 ++++++ arch/i386/OpenOffice_org/ooh680-m11-binfilter.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ooh680-m12-binfilter.tar.bz2 differ: byte 11, line 1 ++++++ ooh680-m11-core.tar.bz2 -> ooh680-m12-core.tar.bz2 ++++++ arch/i386/OpenOffice_org/ooh680-m11-core.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ooh680-m12-core.tar.bz2 differ: byte 11, line 1 ++++++ ooh680-m11-lang.tar.bz2 -> ooh680-m12-lang.tar.bz2 ++++++ arch/i386/OpenOffice_org/ooh680-m11-lang.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ooh680-m12-lang.tar.bz2 differ: byte 11, line 1 ++++++ ooh680-m11-sdk_oo.tar.bz2 -> ooh680-m12-sdk_oo.tar.bz2 ++++++ ++++++ ooh680-m11-system.tar.bz2 -> ooh680-m12-system.tar.bz2 ++++++ arch/i386/OpenOffice_org/ooh680-m11-system.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org/ooh680-m12-system.tar.bz2 differ: byte 11, line 1 ++++++ ooo-build-2.4.0.3.tar.gz -> ooo-build-2.4.0.5.tar.gz ++++++ arch/i386/OpenOffice_org/ooo-build-2.4.0.3.tar.gz /mounts/work_src_done/STABLE/OpenOffice_org/ooo-build-2.4.0.5.tar.gz differ: byte 5, 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 yast2-fingerprint-reader
by root＠Hilbert.suse.de 30 Mar '08

30 Mar '08

Hello community, here is the log from the commit of package yast2-fingerprint-reader checked in at Mon Mar 31 01:13:18 CEST 2008. -------- --- yast2-fingerprint-reader/yast2-fingerprint-reader.changes 2008-03-26 10:44:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-fingerprint-reader/yast2-fingerprint-reader.changes 2008-03-30 20:50:10.064208000 +0200 @@ -1,0 +2,6 @@ +Sun Mar 30 20:48:47 CEST 2008 - jsuchome(a)suse.cz + +- merged proofread texts +- 2.16.6 + +------------------------------------------------------------------- Old: ---- yast2-fingerprint-reader-2.16.5.tar.bz2 New: ---- yast2-fingerprint-reader-2.16.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-fingerprint-reader.spec ++++++ --- /var/tmp/diff_new_pack.J29606/_old 2008-03-31 01:13:12.000000000 +0200 +++ /var/tmp/diff_new_pack.J29606/_new 2008-03-31 01:13:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-fingerprint-reader (Version 2.16.5) +# spec file for package yast2-fingerprint-reader (Version 2.16.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-fingerprint-reader -Version: 2.16.5 +Version: 2.16.6 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-fingerprint-reader-2.16.5.tar.bz2 +Source0: yast2-fingerprint-reader-2.16.6.tar.bz2 Prefix: /usr Requires: yast2 yast2-pam BuildRequires: libthinkfinger libusb-devel @@ -37,7 +37,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-fingerprint-reader-2.16.5 +%setup -n yast2-fingerprint-reader-2.16.6 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,9 @@ %{_libdir}/YaST2/plugin/libpy2ag_thinkfinger.* %doc %{prefix}/share/doc/packages/yast2-fingerprint-reader %changelog +* Sun Mar 30 2008 jsuchome(a)suse.cz +- merged proofread texts +- 2.16.6 * Wed Mar 26 2008 jsuchome(a)suse.cz - use OK button label instead Accept (fate #120373) - 2.16.5 ++++++ yast2-fingerprint-reader-2.16.5.tar.bz2 -> yast2-fingerprint-reader-2.16.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.16.5/src/dialogs.ycp new/yast2-fingerprint-reader-2.16.6/src/dialogs.ycp --- old/yast2-fingerprint-reader-2.16.5/src/dialogs.ycp 2007-10-22 13:33:23.000000000 +0200 +++ new/yast2-fingerprint-reader-2.16.6/src/dialogs.ycp 2008-03-30 20:48:31.000000000 +0200 @@ -79,11 +79,12 @@ boolean use_pam = FingerprintReader::use_pam; // help text string help_text = _(" -<big>Fingerprint Authentication</big> -The Fingerprint Reader Configuration updates your PAM settings to enable authentication with fingerprints.") + +Fingerprint Authentication +The fingerprint reader configuration updates your PAM settings to enable authentication with fingerprints. +") + // help text, cont. - _("To import fingerprint files from different installations, choose the directory where the files are located."); + _("To Import Fingerprint Files from different installations, choose the directory where the files are located."); term con = `HBox (`HSpacing (3), `VBox ( // frame label diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.16.5/src/helps.ycp new/yast2-fingerprint-reader-2.16.6/src/helps.ycp --- old/yast2-fingerprint-reader-2.16.5/src/helps.ycp 2007-10-02 13:27:17.000000000 +0200 +++ new/yast2-fingerprint-reader-2.16.6/src/helps.ycp 2008-03-30 20:48:31.000000000 +0200 @@ -37,7 +37,7 @@ map HELPS = $[ /* Read dialog help 1/2 */ - "read" : _("<big>Initializing Fingerprint Reader Configuration</big> + "read" : _("Initializing Fingerprint Reader Configuration Please wait... ") + @@ -47,9 +47,8 @@ "), /* Write dialog help 1/2 */ - "write" : _("<big>Saving Fingerprint Reader Configuration</big> -Please wait... -") + + "write" : _("Saving Fingerprint Reader Configuration +Please wait... \n") + /* Write dialog help 2/2 */ _("<big>Aborting Saving:</big> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.16.5/src/users_plugin_fingerprint_reader.ycp new/yast2-fingerprint-reader-2.16.6/src/users_plugin_fingerprint_reader.ycp --- old/yast2-fingerprint-reader-2.16.5/src/users_plugin_fingerprint_reader.ycp 2008-03-26 10:43:35.000000000 +0100 +++ new/yast2-fingerprint-reader-2.16.6/src/users_plugin_fingerprint_reader.ycp 2008-03-26 10:44:34.000000000 +0100 @@ -12,7 +12,7 @@ * Authors: * Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: users_plugin_fingerprint_reader.ycp 45293 2008-03-07 14:33:41Z jsuchome $ + * $Id: users_plugin_fingerprint_reader.ycp 45722 2008-03-26 09:44:34Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-fingerprint-reader-2.16.5/VERSION new/yast2-fingerprint-reader-2.16.6/VERSION --- old/yast2-fingerprint-reader-2.16.5/VERSION 2008-03-19 08:53:50.000000000 +0100 +++ new/yast2-fingerprint-reader-2.16.6/VERSION 2008-03-30 20:49:33.000000000 +0200 @@ -1 +1 @@ -2.16.5 +2.16.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-country
by root＠Hilbert.suse.de 30 Mar '08

30 Mar '08

Hello community, here is the log from the commit of package yast2-country checked in at Mon Mar 31 01:13:05 CEST 2008. -------- --- yast2-country/yast2-country.changes 2008-03-19 08:31:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2008-03-30 21:08:31.705986000 +0200 @@ -1,0 +2,6 @@ +Sun Mar 30 21:06:41 CEST 2008 - jsuchome(a)suse.cz + +- merged proofread texts +- 2.16.13 + +------------------------------------------------------------------- Old: ---- yast2-country-2.16.12.tar.bz2 New: ---- yast2-country-2.16.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.o28853/_old 2008-03-31 01:12:33.000000000 +0200 +++ /var/tmp/diff_new_pack.o28853/_new 2008-03-31 01:12:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-country (Version 2.16.12) +# spec file for package yast2-country (Version 2.16.13) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-country -Version: 2.16.12 +Version: 2.16.13 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.16.12.tar.bz2 +Source0: yast2-country-2.16.13.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite Requires: yast2-trans-stats yast2-perl-bindings timezone @@ -68,7 +68,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-country-2.16.12 +%setup -n yast2-country-2.16.13 %build %{prefix}/bin/y2tool y2autoconf @@ -115,6 +115,7 @@ %{prefix}/share/applications/YaST2/timezone.desktop %package data +License: GPL v2 or later Summary: YaST2 - Data files for Country settings Group: System/YaST @@ -135,6 +136,9 @@ /usr/share/YaST2/data/languages/*.ycp /usr/share/YaST2/modules/Language.y* %changelog +* Sun Mar 30 2008 jsuchome(a)suse.cz +- merged proofread texts +- 2.16.13 * Wed Mar 19 2008 jsuchome(a)suse.cz - fixed "Fernando de Noronha" timezone name (bnc#371817) - 2.16.12 @@ -396,7 +400,7 @@ * Mon Feb 27 2006 jsuchome(a)suse.cz - fixed XLibAPI (passing parameters) - 2.13.14 -* Sat Feb 25 2006 olh(a)suse.de +* Sun Feb 26 2006 olh(a)suse.de - fix typo in last patch, causing two getty on console (#153555) * Tue Feb 07 2006 jsuchome(a)suse.cz - fix the wrongly applied patch @@ -936,7 +940,7 @@ * Fri Feb 07 2003 kkaempf(a)suse.de - drop fixed encoding in consolefonts table, glibc can tell this value now (#23348) -* Thu Feb 06 2003 nashif(a)suse.de +* Fri Feb 07 2003 nashif(a)suse.de - adapted timezone, mouse and keyboard for use with autoyast * Mon Feb 03 2003 fehr(a)suse.de - pot file now in source tarball ++++++ yast2-country-2.16.12.tar.bz2 -> yast2-country-2.16.13.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.16.12/language/src/modules/Language.ycp new/yast2-country-2.16.13/language/src/modules/Language.ycp --- old/yast2-country-2.16.12/language/src/modules/Language.ycp 2008-02-26 12:51:14.000000000 +0100 +++ new/yast2-country-2.16.13/language/src/modules/Language.ycp 2008-03-30 21:06:16.000000000 +0200 @@ -1140,8 +1140,9 @@ y2milestone ("Language %1 is not fully supported", selected_language); // popup message Popup::Message (_("Only minimal support for the selected language is included on the media. -Add the Language Add-On CD as an additional repository to get better support -for this language.")); +Add the Language add-on CD as an additional repository in order to get appropriate support +for this language. +")); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.16.12/timezone/data/timezone_raw.ycp new/yast2-country-2.16.13/timezone/data/timezone_raw.ycp --- old/yast2-country-2.16.12/timezone/data/timezone_raw.ycp 2008-03-19 08:23:55.000000000 +0100 +++ new/yast2-country-2.16.13/timezone/data/timezone_raw.ycp 2008-03-19 08:31:49.000000000 +0100 @@ -3,7 +3,7 @@ * Authors: Thomas Roelz <tom(a)suse.de> * Summary: The untranslated timezone database. * - * $Id: timezone_raw.ycp 44969 2008-02-25 08:01:28Z jsuchome $ + * $Id: timezone_raw.ycp 45583 2008-03-19 07:31:49Z jsuchome $ * * ***************************************************************** * In case of changes please keep the following files in sync: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.16.12/timezone/src/dialogs.ycp new/yast2-country-2.16.13/timezone/src/dialogs.ycp --- old/yast2-country-2.16.12/timezone/src/dialogs.ycp 2008-03-19 08:24:05.000000000 +0100 +++ new/yast2-country-2.16.13/timezone/src/dialogs.ycp 2008-03-30 21:06:16.000000000 +0200 @@ -11,7 +11,7 @@ * Summary: * Dialogs for timeone and time configuration. * - * $Id: dialogs.ycp 44234 2008-02-07 12:14:21Z jsuchome $ + * $Id: dialogs.ycp 45714 2008-03-26 08:30:55Z jsuchome $ */ { textdomain "country"; @@ -61,10 +61,10 @@ define boolean SetTimeDialog() { // help text for set time dialog - string htext = _("The current system time and date are displayed. Change them to the correct values manually or select a NTP server to adapt your time automatically. Use Configure to run NTP client configuration.") + + string htext = _("The current system time and date are displayed. Change them to the correct values manually, or select a NTP server to adapt your time automatically. Use Configure to run the NTP client configuration.") + // help text, cont. - _("Changes are written after pressing Accept. Synchronization with NTP server can be done only when the network is configured."); + _("Press Accept to save your changes. Synchronization with the NTP server can be done only when the network is configured."); map val = Timezone::GetDateTimeMap(); @@ -432,7 +432,9 @@ list trl = maplist ( string key, string name, (map<string,string>)region["entries"]:$[], { - zones[yast2zonetab[key]:key] = name; + // Vatican cannot be shown in the map, Rome would be missing... + if (key != "Europe/Vatican") + zones[yast2zonetab[key]:key] = name; return [ name, key ]; }); trl = sort (list a, list b, (list<list>) trl, { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.16.12/VERSION new/yast2-country-2.16.13/VERSION --- old/yast2-country-2.16.12/VERSION 2008-03-19 08:26:12.000000000 +0100 +++ new/yast2-country-2.16.13/VERSION 2008-03-30 21:06:50.000000000 +0200 @@ -1 +1 @@ -2.16.12 +2.16.13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pinentry
by root＠Hilbert.suse.de 30 Mar '08

30 Mar '08

Hello community, here is the log from the commit of package pinentry checked in at Mon Mar 31 01:12:10 CEST 2008. -------- --- pinentry/pinentry.changes 2007-09-11 14:44:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/pinentry/pinentry.changes 2008-03-31 01:03:36.928427000 +0200 @@ -1,0 +2,5 @@ +Mon Mar 31 01:03:15 CEST 2008 - ro(a)suse.de + +- fix build with changed definition of g_malloc (gulong->gsize) + +------------------------------------------------------------------- New: ---- pinentry-gsize.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pinentry.spec ++++++ --- /var/tmp/diff_new_pack.u26940/_old 2008-03-31 01:11:57.000000000 +0200 +++ /var/tmp/diff_new_pack.u26940/_new 2008-03-31 01:11:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pinentry (Version 0.7.2) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,14 +10,15 @@ # norootforbuild + Name: pinentry BuildRequires: gtk2-devel libdrm-devel libjpeg-devel ncurses-devel qt3-devel update-desktop-files -URL: http://www.gnupg.org/aegypten/ +Url: http://www.gnupg.org/aegypten/ Version: 0.7.2 -Release: 115 +Release: 177 Summary: Collection of Simple PIN or Passphrase Entry Dialogs License: GPL v2 or later -Autoreqprov: on +AutoReqProv: on Source: pinentry-%{version}.tar.bz2 Source1: pinentry Patch0: moreSecureMemoryForPinentry-qt.diff @@ -25,6 +26,7 @@ Patch2: bugzilla-17996-disable-inputmethod-for-passords.patch Patch3: %{name}-0.7.2-curses-utf-8.diff Patch4: %{name}-0.7.2-qt-utf8.diff +Patch5: pinentry-gsize.diff Group: Productivity/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -94,6 +96,7 @@ %patch2 -p 1 %patch3 %patch4 -p1 +%patch5 %build cp /usr/share/gettext/config.rpath . @@ -131,60 +134,62 @@ %attr(755,root,root) %{_bindir}/pinentry-gtk-2 %changelog -* Tue Sep 11 2007 - ltinkl(a)suse.cz +* Mon Mar 31 2008 ro(a)suse.de +- fix build with changed definition of g_malloc (gulong->gsize) +* Tue Sep 11 2007 ltinkl(a)suse.cz - fix various utf-8 problems (#305725) -* Fri Mar 30 2007 - ro(a)suse.de +* Fri Mar 30 2007 ro(a)suse.de - added ncurses-devel to buildreq -* Fri Jan 05 2007 - anicka(a)suse.cz +* Fri Jan 05 2007 anicka(a)suse.cz - fix KDE detection in pinentry wrapper script (thanks llunak for a patch) -* Wed Nov 22 2006 - anicka(a)suse.cz +* Wed Nov 22 2006 anicka(a)suse.cz - fixed Provides [#223074] -* Tue Nov 21 2006 - nadvornik(a)suse.cz +* Tue Nov 21 2006 nadvornik(a)suse.cz - fixed pinentry script: dont use pinentry-curses in GUI [#205688] - removed useless provides -* Mon Nov 06 2006 - anicka(a)suse.de +* Mon Nov 06 2006 anicka(a)suse.de - split graphical frontends (#217373) - rewrite pinentry wrapper to use the right binary -* Mon Nov 06 2006 - pnemec(a)suse.cz +* Mon Nov 06 2006 pnemec(a)suse.cz - Fixed pinnentry wrapper #218257 -* Mon Oct 16 2006 - schwab(a)suse.de +* Mon Oct 16 2006 schwab(a)suse.de - Make sure config.rpath is present. -* Tue Oct 03 2006 - pnemec(a)suse.cz +* Tue Oct 03 2006 pnemec(a)suse.cz - removed static simlink to pinentry-qt - add script which use pinentry-qt only when KDE is detected -* Mon Jun 26 2006 - mfabian(a)suse.de +* Mon Jun 26 2006 mfabian(a)suse.de - Bugzilla #179996: enable input methods in SecQlineEdit widgets only when "mode == Normal" (i.e. not when "mode == NoEcho" or "mode == Password"). Using input methods while inputting passwords is useless. See also Bugzilla #117115. -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Mon Dec 19 2005 - ro(a)suse.de +* Mon Dec 19 2005 ro(a)suse.de - added symlink to filelist -* Fri Jul 29 2005 - anicka(a)suse.cz +* Fri Jul 29 2005 anicka(a)suse.cz - update to 0.7.2 - remove part of gtk2 patch contained in new version -* Tue Nov 02 2004 - postadal(a)suse.cz +* Tue Nov 02 2004 postadal(a)suse.cz - added patch gtk+-2.4.diff.bz2 for gtk2 support (removing gtk1 dependency) -* Tue Jul 13 2004 - adrian(a)suse.de +* Tue Jul 13 2004 adrian(a)suse.de - update to version 0.7.1 -* Sat Jan 10 2004 - adrian(a)suse.de +* Sun Jan 11 2004 adrian(a)suse.de - build as user -* Tue Nov 18 2003 - mc(a)suse.de +* Tue Nov 18 2003 mc(a)suse.de - increase secmem allocation for pinentry-qt to avoid "Out of memory" errors. (pinentry-0.6.9.moreSecureMemoryForPinentry-qt.diff) -* Mon Jun 02 2003 - mc(a)suse.de +* Mon Jun 02 2003 mc(a)suse.de - remove pinentry-0.6.8-prevent-assuan-stderr.dif; no longer needed - switch to version 0.6.9 * a memory-issue present in 0.6.8 * a minor build problem (make distclean now cleans up .moc files) * assuan protocol debug messages are not written to stderr - fixed build on x86_64 -* Tue Apr 08 2003 - mc(a)suse.de +* Tue Apr 08 2003 mc(a)suse.de - prevent pinentry-qt to print the assuan protocol to stderr -* Fri Feb 21 2003 - ro(a)suse.de +* Fri Feb 21 2003 ro(a)suse.de - fixed neededforbuild -* Tue Feb 11 2003 - mc(a)suse.de +* Tue Feb 11 2003 mc(a)suse.de - initial release ++++++ pinentry-gsize.diff ++++++ --- gtk+-2/gtksecentry.c +++ gtk+-2/gtksecentry.c @@ -270,7 +270,7 @@ gpointer -g_malloc(gulong size) +g_malloc(gsize size) { gpointer p; @@ -288,7 +288,7 @@ } gpointer -g_malloc0(gulong size) +g_malloc0(gsize size) { gpointer p; @@ -308,7 +308,7 @@ } gpointer -g_realloc(gpointer mem, gulong size) +g_realloc(gpointer mem, gsize size) { gpointer p; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 graphviz
by root＠Hilbert.suse.de 30 Mar '08

30 Mar '08

Hello community, here is the log from the commit of package graphviz checked in at Mon Mar 31 01:11:13 CEST 2008. -------- --- graphviz/graphviz-plugins.changes 2008-03-28 12:54:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/graphviz/graphviz-plugins.changes 2008-03-31 00:47:51.786192000 +0200 @@ -1,0 +2,5 @@ +Mon Mar 31 00:47:40 CEST 2008 - ro(a)suse.de + +- fix build (added directories to filelist) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ graphviz-plugins.spec ++++++ --- /var/tmp/diff_new_pack.D23830/_old 2008-03-31 01:10:58.000000000 +0200 +++ /var/tmp/diff_new_pack.D23830/_new 2008-03-31 01:10:58.000000000 +0200 @@ -24,7 +24,7 @@ BuildRequires: fdupes %endif Version: 2.18 -Release: 1 +Release: 2 AutoReqProv: on Summary: Graph Visualization Tools Group: Productivity/Graphics/Visualization/Graph @@ -457,7 +457,10 @@ %files -n graphviz-php %defattr(-,root,root,-) %{_libdir}/graphviz/php +%dir %{_libdir}/php +%dir %{_libdir}/php/modules %{_libdir}/php/modules/gv.so +%dir %{_datadir}/php %{_datadir}/php/gv.php %doc %{_mandir}/mann/gv_php.n.gz @@ -471,12 +474,13 @@ %files -n graphviz-ruby %defattr(-,root,root,-) %{_libdir}/graphviz/ruby -%{rb_sitedir}/%{_arch}-%{_os}/gv.so +%{rb_sitedir}/*-%{_os}/gv.so %doc %{_mandir}/mann/gv_ruby.n.gz %files -n graphviz-tcl %defattr(-,root,root) %dir %{_datadir}/tcl/%{mname} +%dir %{_libdir}/tcl%{tcl_version} %dir %{_libdir}/tcl%{tcl_version}/graphviz-%{version} %{_libdir}/graphviz/tcl %{_datadir}/tcl/%{mname}/pkgIndex.tcl @@ -489,6 +493,8 @@ %doc __doc/* %changelog +* Mon Mar 31 2008 ro(a)suse.de +- fix build (added directories to filelist) * Fri Mar 28 2008 pth(a)suse.de - Update to 2.18. Changes since 2.12: - Lots of bugs fixed, see ChangeLog for detailed list. ++++++ graphviz.spec ++++++ --- /var/tmp/diff_new_pack.D23830/_old 2008-03-31 01:10:58.000000000 +0200 +++ /var/tmp/diff_new_pack.D23830/_new 2008-03-31 01:10:58.000000000 +0200 @@ -18,7 +18,7 @@ BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel PreReq: /bin/rm Version: 2.18 -Release: 1 +Release: 3 AutoReqProv: on Summary: Graph Visualization Tools Group: Productivity/Graphics/Visualization/Graph ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-add-on-creator
by root＠Hilbert.suse.de 30 Mar '08

30 Mar '08

Hello community, here is the log from the commit of package yast2-add-on-creator checked in at Mon Mar 31 01:11:00 CEST 2008. -------- --- yast2-add-on-creator/yast2-add-on-creator.changes 2008-02-15 16:27:02.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-add-on-creator/yast2-add-on-creator.changes 2008-03-30 20:46:56.018006000 +0200 @@ -1,0 +2,11 @@ +Sun Mar 30 20:44:45 CEST 2008 - jsuchome(a)suse.cz + +- merged proofread texts +- 2.16.5 + +------------------------------------------------------------------- +Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz + +- added 'StartupNotify=true' to the desktop file (bnc #304964) + +------------------------------------------------------------------- Old: ---- yast2-add-on-creator-2.16.4.tar.bz2 New: ---- yast2-add-on-creator-2.16.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on-creator.spec ++++++ --- /var/tmp/diff_new_pack.E22739/_old 2008-03-31 01:10:27.000000000 +0200 +++ /var/tmp/diff_new_pack.E22739/_new 2008-03-31 01:10:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on-creator (Version 2.16.4) +# spec file for package yast2-add-on-creator (Version 2.16.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-add-on-creator -Version: 2.16.4 +Version: 2.16.5 Release: 1 -License: GPL v2 or later +License: GPL v2 only; GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-creator-2.16.4.tar.bz2 +Source0: yast2-add-on-creator-2.16.5.tar.bz2 Prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -34,7 +34,7 @@ Jiř� Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-add-on-creator-2.16.4 +%setup -n yast2-add-on-creator-2.16.5 %build %{prefix}/bin/y2tool y2autoconf @@ -70,6 +70,11 @@ /usr/lib/YaST2/servers_non_y2/ag_* %doc %{prefix}/share/doc/packages/yast2-add-on-creator %changelog +* Sun Mar 30 2008 jsuchome(a)suse.cz +- merged proofread texts +- 2.16.5 +* Mon Mar 17 2008 jsrain(a)suse.cz +- added 'StartupNotify=true' to the desktop file (bnc #304964) * Wed Feb 13 2008 jsuchome(a)suse.cz - new summary screen with the list of already configured add-ons - CLI support for handling of saved configurations ++++++ yast2-add-on-creator-2.16.4.tar.bz2 -> yast2-add-on-creator-2.16.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.16.4/src/add-on-creator.desktop new/yast2-add-on-creator-2.16.5/src/add-on-creator.desktop --- old/yast2-add-on-creator-2.16.4/src/add-on-creator.desktop 2007-01-31 08:57:52.000000000 +0100 +++ new/yast2-add-on-creator-2.16.5/src/add-on-creator.desktop 2008-03-19 08:52:19.000000000 +0100 @@ -22,3 +22,4 @@ Name=Add-On Creator GenericName=Create Add-On product X-KDE-SubstituteUID=true +StartupNotify=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.16.4/src/add-on-creator.ycp new/yast2-add-on-creator-2.16.5/src/add-on-creator.ycp --- old/yast2-add-on-creator-2.16.4/src/add-on-creator.ycp 2008-02-15 08:42:08.000000000 +0100 +++ new/yast2-add-on-creator-2.16.5/src/add-on-creator.ycp 2008-03-30 20:37:12.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Main file * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: add-on-creator.ycp 40904 2007-09-14 08:02:58Z jsuchome $ + * $Id: add-on-creator.ycp 44537 2008-02-15 15:27:21Z jsuchome $ * * Main file for add-on-creator configuration. Uses all other files. */ @@ -422,7 +422,7 @@ CommandLine::Print (sformat (_("(%1) Product Name: %2"), i, cont["PRODUCT"]:"")); // command line summary - CommandLine::Print (sformat (_("\tVersion : %1"), cont["VERSION"]:"")); + CommandLine::Print (sformat (_("\tVersio: %1"), cont["VERSION"]:"")); // command line summary CommandLine::Print (sformat (_("\tInput directory: %1"), add_on["rpm_path"]:"")); @@ -448,7 +448,7 @@ if (size (add_on_products) == 0) { // command line message, do not translate 'create', 'clone' - Report::Error (_("There is no Add-On Product configuration present. Create a new one using 'create' or 'clone' command.")); + Report::Error (_("There is no add-on product configuration present. Create a new one using 'create' or 'clone' command.")); return false; } integer number = options["number"]:0; @@ -459,7 +459,7 @@ else { // error message - Report::Error (_("Specify Add-On Product that should be built.")); + Report::Error (_("Specify add-on product that should be built.")); return false; } } @@ -488,14 +488,14 @@ if (size (add_on_products) == 0) { // command line message - Report::Error (_("There is no Add-On Product configuration present.")); + Report::Error (_("There is no add-on product configuration present.")); return false; } integer number = options["number"]:0; if (number < 1) { // error message - Report::Error (_("Specify Add-On Product configuration that should be deleted.")); + Report::Error (_("Specify add-on product configuration that should be deleted.")); return false; } // !!! numbers are shown starting from 1, list is indexed from 0 !!! @@ -514,12 +514,12 @@ "create" : $[ "handler" : CreateAddOn, // command line help text for 'create' action - "help" : _("Create and build new Add-On Product"), + "help" : _("Create and build new add-on product"), ], "clone" : $[ "handler" : CloneAddOn, // command line help text for 'clone' action - "help" : _("Create and build new Add-On Product based on an existing one"), + "help" : _("Create and build new add-on product based on an existing one"), ], "sign" : $[ "handler" : SignAddOn, @@ -529,17 +529,17 @@ "list" : $[ "handler" : ListAddOns, // command line help text for 'list' action - "help" : _("List available Add-On Product configurations"), + "help" : _("List available add-on product configurations"), ], "build" : $[ "handler" : BuildAddOnHandler, // command line help text for 'create' action - "help" : _("Build Add-On Product from selected configuration"), + "help" : _("Build add-on product from selected configuration"), ], "delete" : $[ "handler" : DeleteAddOn, // command line help text for 'create' action - "help" : _("Delete selected Add-On Product configuration"), + "help" : _("Delete selected add-on product configuration"), ], ], "options" : $[ @@ -655,7 +655,7 @@ ], "number" : $[ // help text for 'number' option; do not translate 'list' - "help" : _("Number of selected Add-On (see 'list' command for product numbers)"), + "help" : _("Number of selected add-on (see 'list' command for product numbers)"), "type" : "integer" ], ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.16.4/src/AddOnCreator.ycp new/yast2-add-on-creator-2.16.5/src/AddOnCreator.ycp --- old/yast2-add-on-creator-2.16.4/src/AddOnCreator.ycp 2008-02-14 16:20:59.000000000 +0100 +++ new/yast2-add-on-creator-2.16.5/src/AddOnCreator.ycp 2008-03-30 20:37:12.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: AddOnCreator settings, input and output functions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: AddOnCreator.ycp 42956 2007-12-11 12:54:16Z jsuchome $ + * $Id: AddOnCreator.ycp 44537 2008-02-15 15:27:21Z jsuchome $ * * Representation of the configuration of add-on-creator. * Input and output routines. @@ -218,7 +218,7 @@ // labeliption of content file PREREQUIRES key "label" : _("Resolvables needed before installation"), // help text for content file 'PREREQUIRES' key - "help" : _("Resolvables that must be installed on the system before installation of this product. The syntax is the same as for REQUIRES."), + "help" : _("Resolvables that must be installed on the system before the installation of this product. The syntax is the same as for REQUIRES."), ], "LABEL" : $[ "key" : "LABEL", @@ -232,7 +232,7 @@ // label of content file PROVIDES key "label" : _("Resolvables provided"), // help text for content file 'PROVIDES' key - "help" : _("Capabilities this product provides. They can be used to match REQUIRES from others. Every resolvable has a provides by default--its own name and edition. For example, package bar-1.42-1 provides the capability <tt>bar = 1.42-1</tt>."), + "help" : _("Capabilities this product provides. They can be used to match REQUIRES from others. Every resolvable has a provides by default- its own name and edition. For example, package bar-1.42-1 provides the capability <tt>bar = 1.42-1</tt>."), ], "CONFLICTS" : $[ "key" : "CONFLICTS", @@ -319,7 +319,7 @@ // label of content file 'PATTERNS' key "label" : _("Preselected patterns"), // help text for content file 'PATTERNS' key - "help" : _("List of patterns pre-selected by the product."), + "help" : _("List of patterns preselected by the product."), ], "SHORTLABEL" : $[ "key" : "SHORTLABEL", @@ -396,7 +396,7 @@ // help text for 'Des' pattern key "help" :_("Multiple line description in the default language"), // help text for 'Des.lang' pattern key - "lang_help" :_("Multiple line description, language specific.") + "lang_help" :_("Multiple line description, language-specific.") ], "Cat" : $[ // label for 'Cat' pattern key @@ -521,7 +521,7 @@ // label for 'Fre' pattern key "label" : _("Freshen"), // help text for 'Fre' pattern key - "help" : _("The current pattern is only considered for installation is the pattern specified here is installed."), + "help" : _("The current pattern is only considered for installation if the pattern specified here is installed."), "defval" : "", "type" : "pattern-list", ], @@ -569,7 +569,7 @@ // label for 'Eul' key "label" : _("EULA"), // help text for 'Eul' key - "help" : _("Text of the EULA. This text is displayed before package installation. If the user does not accept the EULA, package is not installed."), + "help" : _("Text of the EULA. This text is displayed before the package installation. If the user does not accept the EULA, the package is not installed."), "type" : "multiline", ], ]; @@ -1299,8 +1299,9 @@ Progress::New (caption, " ", size (stages), (list<string>) stages, (list<string>) steps, // help text - _("Generating data for Add-On -Please wait...")); + _("Generating Data for Add-On +Please wait... +")); Progress::NextStage(); map<string,string> arch_map = $[]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.16.4/src/complex.ycp new/yast2-add-on-creator-2.16.5/src/complex.ycp --- old/yast2-add-on-creator-2.16.4/src/complex.ycp 2008-02-14 15:14:53.000000000 +0100 +++ new/yast2-add-on-creator-2.16.5/src/complex.ycp 2008-03-30 20:37:12.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: complex.ycp 42815 2007-12-07 14:54:49Z jsuchome $ + * $Id: complex.ycp 44537 2008-02-15 15:27:21Z jsuchome $ */ { @@ -141,16 +141,16 @@ } // help text - string help_text = _("Start the creating of new Add-On Product configuration with Add.") + + string help_text = _("Start the creating of new add-on product configuration with Add.") + // help text - _("Use Edit to modify selected Add-On Product configuration.") + + _("Use Edit to modify selected add-on product configuration.") + // help text _("Delete the selected configuration using Delete.") + // help text - _("Build the fresh Add On Product based on selected configuration with Build."); + _("Build the fresh add-on product based on selected configuration with Build."); term contents = `VBox ( `VWeight (3, `Table (`id (`table), `opt (`notify, `immediate), @@ -1550,7 +1550,7 @@ { // error popup (see Name, Comment, Email Adress text entries Popup::Error (_("Name, comment, and e-mail address values are empty. -You must enter at least one of the them to provide user identification. +You must enter at least one of them to provide user identification. ")); continue; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.16.4/src/dialogs.ycp new/yast2-add-on-creator-2.16.5/src/dialogs.ycp --- old/yast2-add-on-creator-2.16.4/src/dialogs.ycp 2008-02-12 16:11:07.000000000 +0100 +++ new/yast2-add-on-creator-2.16.5/src/dialogs.ycp 2008-02-15 16:27:22.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: dialogs.ycp 35715 2007-01-31 08:02:45Z jsuchome $ + * $Id: dialogs.ycp 44537 2008-02-15 15:27:21Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.16.4/src/helps.ycp new/yast2-add-on-creator-2.16.5/src/helps.ycp --- old/yast2-add-on-creator-2.16.4/src/helps.ycp 2008-02-13 11:20:23.000000000 +0100 +++ new/yast2-add-on-creator-2.16.5/src/helps.ycp 2008-03-30 20:37:12.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Help texts of all the dialogs * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: helps.ycp 40167 2007-08-10 10:56:18Z jsuchome $ + * $Id: helps.ycp 44537 2008-02-15 15:27:21Z jsuchome $ */ { @@ -42,7 +42,7 @@ "), // Write dialog help - "write" : _("Writing Add-On configurations + "write" : _("Writing add-on configurations Please wait... "), @@ -88,7 +88,7 @@ _("Use Import to import an existing <tt>content</tt> file."), // help text for package description files - "packages" : _("Here, edit the language-specific descriptions of packages (<tt>packages.lang</tt> files).") + + "packages" : _("Edit the language-specific descriptions of packages (<tt>packages.lang</tt> files) here.") + // help text for package description files, cont. _("Use Add Language to add a description file for a new language. The list of available languages is read from the LINGUAS value of the <tt>content</tt> file. Import an existing file with package descriptions with Import. Delete the description file with Delete.") + @@ -99,7 +99,7 @@ _("Optionally, choose the path for the file providing Additional Package Dependencies (EXTRA_PROV)."), // help text for patterns - "patterns" : _("Here, create and edit the patterns for the add-on product.") + + "patterns" : _("Create and edit the patterns for the add-on product here.") + // help text for patterns, cont. _("Use New to create a new pattern or Import to import an existing one.") + @@ -124,7 +124,7 @@ _("Enter the location of the file with the workflow description. This file is an alternative to <tt>control.xml</tt> and is saved as <tt>installation.xml</tt> in the add-on product's base directory.") + // workflow help text - _("To use custom YaST modules during installation of the add-on product, enter the path to the <tt>y2update.tgz</tt> archive where these modules are stored or configure the contents of <tt>y2update.tgz</tt> by specifying the YaST RPM packages in Import the Packages."), + _("To use custom YaST modules during the installation of the add-on product, enter the path to the <tt>y2update.tgz</tt> archive where these modules are stored or configure the contents of <tt>y2update.tgz</tt> by specifying the YaST RPM packages in Import the Packages."), // help text for expert dialog 1 "expert" : _("The optional <tt>info.txt</tt> file gives information about the add-on that should be displayed as a pop-up window with an OK button.") + @@ -141,7 +141,7 @@ _("Enter the passphrase needed to unlock the secret key.") + // help text for signing dialog, cont. - _("Select if you want to sign all packages of the add-on product with selected key. All previous package signatures will be removed."), + _("Select if you want to Sign All Packages of the add-on product with selected key. All previous package signatures will be removed."), // help text for generating new key dialog "generate" : _("Enter the values necessary for generating the new primary key pair.") + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.16.4/src/patterns.ycp new/yast2-add-on-creator-2.16.5/src/patterns.ycp --- old/yast2-add-on-creator-2.16.4/src/patterns.ycp 2008-02-13 11:07:16.000000000 +0100 +++ new/yast2-add-on-creator-2.16.5/src/patterns.ycp 2008-02-15 16:27:22.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Dialogs for patterns and selections * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: patterns.ycp 41230 2007-10-03 12:41:25Z jsuchome $ + * $Id: patterns.ycp 44537 2008-02-15 15:27:21Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.16.4/src/wizards.ycp new/yast2-add-on-creator-2.16.5/src/wizards.ycp --- old/yast2-add-on-creator-2.16.4/src/wizards.ycp 2008-02-14 13:48:49.000000000 +0100 +++ new/yast2-add-on-creator-2.16.5/src/wizards.ycp 2008-02-15 16:27:22.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Wizards definitions * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: wizards.ycp 35715 2007-01-31 08:02:45Z jsuchome $ + * $Id: wizards.ycp 44537 2008-02-15 15:27:21Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.16.4/VERSION new/yast2-add-on-creator-2.16.5/VERSION --- old/yast2-add-on-creator-2.16.4/VERSION 2008-02-13 16:16:57.000000000 +0100 +++ new/yast2-add-on-creator-2.16.5/VERSION 2008-03-19 08:52:26.000000000 +0100 @@ -1 +1 @@ -2.16.4 +2.16.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 banter
by root＠Hilbert.suse.de 30 Mar '08

30 Mar '08

Hello community, here is the log from the commit of package banter checked in at Mon Mar 31 01:10:40 CEST 2008. -------- --- GNOME/banter/banter.changes 2008-03-25 00:34:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/banter/banter.changes 2008-03-31 00:53:50.547986000 +0200 @@ -1,0 +2,5 @@ +Mon Mar 31 00:53:16 CEST 2008 - ro(a)suse.de + +- fix build after change in gconf-sharp (peditors split off) + +------------------------------------------------------------------- New: ---- banter_gconf_sharp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ banter.spec ++++++ --- /var/tmp/diff_new_pack.t22555/_old 2008-03-31 01:10:23.000000000 +0200 +++ /var/tmp/diff_new_pack.t22555/_new 2008-03-31 01:10:23.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: dbus-1-glib-devel evolution-sharp farsight-devel gconf-sharp2 gecko-sharp2 gnome-keyring-sharp-devel gst-plugins-farsight gstreamer010-devel gstreamer010-plugins-base-devel gtk-sharp2-complete jscall-sharp-devel libtelepathy-devel mono-devel ndesk-dbus-glib ndesk-dbus-glib-devel notify-sharp perl-XML-Parser pkg-config telepathy-sharp telepathy-stream-engine xorg-x11-devel Requires: ndesk-dbus ndesk-dbus-glib telepathy-sharp gnome-keyring-sharp telepathy-stream-engine gst-plugins-farsight farsight libjingle-0_3-0 telepathy-gabble Version: 0.1.11 -Release: 102 +Release: 107 License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Productivity/Networking/Other @@ -24,6 +24,8 @@ Source: %{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE suse-translation.patch Patch1: suse-translation.patch +# buildfix after gconf-sharp split +Patch2: banter_gconf_sharp.patch AutoReqProv: on %gconf_schemas_prereq @@ -38,8 +40,10 @@ %prep %setup -q %patch1 -p 1 +%patch2 %build +autoconf %configure make @@ -70,6 +74,8 @@ %{_datadir}/applications/* %changelog +* Mon Mar 31 2008 ro(a)suse.de +- fix build after change in gconf-sharp (peditors split off) * Tue Mar 25 2008 ro(a)suse.de - added ndesk-dbus-glibc-devel to buildreq * Mon Mar 17 2008 rodrigo(a)suse.de @@ -97,7 +103,7 @@ - Fix up the installation of gconf schemas. * Fri Jun 22 2007 maw(a)suse.de - Enable automagic requirements generation. -* Thu Jun 21 2007 maw(a)suse.de +* Fri Jun 22 2007 maw(a)suse.de - Build require jscall-sharp-devel and gnome-keyring-sharp-devel. * Mon Jun 18 2007 mauro(a)novell.com - Adding it to the factory ++++++ banter_gconf_sharp.patch ++++++ --- Banter/Makefile.am +++ Banter/Makefile.am 2008/03/30 22:44:40 @@ -82,6 +82,7 @@ $(NDESK_DBUS_10_LIBS) \ $(GNOME_KEYRING_SHARP_LIBS) \ $(GCONF_SHARP_20_LIBS) \ + $(GCONF_SHARP_PEDITORS_20_LIBS) \ $(GLIB_SHARP_20_LIBS) \ $(GNOME_SHARP_20_LIBS) \ $(GTK_DOTNET_20_LIBS) \ --- Banter/Makefile.in +++ Banter/Makefile.in 2008/03/30 22:45:25 @@ -94,6 +94,8 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GCONF_SHARP_20_CFLAGS = @GCONF_SHARP_20_CFLAGS@ GCONF_SHARP_20_LIBS = @GCONF_SHARP_20_LIBS@ +GCONF_SHARP_PEDITORS_20_CFLAGS = @GCONF_SHARP_PEDITORS_20_CFLAGS@ +GCONF_SHARP_PEDITORS_20_LIBS = @GCONF_SHARP_PEDITORS_20_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@ GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@ @@ -309,6 +311,7 @@ $(NDESK_DBUS_10_LIBS) \ $(GNOME_KEYRING_SHARP_LIBS) \ $(GCONF_SHARP_20_LIBS) \ + $(GCONF_SHARP_PEDITORS_20_LIBS) \ $(GLIB_SHARP_20_LIBS) \ $(GNOME_SHARP_20_LIBS) \ $(GTK_DOTNET_20_LIBS) \ --- configure.ac +++ configure.ac 2008/03/30 22:43:54 @@ -41,6 +41,7 @@ PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0]) PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0]) +PKG_CHECK_MODULES([GCONF_SHARP_PEDITORS_20], [gconf-sharp-peditors-2.0]) PKG_CHECK_MODULES([NDESK_DBUS_10], [ndesk-dbus-1.0]) PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0]) PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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
by root＠Hilbert.suse.de 30 Mar '08

30 Mar '08

Hello community, here is the log from the commit of package kernel-source checked in at Sun Mar 30 12:25:15 CEST 2008. -------- --- kernel-source/kernel-debug.changes 2008-03-22 08:41:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2008-03-28 19:29:11.000000000 +0100 @@ -1,0 +2,33 @@ +Thu Mar 27 20:31:48 CET 2008 - jeffm(a)suse.de + +- Fixed up the rest of the reiserfs patch queue. + +------------------------------------------------------------------- +Thu Mar 27 19:21:32 CET 2008 - jeffm(a)suse.de + +- Updated reiserfs xattr patches. + +------------------------------------------------------------------- +Thu Mar 27 18:53:17 CET 2008 - gregkh(a)suse.de + +- fix merge error in patches.suse/supported-flag caused by me... + +------------------------------------------------------------------- +Thu Mar 27 18:14:18 CET 2008 - gregkh(a)suse.de + +- update to 2.6.25-rc7-git2 + +------------------------------------------------------------------- +Thu Mar 27 18:09:56 CET 2008 - gregkh(a)suse.de + +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... + +------------------------------------------------------------------- +Sun Mar 23 13:29:25 CET 2008 - teheo(a)suse.de + +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). + +------------------------------------------------------------------- kernel-default.changes: same change kernel-dummy.changes: same change kernel-kdump.changes: same change 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-vanilla.changes: same change kernel-xen.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:47.000000000 +0200 +++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:47.000000000 +0200 @@ -44,7 +44,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.25 -Release: 9 +Release: 10 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -180,7 +180,7 @@ -Source Timestamp: 2008-03-20 22:57:18 +0100 +Source Timestamp: 2008-03-27 21:12:25 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then @@ -259,7 +259,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25-rc6-git5-$RELEASE-debug +KERNELRELEASE=2.6.25-rc7-git2-$RELEASE-debug EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -578,6 +578,21 @@ %files -f kernel.files %changelog +* Thu Mar 27 2008 jeffm(a)suse.de +- Fixed up the rest of the reiserfs patch queue. +* Thu Mar 27 2008 jeffm(a)suse.de +- Updated reiserfs xattr patches. +* Thu Mar 27 2008 gregkh(a)suse.de +- fix merge error in patches.suse/supported-flag caused by me... +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7-git2 +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... +* Sun Mar 23 2008 teheo(a)suse.de +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). * Thu Mar 20 2008 gregkh(a)suse.de - fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the code is not upstream and we aren't allowed to add non-GPL exports to ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:47.000000000 +0200 +++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:47.000000000 +0200 @@ -44,7 +44,7 @@ Name: kernel-default Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems Version: 2.6.25 -Release: 9 +Release: 10 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -198,7 +198,7 @@ -Source Timestamp: 2008-03-20 22:57:18 +0100 +Source Timestamp: 2008-03-27 21:12:25 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then @@ -277,7 +277,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25-rc6-git5-$RELEASE-default +KERNELRELEASE=2.6.25-rc7-git2-$RELEASE-default EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -596,6 +596,21 @@ %files -f kernel.files %changelog +* Thu Mar 27 2008 jeffm(a)suse.de +- Fixed up the rest of the reiserfs patch queue. +* Thu Mar 27 2008 jeffm(a)suse.de +- Updated reiserfs xattr patches. +* Thu Mar 27 2008 gregkh(a)suse.de +- fix merge error in patches.suse/supported-flag caused by me... +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7-git2 +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... +* Sun Mar 23 2008 teheo(a)suse.de +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). * Thu Mar 20 2008 gregkh(a)suse.de - fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the code is not upstream and we aren't allowed to add non-GPL exports to ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:47.000000000 +0200 +++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:47.000000000 +0200 @@ -16,7 +16,7 @@ Name: kernel-dummy Summary: Internal dummy package for synchronizing release numbers Version: 2.6.25 -Release: 9 +Release: 10 License: GPL v2 or later Group: System/Kernel AutoReqProv: off @@ -29,7 +29,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2008-03-20 22:57:18 +0100 +Source Timestamp: 2008-03-27 21:12:25 +0100 %install rm -rf %buildroot @@ -40,6 +40,21 @@ %defattr(-, root, root) /etc/dummy %changelog +* Thu Mar 27 2008 jeffm(a)suse.de +- Fixed up the rest of the reiserfs patch queue. +* Thu Mar 27 2008 jeffm(a)suse.de +- Updated reiserfs xattr patches. +* Thu Mar 27 2008 gregkh(a)suse.de +- fix merge error in patches.suse/supported-flag caused by me... +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7-git2 +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... +* Sun Mar 23 2008 teheo(a)suse.de +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). * Thu Mar 20 2008 gregkh(a)suse.de - fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the code is not upstream and we aren't allowed to add non-GPL exports to ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:48.000000000 +0200 +++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:48.000000000 +0200 @@ -44,7 +44,7 @@ Name: kernel-kdump Summary: kernel for kdump Version: 2.6.25 -Release: 9 +Release: 10 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -179,7 +179,7 @@ -Source Timestamp: 2008-03-20 22:57:18 +0100 +Source Timestamp: 2008-03-27 21:12:25 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then @@ -258,7 +258,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25-rc6-git5-$RELEASE-kdump +KERNELRELEASE=2.6.25-rc7-git2-$RELEASE-kdump EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -577,6 +577,21 @@ %files -f kernel.files %changelog +* Thu Mar 27 2008 jeffm(a)suse.de +- Fixed up the rest of the reiserfs patch queue. +* Thu Mar 27 2008 jeffm(a)suse.de +- Updated reiserfs xattr patches. +* Thu Mar 27 2008 gregkh(a)suse.de +- fix merge error in patches.suse/supported-flag caused by me... +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7-git2 +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... +* Sun Mar 23 2008 teheo(a)suse.de +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). * Thu Mar 20 2008 gregkh(a)suse.de - fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the code is not upstream and we aren't allowed to add non-GPL exports to ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:48.000000000 +0200 +++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:48.000000000 +0200 @@ -44,7 +44,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 2.6.25 -Release: 9 +Release: 10 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -175,7 +175,7 @@ -Source Timestamp: 2008-03-20 22:57:18 +0100 +Source Timestamp: 2008-03-27 21:12:25 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then @@ -254,7 +254,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25-rc6-git5-$RELEASE-pae +KERNELRELEASE=2.6.25-rc7-git2-$RELEASE-pae EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -573,6 +573,21 @@ %files -f kernel.files %changelog +* Thu Mar 27 2008 jeffm(a)suse.de +- Fixed up the rest of the reiserfs patch queue. +* Thu Mar 27 2008 jeffm(a)suse.de +- Updated reiserfs xattr patches. +* Thu Mar 27 2008 gregkh(a)suse.de +- fix merge error in patches.suse/supported-flag caused by me... +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7-git2 +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... +* Sun Mar 23 2008 teheo(a)suse.de +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). * Thu Mar 20 2008 gregkh(a)suse.de - fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the code is not upstream and we aren't allowed to add non-GPL exports to ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:48.000000000 +0200 +++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:48.000000000 +0200 @@ -43,7 +43,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems Version: 2.6.25 -Release: 9 +Release: 10 License: GPL v2 or later; LGPL v2.1 or later Group: System/Kernel AutoReqProv: on @@ -191,7 +191,7 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-03-20 22:57:18 +0100 +Source Timestamp: 2008-03-27 21:12:25 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then @@ -270,7 +270,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25-rc6-git5-$RELEASE-ppc64 +KERNELRELEASE=2.6.25-rc7-git2-$RELEASE-ppc64 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -589,6 +589,21 @@ %files -f kernel.files %changelog +* Thu Mar 27 2008 jeffm(a)suse.de +- Fixed up the rest of the reiserfs patch queue. +* Thu Mar 27 2008 jeffm(a)suse.de +- Updated reiserfs xattr patches. +* Thu Mar 27 2008 gregkh(a)suse.de +- fix merge error in patches.suse/supported-flag caused by me... +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7-git2 +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... +* Sun Mar 23 2008 teheo(a)suse.de +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). * Thu Mar 20 2008 gregkh(a)suse.de - fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the code is not upstream and we aren't allowed to add non-GPL exports to ++++++ kernel-ps3.spec ++++++ --- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:49.000000000 +0200 +++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:49.000000000 +0200 @@ -43,7 +43,7 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader Version: 2.6.25 -Release: 9 +Release: 10 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -177,7 +177,7 @@ -Source Timestamp: 2008-03-20 22:57:18 +0100 +Source Timestamp: 2008-03-27 21:12:25 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then @@ -256,7 +256,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25-rc6-git5-$RELEASE-ps3 +KERNELRELEASE=2.6.25-rc7-git2-$RELEASE-ps3 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -575,6 +575,21 @@ %files -f kernel.files %changelog +* Thu Mar 27 2008 jeffm(a)suse.de +- Fixed up the rest of the reiserfs patch queue. +* Thu Mar 27 2008 jeffm(a)suse.de +- Updated reiserfs xattr patches. +* Thu Mar 27 2008 gregkh(a)suse.de +- fix merge error in patches.suse/supported-flag caused by me... +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7-git2 +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... +* Sun Mar 23 2008 teheo(a)suse.de +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). * Thu Mar 20 2008 gregkh(a)suse.de - fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the code is not upstream and we aren't allowed to add non-GPL exports to ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:49.000000000 +0200 +++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:49.000000000 +0200 @@ -44,7 +44,7 @@ Name: kernel-s390 Summary: The Standard Kernel Version: 2.6.25 -Release: 9 +Release: 10 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -173,7 +173,7 @@ -Source Timestamp: 2008-03-20 22:57:18 +0100 +Source Timestamp: 2008-03-27 21:12:25 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then @@ -252,7 +252,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25-rc6-git5-$RELEASE-s390 +KERNELRELEASE=2.6.25-rc7-git2-$RELEASE-s390 EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -571,6 +571,21 @@ %files -f kernel.files %changelog +* Thu Mar 27 2008 jeffm(a)suse.de +- Fixed up the rest of the reiserfs patch queue. +* Thu Mar 27 2008 jeffm(a)suse.de +- Updated reiserfs xattr patches. +* Thu Mar 27 2008 gregkh(a)suse.de +- fix merge error in patches.suse/supported-flag caused by me... +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7-git2 +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... +* Sun Mar 23 2008 teheo(a)suse.de +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). * Thu Mar 20 2008 gregkh(a)suse.de - fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the code is not upstream and we aren't allowed to add non-GPL exports to ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:49.000000000 +0200 +++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:49.000000000 +0200 @@ -23,7 +23,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 2.6.25 -Release: 9 +Release: 10 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -105,7 +105,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-03-20 22:57:18 +0100 +Source Timestamp: 2008-03-27 21:12:25 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then @@ -140,7 +140,7 @@ RELEASE=${RELEASE#[^0-9]*.} done %_sourcedir/install-configs %_sourcedir %_builddir/%buildsubdir $RELEASE -KERNELRELEASE=2.6.25-rc6-git5-$RELEASE +KERNELRELEASE=2.6.25-rc7-git2-$RELEASE cat > %_builddir/%{name}-%{version}/.rpm-defs <<EOF KERNELRELEASE=$KERNELRELEASE SYMBOLS="%symbols" @@ -283,6 +283,21 @@ %files -f kernel-source.files %changelog +* Thu Mar 27 2008 jeffm(a)suse.de +- Fixed up the rest of the reiserfs patch queue. +* Thu Mar 27 2008 jeffm(a)suse.de +- Updated reiserfs xattr patches. +* Thu Mar 27 2008 gregkh(a)suse.de +- fix merge error in patches.suse/supported-flag caused by me... +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7-git2 +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... +* Sun Mar 23 2008 teheo(a)suse.de +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). * Thu Mar 20 2008 gregkh(a)suse.de - fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the code is not upstream and we aren't allowed to add non-GPL exports to ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:50.000000000 +0200 @@ -22,7 +22,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.25 -Release: 9 +Release: 10 License: GPL v2 or later Group: Development/Sources AutoReqProv: off @@ -92,7 +92,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2008-03-20 22:57:18 +0100 +Source Timestamp: 2008-03-27 21:12:25 +0100 %prep echo "Architecture symbol(s):" %symbols @@ -144,6 +144,21 @@ /boot/symsets-*-*.tar.gz /lib/modules/*/build %changelog +* Thu Mar 27 2008 jeffm(a)suse.de +- Fixed up the rest of the reiserfs patch queue. +* Thu Mar 27 2008 jeffm(a)suse.de +- Updated reiserfs xattr patches. +* Thu Mar 27 2008 gregkh(a)suse.de +- fix merge error in patches.suse/supported-flag caused by me... +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7-git2 +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... +* Sun Mar 23 2008 teheo(a)suse.de +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). * Thu Mar 20 2008 gregkh(a)suse.de - fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the code is not upstream and we aren't allowed to add non-GPL exports to ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:50.000000000 +0200 @@ -44,7 +44,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 2.6.25 -Release: 9 +Release: 10 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -190,7 +190,7 @@ -Source Timestamp: 2008-03-20 22:57:18 +0100 +Source Timestamp: 2008-03-27 21:12:25 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then @@ -269,7 +269,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25-rc6-git5-$RELEASE-vanilla +KERNELRELEASE=2.6.25-rc7-git2-$RELEASE-vanilla EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -588,6 +588,21 @@ %files -f kernel.files %changelog +* Thu Mar 27 2008 jeffm(a)suse.de +- Fixed up the rest of the reiserfs patch queue. +* Thu Mar 27 2008 jeffm(a)suse.de +- Updated reiserfs xattr patches. +* Thu Mar 27 2008 gregkh(a)suse.de +- fix merge error in patches.suse/supported-flag caused by me... +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7-git2 +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... +* Sun Mar 23 2008 teheo(a)suse.de +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). * Thu Mar 20 2008 gregkh(a)suse.de - fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the code is not upstream and we aren't allowed to add non-GPL exports to ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:50.000000000 +0200 @@ -44,7 +44,7 @@ Name: kernel-xen Summary: The Xen Kernel Version: 2.6.25 -Release: 8 +Release: 9 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -179,7 +179,7 @@ -Source Timestamp: 2008-03-20 22:57:18 +0100 +Source Timestamp: 2008-03-27 21:12:25 +0100 %prep if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then @@ -258,7 +258,7 @@ EOF %endif cat >> ../.rpm-defs <<EOF -KERNELRELEASE=2.6.25-rc6-git5-$RELEASE-xen +KERNELRELEASE=2.6.25-rc7-git2-$RELEASE-xen EOF %if 0%{?__debug_package:1} cat >> ../.rpm-defs <<EOF @@ -577,6 +577,21 @@ %files -f kernel.files %changelog +* Thu Mar 27 2008 jeffm(a)suse.de +- Fixed up the rest of the reiserfs patch queue. +* Thu Mar 27 2008 jeffm(a)suse.de +- Updated reiserfs xattr patches. +* Thu Mar 27 2008 gregkh(a)suse.de +- fix merge error in patches.suse/supported-flag caused by me... +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7-git2 +* Thu Mar 27 2008 gregkh(a)suse.de +- update to 2.6.25-rc7 + - note that reiserfs xattr patches are now disabled due to merge + issues... +* Sun Mar 23 2008 teheo(a)suse.de +- patches.drivers/libata-improve-hpa-error-handling: libata: + improve HPA error handling (365534). * Thu Mar 20 2008 gregkh(a)suse.de - fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the code is not upstream and we aren't allowed to add non-GPL exports to ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2008-03-22 08:41:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2008-03-28 19:29:08.000000000 +0100 @@ -1 +1 @@ -2008-03-20 22:57:18 +0100 +2008-03-27 21:12:25 +0100 ++++++ get_release_number.sh ++++++ --- kernel-source/get_release_number.sh 2008-03-22 08:41:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/get_release_number.sh 2008-03-28 19:29:13.000000000 +0100 @@ -1,8 +1,7 @@ #! /bin/sh - +prefix=rc7.git2. +suffix= if [ "$3" = kernel-dummy -o -n "$suffix" ]; then - prefix=rc6.git5. - suffix= [ -n "$suffix" ] || suffix=$2 while [ "$suffix" != "${suffix#[^0-9]*.}" ]; do suffix=${suffix#[^0-9]*.} ++++++ needed_space_in_mb ++++++ --- kernel-source/needed_space_in_mb 2008-03-22 11:57:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2008-03-28 19:29:35.000000000 +0100 @@ -1 +1 @@ -6000 +6144 ++++++ patches.addon.tar.bz2 ++++++ ++++++ patches.apparmor.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-mkdir.diff new/patches.apparmor/vfs-mkdir.diff --- old/patches.apparmor/vfs-mkdir.diff 2008-03-05 20:15:13.000000000 +0100 +++ new/patches.apparmor/vfs-mkdir.diff 2008-03-28 15:59:05.000000000 +0100 @@ -13,13 +13,14 @@ fs/namei.c | 5 +++-- fs/nfsd/nfs4recover.c | 3 ++- fs/nfsd/vfs.c | 8 +++++--- - fs/reiserfs/xattr.c | 2 +- include/linux/fs.h | 2 +- kernel/cgroup.c | 2 +- - 7 files changed, 17 insertions(+), 10 deletions(-) + 6 files changed, 16 insertions(+), 9 deletions(-) ---- a/fs/ecryptfs/inode.c -+++ b/fs/ecryptfs/inode.c +Index: b/fs/ecryptfs/inode.c +=================================================================== +--- a/fs/ecryptfs/inode.c 2008-03-27 14:01:01.000000000 -0400 ++++ b/fs/ecryptfs/inode.c 2008-03-27 14:01:01.000000000 -0400 @@ -487,11 +487,14 @@ static int ecryptfs_mkdir(struct inode * { int rc; @@ -36,9 +37,11 @@ if (rc || !lower_dentry->d_inode) goto out; rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0); ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1999,7 +1999,8 @@ asmlinkage long sys_mknod(const char __u +Index: b/fs/namei.c +=================================================================== +--- a/fs/namei.c 2008-03-27 14:01:01.000000000 -0400 ++++ b/fs/namei.c 2008-03-27 14:01:01.000000000 -0400 +@@ -2000,7 +2000,8 @@ asmlinkage long sys_mknod(const char __u return sys_mknodat(AT_FDCWD, filename, mode, dev); } @@ -48,7 +51,7 @@ { int error = may_create(dir, dentry, NULL); -@@ -2043,7 +2044,7 @@ asmlinkage long sys_mkdirat(int dfd, con +@@ -2044,7 +2045,7 @@ asmlinkage long sys_mkdirat(int dfd, con if (!IS_POSIXACL(nd.path.dentry->d_inode)) mode &= ~current->fs->umask; @@ -57,8 +60,10 @@ dput(dentry); out_unlock: mutex_unlock(&nd.path.dentry->d_inode->i_mutex); ---- a/fs/nfsd/nfs4recover.c -+++ b/fs/nfsd/nfs4recover.c +Index: b/fs/nfsd/nfs4recover.c +=================================================================== +--- a/fs/nfsd/nfs4recover.c 2008-03-27 13:58:27.000000000 -0400 ++++ b/fs/nfsd/nfs4recover.c 2008-03-27 14:01:01.000000000 -0400 @@ -154,7 +154,8 @@ nfsd4_create_clid_dir(struct nfs4_client dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n"); goto out_put; @@ -69,8 +74,10 @@ out_put: dput(dentry); out_unlock: ---- a/fs/nfsd/vfs.c -+++ b/fs/nfsd/vfs.c +Index: b/fs/nfsd/vfs.c +=================================================================== +--- a/fs/nfsd/vfs.c 2008-03-27 14:01:01.000000000 -0400 ++++ b/fs/nfsd/vfs.c 2008-03-27 14:01:01.000000000 -0400 @@ -1186,6 +1186,7 @@ nfsd_create(struct svc_rqst *rqstp, stru int type, dev_t rdev, struct svc_fh *resfhp) { @@ -114,19 +121,10 @@ err = nfserrno(nfsd_sync_dir(dentry)); write_inode_now(dchild->d_inode, 1); } ---- a/fs/reiserfs/xattr.c -+++ b/fs/reiserfs/xattr.c -@@ -116,7 +116,7 @@ static struct dentry *lookup_or_create_d - int err = -ENODATA; - - if (xattr_may_create(flags)) -- err = vfs_mkdir(parent->d_inode, dentry, 0700); -+ err = vfs_mkdir(parent->d_inode, dentry, NULL, 0700); - - if (err) { - dput(dentry); ---- a/include/linux/fs.h -+++ b/include/linux/fs.h +Index: b/include/linux/fs.h +=================================================================== +--- a/include/linux/fs.h 2008-03-27 14:01:01.000000000 -0400 ++++ b/include/linux/fs.h 2008-03-27 14:01:01.000000000 -0400 @@ -1076,7 +1076,7 @@ extern void unlock_super(struct super_bl */ extern int vfs_permission(struct nameidata *, int); @@ -136,8 +134,10 @@ extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t); extern int vfs_symlink(struct inode *, struct dentry *, const char *, int); extern int vfs_link(struct dentry *, struct inode *, struct dentry *); ---- a/kernel/cgroup.c -+++ b/kernel/cgroup.c +Index: b/kernel/cgroup.c +=================================================================== +--- a/kernel/cgroup.c 2008-03-27 13:58:27.000000000 -0400 ++++ b/kernel/cgroup.c 2008-03-27 14:01:01.000000000 -0400 @@ -2819,7 +2819,7 @@ int cgroup_clone(struct task_struct *tsk } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-notify_change.diff new/patches.apparmor/vfs-notify_change.diff --- old/patches.apparmor/vfs-notify_change.diff 2008-03-21 22:53:41.000000000 +0100 +++ new/patches.apparmor/vfs-notify_change.diff 2008-03-28 15:59:05.000000000 +0100 @@ -18,17 +18,19 @@ fs/namei.c | 2 +- fs/nfsd/vfs.c | 8 ++++---- fs/open.c | 28 +++++++++++++++------------- - fs/reiserfs/xattr.c | 4 ++-- + fs/reiserfs/xattr.c | 12 ++++++------ fs/sysfs/file.c | 2 +- fs/utimes.c | 11 ++++++----- include/linux/fs.h | 6 +++--- mm/filemap.c | 2 +- mm/tiny-shmem.c | 2 +- - 14 files changed, 43 insertions(+), 36 deletions(-) + 14 files changed, 47 insertions(+), 40 deletions(-) ---- a/fs/attr.c -+++ b/fs/attr.c -@@ -100,7 +100,8 @@ +Index: b/fs/attr.c +=================================================================== +--- a/fs/attr.c 2008-03-27 13:58:27.000000000 -0400 ++++ b/fs/attr.c 2008-03-27 14:21:16.000000000 -0400 +@@ -100,7 +100,8 @@ int inode_setattr(struct inode * inode, } EXPORT_SYMBOL(inode_setattr); @@ -38,9 +40,11 @@ { struct inode *inode = dentry->d_inode; mode_t mode = inode->i_mode; ---- a/fs/ecryptfs/inode.c -+++ b/fs/ecryptfs/inode.c -@@ -848,6 +848,7 @@ +Index: b/fs/ecryptfs/inode.c +=================================================================== +--- a/fs/ecryptfs/inode.c 2008-03-27 13:58:27.000000000 -0400 ++++ b/fs/ecryptfs/inode.c 2008-03-27 14:21:16.000000000 -0400 +@@ -848,6 +848,7 @@ static int ecryptfs_setattr(struct dentr { int rc = 0; struct dentry *lower_dentry; @@ -48,7 +52,7 @@ struct inode *inode; struct inode *lower_inode; struct ecryptfs_crypt_stat *crypt_stat; -@@ -858,6 +859,7 @@ +@@ -858,6 +859,7 @@ static int ecryptfs_setattr(struct dentr inode = dentry->d_inode; lower_inode = ecryptfs_inode_to_lower(inode); lower_dentry = ecryptfs_dentry_to_lower(dentry); @@ -56,7 +60,7 @@ mutex_lock(&crypt_stat->cs_mutex); if (S_ISDIR(dentry->d_inode->i_mode)) crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED); -@@ -908,7 +910,7 @@ +@@ -908,7 +910,7 @@ static int ecryptfs_setattr(struct dentr if (ia->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID)) ia->ia_valid &= ~ATTR_MODE; @@ -65,9 +69,11 @@ out: fsstack_copy_attr_all(inode, lower_inode, NULL); return rc; ---- a/fs/exec.c -+++ b/fs/exec.c -@@ -1777,7 +1777,8 @@ +Index: b/fs/exec.c +=================================================================== +--- a/fs/exec.c 2008-03-27 13:58:27.000000000 -0400 ++++ b/fs/exec.c 2008-03-27 14:01:01.000000000 -0400 +@@ -1777,7 +1777,8 @@ int do_coredump(long signr, int exit_cod goto close_fail; if (!file->f_op->write) goto close_fail; @@ -77,9 +83,11 @@ goto close_fail; retval = binfmt->core_dump(signr, regs, file, core_limit); ---- a/fs/fat/file.c -+++ b/fs/fat/file.c -@@ -92,7 +92,7 @@ +Index: b/fs/fat/file.c +=================================================================== +--- a/fs/fat/file.c 2008-03-27 13:58:27.000000000 -0400 ++++ b/fs/fat/file.c 2008-03-27 14:01:01.000000000 -0400 +@@ -92,7 +92,7 @@ int fat_generic_ioctl(struct inode *inod } /* This MUST be done before doing anything irreversible... */ @@ -88,9 +96,11 @@ if (err) goto up; ---- a/fs/hpfs/namei.c -+++ b/fs/hpfs/namei.c -@@ -426,7 +426,7 @@ +Index: b/fs/hpfs/namei.c +=================================================================== +--- a/fs/hpfs/namei.c 2008-03-27 13:58:27.000000000 -0400 ++++ b/fs/hpfs/namei.c 2008-03-27 14:01:01.000000000 -0400 +@@ -426,7 +426,7 @@ again: /*printk("HPFS: truncating file before delete.\n");*/ newattrs.ia_size = 0; newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; @@ -99,9 +109,11 @@ put_write_access(inode); if (!err) goto again; ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1662,7 +1662,7 @@ +Index: b/fs/namei.c +=================================================================== +--- a/fs/namei.c 2008-03-27 14:01:01.000000000 -0400 ++++ b/fs/namei.c 2008-03-27 14:21:16.000000000 -0400 +@@ -1663,7 +1663,7 @@ int may_open(struct nameidata *nd, int a if (!error) { DQUOT_INIT(inode); @@ -110,9 +122,11 @@ ATTR_MTIME|ATTR_CTIME|ATTR_OPEN, NULL); } ---- a/fs/nfsd/vfs.c -+++ b/fs/nfsd/vfs.c -@@ -388,7 +388,7 @@ +Index: b/fs/nfsd/vfs.c +=================================================================== +--- a/fs/nfsd/vfs.c 2008-03-27 13:58:27.000000000 -0400 ++++ b/fs/nfsd/vfs.c 2008-03-27 14:21:16.000000000 -0400 +@@ -388,7 +388,7 @@ nfsd_setattr(struct svc_rqst *rqstp, str err = nfserr_notsync; if (!check_guard || guardtime == inode->i_ctime.tv_sec) { fh_lock(fhp); @@ -121,7 +135,7 @@ err = nfserrno(host_err); fh_unlock(fhp); } -@@ -944,13 +944,13 @@ +@@ -944,13 +944,13 @@ out: return err; } @@ -137,7 +151,7 @@ mutex_unlock(&dentry->d_inode->i_mutex); } -@@ -1009,7 +1009,7 @@ +@@ -1009,7 +1009,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s /* clear setuid/setgid flag after write */ if (host_err >= 0 && (inode->i_mode & (S_ISUID | S_ISGID))) @@ -146,9 +160,11 @@ if (host_err >= 0 && stable) { static ino_t last_ino; ---- a/fs/open.c -+++ b/fs/open.c -@@ -194,8 +194,8 @@ +Index: b/fs/open.c +=================================================================== +--- a/fs/open.c 2008-03-27 13:58:27.000000000 -0400 ++++ b/fs/open.c 2008-03-27 14:21:14.000000000 -0400 +@@ -194,8 +194,8 @@ out: return error; } @@ -159,7 +175,7 @@ { int err; struct iattr newattrs; -@@ -215,7 +215,7 @@ +@@ -215,7 +215,7 @@ int do_truncate(struct dentry *dentry, l newattrs.ia_valid |= should_remove_suid(dentry); mutex_lock(&dentry->d_inode->i_mutex); @@ -168,7 +184,7 @@ mutex_unlock(&dentry->d_inode->i_mutex); return err; } -@@ -271,7 +271,7 @@ +@@ -271,7 +271,7 @@ static long do_sys_truncate(const char _ error = locks_verify_truncate(inode, NULL, length); if (!error) { DQUOT_INIT(inode); @@ -177,7 +193,7 @@ } put_write_and_out: -@@ -324,7 +324,8 @@ +@@ -324,7 +324,8 @@ static long do_sys_ftruncate(unsigned in error = locks_verify_truncate(inode, file, length); if (!error) @@ -187,7 +203,7 @@ out_putf: fput(file); out: -@@ -578,7 +579,7 @@ +@@ -578,7 +579,7 @@ asmlinkage long sys_fchmod(unsigned int mode = inode->i_mode; newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; @@ -196,7 +212,7 @@ mutex_unlock(&inode->i_mutex); out_putf: -@@ -613,7 +614,7 @@ +@@ -613,7 +614,7 @@ asmlinkage long sys_fchmodat(int dfd, co mode = inode->i_mode; newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; @@ -205,7 +221,7 @@ mutex_unlock(&inode->i_mutex); dput_and_out: -@@ -627,7 +628,8 @@ +@@ -627,7 +628,8 @@ asmlinkage long sys_chmod(const char __u return sys_fchmodat(AT_FDCWD, filename, mode); } @@ -215,7 +231,7 @@ { struct inode * inode; int error; -@@ -657,7 +659,7 @@ +@@ -657,7 +659,7 @@ static int chown_common(struct dentry * newattrs.ia_valid |= ATTR_KILL_SUID | ATTR_KILL_SGID | ATTR_KILL_PRIV; mutex_lock(&inode->i_mutex); @@ -224,7 +240,7 @@ mutex_unlock(&inode->i_mutex); out: return error; -@@ -671,7 +673,7 @@ +@@ -671,7 +673,7 @@ asmlinkage long sys_chown(const char __u error = user_path_walk(filename, &nd); if (error) goto out; @@ -233,7 +249,7 @@ path_put(&nd.path); out: return error; -@@ -691,7 +693,7 @@ +@@ -691,7 +693,7 @@ asmlinkage long sys_fchownat(int dfd, co error = __user_walk_fd(dfd, filename, follow, &nd); if (error) goto out; @@ -242,7 +258,7 @@ path_put(&nd.path); out: return error; -@@ -705,7 +707,7 @@ +@@ -705,7 +707,7 @@ asmlinkage long sys_lchown(const char __ error = user_path_walk_link(filename, &nd); if (error) goto out; @@ -251,7 +267,7 @@ path_put(&nd.path); out: return error; -@@ -724,7 +726,7 @@ +@@ -724,7 +726,7 @@ asmlinkage long sys_fchown(unsigned int dentry = file->f_path.dentry; audit_inode(NULL, dentry); @@ -260,18 +276,49 @@ fput(file); out: return error; ---- a/fs/reiserfs/xattr.c -+++ b/fs/reiserfs/xattr.c -@@ -297,7 +297,7 @@ +Index: b/fs/reiserfs/xattr.c +=================================================================== +--- a/fs/reiserfs/xattr.c 2008-03-27 13:59:46.000000000 -0400 ++++ b/fs/reiserfs/xattr.c 2008-03-27 14:06:20.000000000 -0400 +@@ -117,7 +117,7 @@ static struct dentry *lookup_or_create_d + int err = -ENODATA; + + if (xattr_may_create(flags)) +- err = vfs_mkdir(parent->d_inode, dentry, 0700); ++ err = vfs_mkdir(parent->d_inode, dentry, NULL, 0700); + + if (err) { + dput(dentry); +@@ -308,7 +308,7 @@ reiserfs_xattr_set_handle(struct reiserf + goto out_dput; + } + +- err = vfs_unlink(xadir->d_inode, dentry); ++ err = vfs_unlink(xadir->d_inode, dentry, NULL); + if (!err && !timespec_equal(&inode->i_ctime, &now)) { + inode->i_ctime = CURRENT_TIME_SEC; + mark_inode_dirty(inode); +@@ -332,7 +332,7 @@ out_unlock: + /* Resize it so we're ok to write there */ newattrs.ia_size = buffer_size; newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; - mutex_lock_nested(&xinode->i_mutex, I_MUTEX_XATTR); -- err = notify_change(fp->f_path.dentry, &newattrs); -+ err = notify_change(fp->f_path.dentry, NULL, &newattrs); +- err = notify_change(dentry, &newattrs); ++ err = notify_change(dentry, NULL, &newattrs); if (err) goto out_filp; -@@ -692,7 +692,7 @@ +@@ -664,16 +664,16 @@ static int delete_one_xattr(struct dentr + + /* This is the xattr dir, handle specially. */ + if (S_ISDIR(dentry->d_inode->i_mode)) +- return vfs_rmdir(dir, dentry); ++ return vfs_rmdir(dir, dentry, NULL); + +- return vfs_unlink(dir, dentry); ++ return vfs_unlink(dir, dentry, NULL); + } + + /* dir->i_mutex is locked */ static int chown_one_xattr(struct dentry *dentry, void *data) { struct iattr *attrs = data; @@ -280,9 +327,11 @@ } int reiserfs_delete_xattrs(struct inode *inode) ---- a/fs/sysfs/file.c -+++ b/fs/sysfs/file.c -@@ -587,7 +587,7 @@ +Index: b/fs/sysfs/file.c +=================================================================== +--- a/fs/sysfs/file.c 2008-03-27 14:01:01.000000000 -0400 ++++ b/fs/sysfs/file.c 2008-03-27 14:01:01.000000000 -0400 +@@ -593,7 +593,7 @@ int sysfs_chmod_file(struct kobject *kob newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; @@ -291,9 +340,11 @@ if (rc == 0) { mutex_lock(&sysfs_mutex); ---- a/fs/utimes.c -+++ b/fs/utimes.c -@@ -55,7 +55,7 @@ +Index: b/fs/utimes.c +=================================================================== +--- a/fs/utimes.c 2008-03-27 13:58:27.000000000 -0400 ++++ b/fs/utimes.c 2008-03-27 14:01:01.000000000 -0400 +@@ -55,7 +55,7 @@ long do_utimes(int dfd, char __user *fil { int error; struct nameidata nd; @@ -302,7 +353,7 @@ struct inode *inode; struct iattr newattrs; struct file *f = NULL; -@@ -78,16 +78,17 @@ +@@ -78,16 +78,17 @@ long do_utimes(int dfd, char __user *fil f = fget(dfd); if (!f) goto out; @@ -323,7 +374,7 @@ error = -EROFS; if (IS_RDONLY(inode)) -@@ -132,7 +133,7 @@ +@@ -132,7 +133,7 @@ long do_utimes(int dfd, char __user *fil } } mutex_lock(&inode->i_mutex); @@ -332,9 +383,11 @@ mutex_unlock(&inode->i_mutex); dput_and_out: if (f) ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -1561,8 +1561,8 @@ +Index: b/include/linux/fs.h +=================================================================== +--- a/include/linux/fs.h 2008-03-27 14:01:01.000000000 -0400 ++++ b/include/linux/fs.h 2008-03-27 14:21:16.000000000 -0400 +@@ -1561,8 +1561,8 @@ static inline int break_lease(struct ino /* fs/open.c */ @@ -345,7 +398,7 @@ extern long do_sys_open(int dfd, const char __user *filename, int flags, int mode); extern struct file *filp_open(const char *, int, int); -@@ -1717,7 +1717,7 @@ +@@ -1717,7 +1717,7 @@ extern int do_remount_sb(struct super_bl #ifdef CONFIG_BLOCK extern sector_t bmap(struct inode *, sector_t); #endif @@ -354,9 +407,11 @@ extern int permission(struct inode *, int, struct nameidata *); extern int generic_permission(struct inode *, int, int (*check_acl)(struct inode *, int)); ---- a/mm/filemap.c -+++ b/mm/filemap.c -@@ -1662,7 +1662,7 @@ +Index: b/mm/filemap.c +=================================================================== +--- a/mm/filemap.c 2008-03-27 14:01:01.000000000 -0400 ++++ b/mm/filemap.c 2008-03-27 14:01:01.000000000 -0400 +@@ -1662,7 +1662,7 @@ int __remove_suid(struct path *path, int struct iattr newattrs; newattrs.ia_valid = ATTR_FORCE | kill; @@ -365,9 +420,11 @@ } int remove_suid(struct path *path) ---- a/mm/tiny-shmem.c -+++ b/mm/tiny-shmem.c -@@ -80,7 +80,7 @@ +Index: b/mm/tiny-shmem.c +=================================================================== +--- a/mm/tiny-shmem.c 2008-03-27 13:58:27.000000000 -0400 ++++ b/mm/tiny-shmem.c 2008-03-27 14:01:01.000000000 -0400 +@@ -80,7 +80,7 @@ struct file *shmem_file_setup(char *name inode->i_nlink = 0; /* It is unlinked */ /* notify everyone as to the change of file size */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-rmdir.diff new/patches.apparmor/vfs-rmdir.diff --- old/patches.apparmor/vfs-rmdir.diff 2008-03-05 20:15:13.000000000 +0100 +++ new/patches.apparmor/vfs-rmdir.diff 2008-03-28 15:59:05.000000000 +0100 @@ -13,12 +13,13 @@ fs/namei.c | 4 ++-- fs/nfsd/nfs4recover.c | 2 +- fs/nfsd/vfs.c | 8 +++++--- - fs/reiserfs/xattr.c | 6 +++--- include/linux/fs.h | 2 +- - 6 files changed, 15 insertions(+), 11 deletions(-) + 5 files changed, 12 insertions(+), 8 deletions(-) ---- a/fs/ecryptfs/inode.c -+++ b/fs/ecryptfs/inode.c +Index: b/fs/ecryptfs/inode.c +=================================================================== +--- a/fs/ecryptfs/inode.c 2008-03-27 14:04:47.000000000 -0400 ++++ b/fs/ecryptfs/inode.c 2008-03-27 14:04:48.000000000 -0400 @@ -520,14 +520,16 @@ out: static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry) { @@ -37,9 +38,11 @@ dput(lower_dentry); if (!rc) d_delete(lower_dentry); ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -2089,7 +2089,7 @@ void dentry_unhash(struct dentry *dentry +Index: b/fs/namei.c +=================================================================== +--- a/fs/namei.c 2008-03-27 14:04:47.000000000 -0400 ++++ b/fs/namei.c 2008-03-27 14:04:48.000000000 -0400 +@@ -2090,7 +2090,7 @@ void dentry_unhash(struct dentry *dentry spin_unlock(&dcache_lock); } @@ -48,7 +51,7 @@ { int error = may_delete(dir, dentry, 1); -@@ -2153,7 +2153,7 @@ static long do_rmdir(int dfd, const char +@@ -2154,7 +2154,7 @@ static long do_rmdir(int dfd, const char error = PTR_ERR(dentry); if (IS_ERR(dentry)) goto exit2; @@ -57,8 +60,10 @@ dput(dentry); exit2: mutex_unlock(&nd.path.dentry->d_inode->i_mutex); ---- a/fs/nfsd/nfs4recover.c -+++ b/fs/nfsd/nfs4recover.c +Index: b/fs/nfsd/nfs4recover.c +=================================================================== +--- a/fs/nfsd/nfs4recover.c 2008-03-27 14:01:01.000000000 -0400 ++++ b/fs/nfsd/nfs4recover.c 2008-03-27 14:04:48.000000000 -0400 @@ -274,7 +274,7 @@ nfsd4_clear_clid_dir(struct dentry *dir, * a kernel from the future.... */ nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file); @@ -68,8 +73,10 @@ mutex_unlock(&dir->d_inode->i_mutex); return status; } ---- a/fs/nfsd/vfs.c -+++ b/fs/nfsd/vfs.c +Index: b/fs/nfsd/vfs.c +=================================================================== +--- a/fs/nfsd/vfs.c 2008-03-27 14:04:47.000000000 -0400 ++++ b/fs/nfsd/vfs.c 2008-03-27 14:04:48.000000000 -0400 @@ -1729,6 +1729,7 @@ nfsd_unlink(struct svc_rqst *rqstp, stru char *fname, int flen) { @@ -111,37 +118,10 @@ host_err = nfsd_sync_dir(dentry); out_nfserr: ---- a/fs/reiserfs/xattr.c -+++ b/fs/reiserfs/xattr.c -@@ -275,7 +275,7 @@ reiserfs_xattr_set_handle(struct reiserf - return err; - } - -- err = vfs_unlink(dentry->d_parent->d_inode, dentry); -+ err = vfs_unlink(dentry->d_parent->d_inode, dentry, NULL); - if (!err) { - inode->i_ctime = CURRENT_TIME_SEC; - mark_inode_dirty(inode); -@@ -677,7 +677,7 @@ static int delete_one_xattr(struct dentr - if (err == 0) { - int err2; - mutex_lock_nested(&dir->i_mutex, I_MUTEX_XATTR); -- err = vfs_rmdir(dir, dentry); -+ err = vfs_rmdir(dir, dentry, NULL); - err2 = journal_end(&th, dir->i_sb, nblocks); - mutex_unlock(&dir->i_mutex); - if (err2) -@@ -686,7 +686,7 @@ static int delete_one_xattr(struct dentr - return err; - } - -- return vfs_unlink(dir, dentry); -+ return vfs_unlink(dir, dentry, NULL); - } - - static int chown_one_xattr(struct dentry *dentry, void *data) ---- a/include/linux/fs.h -+++ b/include/linux/fs.h +Index: b/include/linux/fs.h +=================================================================== +--- a/include/linux/fs.h 2008-03-27 14:04:47.000000000 -0400 ++++ b/include/linux/fs.h 2008-03-27 14:04:48.000000000 -0400 @@ -1080,7 +1080,7 @@ extern int vfs_mkdir(struct inode *, str extern int vfs_mknod(struct inode *, struct dentry *, struct vfsmount *, int, dev_t); extern int vfs_symlink(struct inode *, struct dentry *, struct vfsmount *, const char *, int); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-unlink.diff new/patches.apparmor/vfs-unlink.diff --- old/patches.apparmor/vfs-unlink.diff 2008-03-05 20:15:13.000000000 +0100 +++ new/patches.apparmor/vfs-unlink.diff 2008-03-28 15:59:05.000000000 +0100 @@ -17,9 +17,11 @@ ipc/mqueue.c | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) ---- a/fs/ecryptfs/inode.c -+++ b/fs/ecryptfs/inode.c -@@ -430,10 +430,11 @@ static int ecryptfs_unlink(struct inode +Index: b/fs/ecryptfs/inode.c +=================================================================== +--- a/fs/ecryptfs/inode.c 2008-03-27 14:04:48.000000000 -0400 ++++ b/fs/ecryptfs/inode.c 2008-03-27 14:06:02.000000000 -0400 +@@ -430,10 +430,11 @@ static int ecryptfs_unlink(struct inode { int rc = 0; struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry); @@ -32,9 +34,11 @@ if (rc) { printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc); goto out_unlock; ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -2170,7 +2170,7 @@ asmlinkage long sys_rmdir(const char __u +Index: b/fs/namei.c +=================================================================== +--- a/fs/namei.c 2008-03-27 14:05:55.000000000 -0400 ++++ b/fs/namei.c 2008-03-27 14:06:02.000000000 -0400 +@@ -2171,7 +2171,7 @@ asmlinkage long sys_rmdir(const char __u return do_rmdir(AT_FDCWD, pathname); } @@ -43,7 +47,7 @@ { int error = may_delete(dir, dentry, 0); -@@ -2235,7 +2235,7 @@ static long do_unlinkat(int dfd, const c +@@ -2236,7 +2236,7 @@ static long do_unlinkat(int dfd, const c inode = dentry->d_inode; if (inode) atomic_inc(&inode->i_count); @@ -52,8 +56,10 @@ exit2: dput(dentry); } ---- a/fs/nfsd/nfs4recover.c -+++ b/fs/nfsd/nfs4recover.c +Index: b/fs/nfsd/nfs4recover.c +=================================================================== +--- a/fs/nfsd/nfs4recover.c 2008-03-27 14:04:48.000000000 -0400 ++++ b/fs/nfsd/nfs4recover.c 2008-03-27 14:06:02.000000000 -0400 @@ -259,7 +259,7 @@ nfsd4_remove_clid_file(struct dentry *di return -EINVAL; } @@ -63,8 +69,10 @@ mutex_unlock(&dir->d_inode->i_mutex); return status; } ---- a/fs/nfsd/vfs.c -+++ b/fs/nfsd/vfs.c +Index: b/fs/nfsd/vfs.c +=================================================================== +--- a/fs/nfsd/vfs.c 2008-03-27 14:04:48.000000000 -0400 ++++ b/fs/nfsd/vfs.c 2008-03-27 14:06:02.000000000 -0400 @@ -1767,7 +1767,7 @@ nfsd_unlink(struct svc_rqst *rqstp, stru host_err = -EPERM; } else @@ -74,8 +82,10 @@ } else { /* It's RMDIR */ host_err = vfs_rmdir(dirp, rdentry, exp->ex_path.mnt); } ---- a/include/linux/fs.h -+++ b/include/linux/fs.h +Index: b/include/linux/fs.h +=================================================================== +--- a/include/linux/fs.h 2008-03-27 14:04:48.000000000 -0400 ++++ b/include/linux/fs.h 2008-03-27 14:06:02.000000000 -0400 @@ -1081,7 +1081,7 @@ extern int vfs_mknod(struct inode *, str extern int vfs_symlink(struct inode *, struct dentry *, struct vfsmount *, const char *, int); extern int vfs_link(struct dentry *, struct vfsmount *, struct inode *, struct dentry *, struct vfsmount *); @@ -85,8 +95,10 @@ extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *); /* ---- a/ipc/mqueue.c -+++ b/ipc/mqueue.c +Index: b/ipc/mqueue.c +=================================================================== +--- a/ipc/mqueue.c 2008-03-27 13:58:26.000000000 -0400 ++++ b/ipc/mqueue.c 2008-03-27 14:06:02.000000000 -0400 @@ -743,7 +743,7 @@ asmlinkage long sys_mq_unlink(const char if (inode) atomic_inc(&inode->i_count); ++++++ patches.arch.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3-rename-wireless-interface.patch new/patches.arch/ppc-ps3-rename-wireless-interface.patch --- old/patches.arch/ppc-ps3-rename-wireless-interface.patch 2008-03-12 13:31:52.000000000 +0100 +++ new/patches.arch/ppc-ps3-rename-wireless-interface.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -Subject: rename wireless iface from eth to wlan -The gelic driver uses two net interfaces, one for ethernet and the -other for wireless. They share same MAC address and use 'eth' prefix -for the name. -As udev uses the MAC address to check uniqueness, this is -somewhat problematic. So change the prefix of the network interface -name for the wireless so that udev can have an easy way to distinguish -interfaces. - -From: Masakazu Mokuno <mokuno(a)sm.sony.co.jp> -Signed-off-by: Stefan Assmann <sassmann(a)suse.de> - ---- - drivers/net/ps3_gelic_wireless.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/net/ps3_gelic_wireless.c -+++ b/drivers/net/ps3_gelic_wireless.c -@@ -2389,6 +2389,8 @@ static struct net_device *gelic_wl_alloc - if (!netdev) - return NULL; - -+ strcpy(netdev->name, "wlan%d"); -+ - port = netdev_priv(netdev); - port->netdev = netdev; - port->card = card; ++++++ 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.suse.tar.bz2 ++++++ ++++ 5966 lines of diff (skipped) ++++++ series.conf ++++++ --- kernel-source/series.conf 2008-03-22 08:40:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2008-03-28 19:28:57.000000000 +0100 @@ -27,8 +27,8 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## - patches.kernel.org/patch-2.6.25-rc6 - patches.kernel.org/patch-2.6.25-rc6-git5 + patches.kernel.org/patch-2.6.25-rc7 + patches.kernel.org/patch-2.6.25-rc7-git2 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -131,8 +131,6 @@ # PS3 ######################################################## - patches.arch/ppc-ps3-rename-wireless-interface.patch - ######################################################## # S/390 ######################################################## @@ -233,7 +231,6 @@ patches.suse/reiserfs-remove-i_has_xattr_dir.diff patches.suse/reiserfs-remove-link-detection.diff patches.suse/reiserfs-use-generic-xattr-handlers.diff - patches.suse/reiserfs-xattrs-noatime.diff patches.suse/reiserfs-add-per-file-data-ordered-mode.diff patches.suse/reiserfs-journaled-xattrs.diff patches.suse/reiserfs-kill-xattr-readdir.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-driver-video-radeonhd
by root＠Hilbert.suse.de 30 Mar '08

30 Mar '08

Hello community, here is the log from the commit of package xorg-x11-driver-video-radeonhd checked in at Sun Mar 30 12:09:23 CEST 2008. -------- --- xorg-x11-driver-video-radeonhd/xorg-x11-driver-video-radeonhd.changes 2008-03-20 17:43:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-radeonhd/xorg-x11-driver-video-radeonhd.changes 2008-03-27 17:36:21.309343000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 27 17:40:33 CET 2008 - sndirsch(a)suse.de + +- updated to current git version 1623f86 + +------------------------------------------------------------------- Old: ---- xf86-video-radeonhd-1.1.0_080320_96f3633.tar.bz2 New: ---- xf86-video-radeonhd-1.1.0_080327_1623f86.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video-radeonhd.spec ++++++ --- /var/tmp/diff_new_pack.KG5678/_old 2008-03-30 12:09:18.000000000 +0200 +++ /var/tmp/diff_new_pack.KG5678/_new 2008-03-30 12:09:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-driver-video-radeonhd (Version 1.1.0_080320_96f3633) +# spec file for package xorg-x11-driver-video-radeonhd (Version 1.1.0_080327_1623f86) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -36,7 +36,7 @@ Group: System/X11/Servers/XF86_4 %endif AutoReqProv: on -Version: 1.1.0_080320_96f3633 +Version: 1.1.0_080327_1623f86 Release: 1 Summary: Driver for AMD GPG (ATI) r5xx/r6xx Chipsets %if 0%{?suse_version} @@ -185,6 +185,8 @@ %endif %changelog +* Thu Mar 27 2008 sndirsch(a)suse.de +- updated to current git version 1623f86 * Thu Mar 20 2008 sndirsch(a)suse.de - updated to current git version 96f3633, which fixes driver for imake based builds like it's used for SLES10 ++++++ xf86-video-radeonhd-1.1.0_080320_96f3633.tar.bz2 -> xf86-video-radeonhd-1.1.0_080327_1623f86.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/aclocal.m4 new/xf86-video-radeonhd-1.1.0/aclocal.m4 --- old/xf86-video-radeonhd-1.1.0/aclocal.m4 2008-03-13 19:06:28.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/aclocal.m4 2008-03-27 17:26:40.000000000 +0100 @@ -6858,7 +6858,7 @@ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.5 + [XORG_MACROS_version=1.1.6 XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then @@ -7007,7 +7007,11 @@ XORG_SGML_PATH=$prefix/share/sgml HAVE_DEFS_ENT= -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) +if test x"$cross_compiling" = x"yes" ; then + HAVE_DEFS_ENT=no +else + AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) +fi AC_PATH_PROG(LINUXDOC, linuxdoc) AC_PATH_PROG(PS2PDF, ps2pdf) @@ -7328,14 +7332,14 @@ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], [`echo $PACKAGE_VERSION | cut -d . -f 1`], [Major version of this package]) - PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` if test "x$PVM" = "x"; then PVM="0" fi AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], [$PVM], [Minor version of this package]) - PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` if test "x$PVP" = "x"; then PVP="0" fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/ChangeLog new/xf86-video-radeonhd-1.1.0/ChangeLog --- old/xf86-video-radeonhd-1.1.0/ChangeLog 2008-03-20 17:39:29.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/ChangeLog 2008-03-27 17:32:44.000000000 +0100 @@ -1,3 +1,91 @@ +commit 1623f86f0834e7c13a89682983729b70348512b2 +Author: Stefan Dirsch <sndirsch(a)suse.de> +Date: Thu Mar 27 17:49:01 2008 +0100 + + Added missing rhd_ddia.c/rhd_ddia.o to Imakefile. + +commit 186c345cad07fb4eb626707f40a2c444fc5d8bc7 +Author: Egbert Eich <eich(a)freedesktop.org> +Date: Thu Mar 27 07:34:30 2008 +0100 + + Print output name for sensed type. + +commit d7d63b25d264f0838c497a79e38059506ccdc814 +Author: Egbert Eich <eich(a)freedesktop.org> +Date: Wed Mar 26 22:50:43 2008 +0100 + + Print sensed type also for RandR. + +commit 6d628f5658512cb73fd04dda85f5672736e80080 +Author: Egbert Eich <eich(a)freedesktop.org> +Date: Wed Mar 26 21:10:31 2008 +0100 + + Make debugging output of HPD verbose about the result. + +commit 811b0cd66958e32bddcbbca7656893de160b2de8 +Author: Matthias Hopf <mhopf(a)suse.de> +Date: Tue Mar 25 17:25:14 2008 +0100 + + Added quirk table entry for a different Sapphire X1300 + +commit 89cfb7384b1e34c1de88d3b32ff6202b9ecda287 +Author: Egbert Eich <eich(a)freedesktop.org> +Date: Mon Mar 24 23:07:08 2008 +0100 + + Add support for RS690 DDIA digital block. + + This will support the second digital output on many RS690 boards. + +commit b6418a97bfc448ecd6e15c548bcdeb8af8967619 +Author: Egbert Eich <eich(a)freedesktop.org> +Date: Mon Mar 24 09:34:18 2008 +0100 + + Add debugging aids. + + The RHDReg??D() functions can be used to print out the register + values read/written. When RHD_DEBUG isn't define they will be + identical to the versions without the 'D'. + +commit c8ad2599d54fa855b4cdf234c6c560301afeebf4 +Author: Egbert Eich <eich(a)freedesktop.org> +Date: Mon Mar 24 18:28:55 2008 +0100 + + Reset CRTC horizontal counter replication. + + Appearantly this should only be set for 30bpp DVI modes. + +commit bd11d76aab42354403dff1bffd5f89dc86c3ecc7 +Author: Egbert Eich <eich(a)freedesktop.org> +Date: Mon Mar 24 16:23:08 2008 +0100 + + Handle AtomBIOS TMDS PLL parameters correctly. + + NOTE: This code is not used so far but support for this + will be added later. + +commit 806d95361c11068a078c85db2891c3802a106f9d +Author: Egbert Eich <eich(a)freedesktop.org> +Date: Mon Mar 24 13:57:44 2008 +0100 + + HDMI Type B connector is dual link capable. + +commit ae3171b9621b54ecacc2a10a133c435f2e380152 +Author: Egbert Eich <eich(a)freedesktop.org> +Date: Mon Mar 24 13:43:40 2008 +0100 + + Add TMDS PLL macro control values for M54 (0x7145). + + Bug #15132, reported by Veli-Jussi Raitila. + +commit 19a6eb464a5f988a700259c85042350d67d66ea3 +Author: Stefan Dirsch <sndirsch(a)suse.de> +Date: Fri Mar 21 11:35:13 2008 +0100 + + Chipset name review. + + Added Device ID for Radeon HD 3850 AGP. Fixed typo in Device + ID for ATI FireMV 2450. + commit 96f36339e2b6dbe60efafc6a150a561111aaf844 Author: Stefan Dirsch <sndirsch(a)suse.de> Date: Thu Mar 20 17:54:57 2008 +0100 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/configure new/xf86-video-radeonhd-1.1.0/configure --- old/xf86-video-radeonhd-1.1.0/configure 2008-03-13 19:06:30.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/configure 2008-03-27 17:26:42.000000000 +0100 @@ -22590,7 +22590,7 @@ #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF - PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` if test "x$PVM" = "x"; then PVM="0" fi @@ -22599,7 +22599,7 @@ #define PACKAGE_VERSION_MINOR $PVM _ACEOF - PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` if test "x$PVP" = "x"; then PVP="0" fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/git_version.h new/xf86-video-radeonhd-1.1.0/src/git_version.h --- old/xf86-video-radeonhd-1.1.0/src/git_version.h 2008-03-20 17:39:32.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/git_version.h 2008-03-27 17:32:47.000000000 +0100 @@ -14,13 +14,13 @@ /* git utilities found */ #undef GIT_NOT_FOUND -#define GIT_VERSION "git version 1.5.3.8" +#define GIT_VERSION "git version 1.5.4.4" /* git repo found */ #define GIT_REPO 1 /* Git SHA ID of last commit */ -#define GIT_SHAID "96f36339" +#define GIT_SHAID "1623f86f" /* Branch this tree is on */ #define GIT_BRANCH "master" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/Imakefile new/xf86-video-radeonhd-1.1.0/src/Imakefile --- old/xf86-video-radeonhd-1.1.0/src/Imakefile 2008-03-20 17:28:42.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/Imakefile 2008-03-27 17:06:00.000000000 +0100 @@ -26,6 +26,7 @@ rhd_cursor.c \ rhd_dac.c \ rhd_dig.c \ +rhd_ddia.c \ rhd_driver.c \ rhd_edid.c \ rhd_helper.c \ @@ -54,6 +55,7 @@ rhd_cursor.o \ rhd_dac.o \ rhd_dig.o \ +rhd_ddia.o \ rhd_driver.o \ rhd_edid.o \ rhd_helper.o \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/Makefile.am new/xf86-video-radeonhd-1.1.0/src/Makefile.am --- old/xf86-video-radeonhd-1.1.0/src/Makefile.am 2008-03-13 08:26:05.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/Makefile.am 2008-03-27 16:26:01.000000000 +0100 @@ -33,6 +33,7 @@ rhd_shadow.c \ rhd_randr.c \ rhd_dig.c \ + rhd_ddia.c \ rhd_atombios.h \ rhd.h \ rhd_i2c.h \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/Makefile.in new/xf86-video-radeonhd-1.1.0/src/Makefile.in --- old/xf86-video-radeonhd-1.1.0/src/Makefile.in 2008-03-13 19:06:32.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/Makefile.in 2008-03-27 17:26:44.000000000 +0100 @@ -84,12 +84,13 @@ rhd_connector.c rhd_cursor.c rhd_dac.c rhd_driver.c rhd_edid.c \ rhd_helper.c rhd_id.c rhd_lut.c rhd_lvtma.c rhd_modes.c \ rhd_monitor.c rhd_output.c rhd_pll.c rhd_tmds.c rhd_vga.c \ - rhd_mc.c rhd_shadow.c rhd_randr.c rhd_dig.c rhd_atombios.h \ - rhd.h rhd_i2c.h rhd_card.h rhd_crtc.h rhd_connector.h \ - rhd_cursor.h rhd_lut.h rhd_modes.h rhd_monitor.h rhd_output.h \ - rhd_pll.h rhd_randr.h rhd_regs.h rhd_vga.h rhd_shadow.h \ - rhd_mc.h r5xx_accel.c r5xx_accel.h r5xx_xaa.c r5xx_2dregs.h \ - r5xx_exa.c AtomBios/includes/atombios.h rhd_atomwrapper.h + rhd_mc.c rhd_shadow.c rhd_randr.c rhd_dig.c rhd_ddia.c \ + rhd_atombios.h rhd.h rhd_i2c.h rhd_card.h rhd_crtc.h \ + rhd_connector.h rhd_cursor.h rhd_lut.h rhd_modes.h \ + rhd_monitor.h rhd_output.h rhd_pll.h rhd_randr.h rhd_regs.h \ + rhd_vga.h rhd_shadow.h rhd_mc.h r5xx_accel.c r5xx_accel.h \ + r5xx_xaa.c r5xx_2dregs.h r5xx_exa.c \ + AtomBios/includes/atombios.h rhd_atomwrapper.h @USE_EXA_TRUE@am__objects_1 = radeonhd_drv_la-r5xx_exa.lo am__objects_2 = am_radeonhd_drv_la_OBJECTS = radeonhd_drv_la-rhd_atombios.lo \ @@ -103,9 +104,9 @@ radeonhd_drv_la-rhd_pll.lo radeonhd_drv_la-rhd_tmds.lo \ radeonhd_drv_la-rhd_vga.lo radeonhd_drv_la-rhd_mc.lo \ radeonhd_drv_la-rhd_shadow.lo radeonhd_drv_la-rhd_randr.lo \ - radeonhd_drv_la-rhd_dig.lo radeonhd_drv_la-r5xx_accel.lo \ - radeonhd_drv_la-r5xx_xaa.lo $(am__objects_1) $(am__objects_2) \ - $(am__objects_2) + radeonhd_drv_la-rhd_dig.lo radeonhd_drv_la-rhd_ddia.lo \ + radeonhd_drv_la-r5xx_accel.lo radeonhd_drv_la-r5xx_xaa.lo \ + $(am__objects_1) $(am__objects_2) $(am__objects_2) nodist_radeonhd_drv_la_OBJECTS = radeonhd_drv_la_OBJECTS = $(am_radeonhd_drv_la_OBJECTS) \ $(nodist_radeonhd_drv_la_OBJECTS) @@ -282,12 +283,13 @@ rhd_connector.c rhd_cursor.c rhd_dac.c rhd_driver.c rhd_edid.c \ rhd_helper.c rhd_id.c rhd_lut.c rhd_lvtma.c rhd_modes.c \ rhd_monitor.c rhd_output.c rhd_pll.c rhd_tmds.c rhd_vga.c \ - rhd_mc.c rhd_shadow.c rhd_randr.c rhd_dig.c rhd_atombios.h \ - rhd.h rhd_i2c.h rhd_card.h rhd_crtc.h rhd_connector.h \ - rhd_cursor.h rhd_lut.h rhd_modes.h rhd_monitor.h rhd_output.h \ - rhd_pll.h rhd_randr.h rhd_regs.h rhd_vga.h rhd_shadow.h \ - rhd_mc.h r5xx_accel.c r5xx_accel.h r5xx_xaa.c r5xx_2dregs.h \ - $(am__append_1) $(am__append_2) $(am__append_3) + rhd_mc.c rhd_shadow.c rhd_randr.c rhd_dig.c rhd_ddia.c \ + rhd_atombios.h rhd.h rhd_i2c.h rhd_card.h rhd_crtc.h \ + rhd_connector.h rhd_cursor.h rhd_lut.h rhd_modes.h \ + rhd_monitor.h rhd_output.h rhd_pll.h rhd_randr.h rhd_regs.h \ + rhd_vga.h rhd_shadow.h rhd_mc.h r5xx_accel.c r5xx_accel.h \ + r5xx_xaa.c r5xx_2dregs.h $(am__append_1) $(am__append_2) \ + $(am__append_3) nodist_radeonhd_drv_la_SOURCES = \ git_version.h @@ -406,6 +408,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeonhd_drv_la-rhd_crtc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeonhd_drv_la-rhd_cursor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeonhd_drv_la-rhd_dac.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeonhd_drv_la-rhd_ddia.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeonhd_drv_la-rhd_dig.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeonhd_drv_la-rhd_driver.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radeonhd_drv_la-rhd_edid.Plo@am__quote@ @@ -627,6 +630,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(radeonhd_drv_la_CFLAGS) $(CFLAGS) -c -o radeonhd_drv_la-rhd_dig.lo `test -f 'rhd_dig.c' || echo '$(srcdir)/'`rhd_dig.c +radeonhd_drv_la-rhd_ddia.lo: rhd_ddia.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(radeonhd_drv_la_CFLAGS) $(CFLAGS) -MT radeonhd_drv_la-rhd_ddia.lo -MD -MP -MF $(DEPDIR)/radeonhd_drv_la-rhd_ddia.Tpo -c -o radeonhd_drv_la-rhd_ddia.lo `test -f 'rhd_ddia.c' || echo '$(srcdir)/'`rhd_ddia.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/radeonhd_drv_la-rhd_ddia.Tpo $(DEPDIR)/radeonhd_drv_la-rhd_ddia.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rhd_ddia.c' object='radeonhd_drv_la-rhd_ddia.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(radeonhd_drv_la_CFLAGS) $(CFLAGS) -c -o radeonhd_drv_la-rhd_ddia.lo `test -f 'rhd_ddia.c' || echo '$(srcdir)/'`rhd_ddia.c + radeonhd_drv_la-r5xx_accel.lo: r5xx_accel.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(radeonhd_drv_la_CFLAGS) $(CFLAGS) -MT radeonhd_drv_la-r5xx_accel.lo -MD -MP -MF $(DEPDIR)/radeonhd_drv_la-r5xx_accel.Tpo -c -o radeonhd_drv_la-r5xx_accel.lo `test -f 'r5xx_accel.c' || echo '$(srcdir)/'`r5xx_accel.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/radeonhd_drv_la-r5xx_accel.Tpo $(DEPDIR)/radeonhd_drv_la-r5xx_accel.Plo diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_atombios.c new/xf86-video-radeonhd-1.1.0/src/rhd_atombios.c --- old/xf86-video-radeonhd-1.1.0/src/rhd_atombios.c 2008-03-13 18:55:09.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_atombios.c 2008-03-27 16:26:01.000000000 +0100 @@ -115,6 +115,9 @@ static AtomBiosResult rhdAtomCompassionateDataQuery(atomBiosHandlePtr handle, AtomBiosRequestID func, AtomBiosArgPtr data); +static AtomBiosResult +rhdAtomIntegratedSystemInfoQuery(atomBiosHandlePtr handle, + AtomBiosRequestID func, AtomBiosArgPtr data); enum msgDataFormat { @@ -167,8 +170,8 @@ "Start of VRAM area used by Firmware", MSG_FORMAT_HEX}, {GET_FW_FB_SIZE, rhdAtomVramInfoQuery, "Framebuffer space used by Firmware (kb)", MSG_FORMAT_DEC}, - {ATOM_TMDS_FREQUENCY, rhdAtomTmdsInfoQuery, - "TMDS Frequency", MSG_FORMAT_DEC}, + {ATOM_TMDS_MAX_FREQUENCY, rhdAtomTmdsInfoQuery, + "TMDS Max Frequency", MSG_FORMAT_DEC}, {ATOM_TMDS_PLL_CHARGE_PUMP, rhdAtomTmdsInfoQuery, "TMDS PLL ChargePump", MSG_FORMAT_DEC}, {ATOM_TMDS_PLL_DUTY_CYCLE, rhdAtomTmdsInfoQuery, @@ -223,6 +226,10 @@ "Analog TV Supported Modes", MSG_FORMAT_HEX}, {ATOM_GET_CONDITIONAL_GOLDEN_SETTINGS, rhdAtomGetConditionalGoldenSetting, "Conditional Golden Settings", MSG_FORMAT_NONE}, + {ATOM_GET_PCIENB_CFG_REG7, rhdAtomIntegratedSystemInfoQuery, + "PCIE NB Cfg7Reg", MSG_FORMAT_HEX}, + {ATOM_GET_CAPABILITY_FLAG, rhdAtomIntegratedSystemInfoQuery, + "CapabilityFlag", MSG_FORMAT_HEX}, {FUNC_END, NULL, NULL, MSG_FORMAT_NONE} }; @@ -937,7 +944,7 @@ { atomDataTablesPtr atomDataPtr; CARD32 *val = &data->val; - int idx = *val; + int i = 0, clock = *val; atomDataPtr = handle->atomDataPtr; if (!rhdAtomGetTableRevisionAndSize( @@ -948,25 +955,38 @@ RHDFUNC(handle); - switch (func) { - case ATOM_TMDS_FREQUENCY: - *val = atomDataPtr->TMDS_Info->asMiscInfo[idx].usFrequency; - break; - case ATOM_TMDS_PLL_CHARGE_PUMP: - *val = atomDataPtr->TMDS_Info->asMiscInfo[idx].ucPLL_ChargePump; - break; - case ATOM_TMDS_PLL_DUTY_CYCLE: - *val = atomDataPtr->TMDS_Info->asMiscInfo[idx].ucPLL_DutyCycle; - break; - case ATOM_TMDS_PLL_VCO_GAIN: - *val = atomDataPtr->TMDS_Info->asMiscInfo[idx].ucPLL_VCO_Gain; - break; - case ATOM_TMDS_PLL_VOLTAGE_SWING: - *val = atomDataPtr->TMDS_Info->asMiscInfo[idx].ucPLL_VoltageSwing; - break; - default: - return ATOM_NOT_IMPLEMENTED; + if (func == ATOM_TMDS_MAX_FREQUENCY) + *val = atomDataPtr->TMDS_Info->usMaxFrequency * 10; + else { + if (clock > atomDataPtr->TMDS_Info->usMaxFrequency * 10) + return ATOM_FAILED; + + for (;i < ATOM_MAX_MISC_INFO; i++) { + if (clock < atomDataPtr->TMDS_Info->asMiscInfo[i].usFrequency * 10) { + switch (func) { + case ATOM_TMDS_PLL_CHARGE_PUMP: + *val = atomDataPtr->TMDS_Info->asMiscInfo[i].ucPLL_ChargePump; + break; + case ATOM_TMDS_PLL_DUTY_CYCLE: + *val = atomDataPtr->TMDS_Info->asMiscInfo[i].ucPLL_DutyCycle; + break; + case ATOM_TMDS_PLL_VCO_GAIN: + *val = atomDataPtr->TMDS_Info->asMiscInfo[i].ucPLL_VCO_Gain; + break; + case ATOM_TMDS_PLL_VOLTAGE_SWING: + *val = atomDataPtr->TMDS_Info->asMiscInfo[i].ucPLL_VoltageSwing; + break; + default: + return ATOM_NOT_IMPLEMENTED; + } + break; + } + } } + + if (i > ATOM_MAX_MISC_INFO) + return ATOM_FAILED; + return ATOM_SUCCESS; } @@ -1321,6 +1341,47 @@ return ATOM_SUCCESS; } +static AtomBiosResult +rhdAtomIntegratedSystemInfoQuery(atomBiosHandlePtr handle, + AtomBiosRequestID func, AtomBiosArgPtr data) +{ + atomDataTablesPtr atomDataPtr; + CARD8 crev, frev; + CARD32 *val = &data->val; + + RHDFUNC(handle); + + atomDataPtr = handle->atomDataPtr; + + if (!rhdAtomGetTableRevisionAndSize( + (ATOM_COMMON_TABLE_HEADER *)(atomDataPtr->IntegratedSystemInfo.base), + &frev,&crev,NULL)) { + return ATOM_FAILED; + } + + switch (crev) { + case 1: + switch (func) { + case ATOM_GET_PCIENB_CFG_REG7: + *val = atomDataPtr->IntegratedSystemInfo.IntegratedSystemInfo->usPCIENBCfgReg7; + break; + case ATOM_GET_CAPABILITY_FLAG: + *val = atomDataPtr->IntegratedSystemInfo.IntegratedSystemInfo->usCapabilityFlag; + break; + default: + return ATOM_NOT_IMPLEMENTED; + } + break; + case 2: + switch (func) { + default: + return ATOM_NOT_IMPLEMENTED; + } + break; + } + return ATOM_SUCCESS; +} + static DisplayModePtr rhdAtomAnalogTVTimings(atomBiosHandlePtr handle, ATOM_ANALOG_TV_INFO *tv_info, @@ -1721,6 +1782,11 @@ xf86DrvMsg(handle->scrnIndex,X_ERROR,"%s: %s %i exceeds maximum %i\n", \ __func__,name,n,max), TRUE) : FALSE) +enum rhdChipKind { + RHD_CHIP_EXTERNAL = 0, + RHD_CHIP_IGP = 1 +}; + static const struct _rhd_connector_objs { char *name; @@ -1739,7 +1805,7 @@ { "9PIN_DIN", RHD_CONNECTOR_NONE }, { "SCART", RHD_CONNECTOR_TV }, { "HDMI_TYPE_A", RHD_CONNECTOR_DVI_SINGLE }, - { "HDMI_TYPE_B", RHD_CONNECTOR_DVI_SINGLE }, + { "HDMI_TYPE_B", RHD_CONNECTOR_DVI }, { "LVDS", RHD_CONNECTOR_PANEL }, { "7PIN_DIN", RHD_CONNECTOR_TV }, { "PCIE_CONNECTOR", RHD_CONNECTOR_NONE }, @@ -1752,7 +1818,7 @@ static const struct _rhd_encoders { char *name; - rhdOutputType ot[2]; + rhdOutputType ot[2]; /* { RHD_CHIP_EXTERNAL, RHD_CHIP_IGP } */ } rhd_encoders[] = { { "NONE", {RHD_OUTPUT_NONE, RHD_OUTPUT_NONE }}, { "INTERNAL_LVDS", { RHD_OUTPUT_LVDS, RHD_OUTPUT_NONE }}, @@ -1816,18 +1882,18 @@ static const struct _rhd_devices { char *name; - rhdOutputType ot; + rhdOutputType ot[2]; } rhd_devices[] = { - {" CRT1", RHD_OUTPUT_NONE }, - {" LCD1", RHD_OUTPUT_LVTMA }, - {" TV1", RHD_OUTPUT_NONE }, - {" DFP1", RHD_OUTPUT_TMDSA }, - {" CRT2", RHD_OUTPUT_NONE }, - {" LCD2", RHD_OUTPUT_LVTMA }, - {" TV2", RHD_OUTPUT_NONE }, - {" DFP2", RHD_OUTPUT_LVTMA }, - {" CV", RHD_OUTPUT_NONE }, - {" DFP3", RHD_OUTPUT_LVTMA } + {" CRT1", { RHD_OUTPUT_NONE, RHD_OUTPUT_NONE } }, + {" LCD1", { RHD_OUTPUT_LVTMA, RHD_OUTPUT_LVTMA } }, + {" TV1", { RHD_OUTPUT_NONE, RHD_OUTPUT_NONE } }, + {" DFP1", { RHD_OUTPUT_TMDSA, RHD_OUTPUT_NONE } }, + {" CRT2", { RHD_OUTPUT_NONE, RHD_OUTPUT_NONE } }, + {" LCD2", { RHD_OUTPUT_LVTMA, RHD_OUTPUT_NONE } }, + {" TV2", { RHD_OUTPUT_NONE, RHD_OUTPUT_NONE } }, + {" DFP2", { RHD_OUTPUT_LVTMA, RHD_OUTPUT_DVO } }, + {" CV", { RHD_OUTPUT_NONE, RHD_OUTPUT_NONE } }, + {" DFP3", { RHD_OUTPUT_LVTMA, RHD_OUTPUT_LVTMA } } }; static const int n_rhd_devices = sizeof(rhd_devices) / sizeof(struct _rhd_devices); @@ -2197,6 +2263,7 @@ */ static AtomBiosResult rhdAtomConnectorInfoFromSupportedDevices(atomBiosHandlePtr handle, + enum rhdChipKind kind, rhdConnectorInfoPtr *ptr) { atomDataTablesPtr atomDataPtr; @@ -2264,7 +2331,7 @@ if ((devices[n].ot = acc_dac[ci.sucConnectorInfo.sbfAccess.bfAssociatedDAC]) == RHD_OUTPUT_NONE) { - devices[n].ot = rhd_devices[n].ot; + devices[n].ot = rhd_devices[n].ot[kind]; } } else devices[n].ot = RHD_OUTPUT_NONE; @@ -2385,18 +2452,37 @@ /* * */ +enum rhdChipKind +rhdAtomGetChipKind(enum RHD_CHIPSETS chipset) +{ + switch (chipset) { + case RHD_RS600: + case RHD_RS690: + case RHD_RS740: + return RHD_CHIP_IGP; + default: + return RHD_CHIP_EXTERNAL; + } +} + +/* + * + */ static AtomBiosResult rhdAtomConnectorInfo(atomBiosHandlePtr handle, AtomBiosRequestID unused, AtomBiosArgPtr data) { + int chipset = data->chipset; data->connectorInfo = NULL; if (rhdAtomConnectorInfoFromObjectHeader(handle,&data->connectorInfo) == ATOM_SUCCESS) return ATOM_SUCCESS; - else - return rhdAtomConnectorInfoFromSupportedDevices(handle, + else { + enum rhdChipKind kind = rhdAtomGetChipKind(chipset); + return rhdAtomConnectorInfoFromSupportedDevices(handle, kind, &data->connectorInfo); + } } struct atomCodeDataTableHeader diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_atombios.h new/xf86-video-radeonhd-1.1.0/src/rhd_atombios.h --- old/xf86-video-radeonhd-1.1.0/src/rhd_atombios.h 2008-03-13 18:55:09.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_atombios.h 2008-03-27 16:26:01.000000000 +0100 @@ -50,7 +50,7 @@ GET_REF_CLOCK, GET_FW_FB_START, GET_FW_FB_SIZE, - ATOM_TMDS_FREQUENCY, + ATOM_TMDS_MAX_FREQUENCY, ATOM_TMDS_PLL_CHARGE_PUMP, ATOM_TMDS_PLL_DUTY_CYCLE, ATOM_TMDS_PLL_VCO_GAIN, @@ -79,6 +79,8 @@ ATOM_ANALOG_TV_DEFAULT_MODE, ATOM_ANALOG_TV_SUPPORTED_MODES, ATOM_GET_CONDITIONAL_GOLDEN_SETTINGS, + ATOM_GET_PCIENB_CFG_REG7, + ATOM_GET_CAPABILITY_FLAG, FUNC_END } AtomBiosRequestID; @@ -122,6 +124,7 @@ { CARD32 val; struct rhdConnectorInfo *connectorInfo; + enum RHD_CHIPSETS chipset; struct AtomGoldenSettings GoldenSettings; unsigned char* EDIDBlock; struct { @@ -193,10 +196,8 @@ Bool coherent; }; -Bool -rhdAtomDigTransmitterControl(atomBiosHandlePtr handle, enum atomTransmitter id, - enum atomTransmitterAction action, struct atomTransmitterConfig *config); - +Bool rhdAtomDigTransmitterControl(atomBiosHandlePtr handle, enum atomTransmitter id, + enum atomTransmitterAction action, struct atomTransmitterConfig *config); # endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_connector.c new/xf86-video-radeonhd-1.1.0/src/rhd_connector.c --- old/xf86-video-radeonhd-1.1.0/src/rhd_connector.c 2008-03-13 08:26:05.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_connector.c 2008-03-27 16:26:01.000000000 +0100 @@ -116,7 +116,14 @@ static Bool RHDHPDCheck(struct rhdConnector *Connector) { - return (RHDRegRead(Connector, DC_GPIO_HPD_Y) & Connector->HPDMask); + Bool ret; + + RHDFUNC(Connector); + + ret = (RHDRegRead(Connector, DC_GPIO_HPD_Y) & Connector->HPDMask); + RHDDebug(Connector->scrnIndex, "%s returned: %x\n",__func__,ret); + + return ret; } struct rhdCsState { @@ -210,6 +217,7 @@ AtomBiosArgRec data; AtomBiosResult result; + data.chipset = rhdPtr->ChipSet; result = RHDAtomBiosFunc(rhdPtr->scrnIndex, rhdPtr->atomBIOS, ATOMBIOS_GET_CONNECTORS, &data); if (result == ATOM_SUCCESS) { @@ -323,6 +331,11 @@ Output = RHDLVTMAInit(rhdPtr, ConnectorInfo[i].Type); RHDOutputAdd(rhdPtr, Output); break; + case RHD_OUTPUT_DVO: + Output = RHDDDIAInit(rhdPtr, ConnectorInfo[i].Type); + if (Output) + RHDOutputAdd(rhdPtr, Output); + break; case RHD_OUTPUT_KLDSKP_LVTMA: case RHD_OUTPUT_UNIPHYA: case RHD_OUTPUT_UNIPHYB: @@ -416,8 +429,8 @@ const char *output_name[] = { "RHD_OUTPUT_NONE", "RHD_OUTPUT_DACA", "RHD_OUTPUT_DACB", "RHD_OUTPUT_TMDSA", - "RHD_OUTPUT_LVTMA", "RHD_OUTPUT_KLDSKP_LVTMA", "RHD_OUTPUT_UNIPHYA", "RHD_OUTPUT_UNIPHYB" - }; + "RHD_OUTPUT_LVTMA", "RHD_OUTPUT_DVO", "RHD_OUTPUT_KLDSKP_LVTMA", + "RHD_OUTPUT_UNIPHYA", "RHD_OUTPUT_UNIPHYB" }; const char **hpd_name; switch (rhdPtr->hpdUsage) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_crtc.c new/xf86-video-radeonhd-1.1.0/src/rhd_crtc.c --- old/xf86-video-radeonhd-1.1.0/src/rhd_crtc.c 2008-03-13 08:26:05.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_crtc.c 2008-03-27 16:26:01.000000000 +0100 @@ -90,6 +90,7 @@ CARD32 CrtcVSyncACntl; CARD32 CrtcVSyncB; CARD32 CrtcVSyncBCntl; + CARD32 CrtcCountControl; CARD32 CrtcBlackColor; CARD32 CrtcBlankControl; @@ -343,6 +344,9 @@ (Mode->CrtcVSyncEnd - Mode->CrtcVSyncStart) << 16); RHDRegWrite(Crtc, RegOff + D1CRTC_V_SYNC_A_CNTL, Mode->Flags & V_NVSYNC); + /* set D1CRTC_HORZ_COUNT_BY2_EN to 0; should only be set to 1 on 30bpp DVI modes */ + RHDRegMask(Crtc, RegOff + D1CRTC_COUNT_CONTROL, 0x0, 0x1); + Crtc->CurrentMode = Mode; } @@ -727,6 +731,10 @@ Store->CrtcBlackColor = RHDRegRead(Crtc, RegOff + D1CRTC_BLACK_COLOR); Store->CrtcBlankControl = RHDRegRead(Crtc, RegOff + D1CRTC_BLANK_CONTROL); + Store->CrtcCountControl = RHDRegRead(Crtc, RegOff + D1CRTC_COUNT_CONTROL); + RHDDebug(Crtc->scrnIndex, "Saved CrtcCountControl[%i] = 0x%8.8x\n", + Crtc->Id,Store->CrtcCountControl); + if (Crtc->Id == RHD_CRTC_1) Store->CrtcPCLKControl = RHDRegRead(Crtc, PCLK_CRTC1_CNTL); else @@ -824,6 +832,8 @@ RHDRegWrite(Crtc, RegOff + D1CRTC_BLACK_COLOR, Store->CrtcBlackColor); RHDRegWrite(Crtc, RegOff + D1CRTC_BLANK_CONTROL, Store->CrtcBlankControl); + RHDRegWrite(Crtc, RegOff + D1CRTC_COUNT_CONTROL, Store->CrtcCountControl); + if (Crtc->Id == RHD_CRTC_1) RHDRegWrite(Crtc, PCLK_CRTC1_CNTL, Store->CrtcPCLKControl); else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_ddia.c new/xf86-video-radeonhd-1.1.0/src/rhd_ddia.c --- old/xf86-video-radeonhd-1.1.0/src/rhd_ddia.c 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_ddia.c 2008-03-27 16:26:01.000000000 +0100 @@ -0,0 +1,379 @@ +/* + * Copyright 2007, 2008 Luc Verhaegen <lverhaegen(a)novell.com> + * Copyright 2007, 2008 Matthias Hopf <mhopf(a)novell.com> + * Copyright 2007, 2008 Egbert Eich <eich(a)novell.com> + * Copyright 2007, 2008 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "xf86.h" + +/* for usleep */ +#if HAVE_XF86_ANSIC_H +# include "xf86_ansic.h" +#else +# include <unistd.h> +#endif + +#include "rhd.h" +#include "rhd_crtc.h" +#include "rhd_connector.h" +#include "rhd_output.h" +#include "rhd_regs.h" +#include "rhd_card.h" +#ifdef ATOM_BIOS +#include "rhd_atombios.h" +#endif + +struct DDIAPrivate +{ + Bool RunDualLink; + CARD32 PcieCfgReg7; + CARD32 CapabilityFlag; + + Bool Stored; + + CARD32 DdiaPathControl; + CARD32 DdiaCntl; + CARD32 DdiaDcbalancerControl; + CARD32 DdiaPcieLinkControl2; + CARD32 DdiaBitDepthControl; +}; + +/* + * + */ +static ModeStatus +DDIAModeValid(struct rhdOutput *Output, DisplayModePtr Mode) +{ + RHDFUNC(Output); + + if (Mode->Clock < 25000) + return MODE_CLOCK_LOW; + + if (Output->Connector->Type == RHD_CONNECTOR_DVI_SINGLE) { + if (Mode->Clock > 165000) + return MODE_CLOCK_HIGH; + } else if (Output->Connector->Type == RHD_CONNECTOR_DVI) { + if (Mode->Clock > 330000) /* could go higher still */ + return MODE_CLOCK_HIGH; + } + + return MODE_OK; +} + +/* + * + */ +static void +DDIAMode(struct rhdOutput *Output, DisplayModePtr Mode) +{ + struct DDIAPrivate *Private = (struct DDIAPrivate *)Output->Private; + CARD32 mux0, mux1, mux2, mux3; + Bool LaneReversal; + RHDPtr rhdPtr = RHDPTRI(Output); + + RHDFUNC(Output); + + if (Mode->SynthClock >= 165000) + Private->RunDualLink = TRUE; + else + Private->RunDualLink = FALSE; + + /* reset on - will be enabled at POWER_ON */ + RHDRegMask(Output, RS69_DDIA_PATH_CONTROL, RS69_DDIA_PIXVLD_RESET, RS69_DDIA_PIXVLD_RESET); + /* RGB 4:4:4 */ + RHDRegMask(Output, RS69_DDIA_CNTL, 0, RS69_DDIA_PIXEL_ENCODING); + /* TMDS_AC */ + RHDRegMask(Output, RS69_DDIA_PATH_CONTROL, + 2 << RS69_DDIA_PATH_SELECT_SHIFT, + 0x3 << RS69_DDIA_PATH_SELECT_SHIFT); + /* dual link */ + RHDRegMask(Output, RS69_DDIA_CNTL, Private->RunDualLink ? + RS69_DDIA_DUAL_LINK_ENABLE : 0, RS69_DDIA_DUAL_LINK_ENABLE); + RHDRegMask(Output, RS69_DDIA_DCBALANCER_CONTROL, + RS69_DDIA_DCBALANCER_EN, + RS69_DDIA_DCBALANCER_EN); + + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL2, 0x0, 0x80); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL2, 0x0, 0x100); + + mux0 = Private->PcieCfgReg7 & 0x3; + mux1 = (Private->PcieCfgReg7 >> 2) & 0x3; + mux2 = (Private->PcieCfgReg7 >> 4) & 0x3; + mux3 = (Private->PcieCfgReg7 >> 6) & 0x3; + + RHDRegMask(Output, RS69_DDIA_PCIE_LINK_CONTROL2, + (mux0 << RS69_DDIA_PCIE_OUTPUT_MUX_SEL0) + | (mux1 << RS69_DDIA_PCIE_OUTPUT_MUX_SEL1) + | (mux2 << RS69_DDIA_PCIE_OUTPUT_MUX_SEL2) + | (mux3 << RS69_DDIA_PCIE_OUTPUT_MUX_SEL3), + (3 << RS69_DDIA_PCIE_OUTPUT_MUX_SEL0) + | (3 << RS69_DDIA_PCIE_OUTPUT_MUX_SEL1) + | (3 << RS69_DDIA_PCIE_OUTPUT_MUX_SEL2) + | (3 << RS69_DDIA_PCIE_OUTPUT_MUX_SEL3) + ); + LaneReversal = Private->PcieCfgReg7 & (0x1 << 10); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL2, 0x0, 0x3); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL2, 0x2, 0x2); + + RHDRegMask(Output, RS69_DDIA_PCIE_LINK_CONTROL3, + LaneReversal ? RS69_DDIA_PCIE_MIRROR_EN : 0, + RS69_DDIA_PCIE_MIRROR_EN); + + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL2, 0x70, 0x70); + + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0, 0x10); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0, 0x60); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0, 0x4000000); + + switch (rhdPtr->PciDeviceID) { + case 0x791E: + if (Mode->SynthClock <= 25000) { + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x2780, 0x3f80); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x0, 0xc000); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x039f0000, 0x03000000 | 0x039f0000); + } else if (Mode->SynthClock <= 60000) { + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x2780, 0x3f80); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x0, 0xc000); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x024f0000, 0x03000000 | 0x024f0000); + } else { + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x0980, 0x3f80); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x0, 0xc000); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x01270000, 0x03000000 | 0x01270000); + } + break; + case 0x791F: + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x0980, 0x3f80); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x4000, 0xc000); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x00ac0000, 0x03000000 | 0x00ac0000); + if (Private->CapabilityFlag & 0x10) { + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x0, 0xc000); + if (Mode->SynthClock <= 6500) + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x01ac0000, 0x03ff0000); + else + RHDRegMaskD(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x01110000, 0x03ff0000); + } + break; + } + usleep (1); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x04000000, 0x04000000); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x60, 0x60); + usleep(30); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x01, 0x01); + usleep(1); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x02, 0x02); + usleep(1); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x04, 0x04); + usleep(1); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x08, 0x08); + usleep(1); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x10, 0x10); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL1, 0x0, 0xf); + + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL2, 0x0180, 0x0180); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL2, 0x600, 0x600); + usleep(5); + RHDRegMask(Output, RS69_DDIA_PCIE_PHY_CONTROL2, 0x0, 0x600); + + /* hw reset will be turned off at POWER_ON */ +} + +/* + * + */ +static void +DDIAPower(struct rhdOutput *Output, int Power) +{ + RHDFUNC(Output); + + switch (Power) { + case RHD_POWER_ON: + RHDRegMask(Output, RS69_DDIA_PATH_CONTROL, RS69_DDIA_PIXVLD_RESET, + RS69_DDIA_PIXVLD_RESET); + RHDRegWrite(Output, RS69_DDIA_BIT_DEPTH_CONTROL, 0); + RHDRegMask(Output, RS69_DDIA_BIT_DEPTH_CONTROL, + RS69_DDIA_TEMPORAL_DITHER_RESET, RS69_DDIA_TEMPORAL_DITHER_RESET); + RHDRegMask(Output, RS69_DDIA_BIT_DEPTH_CONTROL, + 0, RS69_DDIA_TEMPORAL_DITHER_RESET); + RHDRegMask(Output, RS69_DDIA_CNTL, RS69_DDIA_ENABLE, RS69_DDIA_ENABLE); + RHDRegMask(Output, RS69_DDIA_PATH_CONTROL, 0, RS69_DDIA_PIXVLD_RESET); + return; + case RHD_POWER_RESET: + RHDRegMask(Output, RS69_DDIA_CNTL, 0, RS69_DDIA_ENABLE); + return; + case RHD_POWER_SHUTDOWN: + RHDRegMask(Output, RS69_DDIA_BIT_DEPTH_CONTROL, + RS69_DDIA_TEMPORAL_DITHER_RESET, RS69_DDIA_TEMPORAL_DITHER_RESET); + RHDRegMask(Output, RS69_DDIA_BIT_DEPTH_CONTROL, + 0, RS69_DDIA_TEMPORAL_DITHER_RESET); + RHDRegMask(Output, RS69_DDIA_BIT_DEPTH_CONTROL, + 0, + RS69_DDIA_TRUNCATE_EN + | RS69_DDIA_TRUNCATE_DEPTH + | RS69_DDIA_SPATIAL_DITHER_EN + | RS69_DDIA_SPATIAL_DITHER_DEPTH); + RHDRegMask(Output, RS69_DDIA_BIT_DEPTH_CONTROL, + 0, + RS69_DDIA_TEMPORAL_DITHER_EN + | RS69_DDIA_TEMPORAL_DITHER_EN + | RS69_DDIA_TEMPORAL_DITHER_DEPTH + | RS69_DDIA_TEMPORAL_LEVEL); + RHDRegMask(Output, RS69_DDIA_CNTL, 0, RS69_DDIA_ENABLE); + return; + default: + return; + } +} + +/* + * + */ +static void +DDIASave(struct rhdOutput *Output) +{ + struct DDIAPrivate *Private = (struct DDIAPrivate *)Output->Private; + + RHDFUNC(Output); + + Private->DdiaPathControl = RHDRegRead(Output, RS69_DDIA_PATH_CONTROL); + Private->DdiaCntl = RHDRegRead(Output, RS69_DDIA_CNTL); + Private->DdiaDcbalancerControl = RHDRegRead(Output, RS69_DDIA_DCBALANCER_CONTROL); + Private->DdiaPcieLinkControl2 = RHDRegRead(Output, RS69_DDIA_PCIE_LINK_CONTROL2); + Private->DdiaBitDepthControl = RHDRegRead(Output, RS69_DDIA_BIT_DEPTH_CONTROL); + + Private->Stored = TRUE; +} + +/* + * + */ +static void +DDIARestore(struct rhdOutput *Output) +{ + struct DDIAPrivate *Private = (struct DDIAPrivate *)Output->Private; + RHDFUNC(Output); + + if (!Private->Stored) + return; + + /* disalbe */ + RHDRegMask(Output, RS69_DDIA_CNTL, 0, RS69_DDIA_ENABLE); + /* reset on */ + RHDRegMask(Output, RS69_DDIA_PATH_CONTROL, RS69_DDIA_PIXVLD_RESET, RS69_DDIA_PIXVLD_RESET); + RHDRegWrite(Output, RS69_DDIA_PATH_CONTROL, Private->DdiaPathControl | RS69_DDIA_PIXVLD_RESET); + + RHDRegWrite(Output, RS69_DDIA_BIT_DEPTH_CONTROL, Private->DdiaBitDepthControl); + /* temporal dither reset on */ + RHDRegWrite(Output, RS69_DDIA_BIT_DEPTH_CONTROL, Private->DdiaBitDepthControl + | RS69_DDIA_TEMPORAL_DITHER_RESET); + /* temporal dither reset off */ + RHDRegWrite(Output, RS69_DDIA_BIT_DEPTH_CONTROL, Private->DdiaBitDepthControl); + + RHDRegWrite(Output, RS69_DDIA_DCBALANCER_CONTROL, Private->DdiaDcbalancerControl); + RHDRegWrite(Output, RS69_DDIA_PCIE_LINK_CONTROL2, Private->DdiaPcieLinkControl2); + /* enable if enabled at startup */ + RHDRegWrite(Output, RS69_DDIA_CNTL, Private->DdiaCntl); + /* reset off */ + RHDRegWrite(Output, RS69_DDIA_PATH_CONTROL, Private->DdiaPathControl); +} + +/* + * + */ +static void +DDIADestroy(struct rhdOutput *Output) +{ + struct DDIAPrivate *Private = (struct DDIAPrivate *)Output->Private; + + RHDFUNC(Output); + + xfree(Private); + Output->Private = NULL; +} + +/* + * + */ +struct rhdOutput * +RHDDDIAInit(RHDPtr rhdPtr, enum rhdOutputType outputType) +{ +#ifdef ATOM_BIOS + struct rhdOutput *Output; + struct DDIAPrivate *Private; + AtomBiosArgRec data; + + + /* + * This needs to be handled separately + * for now we only deal with it here. + */ + if (rhdPtr->ChipSet != RHD_RS690) + return FALSE; + + Output = xnfcalloc(sizeof(struct rhdOutput), 1); + + Output->Name = "DDIA"; + + Output->scrnIndex = rhdPtr->scrnIndex; + Output->Id = outputType; + + Output->Sense = NULL; + Output->ModeValid = DDIAModeValid; + Output->Mode = DDIAMode; + Output->Power = DDIAPower; + Output->Save = DDIASave; + Output->Restore = DDIARestore; + Output->Destroy = DDIADestroy; + + Private = xnfcalloc(1, sizeof(struct DDIAPrivate)); + Output->Private = Private; + Private->Stored = FALSE; + + if (RHDAtomBiosFunc(rhdPtr->scrnIndex, rhdPtr->atomBIOS, + ATOM_GET_PCIENB_CFG_REG7, &data) == ATOM_SUCCESS) { + Private->PcieCfgReg7 = data.val; + } else { + xf86DrvMsg(Output->scrnIndex, X_ERROR, "Retrieval of PCIE MUX values failed. " + "no DDIA block support available\n"); + goto error; + } + if (RHDAtomBiosFunc(rhdPtr->scrnIndex, rhdPtr->atomBIOS, + ATOM_GET_CAPABILITY_FLAG, &data) == ATOM_SUCCESS) { + Private->CapabilityFlag = data.val; + } else { + xf86DrvMsg(Output->scrnIndex, X_ERROR, "Retrieval of Capability flag failed. " + "no DDIA block support available\n"); + goto error; + } + + return Output; +error: + xfree(Private); + return NULL; + +#else + return NULL; +#endif +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_dig.c new/xf86-video-radeonhd-1.1.0/src/rhd_dig.c --- old/xf86-video-radeonhd-1.1.0/src/rhd_dig.c 2008-03-13 18:55:09.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_dig.c 2008-03-27 17:29:18.000000000 +0100 @@ -1001,7 +1001,7 @@ #endif case RHD_OUTPUT_KLDSKP_LVTMA: - Output->Name = "UNIPHY_KLDSK_LVTMA"; + Output->Name = "UNIPHY_KLDSKP_LVTMA"; Private->EncoderID = ENCODER_DIG2; Private->Transmitter.Private = (struct LVTMATransmitterPrivate *)xnfcalloc(sizeof (struct LVTMATransmitterPrivate), 1); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_driver.c new/xf86-video-radeonhd-1.1.0/src/rhd_driver.c --- old/xf86-video-radeonhd-1.1.0/src/rhd_driver.c 2008-03-13 18:55:09.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_driver.c 2008-03-27 16:26:01.000000000 +0100 @@ -2080,6 +2080,43 @@ _RHDRegWrite(scrnIndex, offset, tmp); } +#ifdef RHD_DEBUG +/* + * + */ +CARD32 +_RHDRegReadD(int scrnIndex, CARD16 offset) +{ + CARD32 tmp = *(volatile CARD32 *)((CARD8 *) RHDPTR(xf86Screens[scrnIndex])->MMIOBase + offset); + xf86DrvMsg(scrnIndex, X_INFO, "RHDRegRead(0x%4.4x) = 0x%4.4x\n",offset,tmp); + return tmp; +} + +/* + * + */ +void +_RHDRegWriteD(int scrnIndex, CARD16 offset, CARD32 value) +{ + xf86DrvMsg(scrnIndex, X_INFO, "RHDRegWrite(0x%4.4x,0x%4.4x)\n",offset,tmp); + *(volatile CARD32 *)((CARD8 *) RHDPTR(xf86Screens[scrnIndex])->MMIOBase + offset) = value; +} + +/* + * + */ +void +_RHDRegMaskD(int scrnIndex, CARD16 offset, CARD32 value, CARD32 mask) +{ + CARD32 tmp; + + tmp = _RHDRegReadD(scrnIndex, offset); + tmp &= ~mask; + tmp |= (value & mask); + _RHDRegWriteD(scrnIndex, offset, tmp); +} +#endif /* RHD_DEBUG */ + /* The following two are R5XX only. R6XX doesn't require these */ CARD32 _RHDReadMC(int scrnIndex, CARD32 addr) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd.h new/xf86-video-radeonhd-1.1.0/src/rhd.h --- old/xf86-video-radeonhd-1.1.0/src/rhd.h 2008-03-13 08:26:05.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd.h 2008-03-27 16:26:01.000000000 +0100 @@ -321,9 +321,19 @@ #define RHDFUNC(ptr) RHDDebug((ptr)->scrnIndex, "FUNCTION: %s\n", __func__) #define RHDFUNCI(scrnIndex) RHDDebug(scrnIndex, "FUNCTION: %s\n", __func__) void RhdDebugDump(int scrnIndex, unsigned char *start, int size); + #ifdef RHD_DEBUG +CARD32 _RHDRegReadD(int scrnIndex, CARD16 offset); +# define RHDRegReadD(ptr, offset) _RHDRegReadD((ptr)->scrnIndex, (offset)) +void _RHDRegWriteD(int scrnIndex, CARD16 offset, CARD32 value); +# define RHDRegWriteD(ptr, offset, value) _RHDRegWriteD((ptr)->scrnIndex, (offset), (value)) +void _RHDRegMaskD(int scrnIndex, CARD16 offset, CARD32 value, CARD32 mask); +# define RHDRegMaskD(ptr, offset, value, mask) _RHDRegMaskD((ptr)->scrnIndex, (offset), (value), (mask)) # define DEBUGP(x) {x;} #else +# define RHDRegReadD(ptr, offset) RHDRegRead(ptr, offset) +# define RHDRegWriteD(ptr, offset, value) RHDRegWrite(ptr, offset, value) +# define RHDRegMaskD(ptr, offset, value, mask) RHDRegMask(ptr, offset, value, mask) # define DEBUGP(x) #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_id.c new/xf86-video-radeonhd-1.1.0/src/rhd_id.c --- old/xf86-video-radeonhd-1.1.0/src/rhd_id.c 2008-03-20 17:26:58.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_id.c 2008-03-27 16:26:01.000000000 +0100 @@ -223,13 +223,14 @@ RHD_DEVICE_MATCH( 0x94C8, RHD_M74 ), /* Mobility Radeon HD 2400 XT */ RHD_DEVICE_MATCH( 0x94C9, RHD_M72 ), /* Mobility Radeon HD 2400 */ RHD_DEVICE_MATCH( 0x94CB, RHD_M72 ), /* ATI RADEON E2400 */ - RHD_DEVICE_MATCH( 0x94CC, RHD_RV610 ), /* RV610 */ + RHD_DEVICE_MATCH( 0x94CC, RHD_RV610 ), /* ATI Radeon HD 2400 */ RHD_DEVICE_MATCH( 0x9500, RHD_RV670 ), /* RV670 */ RHD_DEVICE_MATCH( 0x9501, RHD_RV670 ), /* ATI Radeon HD3870 */ RHD_DEVICE_MATCH( 0x9505, RHD_RV670 ), /* ATI Radeon HD3850 */ RHD_DEVICE_MATCH( 0x9507, RHD_RV670 ), /* RV670 */ RHD_DEVICE_MATCH( 0x950F, RHD_R680 ), /* ATI Radeon HD3870 X2 */ RHD_DEVICE_MATCH( 0x9511, RHD_RV670 ), /* ATI FireGL V7700 */ + RHD_DEVICE_MATCH( 0x9515, RHD_RV670 ), /* ATI Radeon HD 3850 AGP */ RHD_DEVICE_MATCH( 0x9580, RHD_RV630 ), /* RV630 */ RHD_DEVICE_MATCH( 0x9581, RHD_M76 ), /* Mobility Radeon HD 2600 */ RHD_DEVICE_MATCH( 0x9583, RHD_M76 ), /* Mobility Radeon HD 2600 XT */ @@ -244,7 +245,7 @@ RHD_DEVICE_MATCH( 0x958E, RHD_RV630 ), /* ATI Radeon HD 2600 LE */ RHD_DEVICE_MATCH( 0x9590, RHD_RV635 ), /* ATI Radeon HD 3600 Series */ RHD_DEVICE_MATCH( 0x9591, RHD_RV635 ), /* ATI Mobility Radeon HD 3650 */ - RHD_DEVICE_MATCH( 0x9596, RHD_RV635 ), /* ATI Radeon HD 3600 Series */ + RHD_DEVICE_MATCH( 0x9596, RHD_RV635 ), /* ATI Radeon HD 3650 AGP */ RHD_DEVICE_MATCH( 0x9597, RHD_RV635 ), /* ATI Radeon HD 3600 Series */ RHD_DEVICE_MATCH( 0x9598, RHD_RV635 ), /* ATI Radeon HD 3670 */ RHD_DEVICE_MATCH( 0x9599, RHD_RV635 ), /* ATI Radeon HD 3600 Series */ @@ -253,9 +254,9 @@ RHD_DEVICE_MATCH( 0x95C4, RHD_M82 ), /* ATI Mobility Radeon HD 3400 Series (M82) */ RHD_DEVICE_MATCH( 0x95C5, RHD_RV620 ), /* ATI Radeon HD 3450 */ RHD_DEVICE_MATCH( 0x95C7, RHD_RV620 ), /* ATI Radeon HD 3430 */ - RHD_DEVICE_MATCH( 0x95CE, RHD_RV620 ), /* ATI FireMV 2450 */ - RHD_DEVICE_MATCH( 0x95CE, RHD_RV620 ), /* ATI FireMV 2460 */ - RHD_DEVICE_MATCH( 0x95CF, RHD_RV620 ), /* ATI FireMV 2460 */ + RHD_DEVICE_MATCH( 0x95CD, RHD_RV620 ), /* ATI FireMV 2450 */ + RHD_DEVICE_MATCH( 0x95CE, RHD_RV620 ), /* ATI FireMV 2260 */ + RHD_DEVICE_MATCH( 0x95CF, RHD_RV620 ), /* ATI FireMV 2260 */ LIST_END }; @@ -501,6 +502,7 @@ { 0x7145, 0x17AA, 0x202A, "Lenovo Thinkpad Z61m", RHD_CARD_FLAG_NONE, PANEL_B2_VGA_A0 }, /* 0x7146 : RV515 : Radeon X1300/X1550 */ { 0x7146, 0x174B, 0x0470, "Sapphire X1300", RHD_CARD_FLAG_NONE, VGA_B1_DVI_AB01 }, + { 0x7146, 0x174B, 0x0920, "Sapphire X1300", RHD_CARD_FLAG_HPDSWAP, ID_CONNECTORINFO_EMPTY }, /* 0x7147 : RV505 : Radeon X1550 64-bit */ { 0x7147, 0x174B, 0x0840, "Sapphire X1550", RHD_CARD_FLAG_HPDSWAP, ID_CONNECTORINFO_EMPTY }, /* 0x7149 : M52 : Mobility Radeon X1300 */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_lvtma.c new/xf86-video-radeonhd-1.1.0/src/rhd_lvtma.c --- old/xf86-video-radeonhd-1.1.0/src/rhd_lvtma.c 2008-03-13 18:55:09.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_lvtma.c 2008-03-27 16:26:01.000000000 +0100 @@ -478,7 +478,7 @@ { AtomBiosArgRec data; - if(RHDAtomBiosFunc(rhdPtr->scrnIndex, rhdPtr->atomBIOS, + if (RHDAtomBiosFunc(rhdPtr->scrnIndex, rhdPtr->atomBIOS, ATOM_LVDS_SEQ_DIG_ONTO_DE, &data) == ATOM_SUCCESS) Private->PowerDigToDE = data.val; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_output.c new/xf86-video-radeonhd-1.1.0/src/rhd_output.c --- old/xf86-video-radeonhd-1.1.0/src/rhd_output.c 2008-03-13 18:55:09.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_output.c 2008-03-27 17:29:18.000000000 +0100 @@ -189,7 +189,8 @@ while (list[i].name) { if (list[i].type == Output->SensedType) { xf86DrvMsgVerb(Output->scrnIndex, X_INFO, 3, - "Sensed Output: %s\n",list[i].name); + "%s: Sensed Output: %s\n",Output->Name, + list[i].name); return; } i++; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_output.h new/xf86-video-radeonhd-1.1.0/src/rhd_output.h --- old/xf86-video-radeonhd-1.1.0/src/rhd_output.h 2008-03-13 18:55:09.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_output.h 2008-03-27 16:26:01.000000000 +0100 @@ -34,6 +34,7 @@ RHD_OUTPUT_DACB, RHD_OUTPUT_TMDSA, RHD_OUTPUT_LVTMA, + RHD_OUTPUT_DVO, RHD_OUTPUT_KLDSKP_LVTMA, RHD_OUTPUT_UNIPHYA, RHD_OUTPUT_UNIPHYB, @@ -99,4 +100,5 @@ struct rhdOutput *RHDTMDSAInit(RHDPtr rhdPtr); struct rhdOutput *RHDLVTMAInit(RHDPtr rhdPtr, CARD8 Type); struct rhdOutput *RHDDIGInit(RHDPtr rhdPtr, enum rhdOutputType outputType, CARD8 ConnectorType); +struct rhdOutput *RHDDDIAInit(RHDPtr rhdPtr, enum rhdOutputType outputType); #endif /* _RHD_OUTPUT_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_randr.c new/xf86-video-radeonhd-1.1.0/src/rhd_randr.c --- old/xf86-video-radeonhd-1.1.0/src/rhd_randr.c 2008-03-13 08:26:05.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_randr.c 2008-03-27 16:26:01.000000000 +0100 @@ -772,6 +772,7 @@ if ((rout->Output->SensedType = rout->Output->Sense(rout->Output, rout->Connector->Type))) { + RHDOutputPrintSensedType(rout->Output); rout->Output->Connector = rout->Connector; /* @@@ */ return XF86OutputStatusConnected; } else @@ -790,8 +791,10 @@ o->Output->Sense) { /* Yes, this looks wrong, but is correct */ if ((o->Output->SensedType = - o->Output->Sense(o->Output, o->Connector->Type))) + o->Output->Sense(o->Output, o->Connector->Type))) { + RHDOutputPrintSensedType(o->Output); return XF86OutputStatusDisconnected; + } } } rout->Output->Connector = rout->Connector; /* @@@ */ @@ -811,6 +814,7 @@ = rout->Output->Sense(rout->Output, rout->Connector->Type))) { rout->Output->Connector = rout->Connector; /* @@@ */ + RHDOutputPrintSensedType(rout->Output); return XF86OutputStatusConnected; } } @@ -824,6 +828,7 @@ if ((rout->Output->SensedType = rout->Output->Sense(rout->Output, rout->Connector->Type))) { rout->Output->Connector = rout->Connector; /* @@@ */ + RHDOutputPrintSensedType(rout->Output); return XF86OutputStatusConnected; } else return XF86OutputStatusDisconnected; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_regs.h new/xf86-video-radeonhd-1.1.0/src/rhd_regs.h --- old/xf86-video-radeonhd-1.1.0/src/rhd_regs.h 2008-03-13 08:26:05.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_regs.h 2008-03-27 16:26:01.000000000 +0100 @@ -109,6 +109,7 @@ D1CRTC_BLANK_CONTROL = 0x6084, D1CRTC_BLACK_COLOR = 0x6098, D1CRTC_STATUS = 0x609C, + D1CRTC_COUNT_CONTROL = 0x60B4, /* D1GRPH registers */ D1GRPH_ENABLE = 0x6100, @@ -190,6 +191,7 @@ D2CRTC_BLANK_CONTROL = 0x6884, D2CRTC_BLACK_COLOR = 0x6898, D2CRTC_STATUS = 0x689C, + D2CRTC_COUNT_CONTROL = 0x68B4, /* D2GRPH registers */ D2GRPH_ENABLE = 0x6900, @@ -600,7 +602,72 @@ RS69_DC_I2C_DDC_SETUP_Q = 0x7D44, /* (RW) */ RS69_DC_I2C_DATA = 0x7D58, /* (RW) *//**/ RS69_DC_I2C_TRANSACTION0 = 0x7D48, /* (RW) *//**/ - RS69_DC_I2C_TRANSACTION1 = 0x7D4C /* (RW) *//**/ + RS69_DC_I2C_TRANSACTION1 = 0x7D4C, /* (RW) *//**/ + /* DDIA */ + RS69_DDIA_CNTL = 0x7200, + RS69_DDIA_BIT_DEPTH_CONTROL = 0x7214, + RS69_DDIA_DCBALANCER_CONTROL = 0x7250, + RS69_DDIA_PATH_CONTROL = 0x7264, + RS69_DDIA_PCIE_LINK_CONTROL2 = 0x7278, + RS69_DDIA_PCIE_LINK_CONTROL3 = 0x727c, + RS69_DDIA_PCIE_PHY_CONTROL1 = 0x728c, + RS69_DDIA_PCIE_PHY_CONTROL2 = 0x7290 +}; + +enum RS69_DDIA_CNTL_BITS { + RS69_DDIA_ENABLE = 1 << 0, + RS69_DDIA_HDMI_EN = 1 << 2, + RS69_DDIA_ENABLE_HPD_MASK = 1 << 4, + RS69_DDIA_HPD_SELECT = 1 << 8, + RS69_DDIA_SYNC_PHASE = 1 << 12, + RS69_DDIA_PIXEL_ENCODING = 1 << 16, + RS69_DDIA_DUAL_LINK_ENABLE = 1 << 24, + RS69_DDIA_SWAP = 1 << 28 +}; + +enum RS69_DDIA_LINK_CONTROL2_SHIFT { + RS69_DDIA_PCIE_OUTPUT_MUX_SEL0 = 0, + RS69_DDIA_PCIE_OUTPUT_MUX_SEL1 = 4, + RS69_DDIA_PCIE_OUTPUT_MUX_SEL2 = 8, + RS69_DDIA_PCIE_OUTPUT_MUX_SEL3 = 12 +}; + +enum RS69_DDIA_BIT_DEPTH_CONTROL_BITS { + RS69_DDIA_TRUNCATE_EN = 1 << 0, + RS69_DDIA_TRUNCATE_DEPTH = 1 << 4, + RS69_DDIA_SPATIAL_DITHER_EN = 1 << 8, + RS69_DDIA_SPATIAL_DITHER_DEPTH = 1 << 12, + RS69_DDIA_TEMPORAL_DITHER_EN = 1 << 16, + RS69_DDIA_TEMPORAL_DITHER_DEPTH = 1 << 20, + RS69_DDIA_TEMPORAL_LEVEL = 1 << 24, + RS69_DDIA_TEMPORAL_DITHER_RESET = 1 << 25 +}; + +enum RS69_DDIA_DCBALANCER_CONTROL_BITS { + RS69_DDIA_DCBALANCER_EN = 1 << 0, + RS69_DDIA_SYNC_DCBAL_EN = 1 << 4, + RS69_DDIA_DCBALANCER_TEST_EN = 1 << 8, + RS69_DDIA_DCBALANCER_TEST_IN_SHIFT = 16, + RS69_DDIA_DCBALANCER_FORCE = 1 << 24 +}; + +enum RS69_DDIA_PATH_CONTROL_BITS { + RS69_DDIA_PATH_SELECT_SHIFT = 0, + RS69_DDIA_DDPII_DE_ALIGN_EN = 1 << 4, + RS69_DDIA_DDPII_TRAIN_EN = 1 << 8, + RS69_DDIA_DDPII_TRAIN_SELECT = 1 << 12, + RS69_DDIA_DDPII_SCRAMBLE_EN = 1 << 16, + RS69_DDIA_REPL_MODE_SELECT = 1 << 20, + RS69_DDIA_RB_30b_SWAP_EN = 1 << 24, + RS69_DDIA_PIXVLD_RESET = 1 << 28, + RS69_DDIA_REARRANGER_EN = 1 << 30 +}; + +enum RS69_DDIA_PCIE_LINK_CONTROL3_BITS { + RS69_DDIA_PCIE_MIRROR_EN = 1 << 0, + RS69_DDIA_PCIE_CFGDUALLINK = 1 << 4, + RS69_DDIA_PCIE_NCHG3EN = 1 << 8, + RS69_DDIA_PCIE_RX_PDNB_SHIFT = 12 }; enum RS69_MC_INDEX_BITS { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/src/rhd_tmds.c new/xf86-video-radeonhd-1.1.0/src/rhd_tmds.c --- old/xf86-video-radeonhd-1.1.0/src/rhd_tmds.c 2008-03-13 18:55:09.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/src/rhd_tmds.c 2008-03-27 16:26:01.000000000 +0100 @@ -145,6 +145,7 @@ } R5xxTMDSAMacro[] = { { 0x7104, 0x00C00414 }, /* R520 */ { 0x7142, 0x00A00415 }, /* RV515 */ + { 0x7145, 0x00A00416 }, /* M54 */ { 0x7146, 0x00C0041F }, /* RV515 */ { 0x7147, 0x00C00418 }, /* RV505 */ { 0x7149, 0x00800416 }, /* M56 */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-radeonhd-1.1.0/utils/conntest/git_version.h new/xf86-video-radeonhd-1.1.0/utils/conntest/git_version.h --- old/xf86-video-radeonhd-1.1.0/utils/conntest/git_version.h 2008-03-20 17:39:32.000000000 +0100 +++ new/xf86-video-radeonhd-1.1.0/utils/conntest/git_version.h 2008-03-27 17:32:48.000000000 +0100 @@ -14,13 +14,13 @@ /* git utilities found */ #undef GIT_NOT_FOUND -#define GIT_VERSION "git version 1.5.3.8" +#define GIT_VERSION "git version 1.5.4.4" /* git repo found */ #define GIT_REPO 1 /* Git SHA ID of last commit */ -#define GIT_SHAID "96f36339" +#define GIT_SHAID "1623f86f" /* Branch this tree is on */ #define GIT_BRANCH "master" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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