From e603de7ab7aadf66bd84cf7abae723f19d8e715a Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Mon, 25 Apr 2005 23:03:56 +0000
Subject: [PATCH] Bug #291836 --> packaging changes for the new extension
 manager stuff

---
 mail/app/profile/extensions/Extensions.rdf                   | 3 +--
 mail/app/profile/extensions/Makefile.in                      | 2 --
 .../{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in       | 4 ++--
 .../{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in    | 4 ++--
 mail/config/basemail-unix                                    | 5 +----
 mail/installer/windows/basemail-win                          | 3 +--
 6 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/mail/app/profile/extensions/Extensions.rdf b/mail/app/profile/extensions/Extensions.rdf
index a2a8d97c5077..d2f4a370d05f 100644
--- a/mail/app/profile/extensions/Extensions.rdf
+++ b/mail/app/profile/extensions/Extensions.rdf
@@ -3,7 +3,6 @@
 <RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
      xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 
-  <Seq about="urn:mozilla:extension:root"/>
-  <Seq about="urn:mozilla:theme:root"/>
+  <Seq about="urn:mozilla:item:root"/> 
 
 </RDF>
diff --git a/mail/app/profile/extensions/Makefile.in b/mail/app/profile/extensions/Makefile.in
index a3817783132a..7ddb0b96184b 100644
--- a/mail/app/profile/extensions/Makefile.in
+++ b/mail/app/profile/extensions/Makefile.in
@@ -54,8 +54,6 @@ FILES := $(addprefix $(srcdir)/, $(FILES))
 
 libs::
 	$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/extensions
-	$(INSTALL) $(srcdir)/"installed-extensions.txt" $(DIST)/bin/defaults/profile/extensions
  
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/extensions
-	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/"installed-extensions.txt" $(DESTDIR)$(mozappdir)/defaults/profile/extensions
diff --git a/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in b/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
index 5ecc52ec942d..9c9eccc40e17 100644
--- a/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
+++ b/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
@@ -49,7 +49,7 @@ FILES := \
 
 libs::
 	$(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf.in > install.rdf
-	$(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+	$(INSTALL) $(FILES) $(DIST)/bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
  
 install::
-	$(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+	$(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
diff --git a/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in b/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
index 8837f33dfddb..7afbd4a94d4b 100644
--- a/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
+++ b/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
@@ -12,8 +12,8 @@
     <em:targetApplication>
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>0.7</em:minVersion>
-        <em:maxVersion>0.7+</em:maxVersion>
+        <em:minVersion>1.0</em:minVersion>
+        <em:maxVersion>1.1</em:maxVersion>
       </Description>
     </em:targetApplication>
     
diff --git a/mail/config/basemail-unix b/mail/config/basemail-unix
index 3ebee2f81d36..f7d7909b9d33 100644
--- a/mail/config/basemail-unix
+++ b/mail/config/basemail-unix
@@ -31,6 +31,7 @@ chrome/icons/default/addressbookWindow.xpm
 chrome/icons/default/messengerWindow.xpm
 chrome/icons/default/msgcomposeWindow.xpm
 
+bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Mail Extensions (smime, etc.)
@@ -66,10 +67,6 @@ defaults/profile/US/localstore.rdf
 defaults/profile/US/mimeTypes.rdf
 defaults/isp/US/movemail.rdf
 defaults/isp/movemail.rdf
-defaults/profile/extensions/Extensions.rdf
-defaults/profile/extensions/installed-extensions.txt
-defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; App extensions to Mail
diff --git a/mail/installer/windows/basemail-win b/mail/installer/windows/basemail-win
index bff270aedac5..50ddb6dd7baa 100644
--- a/mail/installer/windows/basemail-win
+++ b/mail/installer/windows/basemail-win
@@ -17,8 +17,6 @@ bin\defaults\messenger\mailViews.dat
 bin\defaults\profile\localstore.rdf
 bin\defaults\profile\prefs.js
 bin\defaults\profile\mimeTypes.rdf
-bin\defaults\profile\extensions\*
-bin\defaults\profile\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf
 
 [xpcom]
 bin\xpcom.dll
@@ -92,6 +90,7 @@ bin\chrome\icons\default\abcardWindow.ico
 bin\chrome\icons\default\addressbookWindow.ico
 bin\chrome\icons\default\messengerWindow.ico
 bin\chrome\icons\default\msgcomposeWindow.ico
+bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Mail Extensions (smime, etc.)