mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-20 00:35:44 +00:00
4f407cb9b4
This gets rid for the need of a number of local packages (mostly related to Gtk+3). One exception is that we now need a 32-bits version of the xz-utils package, some -dev package depends on it, and that dependency can't be fulfilled in the 32-bits image because we already have the 64-bits backport installed, which conflicts with it (we need both 32-bits and 64-bits package to be at the same version when installed). The system binutils fails to link clang-7 for some reason, so we now use our toolchain binutils instead, like we already do for newer versions of clang. The debian-packages docker image now needs an explicit installation of git, because it's not pulled in via the recommends of some other package. For some reason, snapshot.debian.org doesn't contain the jessie-backports archive at the same location as others, and only has a few snapshots of the archive. Differential Revision: https://phabricator.services.mozilla.com/D73784
58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
diff -Nru valgrind-3.15.0/debian/changelog valgrind-3.15.0/debian/changelog
|
|
--- valgrind-3.15.0/debian/changelog 2019-07-14 19:23:29.000000000 +0900
|
|
+++ valgrind-3.15.0/debian/changelog 2019-07-17 18:19:13.000000000 +0900
|
|
@@ -1,3 +1,13 @@
|
|
+valgrind (1:3.15.0-1.deb8moz1) jessie; urgency=medium
|
|
+
|
|
+ * Mozilla backport for jessie.
|
|
+ * debian/control, debian/compat: Drop debhelper compat back to 9, which
|
|
+ requires adding back an explicit dependency on dh-autoreconf.
|
|
+ * debian/rules: Debhelper only defaulted to --parallel in compat >= 10, so
|
|
+ add --parallel back.
|
|
+
|
|
+ -- Mike Hommey <glandium@mozilla.com> Wed, 17 Jul 2019 18:19:13 +0900
|
|
+
|
|
valgrind (1:3.15.0-1) unstable; urgency=medium
|
|
|
|
* New upstream release
|
|
diff -Nru valgrind-3.15.0/debian/compat valgrind-3.15.0/debian/compat
|
|
--- valgrind-3.15.0/debian/compat 2019-07-14 19:23:29.000000000 +0900
|
|
+++ valgrind-3.15.0/debian/compat 2019-07-17 18:19:13.000000000 +0900
|
|
@@ -1 +1 @@
|
|
-12
|
|
+9
|
|
diff -Nru valgrind-3.15.0/debian/control valgrind-3.15.0/debian/control
|
|
--- valgrind-3.15.0/debian/control 2019-07-14 19:23:29.000000000 +0900
|
|
+++ valgrind-3.15.0/debian/control 2019-07-17 18:19:13.000000000 +0900
|
|
@@ -2,7 +2,8 @@
|
|
Section: devel
|
|
Priority: optional
|
|
Maintainer: Alessandro Ghedini <ghedo@debian.org>
|
|
-Build-Depends: debhelper (>= 12),
|
|
+Build-Depends: debhelper (>= 9),
|
|
+ dh-autoreconf,
|
|
gdb,
|
|
gcc-multilib [amd64],
|
|
libc6-dev-i386 [amd64],
|
|
diff -Nru valgrind-3.15.0/debian/rules valgrind-3.15.0/debian/rules
|
|
--- valgrind-3.15.0/debian/rules 2019-07-14 19:23:29.000000000 +0900
|
|
+++ valgrind-3.15.0/debian/rules 2019-07-17 18:19:13.000000000 +0900
|
|
@@ -11,7 +11,7 @@
|
|
LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
|
|
|
|
%:
|
|
- dh $@ --with=autoreconf
|
|
+ dh $@ --parallel --with=autoreconf
|
|
|
|
override_dh_auto_configure:
|
|
dh_auto_configure -- --enable-tls CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
|
|
@@ -20,7 +20,7 @@
|
|
: # do nothing for now
|
|
|
|
override_dh_auto_build:
|
|
- dh_auto_build
|
|
+ dh_auto_build --parallel
|
|
$(MAKE) -C docs FAQ.txt
|
|
$(MAKE) -C docs html-docs
|
|
$(MAKE) -C docs man-pages
|