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

[Fridrich Strba]

 bin/applyflags       |    9 ---------
 patches/dev300/apply |   13 ++++---------
 2 files changed, 4 insertions(+), 18 deletions(-)

New commits:
commit 9bff69a81654de24493a77b33db2702916b7d196
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Sep 17 11:19:57 2010 +0200

    Removing stale (non-existing or empty) sections from applyflags

diff --git a/bin/applyflags b/bin/applyflags
index b649db6..956ea8a 100755
--- a/bin/applyflags
+++ b/bin/applyflags
@@ -22,12 +22,6 @@ test -n "$builddir" && OOBUILDDIR=$builddir
 
 echo -n "--distro=$DISTRO"
 
-if test -d $OOBUILDDIR/binfilter; then
-    SECTIONS="$SECTIONS,Binfilter"
-fi
-if test -d $OOBUILDDIR/zlib; then
-    SECTIONS="$SECTIONS,System"
-fi
 if test -d $OOBUILDDIR/odk; then
     SECTIONS="$SECTIONS,Sdk"
 fi
@@ -40,9 +34,6 @@ fi
 if test -d $OOBUILDDIR/nlpsolver ; then
     SECTIONS="$SECTIONS,NLPSolver"
 fi
-if test -d $OOBUILDDIR/languagetool ; then
-    SECTIONS="$SECTIONS,LanguageTool"
-fi
 
 # The localize.sdf's are created during the build when they do not exits.
 # Additionally, they are created using something like echo > localize.sdf, so
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6b668c1..7f1c4a4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -21,11 +21,10 @@ Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
 	 MySQL, BorderTypes, WriterNavigation
 
 LinuxCommon : Common, Defaults, FontConfigTemporaryHacks, \
-	      FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
-	      msaccess, OpenGLTransitions, \
+	      FedoraLinuxOnlyFixes, LinuxOnly, msaccess, OpenGLTransitions, \
 	      Mono, AddressBooks, QuickStarter, KDE4, Netbook, \
 	      GlobalNSPluginSupport, SystemBitsWithSTLport
-MacOSXCommon : Common, Defaults, SystemBits
+MacOSXCommon : Common, Defaults
 Win32Common : Common, Defaults, Win32Only, NotDebian
 # Experimental sections
 Experimental: VBAUntested, ArkOnlyExperimental, \
@@ -39,14 +38,10 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
 DebianLooseSections: DebianBaseNoHelpContent
 # Optional sections
 Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
-# Binfilter patches: a special distro; applied only when building with binfilter
-Binfilter : BFBuildBits, BFFixes, BFShrink
 # optional section for ConvertTextToNumber extension
 CT2N : CT2NBits 
 # optional section for NLPSolver extension
 NLPSolver : NLPSolverBits 
-# System patches: a special distro; applied only when building with the system tarball unpacked
-System : SystemBuildBits
 # Sdk patches: a special distro; applied only when building with the sdk tarball unpacked
 Sdk : SdkFixes
 # special fragmented build patch distro
@@ -141,10 +136,10 @@ Solaris: NovellBase, UnstableExtensions
 # Universal Upstream-like packages
 GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, GoOoSplash
 # OxygenOffice Professional
-OxygenOfficeLinuxCommon :	Common, FontConfigTemporaryHacks, LinuxOnly, SystemBits, \
+OxygenOfficeLinuxCommon :	Common, FontConfigTemporaryHacks, LinuxOnly, \
 							msaccess, OpenGLTransitions, Mono, AddressBooks, QuickStarter, KDE4,\
 							GlobalNSPluginSupport, LiberationFontsOnWindows
-OxygenOfficeMacOSXCommon :	Common, SystemBits, LiberationFontsOnWindows
+OxygenOfficeMacOSXCommon :	Common, LiberationFontsOnWindows
 OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, LiberationFontsOnWindows
 
 OxygenOfficeLinux:	OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeLinuxOnly