tags 648890 + patch tags 648890 + pending tags 678575 + patch tags 678575 + pending tags 705487 + patch tags 705487 + pending tags 713526 + patch tags 713526 + pending thanks
Dear maintainer, I've prepared an NMU for firetray (versioned as 0.4.6-0.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. I spare you the boring full debdiff (all paths changed between 0.3 and 0.4 as the attached diffstat shows) and only send you the packaging diff (I can provide the full debdiff if you prefer). I’ve worked on Git, based on the existing repository, so I can hand you the commits if you wish too. Please note that I took the full source from GitHub (as documented in the updated d/copyright) instead of the partial one pointed in d/watch. Regards. David
--- firetray-0.3.6/debian/changelog 2012-02-22 13:19:58.000000000 -0400 +++ firetray-0.4.6/debian/changelog 2013-07-09 22:27:54.000000000 -0400 @@ -1,3 +1,15 @@ +firetray (0.4.6-0.1) unstable; urgency=low + + * Non-maintainer upload + * New upstream version + (Closes: #648890, #678575, #705487, #713526) + * Update copyright + * Adapt rules + * Update patches + * Make the package Architecture: all + + -- David Prévot <taf...@debian.org> Tue, 09 Jul 2013 22:26:10 -0400 + firetray (0.3.6-2) unstable; urgency=low [Sascha Girrulat] --- firetray-0.3.6/debian/control 2012-02-22 13:19:58.000000000 -0400 +++ firetray-0.4.6/debian/control 2013-07-09 22:25:02.000000000 -0400 @@ -16,7 +16,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-mozext/firetray.git;a=summary Package: xul-ext-firetray -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: ${xpi:Recommends} Provides: ${xpi:Provides} --- firetray-0.3.6/debian/copyright 2012-02-22 13:19:58.000000000 -0400 +++ firetray-0.4.6/debian/copyright 2013-07-09 22:23:46.000000000 -0400 @@ -5,7 +5,7 @@ It was downloaded from: - http://code.google.com/p/firetray/ + https://github.com/foudfou/FireTray/releases Upstream Authors: @@ -14,13 +14,20 @@ Copyright: - Copyright (C) 2010 Hua Luo, Francesco Solero + Copyright (C) 2011 Foudil Brétel <foudil.newbie+...@gmail.com> License: - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 3 of the + License, or (at your option) any later version. + +On Debian systems, the complete text of the GNU General Public +License can be found in `/usr/share/common-licenses/GPL-3'. + +LibGdkWindow.jsm, LibGObject.jsm borrowed from Mike Conley +<mcon...@mozillamessaging.com> and lincensed under the MPL/LGPL/GPL tri-license The Debian packaging is: --- firetray-0.3.6/debian/patches/remove-extra-license-file.patch 2012-02-22 13:19:58.000000000 -0400 +++ firetray-0.4.6/debian/patches/remove-extra-license-file.patch 2013-07-09 22:24:27.000000000 -0400 @@ -1,22 +1,16 @@ From: Debian Mozilla Extension Maintainers <pkg-mozext-maintain...@lists.alioth.debian.org> Date: Sun, 24 Jul 2011 17:44:41 +0200 Subject: remove extra license file - ---- - SConstruct | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 50845fd..1157181 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -28,8 +28,6 @@ r = env.Install('dist', 'chrome.manifest') - objs.append(r) - r = env.Install('dist', 'install.rdf') - objs.append(r) --r = env.Install('dist', 'License.txt') --objs.append(r) +Reviewed-by: David Prévot <taf...@debian.org> +Last-Update: 2013-07-09 +--- a/src/Makefile ++++ b/src/Makefile +@@ -121,7 +121,7 @@ - r = env.Install('dist/defaults/preferences', 'defaults/preferences/prefs.js') - objs.append(r) --- + # The sources for the XPI file. Uses variables defined in the included + # Makefiles. +-xpi_includes := $(license) \ ++xpi_includes := \ + $(install_rdf) \ + $(chrome_manifest) \ + $(preferences_dir)/prefs.js \ --- firetray-0.3.6/debian/patches/series 2012-02-22 13:19:58.000000000 -0400 +++ firetray-0.4.6/debian/patches/series 2013-07-09 22:24:40.000000000 -0400 @@ -1,5 +1,5 @@ -use-dfsg-clean-icons.patch -minimize-to-tray.patch +# 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 +# get-revision-from-changelog.patch +# use-py-build-files-with-python.patch --- firetray-0.3.6/debian/rules 2012-02-22 13:19:58.000000000 -0400 +++ firetray-0.4.6/debian/rules 2013-07-09 22:24:10.000000000 -0400 @@ -7,11 +7,13 @@ dh $@ --with xul-ext override_dh_auto_build: - cp -f debian/iceowl.xpm components/pixmaps/iceowl.xpm - bash ./build.sh --official-amo-release + $(MAKE) -C src build + dh_auto_build override_dh_auto_install: - install-xpi firetray*.xpi + install-xpi build-*/firetray*.xpi + dh_auto_install override_dh_auto_clean: - rm -f firetray*.xpi + $(MAKE) -C src clean + dh_auto_clean
.gitignore | 1 License.txt | 6 README.md | 100 + SConstruct | 40 TODO | 48 build.sh | 268 --- changes | 84 chrome.manifest | 47 chrome/SConscript | 21 chrome/content/browserOverlay.xul | 13 chrome/content/core.js | 22 chrome/content/ircOverlay.xul | 14 chrome/content/mailOverlay.xul | 9 chrome/content/navigatorOverlay.xul | 13 chrome/content/options.js | 305 --- chrome/content/options.xul | 186 -- chrome/content/songOverlay.xul | 18 chrome/locale/bg-BG/browserOverlay.dtd | 3 chrome/locale/bg-BG/core.properties | 32 chrome/locale/bg-BG/mailOverlay.dtd | 1 chrome/locale/bg-BG/options.dtd | 66 chrome/locale/ca-AD/browserOverlay.dtd | 3 chrome/locale/ca-AD/core.properties | 32 chrome/locale/ca-AD/mailOverlay.dtd | 1 chrome/locale/ca-AD/options.dtd | 66 chrome/locale/de-DE/browserOverlay.dtd | 3 chrome/locale/de-DE/core.properties | 32 chrome/locale/de-DE/mailOverlay.dtd | 1 chrome/locale/de-DE/options.dtd | 66 chrome/locale/en-US/browserOverlay.dtd | 3 chrome/locale/en-US/core.properties | 35 chrome/locale/en-US/mailOverlay.dtd | 1 chrome/locale/en-US/options.dtd | 78 chrome/locale/en-US/songOverlay.dtd | 3 chrome/locale/es-AR/browserOverlay.dtd | 3 chrome/locale/es-AR/core.properties | 32 chrome/locale/es-AR/mailOverlay.dtd | 1 chrome/locale/es-AR/options.dtd | 66 chrome/locale/es-ES/browserOverlay.dtd | 3 chrome/locale/es-ES/core.properties | 32 chrome/locale/es-ES/mailOverlay.dtd | 1 chrome/locale/es-ES/options.dtd | 66 chrome/locale/fa-IR/browserOverlay.dtd | 3 chrome/locale/fa-IR/core.properties | 32 chrome/locale/fa-IR/mailOverlay.dtd | 1 chrome/locale/fa-IR/options.dtd | 66 chrome/locale/fr-FR/browserOverlay.dtd | 3 chrome/locale/fr-FR/core.properties | 32 chrome/locale/fr-FR/mailOverlay.dtd | 1 chrome/locale/fr-FR/options.dtd | 66 chrome/locale/it-IT/browserOverlay.dtd | 3 chrome/locale/it-IT/core.properties | 32 chrome/locale/it-IT/mailOverlay.dtd | 1 chrome/locale/it-IT/options.dtd | 66 chrome/locale/ja-JP/browserOverlay.dtd | 3 chrome/locale/ja-JP/core.properties | 32 chrome/locale/ja-JP/mailOverlay.dtd | 1 chrome/locale/ja-JP/options.dtd | 66 chrome/locale/mk-MK/browserOverlay.dtd | 3 chrome/locale/mk-MK/core.properties | 32 chrome/locale/mk-MK/mailOverlay.dtd | 1 chrome/locale/mk-MK/options.dtd | 66 chrome/locale/nl-NL/browserOverlay.dtd | 3 chrome/locale/nl-NL/core.properties | 32 chrome/locale/nl-NL/mailOverlay.dtd | 1 chrome/locale/nl-NL/options.dtd | 66 chrome/locale/pl-PL/browserOverlay.dtd | 3 chrome/locale/pl-PL/core.properties | 32 chrome/locale/pl-PL/mailOverlay.dtd | 1 chrome/locale/pl-PL/options.dtd | 66 chrome/locale/pt-BR/browserOverlay.dtd | 3 chrome/locale/pt-BR/core.properties | 32 chrome/locale/pt-BR/mailOverlay.dtd | 1 chrome/locale/pt-BR/options.dtd | 66 chrome/locale/ru-RU/browserOverlay.dtd | 3 chrome/locale/ru-RU/core.properties | 32 chrome/locale/ru-RU/mailOverlay.dtd | 1 chrome/locale/ru-RU/options.dtd | 66 chrome/locale/sk-SK/browserOverlay.dtd | 3 chrome/locale/sk-SK/core.properties | 32 chrome/locale/sk-SK/mailOverlay.dtd | 1 chrome/locale/sk-SK/options.dtd | 66 chrome/locale/sl-SI/browserOverlay.dtd | 3 chrome/locale/sl-SI/core.properties | 32 chrome/locale/sl-SI/mailOverlay.dtd | 1 chrome/locale/sl-SI/options.dtd | 66 chrome/locale/sv-SE/browserOverlay.dtd | 3 chrome/locale/sv-SE/core.properties | 32 chrome/locale/sv-SE/mailOverlay.dtd | 1 chrome/locale/sv-SE/options.dtd | 66 chrome/locale/tr-TR/browserOverlay.dtd | 3 chrome/locale/tr-TR/core.properties | 32 chrome/locale/tr-TR/mailOverlay.dtd | 1 chrome/locale/tr-TR/options.dtd | 66 chrome/locale/uk-UA/browserOverlay.dtd | 3 chrome/locale/uk-UA/core.properties | 32 chrome/locale/uk-UA/mailOverlay.dtd | 1 chrome/locale/uk-UA/options.dtd | 66 chrome/locale/zh-CN/browserOverlay.dtd | 3 chrome/locale/zh-CN/core.properties | 32 chrome/locale/zh-CN/mailOverlay.dtd | 1 chrome/locale/zh-CN/options.dtd | 66 chrome/locale/zh-TW/browserOverlay.dtd | 3 chrome/locale/zh-TW/core.properties | 32 chrome/locale/zh-TW/mailOverlay.dtd | 1 chrome/locale/zh-TW/options.dtd | 66 components/SConscript | 110 - components/debug.h | 39 components/keysyms.h | 171 - components/nsFireTrayHandler.js | 1341 --------------- components/nsIBaseWindow.h | 368 ---- components/nsIFireTrayHandler.idl | 12 components/nsITray.idl | 87 components/nsTray.cpp | 1469 ---------------- components/nsTray.h | 96 - components/nsTrayModule.cpp | 53 components/pixmaps/chatzilla.xpm | 207 -- components/pixmaps/dove.xpm | 1868 --------------------- components/pixmaps/icecat.xpm | 2222 ------------------------- components/pixmaps/newmail.xpm | 390 ---- components/pixmaps/weasel.xpm | 1974 ---------------------- debian/changelog | 12 debian/control | 2 debian/copyright | 17 debian/patches/remove-extra-license-file.patch | 30 debian/patches/series | 8 debian/rules | 10 defaults/preferences/prefs.js | 33 generate_install_rdf.sh | 205 -- makefile.example | 6 src/LICENSE | 19 src/Makefile | 195 ++ src/chrome.manifest | 17 src/chrome/content/options.js | 683 +++++++ src/chrome/content/options.xul | 322 +++ src/chrome/content/overlay.js | 87 src/chrome/content/overlay.xul | 17 src/chrome/locale/en-US/options.dtd | 92 + src/chrome/locale/en-US/options.properties | 8 src/chrome/locale/en-US/overlay.dtd | 1 src/chrome/locale/en-US/overlay.properties | 7 src/chrome/locale/sk-SK/options.dtd | 93 + src/chrome/locale/sk-SK/options.properties | 8 src/chrome/locale/sk-SK/overlay.dtd | 1 src/chrome/locale/sk-SK/overlay.properties | 7 src/chrome/skin/firetray128.svg | 341 +++ src/chrome/skin/internet-group-chat.svg | 312 +++ src/chrome/skin/internet-mail.svg | 440 ++++ src/chrome/skin/overlay.css | 27 src/chrome/skin/pref-chat.svg | 312 +++ src/chrome/skin/pref-icon.svg | 396 ++++ src/chrome/skin/pref-mail.svg | 440 ++++ src/chrome/skin/pref-windows.svg | 386 ++++ src/chrome/skin/preferences-system-windows.svg | 386 ++++ src/chrome/skin/preferences-system.svg | 396 ++++ src/components/firetray-clhandler.js | 50 src/defaults/preferences/prefs.js | 37 src/install.rdf | 99 + src/lib/linux/Makefile | 41 src/lib/linux/firetray.c | 20 src/lib/linux/firetray.h | 11 src/modules/FiretrayChat.jsm | 299 +++ src/modules/FiretrayHandler.jsm | 638 +++++++ src/modules/FiretrayMessaging.jsm | 443 ++++ src/modules/PrefListener.jsm | 52 src/modules/VersionChange.jsm | 117 + src/modules/commons.js | 309 +++ src/modules/ctypes/ctypes-utils.jsm | 192 ++ src/modules/ctypes/ctypesMap.jsm | 78 src/modules/ctypes/libfiretray.jsm | 99 + src/modules/ctypes/linux/cairo.jsm | 26 src/modules/ctypes/linux/gdk.jsm | 327 +++ src/modules/ctypes/linux/gio.jsm | 26 src/modules/ctypes/linux/glib.jsm | 21 src/modules/ctypes/linux/gobject.jsm | 159 + src/modules/ctypes/linux/gtk.jsm | 170 + src/modules/ctypes/linux/libc.jsm | 28 src/modules/ctypes/linux/pango.jsm | 47 src/modules/ctypes/linux/pangocairo.jsm | 22 src/modules/ctypes/linux/x11.jsm | 251 ++ src/modules/linux/FiretrayChatStatusIcon.jsm | 152 + src/modules/linux/FiretrayGtkIcons.jsm | 49 src/modules/linux/FiretrayPopupMenu.jsm | 210 ++ src/modules/linux/FiretrayStatusIcon.jsm | 348 +++ src/modules/linux/FiretrayWindow.jsm | 776 ++++++++ src/modules/log4moz.js | 604 ++++++ src/modules/logging.jsm | 163 + testing/Makefile | 38 testing/gtk-version.c | 13 testing/gtk_icon_example.c | 186 ++ testing/hide.c | 53 testing/prop-editor.c | 1345 +++++++++++++++ testing/prop-editor.h | 32 testing/teststatusicon.c | 358 ++++ testing/trayicon.c | 109 + testing/window_state_event.c | 45 testing/x11XGetWindowProp.c | 65 testing/xev_desktop.c | 60 testing/xtypes.c | 17 199 files changed, 13374 insertions(+), 13991 deletions(-)
signature.asc
Description: Digital signature
