Bug#853011: irrlicht: diff for NMU version 1.8.4+dfsg1-1.1

[Niels Thykier]

Control: tags 853011 + pending


Dear maintainer,

I've prepared an NMU for irrlicht (versioned as 1.8.4+dfsg1-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru irrlicht-1.8.4+dfsg1/debian/changelog irrlicht-1.8.4+dfsg1/debian/changelog
--- irrlicht-1.8.4+dfsg1/debian/changelog	2016-09-21 05:54:13.000000000 +0000
+++ irrlicht-1.8.4+dfsg1/debian/changelog	2019-01-06 16:29:15.000000000 +0000
@@ -1,3 +1,24 @@
+irrlicht (1.8.4+dfsg1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Niels Thykier ]
+  * Set Rules-Requires-Root to "no" as irrlicht builds fine without
+    (fake)root.
+  * Tag libirrlicht-doc as "Multi-Arch: foreign".
+  * Pass --parallel to dh.
+  * Improve a shell look in debian/rules by adding set -e to it and
+    fixing a variable reference (it was intended for the shell, but
+    make interpreted it instead).
+  * Replace "Priority: extra" with "Priority: optional" as the
+    former is deprecated.
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Let dh_auto_build pass cross compilers.
+    (Closes: #853011)
+
+ -- Niels Thykier <niels at thykier.net>  Sun, 06 Jan 2019 16:29:15 +0000
+
 irrlicht (1.8.4+dfsg1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru irrlicht-1.8.4+dfsg1/debian/control irrlicht-1.8.4+dfsg1/debian/control
--- irrlicht-1.8.4+dfsg1/debian/control	2016-09-21 05:37:22.000000000 +0000
+++ irrlicht-1.8.4+dfsg1/debian/control	2019-01-06 16:28:59.000000000 +0000
@@ -19,6 +19,7 @@
  mesa-common-dev (>= 7.6),
  x11proto-xf86vidmode-dev,
  zlib1g-dev
+Rules-Requires-Root: no
 Standards-Version: 3.9.8
 Homepage: http://irrlicht.sf.net
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/irrlicht.git
@@ -51,7 +52,6 @@
 
 Package: libirrlicht1.8-dbg
 Section: debug
-Priority: extra
 Architecture: any
 Multi-Arch: same
 Depends: libirrlicht1.8 (= ${binary:Version}), ${misc:Depends}
@@ -63,6 +63,7 @@
 Package: libirrlicht-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: High performance realtime 3D engine (API documentation)
  The Irrlicht Engine is an open source completely cross-platform 3D engine.
diff -Nru irrlicht-1.8.4+dfsg1/debian/rules irrlicht-1.8.4+dfsg1/debian/rules
--- irrlicht-1.8.4+dfsg1/debian/rules	2016-09-21 05:54:13.000000000 +0000
+++ irrlicht-1.8.4+dfsg1/debian/rules	2019-01-06 16:25:12.000000000 +0000
@@ -13,7 +13,7 @@
 scripts_svn_rev=5339
 
 %:
-	dh $@
+	dh $@ --sourcedirectory=source/Irrlicht --parallel
 
 override_dh_clean:
 	# clean documentation
@@ -31,15 +31,13 @@
 	
 	# build irrlicht shared and static lib
 	NDEBUG="true" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-	CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C source/Irrlicht sharedlib
-	NDEBUG="true" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-	CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C source/Irrlicht staticlib
+	CXXFLAGS="$(CXXFLAGS)" dh_auto_build -- sharedlib staticlib
 	
 	# build documentation
 	# based off of scripts/doc/irrlicht/makedocumentation.sh
-	cd scripts/doc/irrlicht && rm -f tut.txt && \
+	set -e ; cd scripts/doc/irrlicht && rm -f tut.txt && \
 	for i in ../../../examples/[012]*/main.cpp; do \
-	  sed -f tutorials.sed $i >>tut.txt; \
+	  sed -f tutorials.sed "$${i}" >>tut.txt; \
 	done && \
 	doxygen doxygen.cfg && \
 	cp irrlicht.png logobig.png ../../../doctemp/html
@@ -50,8 +48,8 @@
 	usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_install:
-	$(MAKE) -C source/Irrlicht DESTDIR=$(CURDIR)/debian/tmp \
-	INSTALL_DIR=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) install
+	dh_auto_install -- \
+	INSTALL_DIR=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_installchangelogs:
 	dh_installchangelogs changes.txt