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

[andyrtr at archlinux.org]

    Date: Wednesday, February 3, 2010 @ 00:43:22
  Author: andyrtr
Revision: 67097

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

........
  r67095 | andyrtr | 2010-02-03 06:15:37 +0100 (Mi, 03 Feb 2010) | 2 lines
  
  upgpkg: openoffice-base-beta 3.2.0_ooo320_m12-1
      new version 3.2.0_ooo320_m12
........

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

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)


Property changes on: openoffice-base-beta/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-beta/trunk:1-65454
   + /openoffice-base-beta/trunk:1-67096

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2010-02-03 05:16:30 UTC (rev 67096)
+++ extra-x86_64/ChangeLog	2010-02-03 05:43:22 UTC (rev 67097)
@@ -1,3 +1,8 @@
+2010-02-02 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.2.0-OOO320_m12-1 :
+	- new snapshot/3.2.0 RC5
+
 2010-01-25 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2.0-OOO320_m11-1 :

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-02-03 05:16:30 UTC (rev 67096)
+++ extra-x86_64/PKGBUILD	2010-02-03 05:43:22 UTC (rev 67097)
@@ -4,18 +4,18 @@
 
 pkgbase="openoffice-base-beta"
 pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
-_OO_milestone=OOO320_m11
-pkgver=3.2.0_${_OO_milestone/OOO/ooo} # m11=3.2.0 RC4
+_OO_milestone=OOO320_m12
+pkgver=3.2.0_${_OO_milestone/OOO/ooo} # m12=3.2.0 RC5
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.openoffice.org"
 makedepends=(# the real makedeps
              'bison' 'svn' 'automake' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl' 'libxtst'
-             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.1.6" 
-             'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler' 'kdelibs' 'pstoedit' 'gconf' "openjdk6>=1.6.2"
+             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.2" 
+             'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler' 'kdelibs' 'pstoedit' 'gconf' "openjdk6>=6.b17_1.7"
 	     # from main OOo the deps
-	     "curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd' 'redland>=1.0.10' 'libxaw' "neon>=0.28.4"
+	     "curl>=7.19.7" "hunspell>=1.2.8" "python>=2.6.4" 'libwpd' 'redland>=1.0.10' 'libxaw' "neon>=0.28.6"
              'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils'
 	     'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'lucene' 'boost>=1.41.0')
 	     # libmythes
@@ -177,7 +177,7 @@
 
  pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite - testing branch leeding to next stable release"
  install=openoffice.install
- depends=("curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd' 'redland' 'libxaw' "neon>=0.28.4" 'gtk2'
+ depends=("curl>=7.19.7" "hunspell>=1.2.8" "python>=2.6.4" 'libwpd' 'redland' 'libxaw' "neon>=0.28.6" 'gtk2'
           'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 
 	  'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'lucene') # 'libmythes'
  optdepends=('java-runtime:	adds java support'