зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1511223 - Update deb7 nasm to 2.13.01. r=glandium
This pulls a newer version of the nasm package, and patches out doc building in order to make it compile on debian 7. Differential Revision: https://phabricator.services.mozilla.com/D13510 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
79cc29fa6e
Коммит
ff5c8168d3
|
@ -0,0 +1,48 @@
|
|||
diff -Nru nasm-2.13.01/debian/changelog nasm-2.13.01/debian/changelog
|
||||
--- nasm-2.13.01/debian/changelog 2017-05-08 16:33:23.000000000 +0000
|
||||
+++ nasm-2.13.01/debian/changelog 2018-11-30 09:54:37.000000000 +0000
|
||||
@@ -1,3 +1,12 @@
|
||||
+nasm (2.13.01-1.deb7moz1) wheezy; urgency=low
|
||||
+
|
||||
+ * Changes for compatibility with building on Debian Wheezy:
|
||||
+ * Remove fonts-liberation2 dep which is not present on Wheezy
|
||||
+ * Disable docs building and installation which is not possible
|
||||
+ without fonts-liberation2
|
||||
+
|
||||
+ -- Thomas Daede <tdaede@mozilla.com> Fri, 30 Nov 2018 09:54:37 +0000
|
||||
+
|
||||
nasm (2.13.01-1) experimental; urgency=low
|
||||
|
||||
* New upstream version 2.13.01
|
||||
--- nasm-2.13.01/debian/control 2017-05-08 16:33:23.000000000 +0000
|
||||
+++ nasm-2.13.01/debian/control 2018-11-30 09:53:57.000000000 +0000
|
||||
@@ -8,7 +8,7 @@
|
||||
Build-Depends:
|
||||
debhelper (>= 9),
|
||||
dpkg-dev (>= 1.16.1~),
|
||||
- fonts-liberation2,
|
||||
+ fontconfig,
|
||||
ghostscript,
|
||||
libfont-ttf-perl,
|
||||
libsort-versions-perl,
|
||||
--- nasm-2.13.01/debian/rules 2017-05-08 16:33:23.000000000 +0000
|
||||
+++ nasm-2.13.01/debian/rules 2018-11-30 09:53:57.000000000 +0000
|
||||
@@ -28,7 +28,7 @@
|
||||
build-stamp:
|
||||
dh_testdir
|
||||
./configure --prefix=/usr --mandir=/usr/share/man
|
||||
- $(MAKE) all doc
|
||||
+ $(MAKE) all
|
||||
> $@
|
||||
|
||||
binary: binary-arch binary-indep
|
||||
@@ -38,8 +38,7 @@
|
||||
dh_testroot
|
||||
dh_clean
|
||||
dh_installdirs usr/bin usr/share/man/man1
|
||||
- $(MAKE) INSTALLROOT=$(CURDIR)/debian/nasm install install_rdf
|
||||
- dh_installdocs AUTHORS README TODO doc/html doc/nasmdoc.txt doc/nasmdoc.ps doc/nasmdoc.pdf
|
||||
+ $(MAKE) INSTALLROOT=$(CURDIR)/debian/nasm install
|
||||
dh_installexamples misc/nasm.sl test/*
|
||||
dh_installman debian/*.1
|
||||
dh_installchangelogs CHANGES
|
|
@ -273,8 +273,9 @@ jobs:
|
|||
run:
|
||||
using: debian-package
|
||||
dsc:
|
||||
url: http://snapshot.debian.org/archive/debian/20160426T155816Z/pool/main/n/nasm/nasm_2.12.01-1.dsc
|
||||
sha256: 70b0478243ca8b36e163af15fb8a0a9be504b3321a9fb7d67ba0767dbfcc32ec
|
||||
url: http://snapshot.debian.org/archive/debian/20170704T094954Z/pool/main/n/nasm/nasm_2.13.01-1.dsc
|
||||
sha256: 76528365eddc646f3f53c9f501ae9c2ba1678a163303d297e9014e3da36643c8
|
||||
patch: nasm-wheezy.diff
|
||||
|
||||
deb7-pcre3:
|
||||
description: "pcre3 8.31 for Debian Wheezy"
|
||||
|
|
Загрузка…
Ссылка в новой задаче