Checked in attachment 211486.(Also removed obsolete files). Bug 326003:Move brand.dtd and brand.properties to locales. r=mostafah

calendar/Makefile.in

@@ -42,7 +42,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE	= calendar
-DIRS = libical resources base providers import-export
+DIRS = libical resources base providers import-export locales
 
 ifndef MOZ_SUNBIRD
 ifneq ($(OS_ARCH),Darwin)

calendar/sunbird/app/Makefile.in

@@ -50,8 +50,6 @@ DIRS		= profile/extensions profile
 
 PREF_JS_EXPORTS = $(srcdir)/profile/sunbird.js
 
-DEFINES += -DAB_CD=$(AB_CD)
-
 ifeq ($(USE_SHORT_LIBNAME), 1)
 PROGRAM = sunbird$(BIN_SUFFIX)
 else
@@ -252,9 +250,6 @@ install::
 	$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/icons
 endif
 
-export:: brand.dtd.in
-	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > brand.dtd
-
 export::
 ifndef MOZ_USE_OFFICIAL_BRANDING
 	$(NSINSTALL) -D $(DIST)/branding

calendar/sunbird/app/brand.dtd.in

@@ -1,7 +0,0 @@
-<!ENTITY  lang.version          "1.7a">
-<!ENTITY  brandShortName        "Sunbird">
-<!ENTITY  brandFullName         "Mozilla Sunbird">
-#expand <!ENTITY  version               "__APP_VERSION__">
-<!ENTITY  vendorShortName       "Mozilla">
-
-<!ENTITY  releaseURL            "http://www.mozilla.org/projects/calendar/releases/sunbird_0.3alpha1.html">

calendar/sunbird/app/brand.properties

@@ -1,3 +0,0 @@
-brandShortName=Sunbird
-brandFullName=Mozilla Sunbird
-vendorShortName=Mozilla

calendar/sunbird/app/contents.rdf

@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-#filter substitution
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locales being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:@AB_CD@"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:@AB_CD@">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:@AB_CD@:packages">
-        <RDF:li resource="urn:mozilla:locale:@AB_CD@:branding"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-</RDF:RDF>

calendar/sunbird/app/jar.mn

@@ -1,6 +0,0 @@
-#filter substitution
-
-@AB_CD@.jar:
-%   locale branding @AB_CD@ %locale/branding/
-+   locale/branding/brand.dtd               (brand.dtd)
-+   locale/branding/brand.properties        (brand.properties)