[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - 2 commits - bin/package-ooo bin/piece patches/dev300

[Petr Mladek]

 bin/package-ooo                                                  |    5 ++++
 bin/piece/file-list-extras                                       |    3 ++
 patches/dev300/apply                                             |    4 +++
 patches/dev300/extensions-geometry-in-control-propsheet-fix.diff |   11 ++++++++++
 4 files changed, 23 insertions(+)

New commits:
commit d85b62008cba959d1d997442f404d5230b786805
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Tue Jun 15 16:56:14 2010 +0200

    show the control geometric propertis correctly (bnc#610921)
    
    * patches/dev300/extensions-geometry-in-control-propsheet-fix.diff:
    * patches/dev300/apply: # workaround for regression caused by
      metric-field-limits.diff; this hack has been created by Noel

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f53e9e9..e83fade 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3982,6 +3982,10 @@ chart-ui-fix.diff, i#110702, timar
 vcl-limit-iterator-advance.diff, i#110806, dtardon
 moblin-netbook-theme.diff, i#103999, bnc#527356, tml
 metric-field-limits.diff, cbosdo
+# show the control geometric propertis correctly
+# workaround for regression caused by metric-field-limits.diff
+# this hack has been created by Noel
+extensions-geometry-in-control-propsheet-fix.diff, bnc#610921, cbosdo
 
 # In some cases when exporting a PDF from a presentation, we are asked
 # to export an empty "link annotation", which gets turned into a
diff --git a/patches/dev300/extensions-geometry-in-control-propsheet-fix.diff b/patches/dev300/extensions-geometry-in-control-propsheet-fix.diff
new file mode 100644
index 0000000..5ee1072
--- /dev/null
+++ b/patches/dev300/extensions-geometry-in-control-propsheet-fix.diff
@@ -0,0 +1,11 @@
+--- extensions/source/propctrlr/standardcontrol.cxx	2010-04-27 14:06:02.000000000 +0100
++++ extensions/source/propctrlr/standardcontrol.cxx	2010-06-04 11:54:00.000000000 +0100
+@@ -593,7 +593,7 @@ namespace pcr
+             // everything which survived the checks above should result in a factor of 1, i.e.,
+             // it should have a direct counterpart as FieldUnit
+             throw RuntimeException();
+-        getTypedControlWindow()->SetUnit( eFieldUnit );
++        getTypedControlWindow()->MetricFormatter::SetUnit( eFieldUnit );
+     }
+ 
+     //--------------------------------------------------------------------
commit d15464b709b87fc6db0005d13ec246810ade080e
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Tue Jun 15 14:42:35 2010 +0200

    Do not pack presets/config/standard.soc.orig
    
    * bin/piece/file-list-extras:
    * bin/package-ooo: remove the non-wanted .orig file

diff --git a/bin/package-ooo b/bin/package-ooo
index aaaab36..89027a1 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -455,6 +455,11 @@ else
     GID_MODULE_ROOT_FILES_LISTS=""
 fi
 
+# remove .orig files created by patching l10n extras
+if test -f gid_Module_Root_Files_6 ; then
+	remove_file gid_Module_Root_Files_6 "$OOINSTBASE/basis$VERSION/presets/config/standard.soc.orig"
+fi
+
 if test "z$VENDORNAME" != "zDebian" ; then
 	echo "Moving package file lists..."
 
diff --git a/bin/piece/file-list-extras b/bin/piece/file-list-extras
index 9b75add..0286465 100755
--- a/bin/piece/file-list-extras
+++ b/bin/piece/file-list-extras
@@ -29,6 +29,9 @@ if test "$VENDORNAME" = "Novell" ; then
     fi
 fi
 
+# prune .orig files created by patch tool
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/presets/config/standard.soc.orig"
+
 # prune redundant files the scp2 likes to make for us
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link"
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link"