[arch-commits] Commit in kdepim/repos (12 files)

Andrea Scarpino andrea at archlinux.org
Wed Apr 4 14:16:52 UTC 2012


    Date: Wednesday, April 4, 2012 @ 10:16:52
  Author: andrea
Revision: 155648

db-move: moved kdepim from [staging] to [extra] (i686)

Added:
  kdepim/repos/extra-i686/PKGBUILD
    (from rev 155508, kdepim/repos/staging-i686/PKGBUILD)
  kdepim/repos/extra-i686/kdepim-kleopatra.install
    (from rev 155508, kdepim/repos/staging-i686/kdepim-kleopatra.install)
  kdepim/repos/extra-i686/kdepim-kmail.install
    (from rev 155508, kdepim/repos/staging-i686/kdepim-kmail.install)
  kdepim/repos/extra-i686/kdepim-korganizer.install
    (from rev 155508, kdepim/repos/staging-i686/kdepim-korganizer.install)
  kdepim/repos/extra-i686/kdepim.install
    (from rev 155508, kdepim/repos/staging-i686/kdepim.install)
Deleted:
  kdepim/repos/extra-i686/PKGBUILD
  kdepim/repos/extra-i686/fix-kalarm-issue-with-alarms.patch
  kdepim/repos/extra-i686/kdepim-kleopatra.install
  kdepim/repos/extra-i686/kdepim-kmail.install
  kdepim/repos/extra-i686/kdepim-korganizer.install
  kdepim/repos/extra-i686/kdepim.install
  kdepim/repos/staging-i686/

------------------------------------+
 PKGBUILD                           |  494 +++++++++++++++++------------------
 fix-kalarm-issue-with-alarms.patch |   48 ---
 kdepim-kleopatra.install           |   24 -
 kdepim-kmail.install               |   24 -
 kdepim-korganizer.install          |   24 -
 kdepim.install                     |   22 -
 6 files changed, 291 insertions(+), 345 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-04-04 14:16:47 UTC (rev 155647)
