[ooo-build-commit] patches/dev300

[René Engelhard]

 patches/dev300/apply                  |    6 +-----
 patches/dev300/ucb-neon-0.24-m58.diff |   19 -------------------
 patches/dev300/ucb-neon-0.24.diff     |    8 ++++----
 3 files changed, 5 insertions(+), 28 deletions(-)

New commits:
commit c54b4c97bd80d825f8b31b46d042930e8387097a
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Oct 12 00:27:14 2009 +0200

    fix ucb-neon-0.24.diff to apply and remove obsolete ucb-neon-0.24-m58.diff
    
    * patches/dev300/ucb-neon-0.24m58.diff: remove, for m58, thus obsolete
    * patches/dev300/ucb-neon-0.24.diff: <tab><tab> is what is in the orginal file
    * patches/dev300/apply: adapt

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0dc6185..c8f4150 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1114,14 +1114,10 @@ installer-get-path-correctly.diff, pmladek
 # allow to use the prebuilt jsr173_1.0_api.jar
 build-prebuilt-stax.diff, i#93116, pmladek
 
-[ BuildBits > dev300-m58 ]
+[ BuildBits ]
 # fix build with neon-0.24
 ucb-neon-0.24.diff, pmladek
 
-[ BuildBits <= dev300-m58 ]
-# fix build with neon-0.24
-ucb-neon-0.24-m58.diff, pmladek
-
 [ BuildBits >= dev300-m60 ]
 # it builds fine with boost-1,36 here
 build-enable-boost-1.36.diff, i#105772, pmladek
diff --git a/patches/dev300/ucb-neon-0.24-m58.diff b/patches/dev300/ucb-neon-0.24-m58.diff
deleted file mode 100644
index dd67a1a..0000000
--- a/patches/dev300/ucb-neon-0.24-m58.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- ucb/source/ucp/webdav/NeonSession.cxx.old	2009-02-26 09:39:43.000000000 +0100
-+++ ucb/source/ucp/webdav/NeonSession.cxx	2009-03-09 13:25:15.000000000 +0100
-@@ -763,11 +763,13 @@ void NeonSession::Init()
-         // Note: Calling ne_set_[server|proxy]_auth more than once per
-         //       m_pHttpSession instance sometimes(?) crashes Neon! ( last
-         //       checked: 0.22.0)
--        //ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
-+#if NEON_VERSION >= 0x0260
- 		ne_add_server_auth( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this ); 
--        //ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
- 		ne_add_proxy_auth ( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this );
--
-+#else
-+		ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
-+		ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
-+#endif
-     }
- }
- 
diff --git a/patches/dev300/ucb-neon-0.24.diff b/patches/dev300/ucb-neon-0.24.diff
index abb77ed..6addca0 100644
--- a/patches/dev300/ucb-neon-0.24.diff
+++ b/patches/dev300/ucb-neon-0.24.diff
@@ -5,11 +5,11 @@
  
          // authentication callbacks.
 +#if NEON_VERSION >= 0x0260
-         ne_add_server_auth( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this ); 
-         ne_add_proxy_auth ( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this );
+ 		ne_add_server_auth( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this ); 
+ 		ne_add_proxy_auth ( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this );
 +#else
-+        ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
-+        ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
++		ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
++		ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
 +#endif
      }
  }