[Libreoffice-commits] .: Branch 'libreoffice-3-3' - bin/piece bin/unpack download.in patches/dev300

[Petr Mladek]

 bin/piece/save-noarch          |    4 ++--
 bin/piece/sort-l10n            |    2 +-
 bin/unpack                     |    2 +-
 download.in                    |    2 +-
 patches/dev300/piece-sfx2.diff |    8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 29d5438380a3b3950f88d1cd33dfb2871f67a6da
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Jan 19 16:18:01 2011 +0100

    misc split build fixes
    
    they affect just the split build and are currently used only by SUSE
    => not need to be signed off

diff --git a/bin/piece/save-noarch b/bin/piece/save-noarch
index 3765612..0320f27 100755
--- a/bin/piece/save-noarch
+++ b/bin/piece/save-noarch
@@ -44,7 +44,7 @@ echo "Saving noarch stuff back into solver ..."
 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 @@ for list in  $DESTDIR/gid_Module_Langpack* ; do
 	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
diff --git a/bin/piece/sort-l10n b/bin/piece/sort-l10n
index fa96f91..0c94f6e 100755
--- a/bin/piece/sort-l10n
+++ b/bin/piece/sort-l10n
@@ -14,7 +14,7 @@ for lang in $OO_LANGS ; do
     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
diff --git a/bin/unpack b/bin/unpack
index a23a103..91d72ec 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -289,7 +289,7 @@ if test "z$OOO_GIT" = "z" ; then
             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
diff --git a/download.in b/download.in
index ae48004..4a3fe50 100755
--- a/download.in
+++ b/download.in
@@ -535,7 +535,7 @@ if ( $download_all || ( '@OOO_LANGS@' ne '' && '@OOO_LANGS@' ne 'en-US' ) || '@B
 }
 
 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 '') {
diff --git a/patches/dev300/piece-sfx2.diff b/patches/dev300/piece-sfx2.diff
index 5eccf23..58b89d9 100644
--- a/patches/dev300/piece-sfx2.diff
+++ b/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 -----------------------------------------------------