[arch-commits] Commit in calligra/trunk (3 files)

[Andrea Scarpino]

    Date: Wednesday, September 28, 2011 @ 17:37:55
  Author: andrea
Revision: 139091

upstream release

Added:
  calligra/trunk/calligra-plan.install
Modified:
  calligra/trunk/PKGBUILD
Deleted:
  calligra/trunk/calligra-kplato.install

-------------------------+
 PKGBUILD                |   22 ++++++++--------------
 calligra-kplato.install |   12 ------------
 calligra-plan.install   |   12 ++++++++++++
 3 files changed, 20 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-28 20:46:57 UTC (rev 139090)
+++ PKGBUILD	2011-09-28 21:37:55 UTC (rev 139091)
@@ -14,7 +14,7 @@
          'calligra-karbon'
          'calligra-kexi'
          'calligra-kounavail'
-         'calligra-kplato'
+         'calligra-plan'
          'calligra-stage'
          'calligra-krita'
          'calligra-tables'
@@ -23,7 +23,7 @@
          'calligra-thesaurus-doc'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.3.74
+pkgver=2.3.81
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org'
@@ -33,7 +33,7 @@
              'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl' 'kdeedu-marble')
 groups=('calligra')
 source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('c29b4712b1992ce2ea7834b7cfe1fff8')
+md5sums=('7f475e22fa3740b2da2f6478880d6341')
 
 build() {
   cd "${srcdir}"
@@ -171,14 +171,14 @@
   make DESTDIR="${pkgdir}" install
 }
 
-package_calligra-kplato() {
+package_calligra-plan() {
   pkgdesc="Calligra Project Management Component"
   depends=('calligra-words')
-  conflicts=('koffice-kplato')
-  replaces=('koffice-kplato')
-  install=calligra-kplato.install
+  conflicts=('koffice-kplato' 'calligra-kplato')
+  replaces=('koffice-kplato' 'calligra-kplato')
+  install=calligra-plan.install
 
-  cd "${srcdir}"/build/kplato
+  cd "${srcdir}"/build/plan
   make DESTDIR="${pkgdir}" install
 }
 
@@ -192,9 +192,6 @@
 
   cd "${srcdir}"/build/stage
   make DESTDIR="${pkgdir}" install
-  
-  cd "${srcdir}"/build/doc/stage
-  make DESTDIR="${pkgdir}" install
 }
 
 package_calligra-krita() {
@@ -208,9 +205,6 @@
 
   cd "${srcdir}"/build/krita
   make DESTDIR="${pkgdir}" install
-  
-  cd "${srcdir}"/build/doc/krita
-  make DESTDIR="${pkgdir}" install
 }
 
 package_calligra-tables() {

Deleted: calligra-kplato.install
===================================================================
--- calligra-kplato.install	2011-09-28 20:46:57 UTC (rev 139090)
+++ calligra-kplato.install	2011-09-28 21:37:55 UTC (rev 139091)
@@ -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
-}
\ No newline at end of file

Added: calligra-plan.install
===================================================================
--- calligra-plan.install	                        (rev 0)
+++ calligra-plan.install	2011-09-28 21:37:55 UTC (rev 139091)
@@ -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
+}
\ No newline at end of file