[Pkg-mozext-commits] [firetray] 56/84: * fix and imporve inclusion of all images into .xpi * fix additional locales declarations
David Prévot
taffit at moszumanska.debian.org
Sun Jul 20 01:42:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository firetray.
commit 639bf7a914bf5be107575f9e6bca6ff6359ca25d
Author: foudfou <foudil.newbie+git at gmail.com>
Date: Wed Apr 30 16:19:15 2014 +0200
* fix and imporve inclusion of all images into .xpi
* fix additional locales declarations
---
src/Makefile | 4 +++-
src/chrome.manifest | 3 +++
src/chrome/locale/{ru_RU => ru-RU}/options.dtd | 0
src/chrome/locale/{ru_RU => ru-RU}/options.properties | 0
src/chrome/locale/{ru_RU => ru-RU}/overlay.dtd | 0
src/chrome/locale/{ru_RU => ru-RU}/overlay.properties | 0
src/chrome/skin/{ => img}/chatzilla22.png | Bin
src/chrome/skin/{ => img}/firefox22.png | Bin
src/chrome/skin/{ => img}/internet-group-chat.svg | 0
src/chrome/skin/{ => img}/internet-mail.svg | 0
src/chrome/skin/{ => img}/mail-unread.png | Bin
src/chrome/skin/{ => img}/pidgin-tray-available.png | Bin
src/chrome/skin/{ => img}/pidgin-tray-away.png | Bin
src/chrome/skin/{ => img}/pidgin-tray-busy.png | Bin
src/chrome/skin/{ => img}/pidgin-tray-offline.png | Bin
src/chrome/skin/{ => img}/preferences-system-windows.svg | 0
src/chrome/skin/{ => img}/preferences-system.svg | 0
src/chrome/skin/{ => img}/seamonkey22.png | Bin
src/chrome/skin/{ => img}/thunderbird22.png | Bin
src/chrome/skin/{ => img}/zotero22.png | Bin
.../skin/linux/icons/gnome/22x22/status/mail-unread.png | 2 +-
.../skin/linux/icons/gnome/22x22/status/user-available.png | 2 +-
.../skin/linux/icons/gnome/22x22/status/user-away.png | 2 +-
.../skin/linux/icons/gnome/22x22/status/user-busy.png | 2 +-
.../skin/linux/icons/gnome/22x22/status/user-offline.png | 2 +-
.../skin/linux/icons/hicolor/22x22/apps/chatzilla.png | 2 +-
src/chrome/skin/linux/icons/hicolor/22x22/apps/firefox.png | 2 +-
.../skin/linux/icons/hicolor/22x22/apps/seamonkey.png | 2 +-
.../skin/linux/icons/hicolor/22x22/apps/thunderbird.png | 2 +-
src/chrome/skin/linux/icons/hicolor/22x22/apps/zotero.png | 1 +
src/chrome/skin/linux/icons/hicolor/22x22/apps/zotero22.png | 1 -
src/chrome/skin/pref-chat.svg | 2 +-
src/chrome/skin/pref-icon.svg | 2 +-
src/chrome/skin/pref-mail.svg | 2 +-
src/chrome/skin/pref-windows.svg | 2 +-
35 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 2f3641c..588dcf0 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -99,7 +99,9 @@ chrome_sources := $(chrome_sources_js) \
$(wildcard $(chrome_source_root)/skin/*.png) \
$(wildcard $(chrome_source_root)/skin/*.svg) \
$(wildcard $(chrome_source_root)/skin/linux/icons/hicolor/22x22/apps/*.png) \
- $(wildcard $(chrome_source_root)/skin/linux/icons/hicolor/32x32/apps/*.png) \
+ $(wildcard $(chrome_source_root)/skin/linux/icons/gnome/22x22/status/*.png) \
+ $(wildcard $(chrome_source_root)/skin/winnt/*.bmp) \
+ $(wildcard $(chrome_source_root)/skin/winnt/*.ico) \
$(wildcard $(chrome_source_root)/locale/*/*.dtd) \
$(wildcard $(chrome_source_root)/locale/*/*.properties)
diff --git a/src/chrome.manifest b/src/chrome.manifest
index c147484..b3e16ef 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -4,8 +4,11 @@ locale firetray de-DE chrome/locale/de-DE/
locale firetray en-US chrome/locale/en-US/
locale firetray es-AR chrome/locale/es-AR/
locale firetray fr chrome/locale/fr/
+locale firetray hr-HR chrome/locale/hr-HR/
locale firetray it chrome/locale/it/
locale firetray nl chrome/locale/nl/
+locale firetray pl-PL chrome/locale/pl-PL/
+locale firetray ru-RU chrome/locale/ru-RU/
locale firetray sk-SK chrome/locale/sk-SK/
locale firetray zh-TW chrome/locale/zh-TW/
resource firetray modules/
diff --git a/src/chrome/locale/ru_RU/options.dtd b/src/chrome/locale/ru-RU/options.dtd
similarity index 100%
rename from src/chrome/locale/ru_RU/options.dtd
rename to src/chrome/locale/ru-RU/options.dtd
diff --git a/src/chrome/locale/ru_RU/options.properties b/src/chrome/locale/ru-RU/options.properties
similarity index 100%
rename from src/chrome/locale/ru_RU/options.properties
rename to src/chrome/locale/ru-RU/options.properties
diff --git a/src/chrome/locale/ru_RU/overlay.dtd b/src/chrome/locale/ru-RU/overlay.dtd
similarity index 100%
rename from src/chrome/locale/ru_RU/overlay.dtd
rename to src/chrome/locale/ru-RU/overlay.dtd
diff --git a/src/chrome/locale/ru_RU/overlay.properties b/src/chrome/locale/ru-RU/overlay.properties
similarity index 100%
rename from src/chrome/locale/ru_RU/overlay.properties
rename to src/chrome/locale/ru-RU/overlay.properties
diff --git a/src/chrome/skin/chatzilla22.png b/src/chrome/skin/img/chatzilla22.png
similarity index 100%
rename from src/chrome/skin/chatzilla22.png
rename to src/chrome/skin/img/chatzilla22.png
diff --git a/src/chrome/skin/firefox22.png b/src/chrome/skin/img/firefox22.png
similarity index 100%
rename from src/chrome/skin/firefox22.png
rename to src/chrome/skin/img/firefox22.png
diff --git a/src/chrome/skin/internet-group-chat.svg b/src/chrome/skin/img/internet-group-chat.svg
similarity index 100%
rename from src/chrome/skin/internet-group-chat.svg
rename to src/chrome/skin/img/internet-group-chat.svg
diff --git a/src/chrome/skin/internet-mail.svg b/src/chrome/skin/img/internet-mail.svg
similarity index 100%
rename from src/chrome/skin/internet-mail.svg
rename to src/chrome/skin/img/internet-mail.svg
diff --git a/src/chrome/skin/mail-unread.png b/src/chrome/skin/img/mail-unread.png
similarity index 100%
rename from src/chrome/skin/mail-unread.png
rename to src/chrome/skin/img/mail-unread.png
diff --git a/src/chrome/skin/pidgin-tray-available.png b/src/chrome/skin/img/pidgin-tray-available.png
similarity index 100%
rename from src/chrome/skin/pidgin-tray-available.png
rename to src/chrome/skin/img/pidgin-tray-available.png
diff --git a/src/chrome/skin/pidgin-tray-away.png b/src/chrome/skin/img/pidgin-tray-away.png
similarity index 100%
rename from src/chrome/skin/pidgin-tray-away.png
rename to src/chrome/skin/img/pidgin-tray-away.png
diff --git a/src/chrome/skin/pidgin-tray-busy.png b/src/chrome/skin/img/pidgin-tray-busy.png
similarity index 100%
rename from src/chrome/skin/pidgin-tray-busy.png
rename to src/chrome/skin/img/pidgin-tray-busy.png
diff --git a/src/chrome/skin/pidgin-tray-offline.png b/src/chrome/skin/img/pidgin-tray-offline.png
similarity index 100%
rename from src/chrome/skin/pidgin-tray-offline.png
rename to src/chrome/skin/img/pidgin-tray-offline.png
diff --git a/src/chrome/skin/preferences-system-windows.svg b/src/chrome/skin/img/preferences-system-windows.svg
similarity index 100%
rename from src/chrome/skin/preferences-system-windows.svg
rename to src/chrome/skin/img/preferences-system-windows.svg
diff --git a/src/chrome/skin/preferences-system.svg b/src/chrome/skin/img/preferences-system.svg
similarity index 100%
rename from src/chrome/skin/preferences-system.svg
rename to src/chrome/skin/img/preferences-system.svg
diff --git a/src/chrome/skin/seamonkey22.png b/src/chrome/skin/img/seamonkey22.png
similarity index 100%
rename from src/chrome/skin/seamonkey22.png
rename to src/chrome/skin/img/seamonkey22.png
diff --git a/src/chrome/skin/thunderbird22.png b/src/chrome/skin/img/thunderbird22.png
similarity index 100%
rename from src/chrome/skin/thunderbird22.png
rename to src/chrome/skin/img/thunderbird22.png
diff --git a/src/chrome/skin/zotero22.png b/src/chrome/skin/img/zotero22.png
similarity index 100%
rename from src/chrome/skin/zotero22.png
rename to src/chrome/skin/img/zotero22.png
diff --git a/src/chrome/skin/linux/icons/gnome/22x22/status/mail-unread.png b/src/chrome/skin/linux/icons/gnome/22x22/status/mail-unread.png
index 0e4ffc3..0396d4a 120000
--- a/src/chrome/skin/linux/icons/gnome/22x22/status/mail-unread.png
+++ b/src/chrome/skin/linux/icons/gnome/22x22/status/mail-unread.png
@@ -1 +1 @@
-../../../../../mail-unread.png
\ No newline at end of file
+../../../../../img/mail-unread.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/gnome/22x22/status/user-available.png b/src/chrome/skin/linux/icons/gnome/22x22/status/user-available.png
index 3329bf8..ff25ef1 120000
--- a/src/chrome/skin/linux/icons/gnome/22x22/status/user-available.png
+++ b/src/chrome/skin/linux/icons/gnome/22x22/status/user-available.png
@@ -1 +1 @@
-../../../../../pidgin-tray-available.png
\ No newline at end of file
+../../../../../img/pidgin-tray-available.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/gnome/22x22/status/user-away.png b/src/chrome/skin/linux/icons/gnome/22x22/status/user-away.png
index 5580cb1..72e9539 120000
--- a/src/chrome/skin/linux/icons/gnome/22x22/status/user-away.png
+++ b/src/chrome/skin/linux/icons/gnome/22x22/status/user-away.png
@@ -1 +1 @@
-../../../../../pidgin-tray-away.png
\ No newline at end of file
+../../../../../img/pidgin-tray-away.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/gnome/22x22/status/user-busy.png b/src/chrome/skin/linux/icons/gnome/22x22/status/user-busy.png
index 84c85ee..a930256 120000
--- a/src/chrome/skin/linux/icons/gnome/22x22/status/user-busy.png
+++ b/src/chrome/skin/linux/icons/gnome/22x22/status/user-busy.png
@@ -1 +1 @@
-../../../../../pidgin-tray-busy.png
\ No newline at end of file
+../../../../../img/pidgin-tray-busy.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/gnome/22x22/status/user-offline.png b/src/chrome/skin/linux/icons/gnome/22x22/status/user-offline.png
index 5df30b0..9d92822 120000
--- a/src/chrome/skin/linux/icons/gnome/22x22/status/user-offline.png
+++ b/src/chrome/skin/linux/icons/gnome/22x22/status/user-offline.png
@@ -1 +1 @@
-../../../../../pidgin-tray-offline.png
\ No newline at end of file
+../../../../../img/pidgin-tray-offline.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/chatzilla.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/chatzilla.png
index 39401cb..bee9769 120000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/apps/chatzilla.png
+++ b/src/chrome/skin/linux/icons/hicolor/22x22/apps/chatzilla.png
@@ -1 +1 @@
-../../../../../chatzilla22.png
\ No newline at end of file
+../../../../../img/chatzilla22.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/firefox.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/firefox.png
index b9b2b27..7f5ec80 120000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/apps/firefox.png
+++ b/src/chrome/skin/linux/icons/hicolor/22x22/apps/firefox.png
@@ -1 +1 @@
-../../../../../firefox22.png
\ No newline at end of file
+../../../../../img/firefox22.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/seamonkey.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/seamonkey.png
index bb3ac9d..833918b 120000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/apps/seamonkey.png
+++ b/src/chrome/skin/linux/icons/hicolor/22x22/apps/seamonkey.png
@@ -1 +1 @@
-../../../../../seamonkey22.png
\ No newline at end of file
+../../../../../img/seamonkey22.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/thunderbird.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/thunderbird.png
index 465aa92..616e001 120000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/apps/thunderbird.png
+++ b/src/chrome/skin/linux/icons/hicolor/22x22/apps/thunderbird.png
@@ -1 +1 @@
-../../../../../thunderbird22.png
\ No newline at end of file
+../../../../../img/thunderbird22.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/zotero.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/zotero.png
new file mode 120000
index 0000000..1212859
--- /dev/null
+++ b/src/chrome/skin/linux/icons/hicolor/22x22/apps/zotero.png
@@ -0,0 +1 @@
+../../../../../img/zotero22.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/zotero22.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/zotero22.png
deleted file mode 120000
index 395e145..0000000
--- a/src/chrome/skin/linux/icons/hicolor/22x22/apps/zotero22.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../zotero22.png
\ No newline at end of file
diff --git a/src/chrome/skin/pref-chat.svg b/src/chrome/skin/pref-chat.svg
index 3794089..cec8254 120000
--- a/src/chrome/skin/pref-chat.svg
+++ b/src/chrome/skin/pref-chat.svg
@@ -1 +1 @@
-internet-group-chat.svg
\ No newline at end of file
+img/internet-group-chat.svg
\ No newline at end of file
diff --git a/src/chrome/skin/pref-icon.svg b/src/chrome/skin/pref-icon.svg
index 476ddab..5fcadda 120000
--- a/src/chrome/skin/pref-icon.svg
+++ b/src/chrome/skin/pref-icon.svg
@@ -1 +1 @@
-preferences-system.svg
\ No newline at end of file
+img/preferences-system.svg
\ No newline at end of file
diff --git a/src/chrome/skin/pref-mail.svg b/src/chrome/skin/pref-mail.svg
index 26b10f1..78cdd0a 120000
--- a/src/chrome/skin/pref-mail.svg
+++ b/src/chrome/skin/pref-mail.svg
@@ -1 +1 @@
-internet-mail.svg
\ No newline at end of file
+img/internet-mail.svg
\ No newline at end of file
diff --git a/src/chrome/skin/pref-windows.svg b/src/chrome/skin/pref-windows.svg
index d87a4ae..33978b1 120000
--- a/src/chrome/skin/pref-windows.svg
+++ b/src/chrome/skin/pref-windows.svg
@@ -1 +1 @@
-preferences-system-windows.svg
\ No newline at end of file
+img/preferences-system-windows.svg
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git
More information about the Pkg-mozext-commits
mailing list