Mailinglist Archive: opensuse-commit (1206 mails)

< Previous Next >
commit kdebase3-SuSE
  • From: root@xxxxxxx (h_root)
  • Date: Mon, 15 May 2006 19:02:52 +0200 (CEST)
  • Message-id: <20060515170252.D98CD8D925@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdebase3-SuSE
checked in at Mon May 15 19:02:52 CEST 2006.

--------
--- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2006-05-10 11:24:36.000000000 +0200
+++ kdebase3-SuSE/kdebase3-SuSE.changes 2006-05-15 19:02:23.000000000 +0200
@@ -1,0 +2,5 @@
+Mon May 15 18:24:51 CEST 2006 - dmueller@xxxxxxx
+
+- bump version to 10.2
+
+-------------------------------------------------------------------

Old:
----
kdebase-SuSE-10.1.tar.bz2

New:
----
kdebase-SuSE-10.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase3-SuSE.spec ++++++
--- /var/tmp/diff_new_pack.jrUZ9B/_old 2006-05-15 19:02:41.000000000 +0200
+++ /var/tmp/diff_new_pack.jrUZ9B/_new 2006-05-15 19:02:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase3-SuSE (Version 10.1)
+# spec file for package kdebase3-SuSE (Version 10.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -30,8 +30,8 @@
%endif
PreReq: %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 10.1
-Release: 58
+Version: 10.2
+Release: 1
Source0: kdebase-SuSE-%{version}.tar.bz2
Source2: kdebase3-SuSE-displaymanager.fillup
Source3: kdebase3-SuSE-windowmanager.fillup
@@ -185,6 +185,8 @@
/var/lib/kde-profiles

%changelog -n kdebase3-SuSE
+* Mon May 15 2006 - dmueller@xxxxxxx
+- bump version to 10.2
* Wed May 10 2006 - coolo@xxxxxxx
- updating from SVN to fix:
- show PPC CPus correct in sysinfo:/ (#167996)

++++++ kdebase-SuSE-10.1.tar.bz2 -> kdebase-SuSE-10.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/bin/startkde.pick_wallpaper new/kdebase-SuSE/config-files/opt/kde3/bin/startkde.pick_wallpaper
--- old/kdebase-SuSE/config-files/opt/kde3/bin/startkde.pick_wallpaper 2006-03-20 17:59:48.000000000 +0100
+++ new/kdebase-SuSE/config-files/opt/kde3/bin/startkde.pick_wallpaper 2006-05-12 14:39:17.000000000 +0200
@@ -3,8 +3,8 @@
function pick_wallpaper
{
WALLPAPER_BASE="default-"
- X=`LC_ALL=C xdpyinfo |grep dimensions:|cut -d " " -f 7|cut -d "x" -f 1`
- Y=`LC_ALL=C xdpyinfo |grep dimensions:|cut -d " " -f 7|cut -d "x" -f 2`
+ X=`LC_ALL=C xdpyinfo|grep dimensions:|head -n 1|cut -dx -f1|egrep -o '[0-9]+'`
+ Y=`LC_ALL=C xdpyinfo|grep dimensions:|head -n 1|cut -dx -f2|egrep -o '[0-9]+'`

if [ $(($X*11/$Y)) -gt 15 ]; then
WALLPAPER="1920x1200.jpg"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/bin/startkde.theme new/kdebase-SuSE/config-files/opt/kde3/bin/startkde.theme
--- old/kdebase-SuSE/config-files/opt/kde3/bin/startkde.theme 2006-03-10 14:31:45.000000000 +0100
+++ new/kdebase-SuSE/config-files/opt/kde3/bin/startkde.theme 2006-05-12 14:56:50.000000000 +0200
@@ -109,7 +109,7 @@

TEMPLATE_DIR=/opt/kde3/share/config/SuSE/default/
WALLPAPER=$(/opt/kde3/bin/startkde.pick_wallpaper)
- Y=`LC_ALL=C xdpyinfo |grep dimensions:|cut -d " " -f 7|cut -d "x" -f 2`
+ Y=`LC_ALL=C xdpyinfo|grep dimensions:|head -n 1|cut -dx -f2|egrep -o '[0-9]+'`

mkdir -p $HOME/.skel/
cp /etc/SuSE-release $HOME/.skel/kdebase3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/bin/startkde.update101 new/kdebase-SuSE/config-files/opt/kde3/bin/startkde.update101
--- old/kdebase-SuSE/config-files/opt/kde3/bin/startkde.update101 2006-04-18 15:12:33.000000000 +0200
+++ new/kdebase-SuSE/config-files/opt/kde3/bin/startkde.update101 2006-05-12 15:30:42.000000000 +0200
@@ -28,3 +28,18 @@
sed -i -e 's,hintmedium,hintfull,' "$HOME/.fonts.conf"
fi
fi
+
+# 10.0 -> 10.1 update:
+# The font substitution list in qtrc stopped working because fontconfig
+# now handles and under certain conditions prefers the localized font name,
+# which confuses Qt
+# they weren't necessary anymore anyway, so sed them away..
+if [ -f "$HOME/.qt/qtrc.test" ]; then
+ cp $HOME/.qt/qtrc $HOME/.qt/qtrc.old
+
+ cat $HOME/.qt/qtrc.old | \
+ fgrep -v 'HGPGothicB^eIPAPGothic^eSazanami Gothic^eKochi Gothic^eAR PL Mingti2L Big5^eAR PL SungtiL GB^e!Y2KBUG^e' | \
+ fgrep -v 'HGPGothicB^eIPAPGothic^eSazanami Gothic^eKochi Gothic^eAR PL Mingti2L Big5^eAR PL SungtiL GB^eBaekmuk Gulim^e' | \
+ fgrep -v 'HGPMinchoL^eIPAPMincho^eSazanami Mincho^eKochi Mincho^eAR PL KaitiM Big5^eAR PL KaitiM GB^eBaekmuk Batang^e' \
+ > $HOME/.qt/qtrc
+fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/sbin/conf.d/SuSEconfig.kdm3 new/kdebase-SuSE/config-files/sbin/conf.d/SuSEconfig.kdm3
--- old/kdebase-SuSE/config-files/sbin/conf.d/SuSEconfig.kdm3 2006-03-03 15:30:40.000000000 +0100
+++ new/kdebase-SuSE/config-files/sbin/conf.d/SuSEconfig.kdm3 2006-05-12 14:41:54.000000000 +0200
@@ -90,24 +90,28 @@
case "$DISPLAYMANAGER_SHUTDOWN" in
all|ALL|All)
DISPLAYMANAGER_SHUTDOWN=All;;
- none|NONE|None)
+ none|NONE|None)
DISPLAYMANAGER_SHUTDOWN=None;;
- local|LOCAL|Local)
+ local|LOCAL|Local)
# local is legacy
DISPLAYMANAGER_SHUTDOWN=All;;
- auto|Auto|AUTO)
+ auto|Auto|AUTO)
case "$PERMISSION_SECURITY" in
- paranoid)
+ *easy*)
+ DISPLAYMANAGER_SHUTDOWN=All
+ ;;
+ *paranoid*)
ECHO_MODE="NoEcho"
ALLOW_ROOT_LOGIN="false"
+ DISPLAYMANAGER_SHUTDOWN=Root
;;
*)
DISPLAYMANAGER_SHUTDOWN=All
;;
- esac;;
-
- * )
- DISPLAYMANAGER_SHUTDOWN=Root;;
+ esac
+ ;;
+ * )
+ DISPLAYMANAGER_SHUTDOWN=Root;;
esac
SHUTDOWNCMD="-e s/^AllowShutdown=__LOCAL_SHUTDOWN__/AllowShutdown=${DISPLAYMANAGER_SHUTDOWN}/"
ROOTLOGINCMD="-e s/^AllowRootLogin=__LOCAL_ROOTLOGIN__/AllowRootLogin=${ALLOW_ROOT_LOGIN}/ -e s/^AllowNullPasswd=.*/AllowNullPasswd=${ALLOW_ROOT_LOGIN}/"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/suseplugger/susehwitem.cpp new/kdebase-SuSE/suseplugger/susehwitem.cpp
--- old/kdebase-SuSE/suseplugger/susehwitem.cpp 2006-02-15 17:15:15.000000000 +0100
+++ new/kdebase-SuSE/suseplugger/susehwitem.cpp 2006-05-10 13:06:15.000000000 +0200
@@ -100,7 +100,7 @@
hd = hd_read_config(&hd_data, libhal_device_get_property_QString(halc, udi, parent));
}
bool conf = false;
- if ( hd && hd->status.configured )
+ if ( hd && hd->status.configured != status_new )
conf = true;

