Hello community, here is the log from the commit of package kdegraphics3 checked in at Mon Apr 24 16:03:45 CEST 2006. -------- --- KDE/kdegraphics3/kdegraphics3.changes 2006-04-12 11:28:35.000000000 +0200 +++ STABLE/kdegraphics3/kdegraphics3.changes 2006-04-24 09:48:50.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 24 09:47:40 CEST 2006 - stbinner@suse.de + +- write to xorg.conf and don't destroy XF86Config symlink (#168621) + +------------------------------------------------------------------- New: ---- use_xorg_conf.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics3.spec ++++++ --- /var/tmp/diff_new_pack.8U40qx/_old 2006-04-24 16:02:48.000000000 +0200 +++ /var/tmp/diff_new_pack.8U40qx/_new 2006-04-24 16:02:48.000000000 +0200 @@ -23,7 +23,7 @@ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) Summary: Base Libraries for KDE Graphics Applications Version: 3.5.1 -Release: 15 +Release: 19 Source0: kdegraphics-%{version}.tar.bz2 Patch0: 3_5_BRANCH.diff Patch1: prefer-kpdf.diff @@ -32,6 +32,7 @@ Patch5: kamera.patch Patch6: bugzilla-113799-render-fi-correctly.patch Patch7: bugzilla-113799-disable-byte-code-interpreter.patch +Patch8: use_xorg_conf.diff Requires: ghostscript-x11 Provides: kdegraphics3-viewer:/opt/kde3/bin/kuickshow Obsoletes: kdegraphics3-viewer @@ -286,6 +287,7 @@ %patch5 %patch6 -p1 %patch7 -p1 +%patch8 # gift is not maintained anymore and broken rm -rf kmrml . /etc/opt/kde3/common_options @@ -631,6 +633,8 @@ /opt/kde3/include/*.h %changelog -n kdegraphics3 +* Mon Apr 24 2006 - stbinner@suse.de +- write to xorg.conf and don't destroy XF86Config symlink (#168621) * Wed Apr 12 2006 - meissner@suse.de - kamera ioslave: add mimetypes for the directories on the camera, or the default "open in window" slave ++++++ use_xorg_conf.diff ++++++ --- kgamma/kcmkgamma/xf86configpath.cpp 2006/04/24 08:00:42 1.1 +++ kgamma/kcmkgamma/xf86configpath.cpp 2006/04/24 08:04:54 @@ -26,6 +26,8 @@ XF86ConfigPath::XF86ConfigPath(){ vector <string> searchPaths; + searchPaths.push_back("/etc/X11/xorg.conf"); + searchPaths.push_back("/etc/X11/XF86Config-4"); searchPaths.push_back("/etc/X11/XF86Config"); searchPaths.push_back("/etc/XF86Config"); --- kgamma/xf86gammacfg/xf86gammacfg.cpp 2006/04/24 08:00:49 1.1 +++ kgamma/xf86gammacfg/xf86gammacfg.cpp 2006/04/24 08:04:25 @@ -48,6 +48,8 @@ // First, search for XF86Config vector <string> searchPaths; + searchPaths.push_back("/etc/X11/xorg.conf"); + searchPaths.push_back("/etc/X11/XF86Config-4"); searchPaths.push_back("/etc/X11/XF86Config"); searchPaths.push_back("/etc/XF86Config"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...