[arch-commits] Commit in kdepim/kde-unstable (PKGBUILD)

Antonio Rojas arojas at archlinux.org
Fri Aug 14 22:26:16 UTC 2015


    Date: Saturday, August 15, 2015 @ 00:26:16
  Author: arojas
Revision: 243710

Don't replace KDE4 packages, rename kdepim-console to konsolekalendar

Modified:
  kdepim/kde-unstable/PKGBUILD

----------+
 PKGBUILD |   21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-14 21:04:31 UTC (rev 243709)
+++ PKGBUILD	2015-08-14 22:26:16 UTC (rev 243710)
@@ -4,10 +4,10 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgbase=kdepim
-pkgname=(akonadiconsole akregator blogilo kdepim-console kaddressbook kalarm kleopatra kmail knotes
+pkgname=(akonadiconsole akregator blogilo konsolekalendar kaddressbook kalarm kleopatra kmail knotes
          kontact korganizer ktnef libkdepim)
 pkgver=15.07.90
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -37,7 +37,6 @@
 	pkgdesc='Akonadi Management and Debugging Console'
 	depends=('libkdepim')
 	conflicts=("kdepim-$pkgname")
-	replaces=("kdepim-$pkgname")
 	url='http://pim.kde.org'
 	install='kdepim.install'
 	cd build/akonadiconsole
@@ -48,7 +47,6 @@
 	pkgdesc='A Feed Reader for KDE'
 	depends=('libkdepim' 'khtml' 'kontactinterface')
         conflicts=("kdepim-$pkgname")
-        replaces=("kdepim-$pkgname")
 	url="http://kde.org/applications/internet/akregator/"
 	install='akregator.install'
 	cd build/akregator
@@ -61,7 +59,6 @@
 	pkgdesc='A KDE Blogging Client'
 	depends=('libkdepim' 'kblog' 'ktexteditor')
         conflicts=("kdepim-$pkgname")
-        replaces=("kdepim-$pkgname")
 	url="http://kde.org/applications/internet/blogilo/"
 	install='kdepim.install'
 	cd build/blogilo
@@ -72,9 +69,11 @@
 	make DESTDIR="$pkgdir" install
 }
 
-package_kdepim-console() {
+package_konsolekalendar() {
 	pkgdesc='Command line tool for accessing calendar files'
 	depends=('libkdepim')
+	conflicts=('kdepim-console')
+	replaces=('kdepim-console>15')
 	url='http://pim.kde.org'
 	install='kdepim.install'
 	cd build/console
@@ -87,7 +86,6 @@
 	pkgdesc='Contact Manager'
 	depends=('libkdepim' 'kontactinterface')
         conflicts=("kdepim-$pkgname")
-        replaces=("kdepim-$pkgname")
 	url="http://kde.org/applications/office/kaddressbook/"
 	install='kaddressbook.install'
 	for _i in kaddressbook kaddressbookgrantlee plugins/kaddressbook; do
@@ -100,7 +98,6 @@
 	pkgdesc='Personal Alarm Scheduler'
 	depends=('libkdepim')
         conflicts=("kdepim-$pkgname")
-        replaces=("kdepim-$pkgname")
 	url="http://kde.org/applications/utilities/kalarm/"
 	install='kdepim.install'
 	cd build/kalarm
@@ -113,7 +110,6 @@
 	pkgdesc='Certificate Manager and Unified Crypto GUI'
 	depends=('libkdepim')
         conflicts=("kdepim-$pkgname")
-        replaces=("kdepim-$pkgname")
 	install=kleopatra.install
 	url="http://kde.org/applications/utilities/kleopatra/"
 	cd build/kleopatra
@@ -128,7 +124,6 @@
 	pkgdesc='Mail Client'
 	depends=('kaddressbook' 'kontactinterface' 'kio-pim')
         conflicts=("kdepim-$pkgname")
-        replaces=("kdepim-$pkgname")
 	url="http://kde.org/applications/internet/kmail/"
 	install='kmail.install'
 	for _i in kmail agents/archivemailagent agents/mailfilteragent agents/followupreminderagent \
@@ -146,7 +141,6 @@
 	pkgdesc='Popup Notes'
 	depends=('libkdepim' 'kontactinterface')
         conflicts=("kdepim-$pkgname")
-        replaces=("kdepim-$pkgname")
 	url="http://kde.org/applications/utilities/knotes/"
 	install='kdepim.install'
 	cd "$srcdir"/build/knotes
@@ -163,7 +157,6 @@
 	pkgdesc='Personal Information Manager'
 	depends=('libkdepim' 'kontactinterface')
         conflicts=("kdepim-$pkgname")
-        replaces=("kdepim-$pkgname")
 	url="http://kde.org/applications/office/kontact/"
 	install='kdepim.install'
 	cd build/kontact
@@ -178,7 +171,6 @@
 	pkgdesc='Calendar and Scheduling Program'
 	depends=('libkdepim' 'kontactinterface')
         conflicts=("kdepim-$pkgname")
-        replaces=("kdepim-$pkgname")
 	url="http://kde.org/applications/office/korganizer"
 	install='korganizer.install'
 	for _i in korganizer korgac; do
@@ -193,7 +185,6 @@
 	pkgdesc='A viewer/extractor for TNEF files'
 	depends=('libktnef' 'hicolor-icon-theme')
         conflicts=("kdepim-$pkgname")
-        replaces=("kdepim-$pkgname")
 	url="https://projects.kde.org/projects/kde/kdepim/ktnef"
 	install=ktnef.install
 	cd build/ktnef
@@ -207,8 +198,6 @@
         groups=()
 	depends=('kdepim-runtime' 'gpgmepp' 'grantlee-qt5' 'akonadi-search' 'knewstuff' 'kldap' 'kdnssd')
         conflicts=('kdepim-libkdepim')
-	provides=('kdepim-libkdepim') # to allow smooth upgrade from 4.14
-        replaces=('kdepim-libkdepim')
 	url='http://pim.kde.org'
 	install=kdepim.install
 	for _i in agents/sendlateragent calendarsupport grantleetheme incidenceeditor-ng kdgantt2 libkdepim \



More information about the arch-commits mailing list