Date: Thursday, November 25, 2010 @ 04:41:04 Author: andrea Revision: 100680
KDE 4.6 beta1 Added: kdeadmin/kde-unstable/ kdeadmin/kde-unstable/PKGBUILD (from rev 97473, kdeadmin/trunk/PKGBUILD) Modified: kdeadmin/kde-unstable/syslog-path.patch Deleted: kdeadmin/kde-unstable/PKGBUILD -----------------------+ PKGBUILD | 80 ------------------------------------------------ kde-unstable/PKGBUILD | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ syslog-path.patch | 12 +++---- 3 files changed, 86 insertions(+), 86 deletions(-) Deleted: kde-unstable/PKGBUILD =================================================================== --- trunk/PKGBUILD 2010-10-23 11:31:35 UTC (rev 96660) +++ kde-unstable/PKGBUILD 2010-11-25 09:41:04 UTC (rev 100680) @@ -1,80 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgbase=kdeadmin -pkgname=('kdeadmin-kcron' - 'kdeadmin-ksystemlog' - 'kdeadmin-kuser' - 'kdeadmin-system-config-printer-kde') -pkgver=4.5.2 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeadmin') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python' - 'system-config-printer-common' 'pyqt' 'docbook-xsl') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" - 'syslog-path.patch') -sha1sums=('d178f9d15269e990ccbd81defd132f7d9b1bdd5b' - 'c9e7839ba3dd7be15ce140cfebc57c0f57871fdf') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - patch -p1 -i ${srcdir}/syslog-path.patch - - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_kpackage=OFF \ - -DBUILD_knetworkconf=OFF \ - -DBUILD_lilo-config=OFF \ - -DBUILD_strigi-analyzer=OFF - make -} - -package_kdeadmin-kcron() { - pkgdesc='Configure and schedule tasks' - depends=('kdelibs') - cd $srcdir/build/kcron - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcron - make DESTDIR=$pkgdir install -} - -package_kdeadmin-ksystemlog() { - pkgdesc='System log viewer tool' - depends=('kdebase-runtime') - url="http://kde.org/applications/system/ksystemlog/" - cd $srcdir/build/ksystemlog - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksystemlog - make DESTDIR=$pkgdir install -} - -package_kdeadmin-kuser() { - pkgdesc='User Manager' - depends=('kdepim-runtime') - url="http://kde.org/applications/system/kuser/" - install='kdeadmin.install' - cd $srcdir/build/kuser - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kuser - make DESTDIR=$pkgdir install -} - -package_kdeadmin-system-config-printer-kde() { - pkgdesc='Configure local and remote Printers' - depends=('kdebindings-python' 'system-config-printer-common' 'pyqt') - url="http://kde.org/applications/system/printerapplet/" - cd $srcdir/build/system-config-printer-kde - make DESTDIR=$pkgdir install - - # Use the python2 executable - find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} Copied: kdeadmin/kde-unstable/PKGBUILD (from rev 97473, kdeadmin/trunk/PKGBUILD) =================================================================== --- kde-unstable/PKGBUILD (rev 0) +++ kde-unstable/PKGBUILD 2010-11-25 09:41:04 UTC (rev 100680) @@ -0,0 +1,80 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgbase=kdeadmin +pkgname=('kdeadmin-kcron' + 'kdeadmin-ksystemlog' + 'kdeadmin-kuser' + 'kdeadmin-system-config-printer-kde') +pkgver=4.5.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeadmin') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python' + 'system-config-printer-common' 'pyqt' 'docbook-xsl') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'syslog-path.patch') +sha1sums=('2163316b1e5b3e5dee4a9f9dbca008d3096ce2e0' + '96988f1eb531efae56d32a2471bd8ef5329ca749') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + patch -p1 -i ${srcdir}/syslog-path.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_kpackage=OFF \ + -DBUILD_knetworkconf=OFF \ + -DBUILD_lilo-config=OFF \ + -DBUILD_strigi-analyzer=OFF + make +} + +package_kdeadmin-kcron() { + pkgdesc='Configure and schedule tasks' + depends=('kdelibs') + cd $srcdir/build/kcron + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcron + make DESTDIR=$pkgdir install +} + +package_kdeadmin-ksystemlog() { + pkgdesc='System log viewer tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/ksystemlog/" + cd $srcdir/build/ksystemlog + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksystemlog + make DESTDIR=$pkgdir install +} + +package_kdeadmin-kuser() { + pkgdesc='User Manager' + depends=('kdepim-runtime') + url="http://kde.org/applications/system/kuser/" + install='kdeadmin.install' + cd $srcdir/build/kuser + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kuser + make DESTDIR=$pkgdir install +} + +package_kdeadmin-system-config-printer-kde() { + pkgdesc='Configure local and remote Printers' + depends=('kdebindings-python' 'system-config-printer-common' 'pyqt') + url="http://kde.org/applications/system/printerapplet/" + cd $srcdir/build/system-config-printer-kde + make DESTDIR=$pkgdir install + + # Use the python2 executable + find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} Modified: kde-unstable/syslog-path.patch =================================================================== --- trunk/syslog-path.patch 2010-10-23 11:31:35 UTC (rev 96660) +++ kde-unstable/syslog-path.patch 2010-11-25 09:41:04 UTC (rev 100680) @@ -1,11 +1,11 @@ ---- kdeadmin-4.2.2/ksystemlog/src/modes/system/systemConfiguration.h~ 2009-04-22 16:11:44.000000000 +0200 -+++ kdeadmin-4.2.2/ksystemlog/src/modes/system/systemConfiguration.h 2009-04-22 16:11:56.000000000 +0200 +--- kdeadmin-4.5.80/ksystemlog/src/modes/system/systemConfiguration.h~ 2010-11-24 08:52:42.826666681 +0100 ++++ kdeadmin-4.5.80/ksystemlog/src/modes/system/systemConfiguration.h 2010-11-24 08:52:51.140000014 +0100 @@ -39,7 +39,7 @@ SystemConfiguration() : GenericLogModeConfiguration( - SYSTEM_LOG_MODE_ID, -- QStringList() << "/var/log/syslog", -+ QStringList() << "/var/log/messages.log", + QLatin1String( SYSTEM_LOG_MODE_ID ), +- QStringList() << QLatin1String( "/var/log/syslog" ), ++ QStringList() << QLatin1String( "/var/log/messages.log" ), QList<int>() << INFORMATION_LOG_LEVEL_ID ) { - +