ooo-build r12244 - in branches/ooo-build-2-4: . bin patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Apr 21 10:53:08 2008
New Revision: 12244
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12244&view=rev

Log:
2008-04-18  Rene Engelhard  <rene debian org>

        * configure.in: remove dev300
        * bin/package-ooo: remove dev300
        * patches/dev300: remove


Removed:
   branches/ooo-build-2-4/patches/dev300/
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/bin/package-ooo
   branches/ooo-build-2-4/configure.in

Modified: branches/ooo-build-2-4/bin/package-ooo
==============================================================================
--- branches/ooo-build-2-4/bin/package-ooo	(original)
+++ branches/ooo-build-2-4/bin/package-ooo	Mon Apr 21 10:53:08 2008
@@ -825,26 +825,15 @@
             create_package_directory gid_Module_Root_Files_8                pkg/openoffice.org-common
 #            create_package_directory gid_Module_Optional_Oo_English         pkg/openoffice.org-common
             create_package_directory gid_Module_Optional_Testtool           pkg/openoffice.org-common
-        fi            
+        fi
 
 	create_package_directory gid_Module_Root_SDK                    pkg/openoffice.org-dev
 
-	if echo $CVSTAG | grep -q -i dev300; then
-		create_package_directory gid_Module_Root_$l             pkg/openoffice.org-l10n-$l
-		for l in `echo $OOO_LANGS_LIST`; do \
-			for p in Root Impress Draw Math Calc Base Writer; do \
-				create_package_directory  gid_Module_Langpack_${p}_`echo $l | sed -e s/-/_/g`   pkg/openoffice.org-l10n-$l
-			done
-		done
-		create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g`        pkg/openoffice.org-l10n-$l
-		create_package_directory gid_Module_Langpack_Help_`echo $l | sed -e s/-/_/g`    pkg/openoffice.org-help-$l
-	else
-		for l in `echo $OOO_LANGS_LIST | sed -e s/en-US//`; do \
-			create_package_directory gid_Module_Root.$l		pkg/openoffice.org-l10n-$l; \
-			create_package_directory gid_Module_Langpack_Resource.$l	pkg/openoffice.org-l10n-$l; \
-			create_package_directory gid_Module_Langpack_Help.$l	pkg/openoffice.org-help-$l; \
-		done
-	fi
+	for l in `echo $OOO_LANGS_LIST | sed -e s/en-US//`; do \
+		create_package_directory gid_Module_Root.$l		pkg/openoffice.org-l10n-$l; \
+		create_package_directory gid_Module_Langpack_Resource.$l	pkg/openoffice.org-l10n-$l; \
+		create_package_directory gid_Module_Langpack_Help.$l	pkg/openoffice.org-help-$l; \
+	done
 
 	# move_wrappers <directory_name> <name> [...]
 	move_wrappers()

Modified: branches/ooo-build-2-4/configure.in
==============================================================================
--- branches/ooo-build-2-4/configure.in	(original)
+++ branches/ooo-build-2-4/configure.in	Mon Apr 21 10:53:08 2008
@@ -427,8 +427,6 @@
 
 if echo "$with_tag" | $GREP -E ['^(OOO_|oo[a-z]680-|OO[A-Z]680_)'] >/dev/null 2>/dev/null ; then
    APPLY_DIR="$TOOLSDIR/patches/src680"
-elif echo "$with_tag" | $GREP -E ['^(src680-m2[4-9][0-9]|dev300)'] >/dev/null 2>/dev/null ; then
-   APPLY_DIR="$TOOLSDIR/patches/dev300"
 else
    APPLY_DIR="$TOOLSDIR/patches/$with_tag"
 fi