GNOME.org
 

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

Author: kyoshida
Date: Tue Jan 27 19:19:37 2009
New Revision: 15170
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15170&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/cws-native220-m39.diff:
	* patches/dev300/cws-native220.diff:
	* patches/dev300/apply: adjusted for dev300-m40.  Parts of the old patch
	have been upstreamed.



Added:
   trunk/patches/dev300/cws-native220-m39.diff   (props changed)
      - copied unchanged from r15169, /trunk/patches/dev300/cws-native220.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/cws-native220.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 19:19:37 2009
@@ -358,7 +358,10 @@
 # IMPORT filter.
 cws-rt36.diff
 
-[ CWSBackports >= dev300-m39 < dev300-m41 ]
+[ CWSBackports == dev300-m39 ]
+cws-native220-m39.diff, i#98168
+
+[ CWSBackports == dev300-m40 ]
 cws-native220.diff, i#98168
 
 [ WPG ]

Modified: trunk/patches/dev300/cws-native220.diff
==============================================================================
--- trunk/patches/dev300/cws-native220.diff	(original)
+++ trunk/patches/dev300/cws-native220.diff	Tue Jan 27 19:19:37 2009
@@ -1,30 +1,25 @@
-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)
+diff --git instsetoo_native/util/openoffice.lst instsetoo_native/util/openoffice.lst
+index db12652..91b4529 100644
+--- instsetoo_native/util/openoffice.lst
++++ instsetoo_native/util/openoffice.lst
 @@ -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
+ 			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_PRODUCTNAME OpenOffice.org 3.1
 +			SERVICETAG_PRODUCTVERSION 3.1
-+			SERVICETAG_PARENTNAME OpenOffice.org 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
@@ -183,17 +178,6 @@
              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
@@ -398,10 +382,10 @@
              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)
+diff --git solenv/bin/modules/installer/epmfile.pm solenv/bin/modules/installer/epmfile.pm
+index bf70389..ae7f1ef 100644
+--- solenv/bin/modules/installer/epmfile.pm
++++ solenv/bin/modules/installer/epmfile.pm
 @@ -1034,7 +1034,7 @@ sub set_revision_in_pkginfo
  	my $pkgversion = "SOLSPARCPKGVERSION";
  	if ( $installer::globals::issolarisx86build ) { $pkgversion = "SOLIAPKGVERSION"; }
@@ -411,134 +395,3 @@
  	{
  		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]