Backed out 6 changesets (bug 1504906 and bug 1505652) to give time to toolchains and docker images to build without blocking other landings.

Backed out changeset 2fe1e2b7d9c6 (bug 1504906) Backed out changeset 27b4002951a4 (bug 1504906) Backed out changeset f7a685b16579 (bug 1504906) Backed out changeset f8064dbb8009 (bug 1504906) Backed out changeset f899fbb4a5d7 (bug 1504906) Backed out changeset 3f71db4aef73 (bug 1505652)
2018-11-08 17:14:16 +09:00 · 2018-11-08 17:14:16 +09:00 · ad2fed0601
--- a/accessible/atk/moz.build
+++ b/accessible/atk/moz.build
@ -59,7 +59,6 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
    # Used in G_DEFINE_TYPE_EXTENDED macro, probably fixed in newer glib /
    # gobject headers. See bug 1243331 comment 3.
    CXXFLAGS += [
-        '-Wno-error=unused-function',
        '-Wno-error=shadow',
        '-Wno-unused-local-typedefs',
    ]
--- a/build/debian-packages/glib-wheezy.diff
+++ b/build/debian-packages/glib-wheezy.diff
@ -1,26 +0,0 @@
-diff -Nru glib2.0-2.38.2/debian/changelog glib2.0-2.38.2/debian/changelog
--- glib2.0-2.38.2/debian/changelog	2014-02-15 21:47:00.000000000 +0900
-+++ glib2.0-2.38.2/debian/changelog	2018-11-02 09:47:49.000000000 +0900
-@@ -1,3 +1,10 @@
-+glib2.0 (2.38.2-5.deb7moz1) wheezy; urgency=medium
-+
-+  * Mozilla backport for Wheezy.
-+  * debian/control: Remove :any from dependencies because it's not supported.
-+
-+ -- Mike Hommey <glandium@mozilla.com>  Fri, 02 Nov 2018 09:47:49 +0900
-+
- glib2.0 (2.38.2-5) unstable; urgency=medium
- 
-   * Upload to unstable.
-diff -Nru glib2.0-2.38.2/debian/control glib2.0-2.38.2/debian/control
--- glib2.0-2.38.2/debian/control	2014-02-15 21:50:26.000000000 +0900
-+++ glib2.0-2.38.2/debian/control	2018-11-02 09:47:24.000000000 +0900
-@@ -24,7 +24,7 @@
-                dbus-x11,
-                shared-mime-info,
-                xterm,
-               python:any (>= 2.6.6-3~),
-+               python (>= 2.6.6-3~),
-                python-dbus,
-                python-gi,
-                libxml2-utils,
--- a/build/debian-packages/gtk-wheezy.diff
+++ b/build/debian-packages/gtk-wheezy.diff
@ -1,38 +0,0 @@
-diff -Nru gtk+3.0-3.10.7/debian/changelog gtk+3.0-3.10.7/debian/changelog
--- gtk+3.0-3.10.7/debian/changelog	2014-02-15 22:20:29.000000000 +0900
-+++ gtk+3.0-3.10.7/debian/changelog	2018-11-02 12:04:23.000000000 +0900
-@@ -1,3 +1,11 @@
-+gtk+3.0 (3.10.7-1.deb7moz1) wheezy; urgency=medium
-+
-+  * Mozilla backport for Wheezy.
-+  * gtk/Makefile.am: Filter-out -fvisibility=hidden from the flags passed
-+    to g-ir-scanner.
-+
-+ -- Mike Hommey <glandium@mozilla.com>  Fri, 02 Nov 2018 12:04:23 +0900
-+
- gtk+3.0 (3.10.7-1) unstable; urgency=low
- 
-   * debian/libgtk-3-bin.install:
-diff -Nru gtk+3.0-3.10.7/debian/patches/deb7moz1 gtk+3.0-3.10.7/debian/patches/deb7moz1
--- gtk+3.0-3.10.7/debian/patches/deb7moz1	1970-01-01 09:00:00.000000000 +0900
-+++ gtk+3.0-3.10.7/debian/patches/deb7moz1	2018-11-02 12:04:23.000000000 +0900
-@@ -0,0 +1,11 @@
-+--- gtk+3.0-3.10.7.orig/gtk/Makefile.am
-++++ gtk+3.0-3.10.7/gtk/Makefile.am
-+@@ -1352,7 +1352,7 @@ Gtk_3_0_gir_INCLUDES += xlib-2.0
-+ endif
-+ Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
-+ Gtk_3_0_gir_CFLAGS = \
-+-		$(AM_CPPFLAGS) \
-++		$(filter-out -fvisibility=hidden,$(AM_CPPFLAGS)) \
-+ 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-+ Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
-+ Gtk_3_0_gir_FILES = $(introspection_files)
-diff -Nru gtk+3.0-3.10.7/debian/patches/series gtk+3.0-3.10.7/debian/patches/series
--- gtk+3.0-3.10.7/debian/patches/series	2014-02-15 22:14:46.000000000 +0900
-+++ gtk+3.0-3.10.7/debian/patches/series	2018-11-02 12:04:23.000000000 +0900
-@@ -12,3 +12,4 @@
- 061_multiarch_module_fallback.patch
- 071_fix-installation-of-HTML-images.patch
- 080_disable-parallel-docs-build.patch
-+deb7moz1
--- a/build/debian-packages/python-defaults-wheezy.diff
+++ b/build/debian-packages/python-defaults-wheezy.diff
@ -1,65 +0,0 @@
-diff -Nru python-defaults-2.7.3/debian/changelog python-defaults-2.7.3/debian/changelog
--- python-defaults-2.7.3/debian/changelog	2013-09-29 04:36:47.000000000 +0900
-+++ python-defaults-2.7.3/debian/changelog	2018-11-06 18:06:20.000000000 +0900
-@@ -1,3 +1,10 @@
-+python-defaults (2.7.3-4.deb7moz1) wheezy; urgency=medium
-+
-+  * Mozilla backport for Wheezy.
-+  * debian/control: Set "Multi-Arch: foreign" on various packages.
-+
-+ -- Mike Hommey <glandium@debian.org>  Tue, 06 Nov 2018 18:06:20 +0900
-+
- python-defaults (2.7.3-4+deb7u1) stable; urgency=low
- 
-   * Add symlink for /usr/bin/python2 (Closes: #723182)
-diff -Nru python-defaults-2.7.3/debian/control.in python-defaults-2.7.3/debian/control.in
--- python-defaults-2.7.3/debian/control.in	2012-07-01 03:36:04.000000000 +0900
-+++ python-defaults-2.7.3/debian/control.in	2018-11-06 18:06:20.000000000 +0900
-@@ -12,6 +12,7 @@
- 
- Package: python
- Architecture: all
-+Multi-Arch: foreign
- Priority: standard
- Depends: ${misc:Depends}, @PVER@ (>= @PREVVER@), python-minimal (= ${binary:Version})
- Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version})
-@@ -29,6 +30,7 @@
- 
- Package: python-minimal
- Architecture: all
-+Multi-Arch: foreign
- Priority: standard
- Depends: ${misc:Depends}, @PVER@-minimal (>= @PREVVER@), dpkg (>= 1.13.20)
- Recommends: python
-@@ -102,6 +104,7 @@
- 
- Package: python-dbg
- Architecture: all
-+Multi-Arch: foreign
- Section: debug
- Priority: extra
- Depends: ${misc:Depends}, python (= ${binary:Version}), python@VER@-dbg (>= @PREVVER@)
-@@ -112,6 +115,7 @@
- 
- Package: python-all
- Architecture: all
-+Multi-Arch: foreign
- Depends: ${misc:Depends}, python (= ${binary:Version}), python2.6 (>= 2.6.7-3), python2.7 (>= 2.7.2-3)
- Description: package depending on all supported Python runtime versions
-  The package currently depends on python2.6 and python2.7, in the future,
-@@ -123,6 +127,7 @@
- 
- Package: python-all-dev
- Architecture: all
-+Multi-Arch: foreign
- Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dev (= ${binary:Version}), python2.6-dev (>= 2.6.5-2), python2.7-dev (>= 2.7-7)
- Description: package depending on all supported Python development packages
-  The package currently depends on python2.6-dev and python2.7-dev, in the
-@@ -134,6 +139,7 @@
- 
- Package: python-all-dbg
- Architecture: all
-+Multi-Arch: foreign
- Section: debug
- Priority: extra
- Depends: ${misc:Depends}, python (= ${binary:Version}), python-all (= ${binary:Version}), python-dbg (= ${binary:Version}), python2.6-dbg (>= 2.6.5-2), python2.7-dbg (>= 2.7-7)
--- a/build/debian-packages/xkeyboard-config-wheezy.diff
+++ b/build/debian-packages/xkeyboard-config-wheezy.diff
@ -1,25 +0,0 @@
-diff -u xkeyboard-config-2.5.1/debian/control xkeyboard-config-2.5.1/debian/control
--- xkeyboard-config-2.5.1/debian/control
-+++ xkeyboard-config-2.5.1/debian/control
-@@ -23,6 +23,7 @@
- Depends: ${misc:Depends}
- Breaks: libx11-6 (<< 2:1.4.3)
- Architecture: all
-+Multi-Arch: foreign
- Description: X Keyboard Extension (XKB) configuration data
-  This package contains configuration data used by the X Keyboard
-  Extension (XKB), which allows selection of keyboard layouts when
-diff -u xkeyboard-config-2.5.1/debian/changelog xkeyboard-config-2.5.1/debian/changelog
--- xkeyboard-config-2.5.1/debian/changelog
-+++ xkeyboard-config-2.5.1/debian/changelog
-@@ -1,3 +1,10 @@
-+xkeyboard-config (2.5.1-3.deb7moz1) wheezy; urgency=medium
-+
-+  * Mozilla backport for Wheezy.
-+  * Mark xkb-data as "Multi-Arch: foreign".
-+
-+ -- Mike Hommey <glandium@mozilla.com>  Tue, 06 Nov 2018 17:13:52 +0900
-+
- xkeyboard-config (2.5.1-3) unstable; urgency=low
- 
-   * Cherry-picks from upstream:
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@ -249,7 +249,6 @@ linux64-base-toolchains/opt:
        symbol: Bb
    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
    worker:
