[Pkg-mozext-commits] [SCM] system tray extension for thunderbird/firefox alike apps branch, master, updated. debian/0.3.6-2-26-g1ea3ef3
David Prévot
taffit at debian.org
Thu Jul 11 05:07:11 UTC 2013
The following commit has been merged in the master branch:
commit c158159090f6de00774424458eff4cc3b55fbb6f
Author: David Prévot <taffit at debian.org>
Date: Thu Jul 11 00:27:45 2013 -0400
Remove unused patches and icon
diff --git a/debian/iceowl.xpm b/debian/iceowl.xpm
deleted file mode 100644
index fd5cefe..0000000
--- a/debian/iceowl.xpm
+++ /dev/null
@@ -1,294 +0,0 @@
-/* XPM */
-static char *iceowl_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 256 2",
-" c #605F54",
-". c #605F58",
-"X c #616056",
-"o c #63625A",
-"O c #6C6A5E",
-"+ c #6D6A67",
-"@ c #716E62",
-"# c #747164",
-"$ c #7A7768",
-"% c #7D7B6B",
-"& c #7F7E7B",
-"* c #DA371E",
-"= c #DA381F",
-"- c #DA391F",
-"; c #DA381E",
-": c #D9381E",
-"> c #D53B23",
-", c #DF4618",
-"< c #DF4619",
-"1 c #DF4719",
-"2 c #DA491D",
-"3 c #DE5719",
-"4 c #DE5A1D",
-"5 c #E04618",
-"6 c #E15413",
-"7 c #E15615",
-"8 c #E05615",
-"9 c #DD6316",
-"0 c #E16416",
-"q c #E36312",
-"w c #E0661A",
-"e c #E1691E",
-"r c #D84B20",
-"t c #D7612A",
-"y c #DF702A",
-"u c #E06C24",
-"i c #E07430",
-"p c #E07836",
-"a c #E07C3B",
-"s c #93584D",
-"d c #9C6C5D",
-"f c #A0745E",
-"g c #A3795E",
-"h c #807D6C",
-"j c #888472",
-"k c #83817E",
-"l c #8F8B7B",
-"z c #8D8975",
-"x c #908D7C",
-"c c #96927C",
-"v c #98967F",
-"b c #A5907E",
-"n c #E08244",
-"m c #E08A4F",
-"M c #E08F56",
-"N c #E0945E",
-"B c #E09965",
-"V c #E09F6C",
-"C c #DFA87B",
-"Z c #E1A675",
-"A c #E1AB7C",
-"S c #898681",
-"D c #898782",
-"F c #908D86",
-"G c #9F9B83",
-"H c #959189",
-"J c #9D998F",
-"K c #99968C",
-"L c #A29E8B",
-"P c #A09D91",
-"I c #A2A086",
-"U c #ADA986",
-"Y c #A6A288",
-"T c #ADA98E",
-"R c #A5A294",
-"E c #AAA696",
-"W c #ADA991",
-"Q c #ADA997",
-"! c #ACA998",
-"~ c #B3AD95",
-"^ c #B2AF91",
-"/ c #BAB696",
-"( c #BDB997",
-") c #BCB79D",
-"_ c #BAB899",
-"` c #AEAAA3",
-"' c #B1AEA6",
-"] c #BEB9A1",
-"[ c #BDB9A6",
-"{ c #B6B3AA",
-"} c #B9B6AD",
-"| c #BDBAAE",
-" . c #BEBBB0",
-".. c #C2BE9C",
-"X. c #E4B285",
-"o. c #E5B78B",
-"O. c #E8BC95",
-"+. c #E3BD93",
-"@. c #C1BEB2",
-"#. c #C3C09C",
-"$. c #C8C49E",
-"%. c #DEC29B",
-"&. c #E8C09B",
-"*. c #E3C299",
-"=. c #C6C0A6",
-"-. c #CECAA7",
-";. c #CAC5AA",
-":. c #CDC9AD",
-">. c #CCC9A8",
-",. c #CAC5A2",
-"<. c #D1CBAF",
-"1. c #D8D4AE",
-"2. c #D4D0AA",
-"3. c #CDC9B0",
-"4. c #D4CFB5",
-"5. c #D3CFBE",
-"6. c #D6D2B2",
-"7. c #D9D6B5",
-"8. c #DAD6B3",
-"9. c #DDD9B2",
-"0. c #D7D2B8",
-"q. c #D2D0BF",
-"w. c #DBD7BB",
-"e. c #DCD8BC",
-"r. c #EAC7A3",
-"t. c #EBCCA9",
-"y. c #ECD2B2",
-"u. c #E2DFB6",
-"i. c #EDDABB",
-"p. c #E6E3BB",
-"a. c #E9E6BD",
-"s. c #ECE8BE",
-"d. c #D8D6C2",
-"f. c #DEDAC0",
-"g. c #D8D6C9",
-"h. c #DCDACD",
-"j. c #E2DDC2",
-"k. c #E2DEC6",
-"l. c #E1DFCA",
-"z. c #E0DECD",
-"x. c #E1DFD0",
-"c. c #E5E1C2",
-"v. c #E7E3C6",
-"b. c #E5E1C5",
-"n. c #E3E0C6",
-"m. c #E8E3C2",
-"M. c #E8E3C1",
-"N. c #E8E3C5",
-"B. c #E9E5C4",
-"V. c #EBE6C7",
-"C. c #E9E5C6",
-"Z. c #EDE5C6",
-"A. c #EEE1C3",
-"S. c #EBE8C6",
-"D. c #E5E2CA",
-"F. c #E3E0CD",
-"G. c #E6E3CD",
-"H. c #E7E4CD",
-"J. c #E3E0CB",
-"K. c #EAE6C9",
-"L. c #EAE6CA",
-"P. c #E9E5CA",
-"I. c #E9E6CD",
-"U. c #EAE7CD",
-"Y. c #E9E6CE",
-"T. c #EAE7CF",
-"R. c #E8E5CE",
-"E. c #ECE7CE",
-"W. c #EFE7C9",
-"Q. c #ECE9CA",
-"!. c #EEEACA",
-"~. c #EBE8CF",
-"^. c #EEEACD",
-"/. c #ECE8CE",
-"(. c #EEEACD",
-"). c #EBE9C9",
-"_. c #F0ECCF",
-"`. c #F2EECE",
-"'. c #F2EDCB",
-"]. c #E3E1D1",
-"[. c #E5E3D1",
-"{. c #E6E3D4",
-"}. c #E7E4D0",
-"|. c #E9E6D0",
-" X c #E9E6D2",
-".X c #E9E7D5",
-"XX c #EBE8D1",
-"oX c #EBE8D3",
-"OX c #EFEBD1",
-"+X c #ECE9D1",
-"@X c #EBE8D5",
-"#X c #EAE8D6",
-"$X c #ECE9D5",
-"%X c #EFEBD5",
-"&X c #EDEAD6",
-"*X c #EFECD5",
-"=X c #EFECD2",
-"-X c #E7E6D8",
-";X c #E8E6DC",
-":X c #E8E6D8",
-">X c #EBE9D9",
-",X c #ECE9D8",
-"<X c #ECEAD8",
-"1X c #EDEADA",
-"2X c #EEEBD9",
-"3X c #EFECD8",
-"4X c #EFECDA",
-"5X c #EEEED8",
-"6X c #EAE9DC",
-"7X c #EFECDD",
-"8X c #ECEADD",
-"9X c #F2EED0",
-"0X c #F2EED2",
-"qX c #F0EDD1",
-"wX c #F2EED4",
-"eX c #F1EDD6",
-"rX c #F1EED9",
-"tX c #F1EEDF",
-"yX c #F1EEDC",
-"uX c #F5F1D6",
-"iX c #F4F0D3",
-"pX c #F2F0DB",
-"aX c #F4F1D8",
-"sX c #F5F1DA",
-"dX c #F6F2DA",
-"fX c #F2F0DD",
-"gX c #F6F3DC",
-"hX c #F6F3DE",
-"jX c #F5F2DE",
-"kX c #F7F4DE",
-"lX c #ECEBE1",
-"zX c #EEEDE2",
-"xX c #EDECE3",
-"cX c #F0EEE1",
-"vX c #F0EFE6",
-"bX c #F2F0E2",
-"nX c #F3F2E1",
-"mX c #F5F2E2",
-"MX c #F6F4E2",
-"NX c #F3F1E5",
-"BX c #F5F3E6",
-"VX c #F5F2E4",
-"CX c #F6F5E5",
-"ZX c #F9F6E3",
-"AX c #F8F5E1",
-"SX c #F8F6E5",
-"DX c #F3F2E9",
-"FX c #F4F3E8",
-"GX c #F6F4EA",
-"HX c #F6F5ED",
-"JX c #F8F7E8",
-"KX c #F9F7E9",
-"LX c #F8F7EF",
-"PX c #FBF9EC",
-"IX c #FAF9F0",
-"UX c None",
-/* pixels */
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUX> - - - - - - - - - - - - - > = = * > = = = = = * > s @ UX",
-"UXUXUXr 5 5 , , , , , , , , , , 5 5 5 5 5 , , , 5 5 5 5 r d h UX",
-"UXUXUXt 4 4 3 3 3 8 8 8 6 6 6 6 6 6 6 6 6 6 8 6 7 7 7 7 4 f D UX",
-"UXUXUX%.*.+.o.X.A Z V B N M M n n a p i u u u e 0 0 0 q 4 f S UX",
-"UXUXUXM.S.V.).).^.^.^.^._.W.Z.Z.A.j.i.i.i.y.t.r.&.O.o.X.C G S UX",
-"UXUXUXM.c.V.S.K.K.K.K.Z.K.D.K.XXqXXXeX<X<XyXhXbXCXCXCXKXbX` S UX",
-"UXUXUXM.M.!.'.'.'.`.0X0X0XD.0XyX$XL.eX>XD.XX%XJ. X#X,XbXMX' D UX",
-"UXUXUXM.c.N.K.!.^.^.'.0X0X^.dXSX7XeXZXVX XdXMX%X0XdXcXcXMX' F UX",
-"UXUXUXV.v.^.eXJ.K.oXJ.K.E.l.$XvX6X<XSXFXoXhXKX<XuXZXNXcXVX{ H UX",
-"UXUXUXM.N.eXZX<XeXhX#XoXhXJ.R.%X].J.,X;XF.<XvX-XyXCXNXNXVX{ H UX",
-"UXUXUXV.j.H.4X{.%XMX,XuXSX%XwXMX,X0XdXtXD.0X<Xx.R.#X;XcXGX} K UX",
-"UXUXUXV.c.^.eXJ.D.#Xz.R.tX{.%XMX6XeXZXCX XdXZX%X0XhXtXvXVX .J UX",
-"UXUXUXV.v.0XMX X0XdXR.!.%Xl.K..Xx.J.tXvX XhXSX<XdXZXNXvXGX .P UX",
-"UXUXUXV.j.R..Xl.^.fX XeXhX X'.dX XK.oX Xk. X6X].oXbXvXDXHX .R UX",
-"UXUXv.V.!.uX<XD.oX#Xk.^.<XH.eXMX X'.dXaX!.'.yXD.K.oX-XvXHX;.R UX",
-"UXUXV.j.E.yX<X^.dX4XZ.0X Xk.R.%XJ.^.tX4X^.uXhXR.0XuXtXNXDX at .E UX",
-"UXUXK.v.^..Xl.R.tX.X0XhX%X^.dXyXv.^.%X].D.%X6XR.uXkXbXGXvX| ! UX",
-"UXV.V.^.dXtXR.qX#Xh.R.*XJ.0XkX<X^.uXhX X^.%X[.k.E.<XlXHX-X[ Q UX",
-"UX!.N.R.yX%XqXhX4X!.eX.Xl.R.#Xz.^.dXfXR.uXhX%X!.0XyXlXIXx.[ E UX",
-";.w.N.R. XJ.XXrXR.0XgXoX'.dX<XD.R.#X{.R.yXfXR.0XgXbXDXLX5.[ J UX",
-"UX~ ) 4.u.V.^.XXH.oX#XK.0XhX<X0XuXhX<XtXcX<X XeXhXzXLXzX3.] l UX",
-"UXUX@ j L [ 4.j.~.*X#X~.oX%XH.0XhXfXbXKXKXKXGXVXlXxXIXh.:.W UXUX",
-"UXUXUXUXo # z W =.0.D.*XyX4X#X#X#X6XCXKXPXPXPXIXDXHX-X0.;.x UXUX",
-"UXUXUXUXUXUXUXo $ c ~ ;.w.J.yXhXbX7XcXbXVXGX<Xg.g.d.6.8.T UXUXUX",
-"UXUXUXUXUXUXUXUXUXUXO h L ) <.f. XtXMXbX6Xq.^ U ( -.8.;.$ UXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXO j Y ..6.e.e.:.#...$.2.9.7.G UXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX# z T ,.1.9.u.p.a.p.W . UXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX@ c / 1.s.s._ X UXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXo % I Y X UXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX"
-};
diff --git a/debian/patches/get-revision-from-changelog.patch b/debian/patches/get-revision-from-changelog.patch
deleted file mode 100644
index 8450b39..0000000
--- a/debian/patches/get-revision-from-changelog.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers at lists.alioth.debian.org>
-Date: Mon, 25 Jul 2011 11:42:55 +0200
-Subject: get-revision-from-changelog.patch
-
-We use git for packaging instead of svn like upstream. Because of that we
-generate the version number from debian changelog
----
- generate_install_rdf.sh | 7 +------
- 1 files changed, 1 insertions(+), 6 deletions(-)
-
-diff --git a/generate_install_rdf.sh b/generate_install_rdf.sh
-index 83b88bf..9ae31a2 100755
---- a/generate_install_rdf.sh
-+++ b/generate_install_rdf.sh
-@@ -66,12 +66,7 @@ TRANSLATORS=( \
- svn info > /dev/null 2> /dev/null
- NOT_SVN=$?
-
--SVN_REV=svn-r`svnversion .`
--
--if [ $NOT_SVN -ne 0 ]
--then
-- SVN_REV="src-build"
--fi
-+SVN_REV=svn-`dpkg-parsechangelog | awk -F - '/Version/ { print $3 }'`
-
- EXTENSION_VERSION=$VERSION-$SVN_REV #unofficial build
- if [ ${#OFFICIAL_AMO_RELEASE} -gt 0 ]
---
diff --git a/debian/patches/minimize-to-tray.patch b/debian/patches/minimize-to-tray.patch
deleted file mode 100644
index 23ec5ac..0000000
--- a/debian/patches/minimize-to-tray.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers at lists.alioth.debian.org>
-Date: Sun, 24 Jul 2011 17:44:41 +0200
-Subject: minimize to tray
-
----
- defaults/preferences/prefs.js | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
-index 052009e..f41af51 100644
---- a/defaults/preferences/prefs.js
-+++ b/defaults/preferences/prefs.js
-@@ -1,7 +1,7 @@
- pref("extensions.{9533f794-00b4-4354-aa15-c2bbda6989f8}.description","chrome://firetray/locale/core.properties");
-
- pref("extensions.firetray.close_to_tray", true);
--pref("extensions.firetray.minimize_to_tray", true);
-+pref("extensions.firetray.minimize_to_tray", false);
- pref("extensions.firetray.start_minimized", false);
- pref("extensions.firetray.confirm_exit", true);
- pref("extensions.firetray.restore_to_next_unread", false);
---
diff --git a/debian/patches/series b/debian/patches/series
index 09cde21..9ee1a1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-# use-dfsg-clean-icons.patch
-# minimize-to-tray.patch
remove-extra-license-file.patch
-# get-revision-from-changelog.patch
-# use-py-build-files-with-python.patch
diff --git a/debian/patches/use-dfsg-clean-icons.patch b/debian/patches/use-dfsg-clean-icons.patch
deleted file mode 100644
index e47ff82..0000000
--- a/debian/patches/use-dfsg-clean-icons.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers at lists.alioth.debian.org>
-Date: Sun, 24 Jul 2011 17:44:41 +0200
-Subject: use dfsg clean icons
-
----
- components/nsTray.cpp | 25 ++++++++-----------------
- 1 files changed, 8 insertions(+), 17 deletions(-)
-
-diff --git a/components/nsTray.cpp b/components/nsTray.cpp
-index 5d515da..aa515e8 100644
---- a/components/nsTray.cpp
-+++ b/components/nsTray.cpp
-@@ -3,17 +3,12 @@
- #include "debug.h"
-
- //BUILT IN PIXMAPS
--#include "pixmaps/firefox.xpm"
--#include "pixmaps/thunderbird.xpm"
- #include "pixmaps/dove.xpm"
- #include "pixmaps/weasel.xpm"
- #include "pixmaps/icecat.xpm"
- #include "pixmaps/newmail.xpm"
--#include "pixmaps/seamonkey.xpm"
--#include "pixmaps/songbird.xpm"
--#include "pixmaps/songbirdegg.xpm"
--#include "pixmaps/sunbird.xpm"
- #include "pixmaps/chatzilla.xpm"
-+#include "pixmaps/iceowl.xpm"
-
- #include "nsMemory.h"
- #include "nsIBaseWindow.h"
-@@ -173,7 +168,7 @@ nsTray::nsTray() {
-
- systray_icon = gtk_status_icon_new();
-
-- icon = gdk_pixbuf_new_from_xpm_data((const char**)firefox_xpm);
-+ icon = gdk_pixbuf_new_from_xpm_data((const char**)weasel_xpm);
-
- /* Connect signals */
- g_signal_connect(G_OBJECT(this->systray_icon), "activate", G_CALLBACK(nsTray::activate), this);
-@@ -704,16 +699,12 @@ NS_IMETHODIMP nsTray::SetDefaultXpmIcon(PRUint32 app)
- break;
-
- case 10: //seamonkey
-- df_icon=(char**)seamonkey_xpm;
-+ df_icon=(char**)dove_xpm;
- sp_icon=(char**)newmail_xpm;
- break;
- case 9: //sunbird
-- df_icon=(char**)sunbird_xpm;
-- sp_icon=(char**)sunbird_xpm;
-- break;
-- case 8: //songbird
-- df_icon=(char**)songbirdegg_xpm;
-- sp_icon=(char**)songbird_xpm;
-+ df_icon=(char**)iceowl_xpm;
-+ sp_icon=(char**)iceowl_xpm;
- break;
- case 7: //icecat
- df_icon=(char**)icecat_xpm;
-@@ -736,13 +727,13 @@ NS_IMETHODIMP nsTray::SetDefaultXpmIcon(PRUint32 app)
- sp_icon=(char**)newmail_xpm;
- break;
- case 2: //thunderbird
-- df_icon=(char**)thunderbird_xpm;
-+ df_icon=(char**)dove_xpm;
- sp_icon=(char**)newmail_xpm;
- break;
- case 1: //firefox
- default:
-- df_icon=(char**)firefox_xpm;
-- sp_icon=(char**)firefox_xpm;
-+ df_icon=(char**)weasel_xpm;
-+ sp_icon=(char**)weasel_xpm;
- break;
- }
-
---
diff --git a/debian/patches/use-py-build-files-with-python.patch b/debian/patches/use-py-build-files-with-python.patch
deleted file mode 100644
index dabe9c9..0000000
--- a/debian/patches/use-py-build-files-with-python.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bed408ebb0266da4b7ca7e3e590e6907b00e696b Mon Sep 17 00:00:00 2001
-From: Sascha Girrulat <sascha at girrulat.de>
-Date: Wed, 8 Feb 2012 19:28:27 +0100
-Subject: [PATCH] use-py-build-files-with-python
-
----
- components/SConscript | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/components/SConscript b/components/SConscript
-index a94e59b..1038963 100644
---- a/components/SConscript
-+++ b/components/SConscript
-@@ -74,8 +74,8 @@ with open(gecko_include + os.sep + 'mozilla-config.h', 'r') as f:
- break
-
- # Create two builders to create xpt and header files from idl.
--bxpt = Builder(action = 'typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE' + ' --cachedir="."', suffix = '.xpt', src_suffix = '.idl')
--bhdr = Builder(action = 'header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE' + ' --cachedir="."', suffix = '.h', src_suffix = '.idl')
-+bxpt = Builder(action = 'python /usr/lib/xulrunner-devel-10.0/sdk/bin/typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE' + ' --cachedir="."', suffix = '.xpt', src_suffix = '.idl')
-+bhdr = Builder(action = 'python /usr/lib/xulrunner-devel-10.0/sdk/bin/header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE' + ' --cachedir="."', suffix = '.h', src_suffix = '.idl')
-
-
- # Create environment object for build
---
-1.7.7.3
-
diff --git a/debian/rules b/debian/rules
index b21ade1..b75da9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,4 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
%:
dh $@ --with xul-ext
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644
index e213aea..0000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1 +0,0 @@
-debian/new-firetray-icon.png
--
system tray extension for thunderbird/firefox alike apps
More information about the Pkg-mozext-commits
mailing list