[ooo-build-commit] 3 commits - configure.in patches/dev300

[René Engelhard]

 configure.in                                           |    2 +-
 patches/dev300/apply                                   |    4 ++++
 patches/dev300/instsetoo-native-fix-system-python.diff |   11 +++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 89fdb030ba5143c0ebf870faf620331946b2b029
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 6 23:46:13 2009 +0200

    oops, fix typos to fix syntax error
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index db78ad2..d297417 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1173,7 +1173,7 @@ db4.8.diff, rengelha
 buildfix-system-lucene.diff, i#105433, rengelha
 
 [ BuildBits >= dev300-m60 ]
-instsetoo-native-fix-system-python.dif. i#105663, rengelha
+instsetoo-native-fix-system-python.diff, i#105663, rengelha
 
 instsetoo
 [ BuildBits < dev300-m60 ]
commit 4229983a5a75bda588ff5ce327693a8424457a19
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 6 23:40:09 2009 +0200

    default to m60 now that it installs
    
    * configure.in:

diff --git a/configure.in b/configure.in
index 310f369..f6be679 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_PREREQ(2.51)
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
 
-DEFAULT_TAG=dev300-m58
+DEFAULT_TAG=dev300-m60
 # For the upstream packages it is like:
 # DEFAULT_TAG=OOO310_m1
 
commit 9e84cd07ecd05bde09aebf6545b7d5151021eae5
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 6 23:38:50 2009 +0200

    fix install with system python
    
    * patches/dev300/instsetoo-native-fix-system-python.diff: revert articicial
      change
    * patches/dev300/apply: add patch

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4482a4c..db78ad2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1172,6 +1172,10 @@ db4.8.diff, rengelha
 # fix build with system-lucene
 buildfix-system-lucene.diff, i#105433, rengelha
 
+[ BuildBits >= dev300-m60 ]
+instsetoo-native-fix-system-python.dif. i#105663, rengelha
+
+instsetoo
 [ BuildBits < dev300-m60 ]
 # add ro
 postset-add-ro.diff
diff --git a/patches/dev300/instsetoo-native-fix-system-python.diff b/patches/dev300/instsetoo-native-fix-system-python.diff
new file mode 100644
index 0000000..b543d76
--- /dev/null
+++ b/patches/dev300/instsetoo-native-fix-system-python.diff
@@ -0,0 +1,11 @@
+--- instsetoo_native/util/makefile.mk-old	2009-10-06 23:34:37.000000000 +0200
++++ instsetoo_native/util/makefile.mk	2009-10-06 23:34:45.000000000 +0200
+@@ -99,7 +99,7 @@
+     echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
+ 
+ .IF "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+-#ALLTAR : $(LOCALPYFILES)
++ALLTAR : $(LOCALPYFILES)
+     @echo "No EPM: do no packaging at this stage"
+ .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+ .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""