ooo-build r13208 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Jul 14 23:51:38 2008
New Revision: 13208
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13208&view=rev

Log:
        * patches/dev300/apply,
          patches/dev300/debian-system-jfreereport.diff,
          patches/dev300/debian-system-jfreereport-m21.dif,
          patches/dev300/system-lpsolve-rpath.diff,
          patches/dev300/system-lpsolve-rpath-m21.diff: update debian only
          patches for >= m22


Added:
   trunk/patches/dev300/debian-system-jfreereport-m21.diff
      - copied unchanged from r13206, /trunk/patches/dev300/debian-system-jfreereport.diff
   trunk/patches/dev300/system-lpsolve-rpath-m21.diff   (props changed)
      - copied unchanged from r13206, /trunk/patches/dev300/system-lpsolve-rpath.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/debian-system-jfreereport.diff
   trunk/patches/dev300/system-lpsolve-rpath.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 14 23:51:38 2008
@@ -1796,7 +1796,11 @@
 [ DebianSidOnly ]
 static-libs-use-_pic.diff, rengelha
 # link dynamically with liblpsolve55.so
+
+[ DebianSidOnly >= dev300-m22 ]
 system-lpsolve-rpath.diff, rengelha
+[ DebianSidOnly < dev300-m22 ]
+system-lpsolve-rpath-m21.diff, rengelha
 
 [ UbuntuOnly ]
 writer-default-font.diff, mklose
@@ -2213,8 +2217,11 @@
 palette-enhanced-gradient.diff
 palette-enhanced-hatch.diff
 
-[ DebianBaseOnly ]
+[ DebianBaseOnly >= dev300-m22 ]
 debian-system-jfreereport.diff
+[ DebianBaseOnly < dev300-m22 ]
+debian-system-jfreereport.diff
+[ DebianBaseOnly ]
 debian-system-apache-commons.diff
 # FIXME: does this need more for DEV300s new external modules?
 configures-explicit-arch.diff

Modified: trunk/patches/dev300/debian-system-jfreereport.diff
==============================================================================
--- trunk/patches/dev300/debian-system-jfreereport.diff	(original)
+++ trunk/patches/dev300/debian-system-jfreereport.diff	Mon Jul 14 23:51:38 2008
@@ -5,13 +5,14 @@
 diff -u -u -r1.2.68.1 Manifest.mf
 --- reportdesign/java/com/sun/star/report/pentaho/Manifest.mf        11 Jan 2008 08:20:34 -0000      1.2.68.1
 +++ reportdesign/java/com/sun/star/report/pentaho/Manifest.mf        15 Jan 2008 01:33:52 -0000
-@@ -1,6 +1,13 @@
+@@ -1,7 +1,14 @@
  RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory
--Class-Path: flute-1.3-jfree-20061107.jar jcommon-1.0.10.jar
+ Class-Path: reportbuilderwizard.jar
+-  flute-1.3-jfree-20061107.jar jcommon-1.0.10.jar	
 -  jcommon-serializer-0.2.0.jar libfonts-0.3.3.jar libformula-0.1.14.jar
--  liblayout-0.2.8.jar libloader-0.3.6.jar librepository-0.1.4.jar
+-  liblayout-0.2.8.jar libloader-0.3.6.jar librepository-0.1.4.jar 
 -  libxml-0.9.9.jar pentaho-reporting-flow-engine-0.9.2.jar sac.jar
-+Class-Path: file:///usr/share/java/flute-1.3-jfree.jar
++  file:///usr/share/java/flute-1.3-jfree.jar
 +  file:///usr/share/java/jcommon.jar
 +  file:///usr/share/java/jcommon-serializer.jar
 +  file:///usr/share/java/libfonts.jar
@@ -22,7 +23,7 @@
 +  file:///usr/share/java/libxml.jar
 +  file:///usr/share/java/pentaho-reporting-flow-engine.jar
 +  file:///usr/share/java/sac.jar
- UNO-Type-Path:
+ UNO-Type-Path: 
 Index: util/makefile.mk
 ===================================================================
 RCS file: /cvs/dba/reportdesign/util/makefile.mk,v
@@ -30,12 +31,10 @@
 diff -u -u -r1.10.2.1 makefile.mk
 --- reportdesign/util/makefile.mk    11 Jan 2008 08:21:17 -0000      1.10.2.1
 +++ reportdesign/util/makefile.mk    15 Jan 2008 01:33:52 -0000
-@@ -216,25 +216,11 @@
- COMPONENT_JARFILES = \
- 	$(EXTENSIONDIR)$/sun-report-builder.jar
+@@ -222,17 +222,6 @@
  
--# .jar files from solver
--COMPONENT_EXTJARFILES = \
+ # .jar files from solver
+ COMPONENT_EXTJARFILES = \
 -	$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar				\
 -	$(EXTENSIONDIR)$/jcommon-1.0.10.jar					\
 -	$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar				\
@@ -46,14 +45,7 @@
 -	$(EXTENSIONDIR)$/librepository-0.1.4.jar				\
 -	$(EXTENSIONDIR)$/libxml-0.9.9.jar					\
 -	$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar		\
--	$(EXTENSIONDIR)$/sac.jar
--
- COMPONENT_MANIFEST_GENERIC:=TRUE
- COMPONENT_MANIFEST_SEARCHDIR:=registry
- 
- # make sure to add your custom files here
--EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES)
-+EXTENSION_PACKDEPS=$(COMPONENT_HTMLFILES)
- 
- # --- Targets ----------------------------------
+-	$(EXTENSIONDIR)$/sac.jar                                                \
+ 	$(EXTENSIONDIR)$/sun-report-builder.jar
  
+ COMPONENT_MANIFEST_GENERIC:=TRUE

Modified: trunk/patches/dev300/system-lpsolve-rpath.diff
==============================================================================
--- trunk/patches/dev300/system-lpsolve-rpath.diff	(original)
+++ trunk/patches/dev300/system-lpsolve-rpath.diff	Mon Jul 14 23:51:38 2008
@@ -11,8 +11,8 @@
 +.ELSE
  LPSOLVELIB=-llpsolve55
 +.ENDIF
- SOFFICELIB=-lsoffice
- UNOPKGLIB=-lunopkg
+ SOFFICELIB=-lsofficeapp
+ UNOPKGLIB=-lunopkgapp
  
 --- config_office/configure.in-old	2008-04-29 12:59:49.000000000 +0200
 +++ config_office/configure.in	2008-04-29 13:00:07.000000000 +0200