+++ extra-i686/PKGBUILD	2012-04-04 14:16:52 UTC (rev 155648)
@@ -1,250 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=kdepim
-pkgname=('kdepim-akonadiconsole'
-         'kdepim-akregator'
-         'kdepim-blogilo'
-         'kdepim-console'
-         'kdepim-kaddressbook'
-         'kdepim-kalarm'
-         'kdepim-kjots'
-         'kdepim-kleopatra'
-         'kdepim-kmail'
-         'kdepim-knode'
-         'kdepim-knotes'
-         'kdepim-kontact'
-         'kdepim-korganizer'
-         'kdepim-kresources'
-         'kdepim-ktimetracker'
-         'kdepim-libkdepim')
-pkgver=4.8.1
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdepim')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
-             'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'fix-kalarm-issue-with-alarms.patch')
-sha1sums=('93222d56f9adde015cb202a1ad3b194ac52e6bda'
-          'e9761e98fc5486a1a33cfa1eb122b54ca3446ded')
-
-build() {
-    # (FS#28891)
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/fix-kalarm-issue-with-alarms.patch
-
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DKDEPIM_BUILD_MOBILE=OFF
-	make
-}
-
-package_kdepim-akonadiconsole() {
-	pkgdesc='Akonadi Management and Debugging Console'
-	depends=('kdepim-libkdepim')
-	url='http://pim.kde.org'
-	install='kdepim.install'
-	cd "${srcdir}"/build/akonadiconsole
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-akregator() {
-	pkgdesc='A Feed Reader for KDE'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/akregator/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/akregator
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/akregator
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/akregator
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-blogilo() {
-	pkgdesc='A KDE Blogging Client'
-	depends=('kdepim-runtime')
-	url="http://kde.org/applications/internet/blogilo/"
-	replaces=('blogilo')
-	conflicts=('blogilo')
-	install='kdepim.install'
-	cd "${srcdir}"/build/blogilo
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/blogilo
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-console() {
-	pkgdesc='Command line tool for accessing calendar files'
-	depends=('kdepim-runtime')
-	url='http://pim.kde.org'
-	install='kdepim.install'
-	cd "${srcdir}"/build/console
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kaddressbook() {
-	pkgdesc='Contact Manager'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/kaddressbook/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/kaddressbook
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/kaddressbook
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/plugins/kaddressbook
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kalarm() {
-	pkgdesc='Personal Alarm Scheduler'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/kalarm/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/kalarm
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kalarm
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kjots() {
-	pkgdesc='Note Taker'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/kjots/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/kjots
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kjots
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/kjots
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kleopatra() {
-	pkgdesc='Certificate Manager and Unified Crypto GUI'
-	depends=('kdepim-libkdepim')
-    install=kdepim-kleopatra.install
-	url="http://kde.org/applications/utilities/kleopatra/"
-	cd "${srcdir}"/build/kleopatra
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kleopatra
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kmail() {
-	pkgdesc='Mail Client'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/kmail/"
-	install='kdepim-kmail.install'
-	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	           'kdepim-mimelib' 'kdepim-plugins')
-	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
-	          'kdepim-mimelib' 'kdepim-plugins')
-	for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \
-		mailfilteragent ontologies kontact/plugins/kmail; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-package_kdepim-knode() {
-	pkgdesc='News Reader'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/knode/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/knode
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-knotes() {
-	pkgdesc='Popup Notes'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/utilities/knotes/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/knotes
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knotes
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/knotes
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kontact() {
-	pkgdesc='Personal Information Manager'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/kontact/"
-	install='kdepim.install'
-	conflcits=('kdepim-kontactinterfaces')
-	replaces=('kdepim-kontactinterfaces')
-	for i in kontact/src doc/kontact \
-		kontact/plugins/summary kontact/plugins/specialdates; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-package_kdepim-korganizer() {
-	pkgdesc='Calendar and Scheduling Program'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/office/korganizer"
-	install='kdepim-korganizer.install'
-	cd "${srcdir}"/build/korganizer
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/korganizer
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/korganizer
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kresources() {
-	pkgdesc='KDE PIM resources'
-	depends=('kdepim-libkdepim')
-	url='http://pim.kde.org'
-	cd "${srcdir}"/build/kresources
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-ktimetracker() {
-	pkgdesc='Personal Time Tracker'
-	depends=('kdepim-kresources')
-	url="http://kde.org/applications/utilities/ktimetracker/"
-	install='kdepim.install'
-	cd "${srcdir}"/build/ktimetracker
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/ktimetracker
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/kontact/plugins/ktimetracker
-	make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-libkdepim() {
-	pkgdesc='Library for KDE PIM'
-	groups=()
-	depends=('kde-agent' 'kdepim-runtime')
-	url='http://pim.kde.org'
-	conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-	            'kdepim-strigi-analyzer' 'kdepim-akonadi')
-	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-	          'kdepim-strigi-analyzer' 'kdepim-akonadi')
-	for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \
-		kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
-		messagecomposer messagecore messagelist messageviewer icons \
-		strigi-analyzer templateparser plugins/messageviewer \
-        plugins/ktexteditor; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}

Copied: kdepim/repos/extra-i686/PKGBUILD (from rev 155508, kdepim/repos/staging-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-04-04 14:16:52 UTC (rev 155648)
@@ -0,0 +1,244 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=kdepim
+pkgname=('kdepim-akonadiconsole'
+         'kdepim-akregator'
+         'kdepim-blogilo'
+         'kdepim-console'
+         'kdepim-kaddressbook'
+         'kdepim-kalarm'
+         'kdepim-kjots'
+         'kdepim-kleopatra'
+         'kdepim-kmail'
+         'kdepim-knode'
+         'kdepim-knotes'
+         'kdepim-kontact'
+         'kdepim-korganizer'
+         'kdepim-kresources'
+         'kdepim-ktimetracker'
+         'kdepim-libkdepim')
+pkgver=4.8.2
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://pim.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdepim')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
+             'kde-agent')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('1c3a459ef4d76e1247ac47816bf2b7ea6e37908a')
+
+build() {
+    cd "${srcdir}"
+	mkdir build
+	cd build
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DKDEPIM_BUILD_MOBILE=OFF
+	make
+}
+
+package_kdepim-akonadiconsole() {
+	pkgdesc='Akonadi Management and Debugging Console'
+	depends=('kdepim-libkdepim')
+	url='http://pim.kde.org'
+	install='kdepim.install'
+	cd "${srcdir}"/build/akonadiconsole
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-akregator() {
+	pkgdesc='A Feed Reader for KDE'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/internet/akregator/"
+	install='kdepim.install'
+	cd "${srcdir}"/build/akregator
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/akregator
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/akregator
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-blogilo() {
+	pkgdesc='A KDE Blogging Client'
+	depends=('kdepim-runtime')
+	url="http://kde.org/applications/internet/blogilo/"
+	replaces=('blogilo')
+	conflicts=('blogilo')
+	install='kdepim.install'
+	cd "${srcdir}"/build/blogilo
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/blogilo
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-console() {
+	pkgdesc='Command line tool for accessing calendar files'
+	depends=('kdepim-runtime')
+	url='http://pim.kde.org'
+	install='kdepim.install'
+	cd "${srcdir}"/build/console
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kaddressbook() {
+	pkgdesc='Contact Manager'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/office/kaddressbook/"
+	install='kdepim.install'
+	cd "${srcdir}"/build/kaddressbook
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/kaddressbook
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/plugins/kaddressbook
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kalarm() {
+	pkgdesc='Personal Alarm Scheduler'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/utilities/kalarm/"
+	install='kdepim.install'
+	cd "${srcdir}"/build/kalarm
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kalarm
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kjots() {
+	pkgdesc='Note Taker'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/utilities/kjots/"
+	install='kdepim.install'
+	cd "${srcdir}"/build/kjots
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kjots
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/kjots
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kleopatra() {
+	pkgdesc='Certificate Manager and Unified Crypto GUI'
+	depends=('kdepim-libkdepim')
+    install=kdepim-kleopatra.install
+	url="http://kde.org/applications/utilities/kleopatra/"
+	cd "${srcdir}"/build/kleopatra
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/kleopatra
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kmail() {
+	pkgdesc='Mail Client'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/internet/kmail/"
+	install='kdepim-kmail.install'
+	conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
+	           'kdepim-mimelib' 'kdepim-plugins')
+	replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
+	          'kdepim-mimelib' 'kdepim-plugins')
+	for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \
+		mailfilteragent ontologies kontact/plugins/kmail; do
+		cd "${srcdir}"/build/${i}
+		make DESTDIR="${pkgdir}" install
+	done
+}
+
+package_kdepim-knode() {
+	pkgdesc='News Reader'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/internet/knode/"
+	install='kdepim.install'
+	cd "${srcdir}"/build/knode
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/knode
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/knode
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-knotes() {
+	pkgdesc='Popup Notes'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/utilities/knotes/"
+	install='kdepim.install'
+	cd "${srcdir}"/build/knotes
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/knotes
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/knotes
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kontact() {
+	pkgdesc='Personal Information Manager'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/office/kontact/"
+	install='kdepim.install'
+	conflcits=('kdepim-kontactinterfaces')
+	replaces=('kdepim-kontactinterfaces')
+	for i in kontact/src doc/kontact \
+		kontact/plugins/summary kontact/plugins/specialdates; do
+		cd "${srcdir}"/build/${i}
+		make DESTDIR="${pkgdir}" install
+	done
+}
+
+package_kdepim-korganizer() {
+	pkgdesc='Calendar and Scheduling Program'
+	depends=('kdepim-libkdepim')
+	url="http://kde.org/applications/office/korganizer"
+	install='kdepim-korganizer.install'
+	cd "${srcdir}"/build/korganizer
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/korganizer
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/korganizer
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-kresources() {
+	pkgdesc='KDE PIM resources'
+	depends=('kdepim-libkdepim')
+	url='http://pim.kde.org'
+	cd "${srcdir}"/build/kresources
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-ktimetracker() {
+	pkgdesc='Personal Time Tracker'
+	depends=('kdepim-kresources')
+	url="http://kde.org/applications/utilities/ktimetracker/"
+	install='kdepim.install'
+	cd "${srcdir}"/build/ktimetracker
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/doc/ktimetracker
+	make DESTDIR="${pkgdir}" install
+	cd "${srcdir}"/build/kontact/plugins/ktimetracker
+	make DESTDIR="${pkgdir}" install
+}
+
+package_kdepim-libkdepim() {
+	pkgdesc='Library for KDE PIM'
+	groups=()
+	depends=('kde-agent' 'kdepim-runtime')
+	url='http://pim.kde.org'
+	conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
+	            'kdepim-strigi-analyzer' 'kdepim-akonadi')
+	replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
+	          'kdepim-strigi-analyzer' 'kdepim-akonadi')
+	for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \
+		kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
+		messagecomposer messagecore messagelist messageviewer icons \
+		strigi-analyzer templateparser plugins/messageviewer \
+        plugins/ktexteditor; do
+		cd "${srcdir}"/build/${i}
+		make DESTDIR="${pkgdir}" install
+	done
+}

Deleted: extra-i686/fix-kalarm-issue-with-alarms.patch
===================================================================
--- extra-i686/fix-kalarm-issue-with-alarms.patch	2012-04-04 14:16:47 UTC (rev 155647)
+++ extra-i686/fix-kalarm-issue-with-alarms.patch	2012-04-04 14:16:52 UTC (rev 155648)
@@ -1,48 +0,0 @@
-From: David Jarvie <djarvie at kde.org>
-Date: Wed, 07 Mar 2012 22:08:50 +0000
-Subject: Fix error saving changed alarms when closing Edit Alarm dialogue
-X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=ae66e32fb194e01e06521c78e9c72d772d291261
----
-Fix error saving changed alarms when closing Edit Alarm dialogue
----
-
-
---- a/kalarm/Changelog
-+++ b/kalarm/Changelog
-@@ -1,6 +1,10 @@
- KAlarm Change Log
- 
--=== Version 2.8.1 --- 19 February 2012 ===
-+=== Version 2.8.2 --- 7 March 2012 ===
-+- [Akonadi] Fix error saving changed alarms when closing Edit Alarm dialogue.
-+- [Akonadi] Show old-format calendars in read-only colour in calendar list.
-+
-+=== Version 2.8.1 (KDE 4.8.1) --- 19 February 2012 ===
- - [Akonadi] Don't give option to save new alarms in old format calendars.
- - [Akonadi] Prevent duplicate prompts to update format of new calendar resource.
- - [Akonadi] Automatically disable duplicated calendar resources.
-
---- a/kalarm/akonadimodel.cpp
-+++ b/kalarm/akonadimodel.cpp
-@@ -1284,7 +1284,7 @@ KAEvent AkonadiModel::event(const Item&
-     if (e.isValid())
-     {
- 
--        Collection c = data(index, ParentCollectionRole).value<Collection>();
-+        Collection c = data(ix, ParentCollectionRole).value<Collection>();
-         // Set collection ID using a const method, to avoid unnecessary copying of KAEvent
-         e.setCollectionId_const(c.id());
-         if (collection)
-
---- a/kalarm/kalarm.h
-+++ b/kalarm/kalarm.h
-@@ -28,7 +28,7 @@
- #else
- #define VERSION_SUFFIX "-res"
- #endif
--#define KALARM_VERSION "2.8.1" VERSION_SUFFIX
-+#define KALARM_VERSION "2.8.2" VERSION_SUFFIX
- 
- #define KALARM_NAME "KAlarm"
- #define KALARM_DBUS_SERVICE  "org.kde.kalarm"  // D-Bus service name of KAlarm application
-

Deleted: extra-i686/kdepim-kleopatra.install
===================================================================
--- extra-i686/kdepim-kleopatra.install	2012-04-04 14:16:47 UTC (rev 155647)
+++ extra-i686/kdepim-kleopatra.install	2012-04-04 14:16:52 UTC (rev 155648)
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdepim/repos/extra-i686/kdepim-kleopatra.install (from rev 155508, kdepim/repos/staging-i686/kdepim-kleopatra.install)
===================================================================
--- extra-i686/kdepim-kleopatra.install	                        (rev 0)
+++ extra-i686/kdepim-kleopatra.install	2012-04-04 14:16:52 UTC (rev 155648)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: extra-i686/kdepim-kmail.install
===================================================================
--- extra-i686/kdepim-kmail.install	2012-04-04 14:16:47 UTC (rev 155647)
+++ extra-i686/kdepim-kmail.install	2012-04-04 14:16:52 UTC (rev 155648)
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdepim/repos/extra-i686/kdepim-kmail.install (from rev 155508, kdepim/repos/staging-i686/kdepim-kmail.install)
===================================================================
--- extra-i686/kdepim-kmail.install	                        (rev 0)
+++ extra-i686/kdepim-kmail.install	2012-04-04 14:16:52 UTC (rev 155648)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: extra-i686/kdepim-korganizer.install
===================================================================
--- extra-i686/kdepim-korganizer.install	2012-04-04 14:16:47 UTC (rev 155647)
+++ extra-i686/kdepim-korganizer.install	2012-04-04 14:16:52 UTC (rev 155648)
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdepim/repos/extra-i686/kdepim-korganizer.install (from rev 155508, kdepim/repos/staging-i686/kdepim-korganizer.install)
===================================================================
--- extra-i686/kdepim-korganizer.install	                        (rev 0)
+++ extra-i686/kdepim-korganizer.install	2012-04-04 14:16:52 UTC (rev 155648)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: extra-i686/kdepim.install
===================================================================
--- extra-i686/kdepim.install	2012-04-04 14:16:47 UTC (rev 155647)
+++ extra-i686/kdepim.install	2012-04-04 14:16:52 UTC (rev 155648)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdepim/repos/extra-i686/kdepim.install (from rev 155508, kdepim/repos/staging-i686/kdepim.install)
===================================================================
--- extra-i686/kdepim.install	                        (rev 0)
+++ extra-i686/kdepim.install	2012-04-04 14:16:52 UTC (rev 155648)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}




More information about the arch-commits mailing list