Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package iceweasel The original 3.5.12-1 package had the changes mentionned in 20100902145001.gb31...@glandium.org, 3.5.12-2 added 2 fixes for induced FTBFSes on hppa and hurd. Both fixes only touch to build scripts, not code. See the attached debdiff. unblock iceweasel/3.5.12-2 -- System Information: Debian Release: squeeze/sid 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.12/debian/changelog iceweasel-3.5.12/debian/changelog --- iceweasel-3.5.12/debian/changelog 2010-09-08 09:04:44.000000000 +0200 +++ iceweasel-3.5.12/debian/changelog 2010-09-11 11:04:53.000000000 +0200 @@ -1,3 +1,14 @@ +iceweasel (3.5.12-2) unstable; urgency=low + + * config/JarMaker.py: Use errno.ENOENT instead of "2" in JarMaker.py. + bz#595459. Fixes FTBFS on Hurd. + * debian/rules, debian/xulrunner-dev.install.in: Build npapi_getinfo in + build-xulrunner/dist/bin, and use an RPATH. Some plugins depend on + libxpcom.so, and dlopen() from npapi_getinfo fails unless libxpcom.so + can be loaded too. Fixes FTBFS on hppa as a side effect. + + -- Mike Hommey <gland...@debian.org> Sat, 11 Sep 2010 09:42:37 +0200 + iceweasel (3.5.12-1) unstable; urgency=high * New upstream release. diff -Nru iceweasel-3.5.12/debian/patches/fixes/Use-errno.ENOENT-instead-of-2-in-JarMaker.py.patch iceweasel-3.5.12/debian/patches/fixes/Use-errno.ENOENT-instead-of-2-in-JarMaker.py.patch --- iceweasel-3.5.12/debian/patches/fixes/Use-errno.ENOENT-instead-of-2-in-JarMaker.py.patch 1970-01-01 01:00:00.000000000 +0100 +++ iceweasel-3.5.12/debian/patches/fixes/Use-errno.ENOENT-instead-of-2-in-JarMaker.py.patch 2010-09-11 11:04:40.000000000 +0200 @@ -0,0 +1,43 @@ +From 3630e5168a6f5be3035210eb07e4fa9f6c52813b Mon Sep 17 00:00:00 2001 +From: Mike Hommey <m...@glandium.org> +Date: Sat, 11 Sep 2010 09:31:09 +0200 +Subject: Use errno.ENOENT instead of "2" in JarMaker.py + +https://bugzilla.mozilla.org/show_bug.cgi?id=595459 +--- + config/JarMaker.py | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/config/JarMaker.py b/config/JarMaker.py +index 9bd5111..3029120 100644 +--- a/config/JarMaker.py ++++ b/config/JarMaker.py +@@ -44,6 +44,7 @@ See the documentation for jar.mn on MDC for further details on the format. + import sys + import os + import os.path ++import errno + import re + import logging + from time import localtime +@@ -385,7 +386,7 @@ class JarMaker(object): + try: + os.remove(out) + except OSError, e: +- if e.errno != 2: ++ if e.errno != errno.ENOENT: + raise + return open(out, 'wb') + def ensureDirFor(self, name): +@@ -405,7 +406,7 @@ class JarMaker(object): + try: + os.remove(out) + except OSError, e: +- if e.errno != 2: ++ if e.errno != errno.ENOENT: + raise + os.symlink(src, out) + +-- +1.7.2.rc1.13.gd67bc + diff -Nru iceweasel-3.5.12/debian/patches/series iceweasel-3.5.12/debian/patches/series --- iceweasel-3.5.12/debian/patches/series 2010-09-07 08:56:20.000000000 +0200 +++ iceweasel-3.5.12/debian/patches/series 2010-09-11 11:04:40.000000000 +0200 @@ -37,6 +37,7 @@ fixes/Use-syscall-for-mmap-and-munmap-and-disable-ncpus-in.patch fixes/Calculate-negotiate-auth-token-length-after-removing.patch fixes/Bug-504766.-qcms-Fix-unaligned-reads-in-qcms.-r-jrmu.patch +fixes/Use-errno.ENOENT-instead-of-2-in-JarMaker.py.patch iceweasel-branding/Rename-Firefox-to-Iceweasel.patch iceweasel-branding/Set-MOZ_APP_NAME-to-iceweasel.patch iceweasel-branding/Our-name-should-be-Iceweasel-not-Firefox.patch diff -Nru iceweasel-3.5.12/debian/rules iceweasel-3.5.12/debian/rules --- iceweasel-3.5.12/debian/rules 2010-09-07 08:53:03.000000000 +0200 +++ iceweasel-3.5.12/debian/rules 2010-09-11 11:04:52.000000000 +0200 @@ -84,8 +84,8 @@ debian/dh/dh_xulrunner.1: debian/dh/dh_xulrunner pod2man -c Debhelper -r $(GRE_VERSION) $^ > $@ -debian/dh/npapi_getinfo: %: %.c - $(CC) -o $@ $< -Imodules/plugin/base/public -ldl +build-xulrunner/dist/bin/npapi_getinfo: debian/dh/npapi_getinfo.c + $(CC) -o $@ $< -Imodules/plugin/base/public -ldl -Wl,-rpath,\$$ORIGIN IN_FILES := $(wildcard debian/*.in debian/dh/*.in) define preprocess @@ -244,7 +244,7 @@ override_dh_installdocs: MPL dh_installdocs -A $^ -stamps/dh_install:: debian/dh/dh_xulrunner debian/noinstall debian/dh/npapi_getinfo +stamps/dh_install:: debian/dh/dh_xulrunner debian/noinstall build-xulrunner/dist/bin/npapi_getinfo awk '{print "debian/tmp/" $$1 }' < debian/noinstall | xargs rm -r dh_install --fail-missing #Install helpers @@ -284,10 +284,10 @@ # Make sure dh_xulrunner is able to spot the current XPCOM standalone glue. perl debian/dh/dh_xulrunner_test -pxulrunner-$(GRE_VERSION) | awk -v expected='addsubstvar("xulrunner-$(GRE_VERSION)", "shlibs:Depends", "xulrunner-$(GRE_VERSION)");' $(CMP_AWK) -stamps/check-dh_xulrunner-npapi:: stamps/dh_install debian/dh/dh_xulrunner debian/dh/npapi_getinfo +stamps/check-dh_xulrunner-npapi:: stamps/dh_install debian/dh/dh_xulrunner build-xulrunner/dist/bin/npapi_getinfo $(if $(wildcard build-xulrunner/tmp/usr/lib/mozilla),,mkdir -p build-xulrunner/tmp/usr/lib/mozilla/) $(if $(wildcard build-xulrunner/tmp/usr/lib/mozilla/plugins),,ln -s $(CURDIR)/build-xulrunner/dist/bin/plugins build-xulrunner/tmp/usr/lib/mozilla) - PATH=debian/dh:$(PATH) perl debian/dh/dh_xulrunner_test -piceweasel -Pbuild-xulrunner/tmp | awk -v expected='addsubstvar("iceweasel", "npapi:Mimetypes", "application/x-print-unix-nsplugin, application/x-test");' $(CMP_AWK) + PATH=build-xulrunner/dist/bin:$(PATH) perl debian/dh/dh_xulrunner_test -piceweasel -Pbuild-xulrunner/tmp | awk -v expected='addsubstvar("iceweasel", "npapi:Mimetypes", "application/x-print-unix-nsplugin, application/x-test");' $(CMP_AWK) override_dh_install: stamps/check-dh_xulrunner-glue stamps/check-dh_xulrunner-npapi diff -Nru iceweasel-3.5.12/debian/xulrunner-dev.install.in iceweasel-3.5.12/debian/xulrunner-dev.install.in --- iceweasel-3.5.12/debian/xulrunner-dev.install.in 2010-09-07 08:53:03.000000000 +0200 +++ iceweasel-3.5.12/debian/xulrunner-dev.install.in 2010-09-11 11:04:40.000000000 +0200 @@ -1,6 +1,6 @@ ../dh/dh_xulrunner usr/bin ../dh/xulrunner.pm usr/share/perl5/Debian/Debhelper/Sequence -../dh/npapi_getinfo usr/lib/xulrunner-##GRE_VERSION## +../../build-xulrunner/dist/bin/npapi_getinfo usr/lib/xulrunner-##GRE_VERSION## usr/include/xulrunner-##GRE_VERSION## usr/share/idl usr/lib/xulrunner-devel-##GRE_VERSION##
