Bug#609298: unblock: iceweasel/3.5.16-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package iceweasel
The last release contains a few changes that would be nice to have in
squeeze, plus reverts a change from previous version that didn't have
the expected benefit, plus another one to make lenny backports easier,
see the attached debdiff, and the changelog below:
* debian/iceweasel.README.Debian: Fix for the default dsp wrapper behaviour.
* debian/xulrunner-GRE_VERSION.postinst.in: Revert components registration
trigger, it didn't fix anything for python-xpcom.
* debian/iceweasel.desktop: Add russian translation. Closes: #608876.
Thanks Alexander Sashanov.
* debian/control.in, debian/rules, debian/xulrunner-GRE_VERSION.links.in:
Use /usr/share/myspell/dicts for dictionaries when building for lenny.
Closes: #609111.
unblock iceweasel/3.5.16-4
-- System Information:
Debian Release: 6.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru iceweasel-3.5.16/debian/changelog iceweasel-3.5.16/debian/changelog
--- iceweasel-3.5.16/debian/changelog 2010-12-27 11:00:11.000000000 +0100
+++ iceweasel-3.5.16/debian/changelog 2011-01-07 14:15:14.000000000 +0100
@@ -1,3 +1,19 @@
+iceweasel (3.5.16-4) unstable; urgency=low
+
+ * debian/iceweasel.README.Debian: Fix for the default dsp wrapper behaviour.
+ * debian/xulrunner-GRE_VERSION.postinst.in: Revert components registration
+ trigger, it didn't fix anything for python-xpcom.
+ * debian/iceweasel.desktop: Add russian translation. Closes: #608876.
+ Thanks Alexander Sashanov.
+ * debian/control.in, debian/rules, debian/xulrunner-GRE_VERSION.links.in:
+ Use /usr/share/myspell/dicts for dictionaries when building for lenny.
+ Closes: #609111.
+
+ * build/automation.py.in: Add a 2 minutes timeout on automation.py-driven
+ tests.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 07 Jan 2011 14:11:08 +0100
+
iceweasel (3.5.16-3) unstable; urgency=low
* debian/xulrunner-GRE_VERSION.postinst.in: Trigger components registration
diff -Nru iceweasel-3.5.16/debian/control iceweasel-3.5.16/debian/control
--- iceweasel-3.5.16/debian/control 2010-12-27 10:44:31.000000000 +0100
+++ iceweasel-3.5.16/debian/control 2011-01-07 14:08:57.000000000 +0100
@@ -39,7 +39,8 @@
ttf-freefont,
imagemagick,
librsvg2-bin,
- xsltproc
+ xsltproc,
+ lsb-release
Build-Conflicts: graphicsmagick-imagemagick-compat,
libhildonmime-dev,
libosso-dev
diff -Nru iceweasel-3.5.16/debian/control.in iceweasel-3.5.16/debian/control.in
--- iceweasel-3.5.16/debian/control.in 2010-12-27 10:44:31.000000000 +0100
+++ iceweasel-3.5.16/debian/control.in 2011-01-07 14:08:57.000000000 +0100
@@ -39,7 +39,8 @@
ttf-freefont,
imagemagick,
librsvg2-bin,
- xsltproc
+ xsltproc,
+ lsb-release
Build-Conflicts: graphicsmagick-imagemagick-compat,
libhildonmime-dev,
libosso-dev
diff -Nru iceweasel-3.5.16/debian/iceweasel.desktop iceweasel-3.5.16/debian/iceweasel.desktop
--- iceweasel-3.5.16/debian/iceweasel.desktop 2010-12-27 10:44:31.000000000 +0100
+++ iceweasel-3.5.16/debian/iceweasel.desktop 2011-01-07 13:34:02.000000000 +0100
@@ -20,6 +20,7 @@
Name[pl]=Iceweasel
Name[pt]=Iceweasel
Name[pt_BR]=Iceweasel
+Name[ru]=Iceweasel
Name[sk]=Iceweasel
Name[sv]=Iceweasel
Comment=Browse the World Wide Web
@@ -43,6 +44,7 @@
Comment[pl]=Przeglądanie stron WWW
Comment[pt]=Navegue na Internet
Comment[pt_BR]=Navegue na Internet
+Comment[ru]=Обозреватель Всемирной Паутины
Comment[sk]=Prehliadanie internetu
Comment[sv]=Surfa på webben
GenericName=Web Browser
@@ -65,6 +67,7 @@
GenericName[pl]=Przeglądarka WWW
GenericName[pt]=Navegador Web
GenericName[pt_BR]=Navegador Web
+GenericName[ru]=Интернет-браузер
GenericName[sk]=Internetový prehliadač
GenericName[sv]=Webbläsare
X-GNOME-FullName=Iceweasel Web Browser
@@ -87,6 +90,7 @@
X-GNOME-FullName[pl]=Przeglądarka WWW Iceweasel
X-GNOME-FullName[pt]=Iceweasel Navegador Web
X-GNOME-FullName[pt_BR]=Navegador Web Iceweasel
+X-GNOME-FullName[ru]=Интернет-браузер Iceweasel
X-GNOME-FullName[sk]=Internetový prehliadač Iceweasel
X-GNOME-FullName[sv]=Webbläsaren Iceweasel
Exec=iceweasel %u
diff -Nru iceweasel-3.5.16/debian/iceweasel.README.Debian iceweasel-3.5.16/debian/iceweasel.README.Debian
--- iceweasel-3.5.16/debian/iceweasel.README.Debian 2010-12-27 10:44:31.000000000 +0100
+++ iceweasel-3.5.16/debian/iceweasel.README.Debian 2011-01-07 13:34:02.000000000 +0100
@@ -20,8 +20,8 @@
Sound
-----
-By default, iceweasel detects and runs the correct dsp wrapper for esd,
-arts, or alsa. If this is not the desired behaviour, edit
+By default, iceweasel doesn't use a dsp wrapper for sound support. If you
+happen to experience sound issues, you can try to edit
/etc/iceweasel/iceweaselrc or ~/.mozilla/firefox/rc and set the ICEWEASEL_DSP
variable to:
diff -Nru iceweasel-3.5.16/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-automation.py-driven-test.patch iceweasel-3.5.16/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-automation.py-driven-test.patch
--- iceweasel-3.5.16/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-automation.py-driven-test.patch 1970-01-01 01:00:00.000000000 +0100
+++ iceweasel-3.5.16/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-automation.py-driven-test.patch 2011-01-07 14:10:28.000000000 +0100
@@ -0,0 +1,40 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Fri, 7 Jan 2011 10:50:20 +0100
+Subject: Add a 2 minutes timeout on automation.py-driven tests
+
+---
+ build/automation.py.in | 13 ++++++++++---
+ 1 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/build/automation.py.in b/build/automation.py.in
+index dbedd3a..79668a1 100644
+--- a/build/automation.py.in
++++ b/build/automation.py.in
+@@ -48,6 +48,7 @@ import signal
+ import subprocess
+ import sys
+ import threading
++import select
+
+ """
+ Runs the browser from a script, and provides useful utilities
+@@ -481,10 +482,16 @@ def runApp(testURL, env, app, profileDir, extraArgs,
+ if outputPipe is None:
+ log.info("TEST-INFO: Not logging stdout or stderr due to debugger connection")
+ else:
+- line = proc.stdout.readline()
+- while line != "":
+- log.info(line.rstrip())
++ while True:
++ (r, w, e) = select.select([proc.stdout], [], [], 120)
++ if len(r) == 0:
++ log.info("TEST-UNEXPECTED-FAIL | automation.py | application timed out after 120 seconds with no output")
++ proc.kill()
++ break
+ line = proc.stdout.readline()
++ if line == "":
++ break
++ log.info(line.rstrip())
+
+ status = proc.wait()
+ if status != 0:
diff -Nru iceweasel-3.5.16/debian/patches/series iceweasel-3.5.16/debian/patches/series
--- iceweasel-3.5.16/debian/patches/series 2010-12-27 11:00:55.000000000 +0100
+++ iceweasel-3.5.16/debian/patches/series 2011-01-07 14:10:28.000000000 +0100
@@ -109,4 +109,5 @@
debian-hacks/Do-build-time-detection-of-2-bytes-wchar_t-and-char1.patch
debian-hacks/pkg-config-files-don-t-need-to-require-the-version-o.patch
debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch
+debian-hacks/Add-a-2-minutes-timeout-on-automation.py-driven-test.patch
configure.patch
diff -Nru iceweasel-3.5.16/debian/rules iceweasel-3.5.16/debian/rules
--- iceweasel-3.5.16/debian/rules 2010-12-27 10:44:31.000000000 +0100
+++ iceweasel-3.5.16/debian/rules 2011-01-07 14:08:57.000000000 +0100
@@ -96,8 +96,14 @@
GENERATED_FILES += $(filter-out debian/control,$(PREPROCESSED_FILES))
+ifeq ($(shell lsb_release -sc),lenny)
+DICT_DIR := /usr/share/myspell/dicts
+else
+DICT_DIR := /usr/share/hunspell
+endif
+
$(PREPROCESSED_FILES):
- sed $(foreach var,GRE_VERSION GRE_MILESTONE SO_VERSION,-e 's/##$(var)##/$($(var))/g' )$^ > $@
+ sed $(foreach var,GRE_VERSION GRE_MILESTONE SO_VERSION DICT_DIR,-e 's,##$(var)##,$($(var)),g' )$^ > $@
build-iceweasel/%/Makefile build-xulrunner/%/Makefile:
cd $(firstword $(subst /, ,$@)) && ../build/autoconf/make-makefile -t .. $*
diff -Nru iceweasel-3.5.16/debian/xulrunner-GRE_VERSION.links.in iceweasel-3.5.16/debian/xulrunner-GRE_VERSION.links.in
--- iceweasel-3.5.16/debian/xulrunner-GRE_VERSION.links.in 2010-12-27 10:44:31.000000000 +0100
+++ iceweasel-3.5.16/debian/xulrunner-GRE_VERSION.links.in 2011-01-07 14:08:57.000000000 +0100
@@ -1,5 +1,5 @@
usr/lib/libmozjs.so.##SO_VERSION## usr/lib/xulrunner-##GRE_VERSION##/libmozjs.so
-usr/share/hunspell usr/lib/xulrunner-##GRE_VERSION##/dictionaries
+##DICT_DIR## usr/lib/xulrunner-##GRE_VERSION##/dictionaries
usr/share/xulrunner-##GRE_VERSION##/icons usr/lib/xulrunner-##GRE_VERSION##/icons
usr/share/xulrunner-##GRE_VERSION##/greprefs usr/lib/xulrunner-##GRE_VERSION##/greprefs
usr/share/xulrunner-##GRE_VERSION##/res usr/lib/xulrunner-##GRE_VERSION##/res
diff -Nru iceweasel-3.5.16/debian/xulrunner-GRE_VERSION.postinst.in iceweasel-3.5.16/debian/xulrunner-GRE_VERSION.postinst.in
--- iceweasel-3.5.16/debian/xulrunner-GRE_VERSION.postinst.in 2010-12-27 11:00:11.000000000 +0100
+++ iceweasel-3.5.16/debian/xulrunner-GRE_VERSION.postinst.in 2011-01-07 13:34:02.000000000 +0100
@@ -2,7 +2,8 @@
set -e
-if [ "$1" = "triggered" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "triggered" ] ||
+ [ "$1" = "abort-upgrade" ]; then
touch /usr/lib/xulrunner-##GRE_VERSION##/.autoreg
rm -f /usr/lib/xulrunner-##GRE_VERSION##/components/compreg.dat \
/usr/lib/xulrunner-##GRE_VERSION##/components/xpti.dat
@@ -14,10 +15,6 @@
rm -rf "$HOME"
fi
-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
- dpkg-trigger /usr/lib/xulrunner-##GRE_VERSION##/components
-fi
-
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then
update-alternatives --install /usr/bin/xulrunner-stub \
xulrunner-stub /usr/lib/xulrunner-##GRE_VERSION##/xulrunner-stub 100 \
Reply to: