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

[andyrtr at archlinux.org]

    Date: Thursday, November 19, 2009 @ 14:05:07
  Author: andyrtr
Revision: 59052

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

........
  r57083 | andyrtr | 2009-10-31 13:54:43 +0100 (Sa, 31 Okt 2009) | 1 line
  
  add KDE4 support to the profile file
........
  r59049 | andyrtr | 2009-11-19 18:13:56 +0100 (Do, 19 Nov 2009) | 2 lines
  
  upgpkg: openoffice-base-devel 3.2_dev300_m65-1
      new snapshot DEV300_m65
........

Modified:
  openoffice-base-devel/repos/extra-i686/	(properties)
  openoffice-base-devel/repos/extra-i686/ChangeLog
  openoffice-base-devel/repos/extra-i686/PKGBUILD
  openoffice-base-devel/repos/extra-i686/openoffice.install
  openoffice-base-devel/repos/extra-i686/openoffice.profile

--------------------+
 ChangeLog          |    6 ++++++
 PKGBUILD           |    4 ++--
 openoffice.install |    2 +-
 openoffice.profile |    1 +
 4 files changed, 10 insertions(+), 3 deletions(-)


Property changes on: openoffice-base-devel/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-devel/trunk:1-56844
   + /openoffice-base-devel/trunk:1-59051

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-11-19 17:25:37 UTC (rev 59051)
+++ extra-i686/ChangeLog	2009-11-19 19:05:07 UTC (rev 59052)
@@ -1,3 +1,9 @@
+2009-11-19 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.2_dev300_m65-1:
+        - new snapshot
+	- add KDE4 support to the profile file + install msg
+
 2009-10-28 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2_dev300_m63-1:

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-11-19 17:25:37 UTC (rev 59051)
+++ extra-i686/PKGBUILD	2009-11-19 19:05:07 UTC (rev 59052)
@@ -5,7 +5,7 @@
 
 pkgbase="openoffice-base-devel"
 pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m63
+_OO_milestone=DEV300_m65
 pkgver=3.2_${_OO_milestone/DEV/dev}
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -38,7 +38,7 @@
 build() {
 	# now mercurial http://wiki.services.openoffice.org/wiki/Mercurial_Pilot and http://wiki.services.openoffice.org/wiki/OOo_and_Mercurial
 #	mkdir -p ${srcdir}/${_OO_milestone}  # needed?
-	cd ${srcdir}
+#	cd ${srcdir}
 #	hg -v clone -r ${_OO_milestone} http://hg.services.openoffice.org/hg/DEV300 ${srcdir}/${_OO_milestone}
 #	tar -cvzf ../${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
 #	return 1

Modified: extra-i686/openoffice.install
===================================================================
--- extra-i686/openoffice.install	2009-11-19 17:25:37 UTC (rev 59051)
+++ extra-i686/openoffice.install	2009-11-19 19:05:07 UTC (rev 59052)
@@ -3,7 +3,7 @@
 gtk-update-icon-cache -f -q /usr/share/icons/hicolor
 update-desktop-database -q
 
-echo " * relogin or source /etc/profile.d/openoffice-devel.sh"
+echo " * check /etc/profile.d/openoffice-devel.sh, then relogin or \"source\" the file"
 echo " * see http://wiki.archlinux.org/index.php/Openoffice"
 echo "   how to use extensions, e.g. for spell checking"
 echo "   see /usr/lib/openoffice-dev/share/extension/install what"

Modified: extra-i686/openoffice.profile
===================================================================
--- extra-i686/openoffice.profile	2009-11-19 17:25:37 UTC (rev 59051)
+++ extra-i686/openoffice.profile	2009-11-19 19:05:07 UTC (rev 59052)
@@ -1 +1,2 @@
 export OOO_FORCE_DESKTOP=gnome
+#export OOO_FORCE_DESKTOP=KDE4
\ No newline at end of file