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

Andrea Scarpino andrea at archlinux.org
Thu Mar 22 18:08:25 EDT 2012


    Date: Thursday, March 22, 2012 @ 18:08:25
  Author: andrea
Revision: 154085

upgpkg: calligra 2.3.92-1

Upstream release

Added:
  calligra/trunk/calligra-sheets.install
Modified:
  calligra/trunk/PKGBUILD
Deleted:
  calligra/trunk/calligra-tables.install

-------------------------+
 PKGBUILD                |   18 ++++++++----------
 calligra-sheets.install |   12 ++++++++++++
 calligra-tables.install |   12 ------------
 3 files changed, 20 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-22 20:56:19 UTC (rev 154084)
+++ PKGBUILD	2012-03-22 22:08:25 UTC (rev 154085)
@@ -17,13 +17,13 @@
          'calligra-plan'
          'calligra-stage'
          'calligra-krita'
-         'calligra-tables'
+         'calligra-sheets'
          'calligra-words'
          'calligra-handbook'
          'calligra-thesaurus-doc'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.3.87
+pkgver=2.3.92
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org'
@@ -33,7 +33,7 @@
              'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl' 'lcms2')
 groups=('calligra')
 source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('c4c7f802f04c86cd4265829900d2fd10')
+md5sums=('4121631cf148e801cca29e2167b1806d')
 
 build() {
   cd "${srcdir}"
@@ -209,18 +209,16 @@
   make DESTDIR="${pkgdir}" install
 }
 
-package_calligra-tables() {
+package_calligra-sheets() {
   pkgdesc="Write spreadsheet documents"
   depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'gsl')
   optdepends=('calligra-filters: import/export filters')
-  conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc')
-  replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc')
-  install=calligra-tables.install
+  conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
+  replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
+  install=calligra-sheets.install
 
-  cd "${srcdir}"/build/tables
+  cd "${srcdir}"/build/sheets
   make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/doc/tables
-  make DESTDIR="${pkgdir}" install
 }
 
 package_calligra-words() {

Added: calligra-sheets.install
===================================================================
--- calligra-sheets.install	                        (rev 0)
+++ calligra-sheets.install	2012-03-22 22:08:25 UTC (rev 154085)
@@ -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: calligra-tables.install
===================================================================
--- calligra-tables.install	2012-03-22 20:56:19 UTC (rev 154084)
+++ calligra-tables.install	2012-03-22 22:08:25 UTC (rev 154085)
@@ -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
-}



More information about the arch-commits mailing list