gecko-dev/build/debian-packages/valgrind-wheezy.diff

65 строки
2.4 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,14 @@
+valgrind (1:3.15.0-1.deb7moz1) wheezy; urgency=medium
+
+ * Mozilla backport for wheezy.
+ * debian/control, debian/compat: Drop debhelper compat back to 7, which
+ requires adding back an explicit dependency on dh-autoreconf.
+ * debian/rules: Debhelper only defaulted to --parallel in compat >= 10, so
+ add --parallel back.
+ * debian/valgrind-mpi.install: Use non-multiarch path.
+
+ -- 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
+7
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 (>= 7.0.50~),
+ 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
diff -Nru valgrind-3.15.0/debian/valgrind-mpi.install valgrind-3.15.0/debian/valgrind-mpi.install
--- valgrind-3.15.0/debian/valgrind-mpi.install 2019-07-14 19:23:29.000000000 +0900
+++ valgrind-3.15.0/debian/valgrind-mpi.install 2019-07-17 18:19:13.000000000 +0900
@@ -1 +1 @@
-usr/lib/*/valgrind/libmpiwrap*
+usr/lib/valgrind/libmpiwrap*