commit libreoffice-bootstrap for openSUSE:Factory

7 Jan 2011

Hello community,

here is the log from the commit of package libreoffice-bootstrap for openSUSE:Factory
checked in at Fri Jan 7 10:12:29 CET 2011.



--------

--- libreoffice-bootstrap/libreoffice-bootstrap.changes	2010-12-01 20:44:16.000000000 +0100
+++ /mounts/work_src_done/STABLE/libreoffice-bootstrap/libreoffice-bootstrap.changes	2010-12-21 19:55:23.000000000 +0100
@@ -1,0 +2,52 @@
+Tue Dec 21 19:44:02 CET 2010 - pmladek@suse.cz
+
+- updated to libreoffice-3.3.0.2 (3.3-rc2):
+    * common:
+        * copy & paste a text formatted cell (i#115825)
+        * replaced http://www.openoffice.org (fdo#32169)
+    * bootstrap:
+        * check if KDE is >= 4.2
+        * cleanup unfortunate license duplication
+    * calc:
+        * ignore preceding spaces when parsing numbers
+        * make the string 'New Record' localizable (fdo#32209)
+        * remove trailing spaces too when parsing CSV simple numbers
+        * display correct record information in Data Form dialog (fdo#32196)
+    * components:
+        * make the ODMA check box clickable again (fdo#32132)
+        * fixed the sizes of Tips and Extended tips check boxes
+        * make 'Reset help agent' button clickable again (fdo#32132)
+    * extensions:
+        * fix filled polygons on PDF import
+    * filters:
+        * performance for import of XLSX files with drawing objects (i#115940)
+    * impress:
+        * missing embedded object in ODP export (i#115898)
+        * grey as default color for native tables in Impress
+        * graphics on master page cannot be deleted (i#115993)
+    * libs-core:
+        * save with the proper DOC variant (fdo#32219)
+        * removed dupe para ids introduced by copy&paste
+        * colon needed for LD_LIBRARY_PATH set but empty
+        * wikihelp: use the right Help ID URL (fdo#32338)
+        * MySQL Cast(col1 as CHAR) yields error (i#115436)
+        * import compatibility for enhanced fields names (fdo#32172)
+    * libs-extern-sys:
+        * XPATH handling fix
+    * libs-gui:
+        * PPTX import crasher (bnc#654065)
+        * copy&paste problem of metafiles (i#115825)
+        * force Qt paint system to native (fdo#30991)
+        * display problem with Vegur font (fdo#31243)
+        * URIs must be exported as 7bit ASCII (i#115788)
+        * regression in WMF text rendering (fdo#32236, i#115825)
+    * postprocess:
+        * only register EvolutionLocal when EVO support is enabled (fdo#32007)
+    * writer:
+        * after "data to fields" mail merge does not work (fdo#31190)
+        * missing outline feature in new RTF export filter (fdo#32039)
+        * encoding of Greek letters names with accent in French (i#115956)
+    * build bits:
+        * better build identification in the about dialog
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  libreoffice-bootstrap-3.3.0.1.tar.bz2
  libreoffice-build-3.3.0.1.tar.gz
  setup_native_packinfo-3.2.99.3.tar.bz2

New:
----
  libreoffice-bootstrap-3.3.0.2.tar.bz2
  libreoffice-build-3.3.0.1e-piece-sfx2.diff
  libreoffice-build-3.3.0.2-build-fixes.diff
  libreoffice-build-3.3.0.2.tar.gz
  setup_native_packinfo-3.3.0.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libreoffice-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.5TK7Vy/_old	2011-01-07 09:45:43.000000000 +0100
+++ /var/tmp/diff_new_pack.5TK7Vy/_new	2011-01-07 09:45:43.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package libreoffice-bootstrap (Version 3.3.0.1)
+# spec file for package libreoffice-bootstrap (Version 3.3.0.2)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -182,8 +182,8 @@
 # we would like to support also a non-conflicting OOo2 package
 %define	      ooo_bin_suffix	no
 # 
-%define	      ooo_build_version 3.3.0.1
-%define	      ooo_piece_version 3.3.0.1
+%define	      ooo_build_version 3.3.0.2
+%define	      ooo_piece_version 3.3.0.2
 %define	      ooo_build_dir	build
 %define       ooo_sourcedirname libreoffice-%ooo_piece_version
 %define	      ooo_prefix	%_libdir
@@ -191,7 +191,7 @@
 %define	      ooo_basis_dir	basis3.3
 License:        Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT
 Group:          Productivity/Office/Suite
-Version:        3.3.0.1
+Version:        3.3.0.2
 Release:        1
 AutoReqProv:    on
 # we use the tool "free" to detect the available memory and reduce the parallelism is needed
@@ -204,7 +204,7 @@
 Source0:        libreoffice-build-%ooo_build_version.tar.gz
 Source1:        libreoffice-bootstrap-%ooo_piece_version.tar.bz2
 # hacked soures from setup_native
-Source30:       setup_native_packinfo-3.2.99.3.tar.bz2
+Source30:       setup_native_packinfo-3.3.0.2.tar.bz2
 # Hmm, rpmlint complains about devel files in non-devel package
 # We would like to keep the -bootstrap package name
 # So we need to disable these rpmlint checks
@@ -215,6 +215,8 @@
 # patches against libreoffice-build
 # Patch0:       libreoffice-build-3.3.0.1-enable-foo.diff	# example
 Patch0:         libreoffice-build-3.2.99.2-extensions-hack.diff
+Patch1:         libreoffice-build-3.3.0.1e-piece-sfx2.diff
+Patch2:         libreoffice-build-3.3.0.2-build-fixes.diff
 # allow to use xulrunner191 on SLED11-SP1 (bnc#540726)
 Patch500:       ooo-build-3.1.99.2-xulrunner-1.9.1.diff
 # FIXME: fix the python UNO components registration on SLED10
@@ -248,6 +250,8 @@
 # apply patches against libreoffice-build
 # %patch0	# example
 %patch0
+%patch1
+%patch2
 install -m 644 %{S:1} %{S:30} src/
 %if 0%{?suse_version} == 01010
 install -m 644 %{S:150} src/


++++++ libreoffice-bootstrap-3.3.0.1.tar.bz2 -> libreoffice-bootstrap-3.3.0.2.tar.bz2 ++++++
++++ 15548 lines of diff (skipped)

++++++ libreoffice-build-3.2.99.2-extensions-hack.diff ++++++
--- /var/tmp/diff_new_pack.5TK7Vy/_old	2011-01-07 09:45:44.000000000 +0100
+++ /var/tmp/diff_new_pack.5TK7Vy/_new	2011-01-07 09:45:44.000000000 +0100
@@ -9,7 +9,7 @@
  #Localize
  Localize : LocalizeFixes
  UnstableWP : UnstableLibwpd
-@@ -2719,6 +2719,10 @@
+@@ -2315,6 +2315,10 @@
  oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo
  oox-smartart-import.diff, thorsten
  
@@ -19,7 +19,7 @@
 +
  [ NovellOnlyWin32 ]
  sled10-splash.diff, i#123456, pmladek
- 
+ openlockedquerybox-alwaysontop.diff, n#656566, tml
 --- patches/dev300/piece-config-office-extensions.diff
 +++ patches/dev300/piece-config-office-extensions.diff
 @@ -0,0 +1,79 @@

++++++ libreoffice-build-3.3.0.1e-piece-sfx2.diff ++++++
--- patches/dev300/piece-sfx2.diff
+++ patches/dev300/piece-sfx2.diff
@@ -4,7 +4,7 @@
  .SOURCE.xcu : $(MISC)/$(EXTNAME)/merge $(MISC)/$(EXTNAME)/registry/data $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/merge $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/registry/data $(COMPONENT_CONFIGDIR) .
  .SOURCE.xcs : $(MISC)/$(EXTNAME)/registry $(MISC)/$(EXTNAME)/registry/schema .
  
-+SOLARLICENSEDIR*=$(SOLARBINDIR)/osl
++LICENSEDIR*=$(OO_INSTDIR)
 +
  fixme=$(MISC)/$(EXTNAME)/merge/$(MISC)
  fixme2=$(fixme:n)
@@ -14,10 +14,10 @@
  .IF "$(CUSTOM_LICENSE)"==""
  .IF "$(GUI)" == "WNT"
 -PACKLICDEPS=$(SOLARBINDIR)/osl/license.txt
-+PACKLICDEPS=$(SOLARLICENSEDIR)/license.txt
++PACKLICDEPS=$(LICENSEDIR)/license.txt
  .ELSE			# "$(GUI)" == "WNT"
 -PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE
-+PACKLICDEPS=$(SOLARLICENSEDIR)/LICENSE
++PACKLICDEPS=$(LICENSEDIR)/LICENSE
  .ENDIF			# "$(GUI)" == "WNT"
  .ELSE			# "$(CUSTOM_LICENSE)" == ""
  PACKLICDEPS=$(CUSTOM_LICENSE)
@@ -27,7 +27,7 @@
  LIBTARGET=NO
  EXTENSIONNAME:=custom-tool-panel
  
-+SOLARLICENSEDIR=$(SOLARPIECE)$/$(INPATH)$/bin$/osl
++LICENSEDIR=$(SOLARPIECE)$/$(INPATH)$/bin$/osl
 +
  # --- Settings -----------------------------------------------------
  
++++++ libreoffice-build-3.3.0.2-build-fixes.diff ++++++
--- bin/piece/save-noarch
+++ bin/piece/save-noarch
@@ -44,7 +44,7 @@
 mkdir -p $DEST
 
 # lang packs are noarch
-for list in  $DESTDIR/gid_Module_Langpack* ; do
+for list in  $DESTDIR/gid_Module_Langpack* $DESTDIR/gid_Module_Helppack* ; do
     test -f $list || continue;
     # we want to keep the en_US localization in the package
     echo $list | grep "en_US" && continue;
@@ -61,7 +61,7 @@
 	rmdir --ignore-fail-on-non-empty "$DESTDIR$source_dir"
     done
     # we need to save the list of files with the piece-specific name
-    listname_piece=`echo $list | sed "s|gid_Module_Langpack|gid_Module_Langpack_$piece|"`
+    listname_piece=`echo $list | sed -e "s|\(gid_Module_Langpack\)|\1_$piece|" -e "s|\(gid_Module_Helppack\)|\1_$piece|"`
     listname_piece=`basename $listname_piece`
     if test "$OOO_BUILD_NOARCH" = 'YES' ; then
 	sed "s|$OO_INSTDIR|$OO_INSTDIR_SHARE|" $list >$DEST/$listname_piece
--- bin/piece/sort-l10n
+++ bin/piece/sort-l10n
@@ -14,7 +14,7 @@
     files_found=
     filelist=files-$piece-$lang.txt
     rm -f $filelist
-    for list in  $gid_dir/gid_Module_Langpack*$lang ; do
+    for list in $gid_dir/gid_Module_Langpack*$lang $gid_dir/gid_Module_Helppack*$lang ; do
 	test -f $list || continue;
 	files_found=1
 	# add to the lang specific file-list
--- bin/unpack
+++ bin/unpack
@@ -289,7 +289,7 @@
             fi
             # ugly hack around odd positioning of this info
             echo "Unpacking setup_native .txt pieces"
-            ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.2.99.3.tar.bz2 | $GNUTAR xf - ) || exit
+            ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.3.0.2.tar.bz2 | $GNUTAR xf - ) || exit
             # hack to patch new files in the root dir
             if test "z$PIECE" = "zbootstrap" ; then
                 touch $OOBUILDDIR/boost.m4
--- download.in
+++ download.in
@@ -540,7 +540,7 @@
 }
 
 if ('@PIECE@' eq 'bootstrap') {
-   source_file( 'setup_native_packinfo-3.2.99.3.tar.bz2' );
+   source_file( 'setup_native_packinfo-3.3.0.2.tar.bz2' );
 }
 
 if ('@OOOP_FONTS_PACK@' ne '') {
++++++ libreoffice-build-3.3.0.1.tar.gz -> libreoffice-build-3.3.0.2.tar.gz ++++++
libreoffice-bootstrap/libreoffice-build-3.3.0.1.tar.gz /mounts/work_src_done/STABLE/libreoffice-bootstrap/libreoffice-build-3.3.0.2.tar.gz differ: byte 5, line 1

++++++ setup_native_packinfo-3.2.99.3.tar.bz2 -> setup_native_packinfo-3.3.0.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/linuxcopyrightfile new/setup_native/source/packinfo/linuxcopyrightfile
--- old/setup_native/source/packinfo/linuxcopyrightfile	1970-01-01 01:00:00.000000000 +0100
+++ new/setup_native/source/packinfo/linuxcopyrightfile	2010-11-11 16:12:41.000000000 +0100
@@ -0,0 +1,2 @@
+Copyright 2000, 2010 Oracle and/or its affiliates. All rights reserved.
+Use is subject to license terms.
Files old/setup_native/source/packinfo/openofficelanguagepack.pcp and new/setup_native/source/packinfo/openofficelanguagepack.pcp differ
Files old/setup_native/source/packinfo/openoffice.pcp and new/setup_native/source/packinfo/openoffice.pcp differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_accessories.txt new/setup_native/source/packinfo/packinfo_accessories.txt
--- old/setup_native/source/packinfo/packinfo_accessories.txt	1970-01-01 01:00:00.000000000 +0100
+++ new/setup_native/source/packinfo/packinfo_accessories.txt	2010-11-30 21:17:39.000000000 +0100
@@ -0,0 +1,73 @@
+# Format:
+
+# Start
+# scpModule
+# shellscript file (optional)
+# solarispackagename
+# solarisrequires (optional)
+# solarisprovides (optional)
+# packagename
+# linuxreplaces (optional)
+# requires (optional)
+# provides (optional)
+# copyright
+# vendor
+# description
+# destpath
+# End
+
+# Package definitions for OxygenOffice Professional
+# 1/3 Gallery
+
+Start
+module = "gid_Module_Optional_Accessories_Gallery"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-gallery"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-gallery"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+copyright = "1999-2008 by %PRODUCTNAME"
+solariscopyright = "solariscopyrightfile"
+vendor = "%PRODUCTNAME"
+description = "Extra gallery for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+End
+
+# 2/3 Fonts
+
+Start
+module = "gid_Module_Optional_Accessories_Fonts"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-fonts"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-fonts"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+copyright = "1999-2008 by %PRODUCTNAME"
+solariscopyright = "solariscopyrightfile"
+vendor = "%PRODUCTNAME"
+description = "Extra fonts for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+End
+
+# 3/3 Templates - Common
+
+Start
+module = "gid_Module_Optional_Accessories_Tem_Common"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-templates-common"
+solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-templates-common"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+copyright = "1999-2008 by %PRODUCTNAME"
+solariscopyright = "solariscopyrightfile"
+vendor = "%PRODUCTNAME"
+description = "Extra Common Templates for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+End
+
+
+# END OF Package definitions for OxygenOffice Professional
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_brand.txt new/setup_native/source/packinfo/packinfo_brand.txt
--- old/setup_native/source/packinfo/packinfo_brand.txt	2010-11-02 12:43:32.000000000 +0100
+++ new/setup_native/source/packinfo/packinfo_brand.txt	2010-12-17 22:21:26.000000000 +0100
@@ -128,8 +128,8 @@
 module = "gid_Module_Langpack_Brand"
 solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
 packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw (Name="Draw language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help (Name="Help language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress (Name="Impress language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
+requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_office_help.txt new/setup_native/source/packinfo/packinfo_office_help.txt
--- old/setup_native/source/packinfo/packinfo_office_help.txt	1970-01-01 01:00:00.000000000 +0100
+++ new/setup_native/source/packinfo/packinfo_office_help.txt	2010-12-16 12:43:41.000000000 +0100
@@ -0,0 +1,36 @@
+# Format:
+
+# Start
+# scpModule
+# shellscript file (optional)
+# solarispackagename
+# solarisrequires (optional)
+# solarisprovides (optional)
+# packagename
+# linuxreplaces (optional)
+# requires (optional)
+# provides (optional)
+# copyright
+# vendor
+# description
+# destpath
+# End
+
+Start
+module = "gid_Module_Helppack_Help"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+copyright = "1999-2009 by OpenOffice.org"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
+End
+
+
+# END OF Language depended package definitions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_office_lang.txt new/setup_native/source/packinfo/packinfo_office_lang.txt
--- old/setup_native/source/packinfo/packinfo_office_lang.txt	2010-11-02 12:43:32.000000000 +0100
+++ new/setup_native/source/packinfo/packinfo_office_lang.txt	2010-12-16 12:43:41.000000000 +0100
@@ -65,22 +65,6 @@
 End
 
 Start
-module = "gid_Module_Langpack_Help"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
-copyright = "1999-2009 by OpenOffice.org"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "Language help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
-destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-End
-
-Start
 module = "gid_Module_Langpack_Writer"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer"
 solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/private1copyrightfile new/setup_native/source/packinfo/private1copyrightfile
--- old/setup_native/source/packinfo/private1copyrightfile	1970-01-01 01:00:00.000000000 +0100
+++ new/setup_native/source/packinfo/private1copyrightfile	2010-11-11 16:12:41.000000000 +0100
@@ -0,0 +1,2 @@
+Copyright 2000, 2010 Oracle and/or its affiliates.  All rights reserved.
+Use is subject to license terms.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/solariscopyrightfile new/setup_native/source/packinfo/solariscopyrightfile
--- old/setup_native/source/packinfo/solariscopyrightfile	1970-01-01 01:00:00.000000000 +0100
+++ new/setup_native/source/packinfo/solariscopyrightfile	2010-11-11 16:12:41.000000000 +0100
@@ -0,0 +1,2 @@
+Copyright 2000, 2010 Oracle and/or its affiliates. All rights reserved.
+Use is subject to license terms.
Files old/setup_native/source/packinfo/ure.pcp and new/setup_native/source/packinfo/ure.pcp differ


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)