GNOME.org
 

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

Author: rengelhard
Date: Mon Jan 26 17:05:15 2009
New Revision: 15153
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15153&view=rev

Log:
2009-01-26  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/cws-native220.diff: backport


Added:
   trunk/patches/dev300/cws-native220.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jan 26 17:05:15 2009
@@ -323,6 +323,9 @@
 # IMPORT filter.
 cws-rt36.diff
 
+[ CWSBackports >= dev300-m39 < dev300-m41 ]
+cws-native220.diff, i#98168
+
 [ WPG ]
 # libwpg-based import filter for WordPerfect Graphics
 libwpg.diff

Added: trunk/patches/dev300/cws-native220.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/cws-native220.diff	Mon Jan 26 17:05:15 2009
@@ -0,0 +1,544 @@
+Index: instsetoo_native/res/DS_Store
+===================================================================
+Kann nicht anzeigen: Dateityp ist als binÃr angegeben.
+svn:mime-type = application/octet-stream
+Index: instsetoo_native/util/openoffice.lst
+===================================================================
+--- instsetoo_native/util/openoffice.lst	(Revision 266492)
++++ instsetoo_native/util/openoffice.lst	(Revision 266939)
+@@ -4,24 +4,24 @@ Globals
+ 	{
+ 		variables
+ 		{
+-			OOOBASEVERSION 3.0
+-			OOOPACKAGEVERSION 3.0.0
+-			UREPACKAGEVERSION 1.4.0
++			OOOBASEVERSION 3.1
++			OOOPACKAGEVERSION 3.1.0
++			UREPACKAGEVERSION 1.5.0
+ 			URELAYERVERSION 1
+ 			BASISROOTNAME OpenOffice.org
+ 			UNIXBASISROOTNAME openoffice.org
+-			SERVICETAG_PRODUCTNAME OpenOffice.org 3.0 
+-			SERVICETAG_PRODUCTVERSION 3.0
+-			SERVICETAG_PARENTNAME OpenOffice.org 3.0 
++			SERVICETAG_PRODUCTNAME OpenOffice.org 3.1 
++			SERVICETAG_PRODUCTVERSION 3.1
++			SERVICETAG_PARENTNAME OpenOffice.org 3.1 
+ 			SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
+-			SERVICETAG_URN urn:uuid:00c01e7f-36f9-11dd-9b49-080020a9ed93
++			SERVICETAG_URN urn:uuid:67d59a0f-7902-11dd-938b-080020a9ed93
+ 			HIDELICENSEDIALOG 1
+ 			PACKAGEPREFIX 
+ 			BASISPACKAGEPREFIX ooobasis
+ 			UREPACKAGEPREFIX openoffice.org
+ 			SOLSUREPACKAGEPREFIX openofficeorg
+ 			USE_FILEVERSION 1
+-			LIBRARYVERSION 9.0.0
++			LIBRARYVERSION 9.1.0
+             REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
+ 			REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
+ 			PROGRESSBARCOLOR 4,68,155
+@@ -46,7 +46,7 @@ OpenOffice
+ 		variables
+ 		{
+ 			PRODUCTNAME OpenOffice.org
+-			PRODUCTVERSION 3.0
++			PRODUCTVERSION 3.1
+ 			PRODUCTEXTENSION 
+ 			LONG_PRODUCTEXTENSION 
+ 			SHORT_PRODUCTEXTENSION 
+@@ -54,9 +54,10 @@ OpenOffice
+             POSTVERSIONEXTENSIONUNIX
+ 			BRANDPACKAGEVERSION 3
+ 			USERDIRPRODUCTVERSION 3
+-			ABOUTBOXPRODUCTVERSION 3.0.0
+-			BASEPRODUCTVERSION 3.0
+-			UPDATEURL http://update30.services.openoffice.org/ProductUpdateService/check.Update
++			ABOUTBOXPRODUCTVERSION 3.1.0
++			BASEPRODUCTVERSION 3.1
++            PCPFILENAME openoffice.pcp
++			UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
+             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+ 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+ 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+@@ -65,7 +66,7 @@ OpenOffice
+ 			FILEFORMATNAME OpenOffice.org
+ 			FILEFORMATVERSION 1.0
+ 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+-			PACKAGEVERSION 3.0.0
++			PACKAGEVERSION 3.1.0
+ 			PACKAGEREVISION {milestone}
+ 			LICENSENAME LGPL
+ 			SERVICESPROJEKT 1
+@@ -81,7 +82,7 @@ OpenOffice
+ 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ 			CHANGETARGETDIR 1
+ 			USE_FILEVERSION 1
+-			LIBRARYVERSION 9.0.0
++			LIBRARYVERSION 9.1.0
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			DOWNLOADBANNER	ooobanner.bmp
+ 			DOWNLOADBITMAP	ooobitmap.bmp
+@@ -109,7 +110,7 @@ OpenOffice_wJRE
+ 		variables
+ 		{
+ 			PRODUCTNAME OpenOffice.org
+-			PRODUCTVERSION 3.0
++			PRODUCTVERSION 3.1
+ 			PRODUCTEXTENSION 
+ 			LONG_PRODUCTEXTENSION 
+ 			SHORT_PRODUCTEXTENSION 
+@@ -117,9 +118,9 @@ OpenOffice_wJRE
+             POSTVERSIONEXTENSIONUNIX
+ 			BRANDPACKAGEVERSION 3
+ 			USERDIRPRODUCTVERSION 3
+-			ABOUTBOXPRODUCTVERSION 3.0.0
+-			BASEPRODUCTVERSION 3.0
+-			UPDATEURL http://update30.services.openoffice.org/ProductUpdateService/check.Update
++			ABOUTBOXPRODUCTVERSION 3.1.0
++			BASEPRODUCTVERSION 3.1
++			UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
+             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+ 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+ 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+@@ -128,7 +129,7 @@ OpenOffice_wJRE
+ 			FILEFORMATNAME OpenOffice.org
+ 			FILEFORMATVERSION 1.0
+ 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+-			PACKAGEVERSION 3.0.0
++			PACKAGEVERSION 3.1.0
+ 			PACKAGEREVISION {milestone}
+ 			LICENSENAME LGPL
+ 			SERVICESPROJEKT 1
+@@ -144,7 +145,7 @@ OpenOffice_wJRE
+ 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ 			CHANGETARGETDIR 1
+ 			USE_FILEVERSION 1
+-			LIBRARYVERSION 9.0.0
++			LIBRARYVERSION 9.1.0
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			JAVAPRODUCT 1
+ 			DOWNLOADBANNER	ooobanner.bmp
+@@ -153,7 +154,7 @@ OpenOffice_wJRE
+ 			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
+             REGISTRATION_PRODUCT OpenOffice.org
+             REGISTRATION_CID 926117
+ 		}
+@@ -172,7 +173,7 @@ OpenOffice_Dev
+ 		variables
+ 		{
+ 			PRODUCTNAME OOo-dev
+-			PRODUCTVERSION 3.0
++			PRODUCTVERSION 3.1
+ 			PRODUCTEXTENSION 
+ 			LONG_PRODUCTEXTENSION 
+ 			SHORT_PRODUCTEXTENSION 
+@@ -182,21 +183,22 @@ OpenOffice_Dev
+             POSTVERSIONEXTENSIONUNIX
+ 			BRANDPACKAGEVERSION 3
+ 			USERDIRPRODUCTVERSION 3
+-			ABOUTBOXPRODUCTVERSION 3.0.0
+-			BASEPRODUCTVERSION 3.0
++			ABOUTBOXPRODUCTVERSION 3.1.0
++			BASEPRODUCTVERSION 3.1
+ 			DEVELOPMENTPRODUCT 1
+ 			BASISPACKAGEPREFIX ooobasis-dev
+ 			UREPACKAGEPREFIX ooodev
+ 			SOLSUREPACKAGEPREFIX ooodev
+ 			REGISTRYLAYERNAME LayerDev
+-			UPDATEURL http://update30.services.openoffice.org/ProductUpdateService/check.Update
++			SERVICETAG_URN urn:uuid:07a3230b-7902-11dd-938b-080020a9ed93
++			UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
+             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+ 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+ 			EVAL
+ 			FILEFORMATNAME OpenOffice.org
+ 			FILEFORMATVERSION 1.0
+ 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+-			PACKAGEVERSION 3.0.0
++			PACKAGEVERSION 3.1.0
+ 			PACKAGEREVISION {milestone}
+ 			LICENSENAME LGPL
+ 			SERVICESPROJEKT 1
+@@ -213,7 +215,7 @@ OpenOffice_Dev
+ 			CHANGETARGETDIR 1
+ 			USE_FILEVERSION 1
+ 			JAVAPRODUCT 1
+-			LIBRARYVERSION 9.0.0
++			LIBRARYVERSION 9.1.0
+ 			PATCHCODEFILE ooodev_patchcodes.txt
+ 			CODEFILENAME codes_ooodev.txt
+ 			DOWNLOADBANNER	ooobanner.bmp
+@@ -223,7 +225,7 @@ OpenOffice_Dev
+ 			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
+             REGISTRATION_PRODUCT OpenOffice.org
+             REGISTRATION_CID 926117
+ 		}
+@@ -244,8 +246,8 @@ URE
+         variables
+         {
+             PRODUCTNAME URE
+-            PRODUCTVERSION 1.4
+-            PACKAGEVERSION 1.4
++            PRODUCTVERSION 1.5
++            PACKAGEVERSION 1.5
+             PACKAGEREVISION 1
+             PRODUCTEXTENSION
+             LONG_PRODUCTEXTENSION
+@@ -255,6 +257,7 @@ URE
+             SETSTATICPATH 1
+             NOVERSIONINDIRNAME 1
+             PROGRAMFILESROOT 1
++            PCPFILENAME ure.pcp
+             GLOBALFILEGID gid_File_Dl_Cppu
+             DOWNLOADBANNER urebanner.bmp
+             DOWNLOADBITMAP urebitmap.bmp
+@@ -264,7 +267,7 @@ URE
+             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
+             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
+ 			PACKAGEMAP package_names_ext.txt
+         }
+@@ -283,18 +286,18 @@ OpenOffice_SDK
+         variables
+         {
+             PRODUCTNAME OpenOffice.org
+-            PRODUCTVERSION 3.0
++            PRODUCTVERSION 3.1
+             PRODUCTEXTENSION
+             LONG_PRODUCTEXTENSION
+             SHORT_PRODUCTEXTENSION
+             POSTVERSIONEXTENSION SDK
+             POSTVERSIONEXTENSIONUNIX sdk
+             BRANDPACKAGEVERSION 3
+-            PACKAGEVERSION 3.0.0
++            PACKAGEVERSION 3.1.0
+             PACKAGEREVISION {milestone}
+             PACK_INSTALLED 1
+             DMG_VOLUMEEXTENSION SDK
+-	    DATABASENAME openofficeorg30sdk
++            DATABASENAME openofficeorg31sdk
+             NO_README_IN_ROOTDIR 1
+             LICENSENAME LGPL
+             IGNOREDIRECTORYLAYER 1
+@@ -308,7 +311,7 @@ OpenOffice_SDK
+             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
+         }
+         active 1
+         compression 5
+@@ -324,7 +327,7 @@ BrOffice
+ 		variables
+ 		{
+ 			PRODUCTNAME BrOffice.org
+-			PRODUCTVERSION 3.0
++			PRODUCTVERSION 3.1
+ 			PRODUCTEXTENSION 
+ 			LONG_PRODUCTEXTENSION 
+ 			SHORT_PRODUCTEXTENSION 
+@@ -332,12 +335,12 @@ BrOffice
+             POSTVERSIONEXTENSIONUNIX
+ 			BRANDPACKAGEVERSION 3
+ 			USERDIRPRODUCTVERSION 3
+-			ABOUTBOXPRODUCTVERSION 3.0.0
++			ABOUTBOXPRODUCTVERSION 3.1.0
+ 			PROGRESSBARCOLOR 
+ 			PROGRESSSIZE 
+ 			PROGRESSPOSITION 
+ 			PROGRESSFRAMECOLOR 
+-			UPDATEURL http://update30.services.openoffice.org/ProductUpdateService/check.Update
++			UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
+             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+ 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+ 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+@@ -346,7 +349,7 @@ BrOffice
+ 			FILEFORMATNAME OpenOffice.org
+ 			FILEFORMATVERSION 1.0
+ 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+-			PACKAGEVERSION 3.0.0
++			PACKAGEVERSION 3.1.0
+ 			PACKAGEREVISION {milestone}
+ 			LICENSENAME LGPL
+ 			SERVICESPROJEKT 1
+@@ -362,7 +365,7 @@ BrOffice
+ 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ 			CHANGETARGETDIR 1
+ 			USE_FILEVERSION 1
+-			LIBRARYVERSION 9.0.0
++			LIBRARYVERSION 9.1.0
+ 			CODEFILENAME codes_broo.txt
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			DOWNLOADBANNER	brobanner.bmp
+@@ -371,7 +374,7 @@ BrOffice
+ 			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
+             REGISTRATION_PRODUCT OpenOffice.org
+             REGISTRATION_CID 926117
+ 		}
+@@ -391,7 +394,7 @@ BrOffice_wJRE
+ 		variables
+ 		{
+ 			PRODUCTNAME BrOffice.org
+-			PRODUCTVERSION 3.0
++			PRODUCTVERSION 3.1
+ 			PRODUCTEXTENSION 
+ 			LONG_PRODUCTEXTENSION 
+ 			SHORT_PRODUCTEXTENSION 
+@@ -399,12 +402,12 @@ BrOffice_wJRE
+             POSTVERSIONEXTENSIONUNIX
+ 			BRANDPACKAGEVERSION 3
+ 			USERDIRPRODUCTVERSION 3
+-			ABOUTBOXPRODUCTVERSION 3.0.0
++			ABOUTBOXPRODUCTVERSION 3.1.0
+ 			PROGRESSBARCOLOR 
+ 			PROGRESSSIZE 
+ 			PROGRESSPOSITION 
+ 			PROGRESSFRAMECOLOR 
+-			UPDATEURL http://update30.services.openoffice.org/ProductUpdateService/check.Update
++			UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
+             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+ 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+ 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+@@ -413,7 +416,7 @@ BrOffice_wJRE
+ 			FILEFORMATNAME OpenOffice.org
+ 			FILEFORMATVERSION 1.0
+ 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+-			PACKAGEVERSION 3.0.0
++			PACKAGEVERSION 3.1.0
+ 			PACKAGEREVISION {milestone}
+ 			LICENSENAME LGPL
+ 			SERVICESPROJEKT 1
+@@ -429,7 +432,7 @@ BrOffice_wJRE
+ 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ 			CHANGETARGETDIR 1
+ 			USE_FILEVERSION 1
+-			LIBRARYVERSION 9.0.0
++			LIBRARYVERSION 9.1.0
+ 			CODEFILENAME codes_broo.txt
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			JAVAPRODUCT 1
+@@ -439,7 +442,7 @@ BrOffice_wJRE
+ 			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
+             REGISTRATION_PRODUCT OpenOffice.org
+             REGISTRATION_CID 926117
+ 		}
+@@ -458,7 +461,7 @@ BrOffice_Dev
+ 		variables
+ 		{
+ 			PRODUCTNAME BrOo-dev
+-			PRODUCTVERSION 3.0
++			PRODUCTVERSION 3.1
+ 			PRODUCTEXTENSION 
+ 			LONG_PRODUCTEXTENSION 
+ 			SHORT_PRODUCTEXTENSION 
+@@ -468,7 +471,7 @@ BrOffice_Dev
+             POSTVERSIONEXTENSIONUNIX
+ 			BRANDPACKAGEVERSION 3
+ 			USERDIRPRODUCTVERSION 3
+-			ABOUTBOXPRODUCTVERSION 3.0.0
++			ABOUTBOXPRODUCTVERSION 3.1.0
+ 			DEVELOPMENTPRODUCT 1
+ 			PROGRESSBARCOLOR 
+ 			PROGRESSSIZE 
+@@ -478,14 +481,15 @@ BrOffice_Dev
+ 			UREPACKAGEPREFIX ooodev
+ 			SOLSUREPACKAGEPREFIX ooodev
+ 			REGISTRYLAYERNAME LayerDevBroffice
+-			UPDATEURL http://update30.services.openoffice.org/ProductUpdateService/check.Update
++			SERVICETAG_URN urn:uuid:07a3230b-7902-11dd-938b-080020a9ed93
++			UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
+             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
+ 			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+ 			EVAL
+ 			FILEFORMATNAME OpenOffice.org
+ 			FILEFORMATVERSION 1.0
+ 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+-			PACKAGEVERSION 3.0.0
++			PACKAGEVERSION 3.1.0
+ 			PACKAGEREVISION {milestone}
+ 			LICENSENAME LGPL
+ 			SERVICESPROJEKT 1
+@@ -502,7 +506,7 @@ BrOffice_Dev
+ 			CHANGETARGETDIR 1
+ 			USE_FILEVERSION 1
+ 			JAVAPRODUCT 1
+-			LIBRARYVERSION 9.0.0
++			LIBRARYVERSION 9.1.0
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			CODEFILENAME codes_broodev.txt
+ 			DOWNLOADBANNER	brobanner.bmp
+@@ -512,7 +516,7 @@ BrOffice_Dev
+ 			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
+             REGISTRATION_PRODUCT OpenOffice.org
+             REGISTRATION_CID 926117
+ 		}
+Index: solenv/bin/modules/installer/epmfile.pm
+===================================================================
+--- solenv/bin/modules/installer/epmfile.pm	(Revision 266492)
++++ solenv/bin/modules/installer/epmfile.pm	(Revision 266939)
+@@ -1034,7 +1034,7 @@ sub set_revision_in_pkginfo
+ 	my $pkgversion = "SOLSPARCPKGVERSION";
+ 	if ( $installer::globals::issolarisx86build ) { $pkgversion = "SOLIAPKGVERSION"; }
+ 	
+-	if ( $variables->{$pkgversion} )
++	if (( $variables->{$pkgversion} ) &&  ( $variables->{$pkgversion} ne "" ))
+ 	{
+ 		if ( $variables->{$pkgversion} ne "FINALVERSION" )
+ 		{
+Index: sysui/desktop/debian/makefile.mk
+===================================================================
+--- sysui/desktop/debian/makefile.mk	(Revision 266492)
++++ sysui/desktop/debian/makefile.mk	(Revision 266939)
+@@ -49,7 +49,7 @@ TARGET=debian
+ 
+ .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
+ 
+-DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i3.0-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
++DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i3.1-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+ 
+ .ENDIF
+ 
+@@ -64,22 +64,22 @@ ALLTAR : $(DEBFILES)
+ 
+ %/DEBIAN/control : $$(@:f)
+ 	@$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
+-	ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.0//)) $*$/etc$/
+-	/bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.0//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
+-        @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.0//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.0//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.0//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.0//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.0//)
+-	echo "Package: $(*:f:s/_/ /:1:s/3.0//)" > $@
+-	cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.0//))/" >> $@
+-	echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.0//))-$(PKGREV)" >> $@
++	ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.1//)) $*$/etc$/
++	/bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.1//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
++        @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.1//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.1//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.1//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.1//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.1//)
++	echo "Package: $(*:f:s/_/ /:1:s/3.1//)" > $@
++	cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.1//))/" >> $@
++	echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.1//))-$(PKGREV)" >> $@
+ 	@du -k -s $* | awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >> $@
+ 
+ %/DEBIAN/postinst : $$(@:f)
+-	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.0//))/g" > $@
++	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.1//))/g" > $@
+ 
+ %/DEBIAN/postrm : $$(@:f)
+-	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.0//))/g" > $@
++	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.1//))/g" > $@
+ 
+ %/DEBIAN/prerm : $$(@:f)
+-	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.0//))/g" > $@
++	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.1//))/g" > $@
+ 
+ # --- packaging ---------------------------------------------------
+ 
+Index: sysui/desktop/productversion.mk
+===================================================================
+--- sysui/desktop/productversion.mk	(Revision 266492)
++++ sysui/desktop/productversion.mk	(Revision 266939)
+@@ -50,7 +50,7 @@ PKGDIR=$(BIN)
+ PRODUCTLIST = openoffice.org broffice.org
+ 
+ # default values to minimize maintainance effort 
+-PRODUCTVERSION = 3.0
++PRODUCTVERSION = 3.1
+ PRODUCTVERSIONSHORT = 3
+ PKGVERSION = $(PRODUCTVERSION)
+ # gnome-vfs treats everything behind the last '.' as an icon extension, 
+Index: sysui/desktop/slackware/makefile.mk
+===================================================================
+--- sysui/desktop/slackware/makefile.mk	(Revision 266492)
++++ sysui/desktop/slackware/makefile.mk	(Revision 266939)
+@@ -44,7 +44,7 @@ TARGET=slackware
+ 
+ # --- Files --------------------------------------------------------
+ 
+-MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.0-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
++MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.1-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
+ 
+ .IF "$(USE_SHELL)"=="bash"
+ ECHOPARAM=-e
+@@ -67,26 +67,26 @@ $(MISC)/$(TARGET)/usr/share/applications/ :
+ # FIXME: removal of *-extension.* only to create identical packages to OOF680
+ %/usr/share/applications : 
+ 	@$(MKDIRHIER) $@
+-	/bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.0//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.0//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
++	/bin/sh -c "cd $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.1//); DESTDIR=$(shell @cd $*; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.1//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
+ 	$(RM) $*$/opt$/kde$/share$/icons$/*$/*$/*$/*-extension.png	
+ 	$(RM) $*$/opt$/kde$/share$/mimelnk$/application$/*-extension.desktop 
+ 	$(RM) $*$/usr$/share$/applications$/*.desktop
+ 	$(RM) $*$/usr$/bin$/soffice
+ 
+ %$/install$/doinst.sh : update-script
+-	@echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//)) )" > $@
+-	@echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//)) )" >> $@
++	@echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.1//)) )" > $@
++	@echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.1//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.1//)) )" >> $@
+ 	@echo "( cd usr/bin ; rm -rf soffice )" >> $@
+-	@echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//))/program/soffice soffice )" >> $@
+-	@echo $(ECHOPARAM) $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.0//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//))-$i )") >> $@
++	@echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.1//))/program/soffice soffice )" >> $@
++	@echo $(ECHOPARAM) $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.1//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.1//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.1//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.1//))-$i )") >> $@
+ 	@cat $< >> $@
+ 
+ %$/install$/slack-desc : slack-desc
+ 	@$(MKDIRHIER) $(@:d)
+-	@sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/3.0//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/3.0//))/g" \
+-		-e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.0//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/3.0//))/g" \
+-		-e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.0//))/g" \
+-		-e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//))/g" $< > $@
++	@sed -e "s/PKGNAME/$(*:b:s/-/ /:1:s/3.1//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(*:b:s/-/ /:1:s/3.1//))/g" \
++		-e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.1//)) $(PRODUCTVERSION.$(*:b:s/-/ /:1:s/3.1//))/g" \
++		-e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.1//))/g" \
++		-e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.1//))/g" $< > $@
+ 
+ # needed to satisfy the slackware package tools - they need
+ # the entries like this
+Index: setup_native/source/win32/nsis/ooobanner.bmp
+===================================================================
+Kann nicht anzeigen: Dateityp ist als binÃr angegeben.
+svn:mime-type = application/octet-stream
+Index: setup_native/source/win32/nsis/brobanner.bmp
+===================================================================
+Kann nicht anzeigen: Dateityp ist als binÃr angegeben.
+svn:mime-type = application/octet-stream
+Index: setup_native/source/win32/nsis/brobitmap.bmp
+===================================================================
+Kann nicht anzeigen: Dateityp ist als binÃr angegeben.
+svn:mime-type = application/octet-stream
+Index: ooo_custom_images/broffice/introabout/about.bmp
+===================================================================
+Kann nicht anzeigen: Dateityp ist als binÃr angegeben.
+svn:mime-type = application/octet-stream
+Index: ooo_custom_images/broffice/introabout/intro.bmp
+===================================================================
+Kann nicht anzeigen: Dateityp ist als binÃr angegeben.
+svn:mime-type = application/octet-stream
+Index: ooo_custom_images/nologo_broffice/introabout/intro.bmp
+===================================================================
+Kann nicht anzeigen: Dateityp ist als binÃr angegeben.
+svn:mime-type = application/octet-stream
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]