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

[René Engelhard]

 configure.in         |    6 +++++-
 patches/dev300/apply |   26 +++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

New commits:
commit 015d622ce488629f08b66ac9209a00714cc1224a
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jul 17 15:20:24 2009 +0200

    ooo310-m16 update
    
    * patches/dev300/apply: disable sdext-system-zlib.diff and svtools-zero-GetColumnCount.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 447ad87..2e50521 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -379,9 +379,11 @@ wiki-publisher-no-license.diff
 
 [ ExtensionFixes > ooo310-m11 ]
 pdfimport-no-license.diff
+build-java-target-extensions.diff, i#93115, pmladek
+
+[ ExtensionFixes > ooo310-11 < ooo310-m16 ]
 # fix build with system zlib
 sdext-system-zlib.diff, i#102679, caolan
-build-java-target-extensions.diff, i#93115, pmladek
 
 [ ExtensionFixes <= ooo310-m11 ]
 pdfimport-no-license-m11.diff
@@ -456,6 +458,7 @@ libxmlsec-findcerts.diff, i#76870, pmladek
 # avoid error messages about missing directories with templates
 sfx2-check-existing-template-dirs.diff, i#100518, pmladek
 
+[ Fixes < ooo310-m16 ]
 # opening templates with a11y enabled crasher
 svtools-zero-GetColumnCount.diff, i#86443, bnc#497879, pmladek
 
commit f3dca25f50fc474ddf27db45e8e3ee9ae0d47b4b
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jul 16 15:00:49 2009 +0200

    moz2seamonkey01 is in dev300-m53
    
    * configure.in: use 1.1.4 for dev300-m53 while our backport needs 1.1.13
    * patches/dev300/apply: use the backport only for < dev300-m53

diff --git a/configure.in b/configure.in
index fdf1d30..b9b2cad 100644
--- a/configure.in
+++ b/configure.in
@@ -821,7 +821,11 @@ AC_SUBST(PREBUILT_WRITINGAIDS_TIMESTAMP)
 PREBUILT_EXTENSIONAIDS_TIMESTAMP=20090523
 AC_SUBST(PREBUILT_EXTENSIONAIDS_TIMESTAMP)
 
-BUILD_MOZILLA_SOURCE='seamonkey-1.1.13.source.tar.gz'
+if echo "$with_tag" | $GREP -E ['^(dev300-m5[3-9])'] >/dev/null 2>/dev/null ; then
+  BUILD_MOZILLA_SOURCE='seamonkey-1.1.14.source.tar.gz'
+else
+  BUILD_MOZILLA_SOURCE='seamonkey-1.1.13.source.tar.gz'
+fi
 AC_SUBST(BUILD_MOZILLA_SOURCE)
 
 AGFA_MONOTYPE_FONTS_SOURCE='agfa-monotype-fonts.tar.gz'
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8cf5906..447ad87 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -880,6 +880,7 @@ speed-local-link.diff, i#63927, michael
 # fix: this breaks win32
 fpicker-kde-gcc4-visibility.diff, pmladek
 
+[ LinuxOnly < dev300-m53 ]
 #Backport a more recent mozilla building. For the while not for win32, since
 #there are not yet precompiled packages for mozilla based on this CWS.
 cws-moz2seamonkey01-moz.diff
commit 9531951d0922a557d6939ee3ffe5a90f572756ea
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jul 7 02:55:33 2009 +0200

    update KDE4 issue numbers (cws kde4int)
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8cf62d3..8cf5906 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2119,23 +2119,23 @@ sdbc-postgresql-config_office.diff
 
 [ KDE4 ]
 SectionOwner => jholesov
-SectionIssue => i#90618
+SectionIssue => i#103283
 
 # KDE4 support by Eric Bischoff, Bernhard Rosenkraenzer and Roman Shtylman
-kde4-configure.diff
+kde4-configure.diff, i#103288
 kde4-buildfix-connectivity.diff
 
-kde4-shell-prj.diff
-kde4-shell-source.diff
+kde4-shell-prj.diff, i#103286
+kde4-shell-source.diff, i#103286
 
-kde4-fpicker-prj.diff
-kde4-fpicker-source.diff
+kde4-fpicker-prj.diff, i#103290
+kde4-fpicker-source.diff, i#103290
 
-kde4-scp2.diff
+kde4-scp2.diff, i#103289
 
-kde4-plugin-detection.diff
-kde4-vcl-prj.diff
-kde4-vcl-source.diff
+kde4-plugin-detection.diff, i#103284
+kde4-vcl-prj.diff, i#103284
+kde4-vcl-source.diff, i#103284
 
 kde4-oxygen-icons.diff