[ooo-build-commit] .: patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                      |    2 +-
 patches/dev300/python-win32-buildfix.diff |    6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit a5a9b09345699479b0be0f54862005f337a3ac6e
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue Feb 16 20:48:05 2010 +0100

    Bin extra mode changes, avoid ooo320 patch application
    
    * patches/dev300/apply:
    * patches/dev300/python-win32-buildfix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index abf3587..16812c1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3574,7 +3574,7 @@ connectivity-build-fix.diff, i#107957, fridrich
 # Allow oowintool to detect java sdk 1.6.x
 oowintool-java6.diff, fridrich
 
-[ BuildBits > dev300-m70 ]
+[ BuildBits > dev300-m70 < ooo320-m0 ]
 # make python build properly on win32
 python-win32-buildfix.diff, thorsten
 
diff --git a/patches/dev300/python-win32-buildfix.diff b/patches/dev300/python-win32-buildfix.diff
index 7c9587e..8f5eee7 100644
--- a/patches/dev300/python-win32-buildfix.diff
+++ b/patches/dev300/python-win32-buildfix.diff
@@ -1,6 +1,4 @@
 diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch
-old mode 100644
-new mode 100755
 --- python/Python-2.6.1.patch
 +++ python/Python-2.6.1.patch
 @@ -120,6 +120,180 @@
@@ -185,8 +183,6 @@ new mode 100755
  +++ misc/build/Python-2.6.1/Lib/test/test_threading.py	2009-03-12 10:48:04.000000000 +0000
  @@ -382,7 +382,7 @@
 diff --git a/python/Python-ssl.patch b/python/Python-ssl.patch
-old mode 100644
-new mode 100755
 --- python/Python-ssl.patch
 +++ python/Python-ssl.patch
 @@ -208,3 +208,165 @@
@@ -356,8 +352,6 @@ new mode 100755
 +-    main()
 ++    sys.exit(0)
 diff --git a/python/makefile.mk b/python/makefile.mk
-old mode 100644
-new mode 100755
 --- python/makefile.mk
 +++ python/makefile.mk
 @@ -113,16 +113,20 @@