41054: Bundle 2-3 language packs with Seamonkey.r=jbetak.

Makefile.in

@@ -101,6 +101,7 @@ DIRS		+= \
 		editor \
 		sun-java \
 		profile \
+	        l10n \
 	        themes \
 		$(NULL)
 

allmakefiles.sh

@@ -755,6 +755,12 @@ fi
 #
 # l10n/
 #
+if [ "$MOZ_LANGPACKS" ]; then
+	MAKEFILES_langpacks=`cat ${srcdir}/l10n/makefiles.all`
+else
+	MAKEFILES_langpacks=`cat ${srcdir}/l10n/makefiles`
+fi
+
 if [ "$MOZ_L10N" ]; then
     MAKEFILES_l10n="l10n/Makefile"
 
@@ -921,6 +927,7 @@ $MAKEFILES_jprof
 $MAKEFILES_js
 $MAKEFILES_l10n
 $MAKEFILES_l10n_lang
+$MAKEFILES_langpacks
 $MAKEFILES_layout
 $MAKEFILES_libreg
 $MAKEFILES_libimg

client.mak

@@ -163,6 +163,7 @@ pull_seamonkey: pull_clientmak
 pull_l10n:
 	cd $(MOZ_SRC)\.
 !if defined(MOZ_LANGPACKS)
+	$(CVSCO) mozilla/l10n/makefile.win
 	$(CVSCO) mozilla/l10n/langpacks
 !else
 	$(CVSCO) mozilla/l10n/makefile.win

client.mk

@@ -197,6 +197,35 @@ ifdef NSPR_CO_TAG
 endif
 CVSCO_NSPR = cvs $(CVS_FLAGS) co $(NSPR_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSPR_CO_MODULE)
 
+####################################
+# CVS defines for L10N
+#
+ifdef MOZ_LANGPACKS
+L10N_CO_MODULE = \
+	mozilla/l10n/Makefile.in \
+	mozilla/l10n/makefiles.all \
+	mozilla/l10n/langpacks
+else
+L10N_CO_MODULE = \
+	mozilla/l10n/Makefile.in \
+	mozilla/l10n/makefiles \
+	mozilla/l10n/langpacks/Makefile.in \
+	mozilla/l10n/langpacks/en-GB/Makefile.in \
+	mozilla/l10n/langpacks/en-GB/theme.mk \
+	mozilla/l10n/langpacks/en-GB/chrome/Makefile.in \
+	mozilla/l10n/langpacks/en-GB/chrome/en-GB/Makefile.in \
+	mozilla/l10n/langpacks/en-GB/chrome/en-GB/manifest.rdf \
+	mozilla/l10n/langpacks/en-GB/defaults/Makefile.in \
+	mozilla/l10n/langpacks/en-GB/defaults/profile/Makefile.in \
+	mozilla/l10n/langpacks/en-GB/defaults/profile/en-GB
+endif
+
+L10N_CO_FLAGS := -P
+ifdef L10N_CO_TAG
+  L10N_CO_FLAGS := $(L10N_CO_FLAGS) -r $(L10N_CO_TAG)
+endif
+CVSCO_L10N = cvs $(CVS_FLAGS) co $(L10N_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(L10N_CO_MODULE)
+
 ####################################
 # CVS defines for the C LDAP SDK
 #
@@ -283,6 +312,7 @@ real_checkout:
 	cvs_co() { echo "$$@" ; \
 	  ("$$@" || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
 	  if test -f $$failed; then false; else true; fi; }; \
+        cvs_co $(CVSCO_L10N) && \
 	cvs_co $(CVSCO_NSPR) && \
 	cvs_co $(CVSCO_PSM) && \
         cvs_co $(CVSCO_LDAPCSDK) && \
@@ -347,6 +377,12 @@ $(TOPSRCDIR)/configure: $(TOPSRCDIR)/configure.in $(EXTRA_CONFIG_DEPS)
 	cd $(TOPSRCDIR); $(AUTOCONF)
 endif
 
+ifdef MOZ_LANGPACKS
+CONFIG_STATUS_DEPS_L10N := $(wildcard $(TOPSRCDIR)/l10n/makefiles.all)
+else
+CONFIG_STATUS_DEPS_L10N := $(wildcard $(TOPSRCDIR)/l10n/makefiles)
+endif
+
 CONFIG_STATUS_DEPS := \
 	$(TOPSRCDIR)/configure \
 	$(TOPSRCDIR)/allmakefiles.sh \
@@ -354,6 +390,7 @@ CONFIG_STATUS_DEPS := \
 	$(wildcard $(TOPSRCDIR)/nsprpub/configure) \
 	$(wildcard $(TOPSRCDIR)/directory/c-sdk/ldap/configure) \
 	$(wildcard $(TOPSRCDIR)/mailnews/makefiles) \
+	$(CONFIG_STATUS_DEPS_L10N) \
 	$(wildcard $(TOPSRCDIR)/themes/makefiles) \
 	$(NULL)
 

xpinstall/packager/packages-unix

@@ -8,6 +8,19 @@
 ; ; file comment
 ;
 
+[langengb]
+;
+; en-GB 
+bin/defaults/profile/en-GB/*
+bin/chrome/locales/en-GB/*
+
+[deflenus]
+;
+; default files for en-US
+bin/defaults/profile/bookmarks.html
+bin/defaults/profile/panels.rdf
+bin/defaults/profile/search.rdf
+
 [xpcom]
 bin/libjsdom.so
 bin/libmozjs.so