[arch-commits] Commit in openoffice-base-beta/repos (3 files)

[andyrtr at archlinux.org]

    Date: Sunday, February 22, 2009 @ 08:58:56
  Author: andyrtr
Revision: 27526

Merged revisions 27513 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/openoffice-base-beta/trunk

........
  r27513 | andyrtr | 2009-02-22 12:42:59 +0000 (So, 22 Feb 2009) | 2 lines
  
  upgpkg: openoffice-base-beta 3.1.0_ooo310_m2-1
      new version ooo310_m2
........

Modified:
  openoffice-base-beta/repos/extra-i686/	(properties)
  openoffice-base-beta/repos/extra-i686/ChangeLog
  openoffice-base-beta/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    3 +++
 PKGBUILD  |    9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)


Property changes on: openoffice-base-beta/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-beta/trunk:1-26843
   + /openoffice-base-beta/trunk:1-27525

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-02-22 13:55:37 UTC (rev 27525)
+++ extra-i686/ChangeLog	2009-02-22 13:58:56 UTC (rev 27526)
@@ -1,3 +1,6 @@
+openoffice-base-beta 3.1.0-ooo310_m2-1
+- next snapshot on the way to 3.1
+
 openoffice-base-beta 3.1.0-ooo310_m1-1
 - first snapshot on the way to 3.1
   branched from DEV300_m40

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-22 13:55:37 UTC (rev 27525)
+++ extra-i686/PKGBUILD	2009-02-22 13:58:56 UTC (rev 27526)
@@ -2,11 +2,11 @@
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgname=openoffice-base-beta
-pkgver=3.1.0_ooo310_m1 # m1=
+pkgver=3.1.0_ooo310_m2 # m2=
 pkgrel=1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
-_OO_milestone=OOO310_m1
+_OO_milestone=OOO310_m2
 license=('LGPL3')
 url="http://www.openoffice.org"
 install=openoffice.install
@@ -30,7 +30,7 @@
 	shell.patch
 	openoffice-beta.profile)
 options=('!distcc' '!ccache' '!makeflags')
-md5sums=('e8f5578a5f744e75bdcfaa7c431cbdc4'
+md5sums=('94db1994d986cd8e71b5eae1eb91be23'
          'a247ba577007d8169201bd8f41cf41b5'
          '71f136a31e296a04ab68932a31dd533e'
          '6c596129fb48316226ce3adfd3a4c86d'
@@ -249,9 +249,6 @@
 	chown root.root -R ${pkgdir}/
 	chmod +rX -R ${pkgdir}/usr
 
-	# some cleanup
-#	find ${pkgdir}/usr/share/icons -depth -name "CVS" -type d -exec rm -r {} \; > /dev/null 2>&1 # still needed?
-
 	## Develize it for BETA!
 	cd ${pkgdir}/opt/
 	mv openoffice openoffice-beta