change directory structure to follow the more standard package hierarchy

Makefile

@@ -6,14 +6,16 @@ VERSION       = 0.6pre
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 
-JAR_FILES     = ${shell find chrome/content -type f 		\
+JAR_FILES     = ${shell find content skin	\
-					-a ! -path '*CVS*' 	\
+			-type f			\
-					-a \( -path '*.js' 	\
+			-a ! -path '*CVS*'	\
-				     -o  -path '*.css' 	\
+			-a \(			\
-				     -o  -path '*.xul' 	\
+				-path '*.js'	\
-				     -o  -path '*.rdf' 	\
+			     -o -path '*.css'	\
-				     -o  -path '*.png' 	\
+			     -o -path '*.xul'	\
-				   \) } chrome.manifest
+			     -o -path '*.png'	\
+			   \)			\
+		}
 JAR_DIRS      = $(foreach f,${JAR_FILES},$(dir $f))
 JAR           = chrome/vimperator.jar
 
@@ -148,6 +150,7 @@ ${BUILD_JAR_SUBDIRS}:
 
 ${JAR}: ${BUILD_JAR_SUBDIRS} ${JAR_FILES}
 	@echo "Building JAR..."
+	${Q}mkdir -p $(dir ${JAR}) #FIXME
 	${Q}for f in ${JAR_FILES} ; do \
 		${SED} -e "s,###VERSION###,${VERSION},g" \
 		       -e "s,###DATE###,${BUILD_DATE},g" \

chrome.manifest

@@ -1,3 +1,3 @@
-# vimperators chrome registration file
+content	vimperator jar:chrome/vimperator.jar!/content/
-content	vimperator	jar:chrome/vimperator.jar!/chrome/content/vimperator/
+skin vimperator classic/1.0 jar:chrome/vimperator.jar!/skin/
 overlay chrome://browser/content/browser.xul chrome://vimperator/content/vimperator.xul

chrome/content/vimperator/contents.rdf

@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <RDF:Seq RDF:about="urn:mozilla:package:root">
-    <RDF:li RDF:resource="urn:mozilla:package:vimperator"/>
-  </RDF:Seq>
-
-  <!--<RDF:Seq RDF:about="urn:mozilla:overlays">-->
-  <!--<RDF:li RDF:resource="chrome://browser/content/browser.xul"/>-->
-  <!--</RDF:Seq>-->
-
-  <RDF:Seq RDF:about="chrome://browser/content/browser.xul">
-    <RDF:li>chrome://vimperator/content/vimperator.xul</RDF:li>
-  </RDF:Seq>
-
-  <RDF:Description RDF:about="urn:mozilla:package:vimperator"
-        chrome:displayName="Vimperator"
-        chrome:author="Martin Stubenschrott"
-        chrome:name="vimperator"
-        chrome:extension="true"
-        chrome:description="Make Firefox behave like Vim">
-  </RDF:Description>
-</RDF:RDF>

content/vimperator.xul

@@ -31,7 +31,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 
 <!-- The stylesheet which is used for the :help command -->
-<?xml-stylesheet href="chrome://vimperator/content/vimperator.css" type="text/css"?>
+<?xml-stylesheet href="chrome://vimperator/skin/vimperator.css" type="text/css"?>
 
 <overlay id="vimperator"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

install.rdf

@@ -9,7 +9,7 @@
 	<em:description>Make Firefox behave like Vim</em:description>
 	<em:creator>Martin Stubenschrott</em:creator>
 	<em:homepageURL>http://vimperator.mozdev.org</em:homepageURL>
-	<em:iconURL>chrome://vimperator/content/icon.png</em:iconURL>
+	<em:iconURL>chrome://vimperator/skin/icon.png</em:iconURL>
 	<!--em:updateURL>http://downloads.mozdev.org/vimperator/update.rdf</em:updateURL-->
 	<em:file>
 	    <Description about="urn:mozilla:extension:file:vimperator.jar">