[Lunar-commits] CVS: moonbase/zbeta/openoffice-src BUILD, 1.2, 1.3 DEPENDS, 1.2, 1.3 DETAILS, 1.2, 1.3 PRE_BUILD, 1.1, 1.2 build-ooo, 1.2, NONE

[Nick Hudson]

Update of /var/cvs/lunar/moonbase/zbeta/openoffice-src
In directory dbguin.lunar-linux.org:/tmp/cvs-serv15658/openoffice-src

Modified Files:
	BUILD DEPENDS DETAILS PRE_BUILD 
Removed Files:
	build-ooo 
Log Message:

Updating the openoffice-src module, seems to build again now


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/openoffice-src/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	13 Nov 2003 04:29:16 -0000	1.2
+++ BUILD	2 Mar 2004 13:00:31 -0000	1.3
@@ -6,12 +6,16 @@
                 --with-system-gcc \
                 --enable-devel    \
                 --enable-bonobo   \
+                --with-jdk-home=/usr/lib/j2sdk1.4.1/bin \
                 --disable-dependency-tracking \
  		$OPTS &&
 
   default_make   &&
 
-  cp /usr/share/gnome/ximian/applications/* /usr/share/applications/ &&
-  rm -fr /usr/share/gnome/ximian/ 
+  cp etc/autoresponse.conf /etc/openoffice &&
+  cd desktop                               &&
+  cp drawing.desktop presentation.desktop spreadsheet.desktop textdoc.desktop /usr/share/applications/ &&
+  cp *png /usr/share/pixmaps               &&
+  cd $SOURCE_DIRECTORY     
   
 ) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/openoffice-src/DEPENDS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DEPENDS	31 Oct 2003 13:10:28 -0000	1.2
+++ DEPENDS	2 Mar 2004 13:00:31 -0000	1.3
@@ -1,6 +1,5 @@
 depends automake   &&
 depends gnome-vfs2 &&
-depends gnome-cups-manager &&
 depends libbonoboui &&
 depends Linux-PAM  &&
 depends libart_lgpl &&

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/openoffice-src/DETAILS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DETAILS	13 Nov 2003 04:29:16 -0000	1.2
+++ DETAILS	2 Mar 2004 13:00:31 -0000	1.3
@@ -1,19 +1,19 @@
           MODULE=openoffice-src
          VERSION=1.1.0
-          SOURCE=ooo-build-1.1.46.tar.gz
+          SOURCE=ooo-build-1.1.50.tar.gz
           SOURCE2=OOO_1_1_0.tar.bz2
           SOURCE3=ooo-icons-OOO_1_1-6.tar.gz
       SOURCE_URL=http://ooo.ximian.com/packages/OOO_1_1_0/$SOURCE
-      SOURCE_VFY=md5:ff8d22ac9351cc31890baa75480c4f7b
+      SOURCE_VFY=md5:3b5731e74e810265f6806a77e8dcd513
      SOURCE2_URL=http://ooo.ximian.com/packages/OOO_1_1_0/$SOURCE2
      SOURCE2_VFY=md5:4a21da1d8bb5d65360ddd82848ad4b55
      SOURCE3_URL=http://ooo.ximian.com/packages/$SOURCE3
-     SOURCE3_VFY=md5:3f73b262e35011e42d0b4fbfa46c34cd
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/ooo-build-1.1.46
+     SOURCE3_VFY=md5:3f73b262e35011e42d0b4fbfa46c34cd 
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ooo-build-1.1.50
       MAINTAINER=nhudson at lunar-linux.org
         WEB_SITE=http://ooo.ximian.com
          ENTERED=20030805
-         UPDATED=20031113
+         UPDATED=20040302
            SHORT="OO.o Office Suite with Ximian Patches"
 cat << EOF
 OO.o Office Suite with Ximian Patches

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/openoffice-src/PRE_BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PRE_BUILD	31 Oct 2003 13:07:32 -0000	1.1
+++ PRE_BUILD	2 Mar 2004 13:00:31 -0000	1.2
@@ -1,12 +1,8 @@
 ( 
-  
-
-  
   default_pre_build &&
   cd $SOURCE_DIRECTORY &&
   mkdir -p src
   cp $SOURCE_CACHE/$SOURCE2 src/ &&
-  cp $SOURCE_CACHE/$SOURCE3 src/ &&
+  cp $SOURCE_CACHE/$SOURCE3 src/ 
 
-  cp $SCRIPT_DIRECTORY/build-ooo bin/ 
 )

--- build-ooo DELETED ---