Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: pu
The recent ice{weasel,dove} upgrade via debian-security broke some
xul-ext-$stuff, and some of them can simply be fixed by updating the
supported versions.
FireTray is not among those, not only it will FTBFS with the
xulrunner-dev coming from wheezy-security (#713526), but it becomes
totally incompatible with the new icedove version (#648890, #678575).
The new upstream version that has just been uploaded to Sid works
already fine in Wheezy, but the 0.4 branch has nothing in common with
the 0.3 one: it’s a complete rewrite in js-ctypes.
On the bright side: it works, and since it became Architecture: All,
FTBFS is a lot less likely to happen again. There is currently no tight
versioned dependency to ice{weasel,dove}.
On the other side, the upstream code doesn’t have anything in common
with the version currently in Wheezy, and the few preferences get lost
on upgrade.
Please find attached the minimalist debdiff of the packaging I was able
to provide while preparing the 0.4.6-0.1 NMU. I ended up adopting the
package, so the actual debdiff is a bit more invasive, mostly removing
useless stuff (e.g. patches, build dependencies) and properly
documenting the copyright).
So would you consider updating firetray to the version currently in Sid
once it spent the necessary amount of time you’ll judge reasonable in
Jessie (I’ll then prepare a ~deb7u1 version built in Wheezy)?
Thanks in advance for considering this request
David
--
Imagine me bribing the team members with a big part of chocolate cake
with a cherry on top, or with some old rum I won’t miss to share next
month in central Europe…
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (500,
'oldstable'), (100, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.9-1-amd64 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--- 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
signature.asc
Description: Digital signature