-        docker-image: {in-tree: debian7-amd64-build-base}
        max-run-time: 7200
        env:
            PERFHERDER_EXTRA_OPTIONS: base-toolchains
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@ -61,7 +61,6 @@ treeherder:
        'BMcss': 'Beetmover checksums for source'
        'Aries': 'Aries Device Image'
        'Deb7': 'Packages for Debian 7'
-        'Deb7-32': 'Packages for Debian 7 32-bits'
        'Deb9': 'Packages for Debian 9'
        'Nexus 5-L': 'Nexus 5-L Device Image'
        'I': 'Docker Image Builds'
--- a/taskcluster/ci/docker-image/kind.yml
+++ b/taskcluster/ci/docker-image/kind.yml
@ -44,29 +44,12 @@ jobs:
    packages:
      - deb7-cmake
      - deb7-ninja
-  debian7-amd64-build-base:
-    symbol: I(deb7-bb)
-    parent: debian7-base
-    definition: debian7-build
-    packages:
-      - deb7-valgrind
-    args:
-      ARCH: amd64
  debian7-amd64-build:
    symbol: I(deb7)
    parent: debian7-base
    definition: debian7-build
    packages:
-      - deb7-atk
-      - deb7-glib
-      - deb7-gdk-pixbuf
-      - deb7-gtk3
-      - deb7-harfbuzz
-      - deb7-libxkbcommon
-      - deb7-pango
-      - deb7-pcre3
      - deb7-valgrind
