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

[andyrtr at archlinux.org]

    Date: Friday, January 30, 2009 @ 17:28:32
  Author: andyrtr
Revision: 25853

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

........
  r25851 | andyrtr | 2009-01-30 20:55:14 +0000 (Fr, 30 Jan 2009) | 2 lines
  
  upgpkg: openoffice-base-devel 3.2_dev300_m41-1
      new snapshot DEV300_m41
........

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

-----------+
 ChangeLog |    4 ++++
 PKGBUILD  |   11 +++--------
 2 files changed, 7 insertions(+), 8 deletions(-)


Property changes on: openoffice-base-devel/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-devel/trunk:1-25673
   + /openoffice-base-devel/trunk:1-25852

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-01-30 20:55:50 UTC (rev 25852)
+++ extra-x86_64/ChangeLog	2009-01-30 22:28:32 UTC (rev 25853)
@@ -1,3 +1,7 @@
+openoffice-base-devel - 3.2_dev300_m41-1
+- next snapshot
+- disable qadevooo again
+
 openoffice-base-devel - 3.1_dev300_m40-1
 - next snapshot
 - use internal boost, #12983

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-01-30 20:55:50 UTC (rev 25852)
+++ extra-x86_64/PKGBUILD	2009-01-30 22:28:32 UTC (rev 25853)
@@ -2,11 +2,11 @@
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgname=openoffice-base-devel
-pkgver=3.1_dev300_m40
+pkgver=3.2_dev300_m41
 pkgrel=1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=('i686' 'x86_64')
-_OO_milestone=DEV300_m40
+_OO_milestone=DEV300_m41
 license=('LGPL3')
 url="http://www.openoffice.org"
 install=openoffice.install
@@ -67,7 +67,6 @@
 	# his digital certificates. Nss stores digital certificates in your mozilla firefox profile. 
 	patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff || return 1
 
-
 	# important bugfixes
 	# try to fix non-gtk integration 
 	patch -Np0 -i ${srcdir}/shell.patch || return 1
@@ -108,6 +107,7 @@
 	--disable-minimizer\
 	--disable-odk\
 	--disable-pdfimport\
+	--disable-qadevooo\
 	--disable-reportdesign\
 	--disable-systray\
 	--disable-mathmldtd\
@@ -160,11 +160,6 @@
 
 #	--with-system-boost\
 
-#	--disable-qadevooo\ http://www.openoffice.org/issues/show_bug.cgi?id=91452
-#	--enable-evolution2\
-#	--with-system-dicts\
-
-
 	# Setup environment for build
 	if [ "$CARCH" = "x86_64" ]; then
 	  source LinuxX86-64Env.Set.sh