if (conf)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/sysinfo/sysinfo.cpp new/kdebase-SuSE/sysinfo/sysinfo.cpp
--- old/kdebase-SuSE/sysinfo/sysinfo.cpp 2006-05-09 18:18:32.000000000 +0200
+++ new/kdebase-SuSE/sysinfo/sysinfo.cpp 2006-05-11 18:21:16.000000000 +0200
@@ -166,12 +166,15 @@
// CPU info
infoMessage( i18n( "Looking for CPU information..." ) );
cpuInfo();
- sysInfo += "<h2 id=\"cpu\">" + i18n( "CPU Information" ) + "</h2>";
- sysInfo += "<ul>";
- sysInfo += "<li><span class=\"label\">" + i18n( "Processor (CPU):" ) + "</span>" + m_info[CPU_MODEL] + "</li>";
- sysInfo += "<li><span class=\"label\">" + i18n( "Speed:" ) + "</span> " +
- i18n( "%1 MHz" ).arg( KGlobal::locale()->formatNumber( m_info[CPU_SPEED].toFloat(), 2 ) ) + "</li>";
- sysInfo += "</ul>";
+ if ( !m_info[CPU_MODEL].isNull() )
+ {
+ sysInfo += "<h2 id=\"cpu\">" + i18n( "CPU Information" ) + "</h2>";
+ sysInfo += "<ul>";
+ sysInfo += "<li><span class=\"label\">" + i18n( "Processor (CPU):" ) + "</span>" + m_info[CPU_MODEL] + "</li>";
+ sysInfo += "<li><span class=\"label\">" + i18n( "Speed:" ) + "</span> " +
+ i18n( "%1 MHz" ).arg( KGlobal::locale()->formatNumber( m_info[CPU_SPEED].toFloat(), 2 ) ) + "</li>";
+ sysInfo += "</ul>";
+ }

// memory info
infoMessage( i18n( "Looking for memory information..." ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/update_rpm new/kdebase-SuSE/update_rpm
--- old/kdebase-SuSE/update_rpm 2005-10-09 12:18:38.000000000 +0200
+++ new/kdebase-SuSE/update_rpm 2006-05-15 17:31:22.000000000 +0200
@@ -4,6 +4,6 @@
tdir=`mktemp -d`
cd $tdir || exit 1
svn export http://svn/svn/desktop/trunk/kdebase-SuSE
-tar -cvj -f $opwd/kdebase-SuSE-10.1.tar.bz2 kdebase-SuSE
+tar -cvj -f $opwd/kdebase-SuSE-10.2.tar.bz2 kdebase-SuSE
cd /
rm -rf $tdir




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >
This Thread