-      - deb7-wayland
    args:
      ARCH: amd64
  debian7-i386-build:
@ -74,22 +57,6 @@ jobs:
    parent: debian7-base
    definition: debian7-build
    packages:
-      - deb7-32-atk
-      - deb7-32-glib
-      - deb7-32-gdk-pixbuf
-      - deb7-32-gtk3
-      - deb7-32-harfbuzz
-      - deb7-32-libxkbcommon
-      - deb7-32-pango
-      - deb7-32-pcre3
-      - deb7-32-xkeyboard-config
-      - deb7-32-wayland
-      - deb7-atk
-      - deb7-glib
-      - deb7-gtk3
-      - deb7-harfbuzz
-      - deb7-python-defaults
-      - deb7-pcre3
      - deb7-valgrind
    args:
      ARCH: i386
--- a/taskcluster/ci/packages/kind.yml
+++ b/taskcluster/ci/packages/kind.yml
@ -61,18 +61,6 @@ jobs:
      patch: python3-defaults-wheezy.diff
      pre-build-command: debian/rules control-file

-  deb7-python-defaults:
-    description: "multiarch python-defaults for Debian wheezy"
-    treeherder:
-      symbol: Deb7(python-defaults)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20130930T035642Z/pool/main/p/python-defaults/python-defaults_2.7.3-4+deb7u1.dsc
-        sha256: e12fa64899a025b7ac3bdccd5611ae6f3d23327b695b2938473b1cf68ecc9ae5
-      patch: python-defaults-wheezy.diff
-      pre-build-command: debian/rules control-file
-
  deb7-cmake:
    description: "Cmake backport for Debian wheezy"
    treeherder:
