From 18351dea2ee53e26b7fbdf7c037dbe715fb66ceb Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.me.uk>
Date: Sun, 22 May 2011 02:54:18 +0100
Subject: Use the same icon everywhere

---
 Makefile                      | 8 ++++----
 chromium/icon.svg             | 6 ------
 gecko/chrome/content/icon.svg | 6 ------
 icon.svg                      | 6 ++++++
 4 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 chromium/icon.svg
 delete mode 100644 gecko/chrome/content/icon.svg
 create mode 100644 icon.svg

diff --git a/Makefile b/Makefile
index 38644a5..a4c1629 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ xpi:
 	cp COPYING gecko/chrome.manifest gecko-build/
 	cp gecko/chrome/content/simplyread.xul gecko-build/chrome/content/
 	cp simplyread.js gecko-build/chrome/content/
-	rsvg gecko/chrome/content/icon.svg gecko-build/chrome/content/icon.png
+	rsvg -w 22 -h 22 icon.svg gecko-build/chrome/content/icon.png
 	sed "s/VERSION/$(VERSION)/g" < gecko/install.ttl | rapper -i turtle -o rdfxml /dev/stdin 2>/dev/null > gecko-build/install.rdf
 	cd gecko-build; zip -r ../web/$(NAME)-$(VERSION).xpi . 1>/dev/null
 	gpg -b < web/$(NAME)-$(VERSION).xpi > web/$(NAME)-$(VERSION).xpi.sig
@@ -48,9 +48,9 @@ crx:
 	rm -rf chromium-build
 	mkdir chromium-build
 	cp COPYING simplyread.js keybind.js chromium/viable.js chromium/background.html chromium-build/
-	rsvg -w 19 -h 19 chromium/icon.svg chromium-build/icon.png
-	rsvg -w 48 -h 48 chromium/icon.svg chromium-build/icon48.png
-	rsvg -w 128 -h 128 chromium/icon.svg chromium-build/icon128.png
+	rsvg -w 19 -h 19 icon.svg chromium-build/icon.png
+	rsvg -w 48 -h 48 icon.svg chromium-build/icon48.png
+	rsvg -w 128 -h 128 icon.svg chromium-build/icon128.png
 	sed "s/VERSION/$(VERSION)/g" < chromium/manifest.json > chromium-build/manifest.json
 	sh chromium/makecrx.sh chromium-build $(KEYFILE) > web/$(NAME)-$(VERSION).crx
 	rm -r chromium-build
diff --git a/chromium/icon.svg b/chromium/icon.svg
deleted file mode 100644
index fda3979..0000000
--- a/chromium/icon.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="128" height="128">
-	<circle cx="64" cy="64" r="64" fill="white"/>
-	<text x="11" y="100" font-size="128" font-family="sans">s</text>
-	<text x="59" y="100" font-size="128" font-family="sans">r</text>
-</svg>
diff --git a/gecko/chrome/content/icon.svg b/gecko/chrome/content/icon.svg
deleted file mode 100644
index f1f4062..0000000
--- a/gecko/chrome/content/icon.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="22" height="22">
-	<circle cx="11" cy="11" r="11" fill="white"/>
-	<text x="4" y="16" font-size="18" font-family="sans">s</text>
-	<text x="10" y="16" font-size="18" font-family="sans">r</text>
-</svg>
diff --git a/icon.svg b/icon.svg
new file mode 100644
index 0000000..fda3979
--- /dev/null
+++ b/icon.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="128" height="128">
+	<circle cx="64" cy="64" r="64" fill="white"/>
+	<text x="11" y="100" font-size="128" font-family="sans">s</text>
+	<text x="59" y="100" font-size="128" font-family="sans">r</text>
+</svg>
-- 
cgit v1.2.3