build/debian-packages/nasm-wheezy.diff
author Tom Ritter <tom@mozilla.com>
Tue, 08 Jan 2019 15:16:39 -0600
changeset 510199 763f90cc2fac67d6c5598df0fc3af3a335680382
parent 506069 45cd802be3dd3d3271dc19a96e8a8adb7a73757e
permissions -rw-r--r--
Bug 1460620 - Have MinGW look for d3dcompiler_47.dll (so it will be packaged) r=froydnj

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