@ -277,246 +265,3 @@ jobs:
      tarball:
        url: https://github.com/indygreg/python-zstandard/releases/download/0.9.1/python-zstandard-0.9.1.tar.gz
        sha256: 59c7d6f1f85cebb5124abb50d8ec281c5311e0812e18785e28b197cf1515dd3b
-
-  deb7-pcre3:
-    description: "pcre3 8.31 for Debian Wheezy"
-    treeherder:
-      symbol: Deb7(pcre3)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20140424T055217Z/pool/main/p/pcre3/pcre3_8.31-5.dsc
-        sha256: e6e92af1e9f4b1d286ce9e7fdb6cb2f0972a341a94f5631e0b8c31b9f79633a4
-
-  deb7-atk:
-    description: "atk 2.8 for Debian Wheezy"
-    treeherder:
-      symbol: Deb7(atk)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20130510T040301Z/pool/main/a/atk1.0/atk1.0_2.8.0-2.dsc
-        sha256: cae824b2a5ef47704fb820c04b5b7ee234329d9ddda1086bf487e12d58b9f70c
-
-  deb7-glib:
-    description: "glib 2.38 for Debian Wheezy"
-    treeherder:
-      symbol: Deb7(glib)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20140215T160944Z/pool/main/g/glib2.0/glib2.0_2.38.2-5.dsc
-        sha256: 1d81952a9a46a935d35d723f7528bf8d5264ef8a59491bad335d134dbeaa2404
-      patch: glib-wheezy.diff
-      packages:
-        - deb7-pcre3
-
-  deb7-harfbuzz:
-    description: "harfbuzz for Debian Wheezy"
-    treeherder:
-      symbol: Deb7(harfbuzz)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20121211T033951Z/pool/main/h/harfbuzz/harfbuzz_0.9.9-1.dsc
-        sha256: 622677a2757a739fb59c8bcd8cde9c1722fac82808248e19ce1cae46620d92bd
-
-  deb7-gdk-pixbuf:
-    description: "gdk-pixbuf 2.28 for Debian Wheezy"
-    treeherder:
-      symbol: Deb7(gdkpixbuf)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20130608T215552Z/pool/main/g/gdk-pixbuf/gdk-pixbuf_2.28.2-1.dsc
-        sha256: f5057beb54c37293de352c6f253cedd8b144d25289f1fdf1a958f17b51565bcb
-      packages:
-        - deb7-glib
-        - deb7-pcre3
-
-  deb7-pango:
-    description: "pango 1.32 for Debian Wheezy"
-    treeherder:
-      symbol: Deb7(pango)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20130224T223605Z/pool/main/p/pango1.0/pango1.0_1.32.5-1.dsc
-        sha256: d9d9b1f797c5dbe70bfe9c7931d63b28437476aa1a737c424c7f072ca6e22914
-      packages:
-        - deb7-glib
-        - deb7-harfbuzz
-        - deb7-pcre3
-
-  deb7-libxkbcommon:
-    description: "libxkbcommon for Debian Wheezy"
-    treeherder:
-      symbol: Deb7(xkbc)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20140723T102555Z/pool/main/libx/libxkbcommon/libxkbcommon_0.4.1-2.dsc
-        sha256: 9046dbceda207ed7163b7c12c98399e6d119491a480dc908ae451d7fff0fb77c
-
-  deb7-wayland:
-    description: "wayland 1.2 for Debian wheezy"
-    treeherder:
-      symbol: Deb7(wayland)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20130908T214400Z/pool/main/w/wayland/wayland_1.2.1-1.dsc
-        sha256: 964619747c00c697c95f2739c7980a0a360d79d03eaa3d9a342fed81d86e9466
-
-  deb7-gtk3:
-    description: "gtk+ 3.10 for Debian wheezy"
-    treeherder:
-      symbol: Deb7(gtk3)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20140215T220417Z/pool/main/g/gtk+3.0/gtk+3.0_3.10.7-1.dsc
-        sha256: 2a6810d44517806940063bb488e49e7177732d8059c798cf0ef94103fefaf0b3
-      patch: gtk-wheezy.diff
-      packages:
-        - deb7-atk
-        - deb7-glib
-        - deb7-gdk-pixbuf
-        - deb7-harfbuzz
-        - deb7-libxkbcommon
-        - deb7-make
-        - deb7-pango
-        - deb7-pcre3
-        - deb7-wayland
-
-  deb7-32-pcre3:
-    description: "pcre3 8.31 for Debian Wheezy"
-    treeherder:
-      symbol: Deb7-32(pcre3)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20140424T055217Z/pool/main/p/pcre3/pcre3_8.31-5.dsc
-        sha256: e6e92af1e9f4b1d286ce9e7fdb6cb2f0972a341a94f5631e0b8c31b9f79633a4
-      arch: i386
-
-  deb7-32-atk:
-    description: "atk 2.8 for Debian Wheezy"
-    treeherder:
-      symbol: Deb7-32(atk)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20130510T040301Z/pool/main/a/atk1.0/atk1.0_2.8.0-2.dsc
-        sha256: cae824b2a5ef47704fb820c04b5b7ee234329d9ddda1086bf487e12d58b9f70c
-      arch: i386
-
-  deb7-32-glib:
-    description: "glib 2.38 for Debian Wheezy"
-    treeherder:
-      symbol: Deb7-32(glib)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20140215T160944Z/pool/main/g/glib2.0/glib2.0_2.38.2-5.dsc
-        sha256: 1d81952a9a46a935d35d723f7528bf8d5264ef8a59491bad335d134dbeaa2404
-      arch: i386
-      patch: glib-wheezy.diff
-      packages:
-        - deb7-32-pcre3
-
-  deb7-32-harfbuzz:
-    description: "harfbuzz for Debian Wheezy"
-    treeherder:
-      symbol: Deb7-32(harfbuzz)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20121211T033951Z/pool/main/h/harfbuzz/harfbuzz_0.9.9-1.dsc
-        sha256: 622677a2757a739fb59c8bcd8cde9c1722fac82808248e19ce1cae46620d92bd
-      arch: i386
-
-  deb7-32-gdk-pixbuf:
-    description: "gdk-pixbuf 2.28 for Debian Wheezy"
-    treeherder:
-      symbol: Deb7-32(gdkpixbuf)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20130608T215552Z/pool/main/g/gdk-pixbuf/gdk-pixbuf_2.28.2-1.dsc
-        sha256: f5057beb54c37293de352c6f253cedd8b144d25289f1fdf1a958f17b51565bcb
-      arch: i386
-      packages:
-        - deb7-32-glib
-        - deb7-32-pcre3
-
-  deb7-32-pango:
-    description: "pango 1.32 for Debian Wheezy"
-    treeherder:
-      symbol: Deb7-32(pango)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20130224T223605Z/pool/main/p/pango1.0/pango1.0_1.32.5-1.dsc
-        sha256: d9d9b1f797c5dbe70bfe9c7931d63b28437476aa1a737c424c7f072ca6e22914
-      arch: i386
-      packages:
-        - deb7-32-glib
-        - deb7-32-harfbuzz
-        - deb7-32-pcre3
-
-  deb7-32-xkeyboard-config:
-    description: "xkeyboard-config for Debian Wheezy"
-    treeherder:
-      symbol: Deb7-32(xkbdconfig)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20121225T153644Z/pool/main/x/xkeyboard-config/xkeyboard-config_2.5.1-3.dsc
-        sha256: 327d53dfca4288c7f75471bb01e6d1f161811706b1d8daa01bf9abc269016dc1
-      arch: i386
-      patch: xkeyboard-config-wheezy.diff
-
-  deb7-32-libxkbcommon:
-    description: "libxkbcommon for Debian Wheezy"
-    treeherder:
-      symbol: Deb7-32(xkbc)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20140723T102555Z/pool/main/libx/libxkbcommon/libxkbcommon_0.4.1-2.dsc
-        sha256: 9046dbceda207ed7163b7c12c98399e6d119491a480dc908ae451d7fff0fb77c
-      arch: i386
-
-  deb7-32-wayland:
-    description: "wayland 1.2 for Debian wheezy"
-    treeherder:
-      symbol: Deb7-32(wayland)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20130908T214400Z/pool/main/w/wayland/wayland_1.2.1-1.dsc
-        sha256: 964619747c00c697c95f2739c7980a0a360d79d03eaa3d9a342fed81d86e9466
-      arch: i386
-
-  deb7-32-gtk3:
-    description: "gtk+ 3.10 for Debian wheezy"
-    treeherder:
-      symbol: Deb7-32(gtk3)
-    run:
-      using: debian-package
-      dsc:
-        url: http://snapshot.debian.org/archive/debian/20140215T220417Z/pool/main/g/gtk+3.0/gtk+3.0_3.10.7-1.dsc
-        sha256: 2a6810d44517806940063bb488e49e7177732d8059c798cf0ef94103fefaf0b3
-      arch: i386
-      patch: gtk-wheezy.diff
-      packages:
-        - deb7-32-atk
-        - deb7-32-glib
-        - deb7-32-gdk-pixbuf
-        - deb7-32-harfbuzz
-        - deb7-32-libxkbcommon
-        - deb7-make
-        - deb7-32-pango
-        - deb7-32-pcre3
-        - deb7-32-wayland
--- a/taskcluster/docker/debian-base/setup_packages.sh
+++ b/taskcluster/docker/debian-base/setup_packages.sh
@ -1,5 +1,5 @@
 #!/bin/sh

 for task in "$@"; do
