ooo-build r14124 - in branches/ooo-build-3-0: . patches/dev300

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14124 - in branches/ooo-build-3-0: . patches/dev300
Date: Sat, 27 Sep 2008 22:35:28 +0000 (UTC)
Author: rengelhard
Date: Sat Sep 27 22:35:28 2008
New Revision: 14124
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14124&view=rev

Log:
2008-09-28  Rene Engelhard  <rene debian org>

        * patches/dev300/buildfix-no-pdfimport.diff: move ...
        * patches/dev300/buildfix_no-pdfimport.diff: ... here and make apply
          (s/xpdf//)
        * patches/dev300/apply,
          patches/dev300/redirect-extensions-m7.diff,
          patches/dev300/redirect-extensions.diff: ooo300-m8


Added:
   branches/ooo-build-3-0/patches/dev300/buildfix-no-pdfimport.diff   (contents, props changed)
      - copied, changed from r14121, /branches/ooo-build-3-0/patches/dev300/buildfix_no-pdfimport.diff
   branches/ooo-build-3-0/patches/dev300/redirect-extensions-m7.diff
      - copied unchanged from r14121, /branches/ooo-build-3-0/patches/dev300/redirect-extensions.diff
Removed:
   branches/ooo-build-3-0/patches/dev300/buildfix_no-pdfimport.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/redirect-extensions.diff

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Sat Sep 27 22:35:28 2008
@@ -351,8 +351,10 @@
 
 [ FixesNotForUpstream <= dev300-m30 <= ooo300-m3 ]
 redirect-extensions-m30.diff
-[ FixesNotForUpstream > dev300-m30 > ooo300-m3 ]
+[ FixesNotForUpstream > dev300-m30 > ooo300-m3 < ooo300-m8 ]
 # re-direct to plugins via http://extensions.go-oo.org/
+redirect-extensions-m7.diff
+[ FixesNotForUpstream >= ooo300-m8 ]
 redirect-extensions.diff
 
 [ BuildBits >= ooo300-m4 < ooo300-m7 ]
@@ -1002,7 +1004,7 @@
 
 [ BuildBits ]
 # no pdfimport extension
-buildfix_no-pdfimport.diff, i#88375, hmth
+buildfix-no-pdfimport.diff, i#88375, hmth
 
 # allow to define java target, so the build is usable with the JVM 1.5
 # even when it is built with JDK 1.6

Copied: branches/ooo-build-3-0/patches/dev300/buildfix-no-pdfimport.diff (from r14121, /branches/ooo-build-3-0/patches/dev300/buildfix_no-pdfimport.diff)
==============================================================================
--- /branches/ooo-build-3-0/patches/dev300/buildfix_no-pdfimport.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/buildfix-no-pdfimport.diff	Sat Sep 27 22:35:28 2008
@@ -1,5 +1,5 @@
---- sdext/source/pdfimport/xpdftest/makefile.mk.orig	2008-09-27 15:55:08.000000000 +0200
-+++ sdext/source/pdfimport/xpdftest/makefile.mk	2008-09-27 15:55:43.000000000 +0200
+--- sdext/source/pdfimport/test/makefile.mk.orig	2008-09-27 15:55:08.000000000 +0200
++++ sdext/source/pdfimport/test/makefile.mk	2008-09-27 15:55:43.000000000 +0200
 @@ -39,6 +39,11 @@
  
  .INCLUDE: settings.mk
@@ -12,8 +12,8 @@
  # --- Targets ------------------------------------------------------
  
  .INCLUDE :  target.mk
---- sdext/source/pdfimport/xpdfwrapper/makefile.mk.orig	2008-09-27 15:55:00.000000000 +0200
-+++ sdext/source/pdfimport/xpdfwrapper/makefile.mk	2008-09-27 15:56:03.000000000 +0200
+--- sdext/source/pdfimport/wrapper/makefile.mk.orig	2008-09-27 15:55:00.000000000 +0200
++++ sdext/source/pdfimport/wrapper/makefile.mk	2008-09-27 15:56:03.000000000 +0200
 @@ -47,6 +47,11 @@
  CFLAGS += -I$(SOLARINCDIR)$/xpdf
  .ENDIF

Modified: branches/ooo-build-3-0/patches/dev300/redirect-extensions.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/redirect-extensions.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/redirect-extensions.diff	Sat Sep 27 22:35:28 2008
@@ -132,10 +132,10 @@
  			RELATIVE_PATHES_IN_DDF 1
 -            STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
 -            STARTCENTER_INFO_URL http://www.openoffice.org
--            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36
+-            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
 +            STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
 +            STARTCENTER_INFO_URL http://www.go-oo.org
-+            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/taxonomy/term/36
++            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
              REGISTRATION_PRODUCT OpenOffice.org
              REGISTRATION_CID 926117
  		}
@@ -145,10 +145,10 @@
  			RELATIVE_PATHES_IN_DDF 1
 -			STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
 -			STARTCENTER_INFO_URL http://www.openoffice.org
--            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36
+-            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
 +			STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
 +			STARTCENTER_INFO_URL http://www.go-oo.org
-+            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/taxonomy/term/36
++            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
              REGISTRATION_PRODUCT OpenOffice.org
              REGISTRATION_CID 926117
  		}
@@ -158,10 +158,10 @@
              RELATIVE_PATHES_IN_DDF 1
 -            STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
 -            STARTCENTER_INFO_URL http://www.openoffice.org
--            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36
+-            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
 +            STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
 +            STARTCENTER_INFO_URL http://www.go-oo.org
-+            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/taxonomy/term/36
++            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
              ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
          }
          active 1
@@ -171,10 +171,10 @@
              RELATIVE_PATHES_IN_DDF 1
 -            STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
 -            STARTCENTER_INFO_URL http://www.openoffice.org
--            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36
+-            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
 +            STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
 +            STARTCENTER_INFO_URL http://www.go-oo.org
-+            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/taxonomy/term/36
++            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
          }
          active 1
          compression 5
@@ -184,10 +184,10 @@
  			RELATIVE_PATHES_IN_DDF 1
 -            STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
 -            STARTCENTER_INFO_URL http://www.openoffice.org
--            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36
+-            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
 +            STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
 +            STARTCENTER_INFO_URL http://www.go-oo.org
-+            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/taxonomy/term/36
++            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
              REGISTRATION_PRODUCT OpenOffice.org
              REGISTRATION_CID 926117
  		}
@@ -197,10 +197,10 @@
  			RELATIVE_PATHES_IN_DDF 1
 -            STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
 -            STARTCENTER_INFO_URL http://www.openoffice.org
--            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36
+-            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
 +            STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
 +            STARTCENTER_INFO_URL http://www.go-oo.org
-+            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/taxonomy/term/36
++            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
              REGISTRATION_PRODUCT OpenOffice.org
              REGISTRATION_CID 926117
  		}
@@ -210,10 +210,10 @@
  			RELATIVE_PATHES_IN_DDF 1
 -            STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
 -            STARTCENTER_INFO_URL http://www.openoffice.org
--            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/taxonomy/term/36
+-            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
 +            STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
 +            STARTCENTER_INFO_URL http://www.go-oo.org
-+            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/taxonomy/term/36
++            STARTCENTER_TEMPLREP_URL http://extensions.go-oo.org/templates?cid=926383
              REGISTRATION_PRODUCT OpenOffice.org
              REGISTRATION_CID 926117
  		}
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]