bug 307225, make langpacks nice extensions with chrome.manifest and up-to-date install.rdf, l10n-packaging-only build change, r=bsmedberg, sr,a=mscott

mail/locales/Makefile.in

@@ -60,6 +60,7 @@ APP_VERSION = $(shell cat $(srcdir)/../config/version.txt)
 
 DEFINES += \
 	-DAB_CD=$(AB_CD) \
+	-DMOZ_LANGPACK_EID=langpack-$(AB_CD)@thunderbird.mozilla.org \
 	-DMOZ_APP_VERSION=$(APP_VERSION) \
 	-DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \
 	-DPKG_BASENAME=$(PKG_BASENAME) \
@@ -193,13 +194,13 @@ langpack-%: XPI_NAME=locale-$*
 langpack-%:
 	@echo "Making langpack $(LANGPACK_FILE)"
 	@$(RM) -rf $(DIST)/xpi-stage/locale-$(AB_CD)
-	@$(MAKE) libs-$(AB_CD)
+	@$(MAKE) libs-$(AB_CD) USE_EXTENSION_MANIFEST=1
 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
 	  -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc \
 	  -I$(LOCALE_SRCDIR)/defines.inc $(srcdir)/generic/install.rdf > \
 	  $(FINAL_TARGET)/install.rdf
 	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
-	  $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome
+	  $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest
 
 # This is a generic target that will make a langpack, repack ZIP (tarball)
 # builds, and repack and installer if applicable. It is called from the

mail/locales/generic/install.rdf

@@ -45,6 +45,7 @@
                em:id="@MOZ_LANGPACK_EID@"
                em:name="@MOZ_LANG_TITLE@ Language Pack"
                em:version="@MOZ_APP_VERSION@"
+               em:type="8"
                em:creator="@MOZ_LANGPACK_CREATOR@">
 #ifdef MOZ_LANGPACK_CONTRIBUTORS
     @MOZ_LANGPACK_CONTRIBUTORS@
@@ -52,8 +53,8 @@
     <em:targetApplication>
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>1.0+</em:minVersion>
-        <em:maxVersion>1.1</em:maxVersion>
+        <em:minVersion>@MOZ_APP_VERSION@</em:minVersion>
+        <em:maxVersion>@MOZ_APP_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>