-  echo "deb [trusted=yes] https://queue.taskcluster.net/v1/task/$task/artifacts/public/build/ debian/" > "/etc/apt/sources.list.d/99$task.list"
+  echo "deb [trusted=yes] https://queue.taskcluster.net/v1/task/$task/runs/0/artifacts/public/build/ debian/" > "/etc/apt/sources.list.d/99$task.list"
 done
--- a/taskcluster/docker/debian7-build/Dockerfile
+++ b/taskcluster/docker/debian7-build/Dockerfile
@ -17,12 +17,7 @@ RUN dpkg --add-architecture $ARCH
 # Ideally, we wouldn't need gcc-multilib and the extra linux-libc-dev,
 # but the latter is required to make the former installable, and the former
 # because of bug 1409276.
-# We exclude /usr/share/doc/*/changelog.Debian* files because they might differ
-# between i386 and amd64 variants of the packages we build on automation
-# because of dates stored in them by debchange (and both might end up installed
-# in some cases).
 RUN apt-get update && \
-    echo path-exclude=/usr/share/doc/*/changelog.Debian* > /etc/dpkg/dpkg.cfg.d/excludes && \
    apt-get install \
      autoconf2.13 \
      automake \
--- a/taskcluster/taskgraph/transforms/job/debian_package.py
+++ b/taskcluster/taskgraph/transforms/job/debian_package.py
@ -170,7 +170,7 @@ def docker_worker_debian_package(config, job, taskdesc):
        'apt-get install -yyq apt-transport-https ca-certificates && '
        'for task in $PACKAGES; do '
        '  echo "deb [trusted=yes] https://queue.taskcluster.net/v1/task'
-        '/$task/artifacts/public/build/ debian/" '
+        '/$task/runs/0/artifacts/public/build/ debian/" '
        '>> /etc/apt/sources.list; '
        'done && '
        # Install the base utilities required to build debian packages.