From 7f10b02a2379d959a0647104f89351d955045e5d Mon Sep 17 00:00:00 2001
From: "ben%bengoodger.com"
 <ben%bengoodger.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 7 Jun 2004 06:00:52 +0000
Subject: [PATCH] back out this change since it was superfluous and seems to
 have broken a lot of things

git-svn-id: svn://10.0.0.236/trunk@157493 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/allmakefiles.sh                                |  1 -
 .../{contents-region.rdf.in => contents-region.rdf}    | 10 +++-------
 2 files changed, 3 insertions(+), 8 deletions(-)
 rename mozilla/browser/base/content/{contents-region.rdf.in => contents-region.rdf} (51%)

diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh
index 7b14d45ae58..49c3a2e8558 100755
--- a/mozilla/allmakefiles.sh
+++ b/mozilla/allmakefiles.sh
@@ -881,7 +881,6 @@ browser/components/shell/public/Makefile
 browser/installer/Makefile
 browser/installer/unix/Makefile
 browser/installer/windows/Makefile
-browser/base/content/contents-region.rdf
 "
 
 MAKEFILES_xulapp="
diff --git a/mozilla/browser/base/content/contents-region.rdf.in b/mozilla/browser/base/content/contents-region.rdf
similarity index 51%
rename from mozilla/browser/base/content/contents-region.rdf.in
rename to mozilla/browser/base/content/contents-region.rdf
index 78d40378b7f..48256aa9273 100644
--- a/mozilla/browser/base/content/contents-region.rdf.in
+++ b/mozilla/browser/base/content/contents-region.rdf
@@ -2,16 +2,12 @@
 <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 packages being supplied by this jar -->
   <RDF:Seq about="urn:mozilla:package:root">
     <RDF:li resource="urn:mozilla:package:browser-region"/>
   </RDF:Seq>
 
-  <!-- package information -->
+  <!-- we need a dummy package so that browser-region works correctly -->
   <RDF:Description about="urn:mozilla:package:browser-region"
- 	                 chrome:displayName="US Regional Contents"
-                   chrome:author="mozilla.org"
-                   chrome:name="browser-region"
-                   chrome:localeVersion="@MOZILLA_REGION_VERSION@"/>
-
+        chrome:name="browser-region"
+        chrome:localeVersion="0.9.9" />
 </RDF:RDF>