Fix Debian, Ubuntu multiarch building (#531)

Packaging/debian/changelog

@@ -1,3 +1,43 @@
+devilutionx (1.0.0) UNRELEASED; urgency=medium
+
+  * New release
+
+  * Features:
+  * FPS no longer capped at 20hz; smoother mouse and transitions
+  * Full-featured gamepad support
+  * All movies can now be skipped via ESC
+  * Implement --help, --version and --data-dir
+  * Implement FPS counter (-f)
+  * Force windowed mode with -x
+  * Skip startup movies with -n
+  * Implement scroll wheel navigation
+  * Implement touch support
+  * Load assets from the same folder as the mpq
+  * Faster loading
+
+  * Platforms:
+  * Added Nintendo Switch support
+  * Added Retro Gamer Handheld (OpenDingux/Retrofw) support
+  * Added OpenBSD support
+  * Windows version is now build as GUI an app and has an icon
+
+  * Bugfixes:
+  * Fixed random missing sounds
+  * Fixed NPCs not talking about the right quest
+  * Error messages implemented in GUI
+  * Fixed having to restart the game between network sessions
+  * Fixed game not working on some Radeon GPUs
+  * Fixed panel missing after minimizing game if upscaling is disabled
+  * Fixed clicks in the left letterbox being incorrectly handled
+  * Fixed end movie not looping
+
+  * Original Diablo bugs:
+  * Fixed a large number of rare stability issues from the original game
+  * Correctly take open panels into account when casting spells
+  * Fix sound some times being muted after Diablo dies
+
+ -- Goran Vidovic (gogo) <trebelnik2@gmail.com>  Thu, 02 Jan 2019 21:35:11 +0200
+
 devilutionx (0.5.0.3) UNRELEASED; urgency=medium
 
   * Hardcoded font path fix
@@ -10,11 +50,3 @@ devilutionx (0.5.0.2) UNRELEASED; urgency=medium
     Missing font hotfix
   * 
 
- -- root <root@ubuntu1804.localdomain>  Sat, 05 Oct 2019 12:04:39 +0000
-
-devilutionx (0.4.0) bionic; urgency=medium
-
-  [ Vítězslav Dvořák ]
-  * Non-maintainer upload.
-
- -- Vítězslav Dvořák <info@vitexsoftware.cz>  Fri, 28 Jun 2019 22:55:11 +0200

Packaging/debian/control

@@ -3,8 +3,13 @@ Section: contrib/games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Build-Depends:
- debhelper (>= 9),
- cmake, g++, libsdl2-mixer-dev, libsdl2-ttf-dev, libsodium-dev
+	debhelper (>= 9),
+	cmake,
+	g++,
+	gettext,
+	libsdl2-mixer-dev,
+	libsdl2-ttf-dev,
+	libsodium-dev
 Standards-Version: 4.3.0
 Homepage: https://github.com/diasurgical/devilutionX
 Vcs-Git: git://git@github.com:diasurgical/devilutionX.git
@@ -22,6 +27,7 @@ Description: Diablo build for modern operating systems
 
 Package: diablo-data
 Architecture: all
+Multi-Arch: foreign
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},

Packaging/debian/devilutionx.install

@@ -1,4 +0,0 @@
-Packaging/fedora/devilutionx.desktop usr/share/applications/
-obj-x86_64-linux-gnu/devilutionx     	usr/share/games/diablo/
-Packaging/resources/CharisSILB.ttf	usr/share/fonts/truetype
-

Packaging/debian/rules

@@ -2,30 +2,35 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 export COMPILE_FLAGS="-O0"
-
-export DH_VERBOSE = 1
 export DEB_BUILD_MAINT_OPTIONS = hardening=-all
 export DEB_CFLAGS_MAINT_APPEND  = -Wno-error 
 export DEB_LDFLAGS_MAINT_APPEND = -Wno-error
 export CXXFLAGS="-DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-	dh $@ --buildsystem=cmake
+	dh $@ --buildsystem=cmake --builddirectory=obj-${DEB_HOST_MULTIARCH}
 
-#override_dh_auto_clean:
-#	dh_auto_clean
-#override_dh_auto_configure:
-#	dh_auto_configure -O--buildsystem=cmake -- -DDESTDIR=/usr/games -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+override_dh_auto_configure:
+	dh_auto_configure -- -DNIGHTLY_BUILD=ON #-DSPAWN=ON
 
 override_dh_auto_install:
-	mkdir -p debian/diablo-data/usr/share/games/diablo/
+	install -pdm755 debian/diablo-data/usr/share/games/diablo/
 	test -f "../diabdat.mpq" && cp ../diabdat.mpq debian/diablo-data/usr/share/games/diablo/ || true
 	dh_auto_install
-	mkdir -p debian/devilutionx/usr/share/icons/hicolor/16x16/apps/
-	mkdir -p debian/devilutionx/usr/share/icons/hicolor/32x32/apps/
-	mkdir -p debian/devilutionx/usr/share/icons/hicolor/48x48/apps/
-	cp Packaging/resources/16.png debian/devilutionx/usr/share/icons/hicolor/16x16/apps/devilutionx.png 
-	cp Packaging/resources/Diablo_32.png debian/devilutionx/usr/share/icons/hicolor/32x32/apps/devilutionx.png 
-	cp Packaging/resources/Diablo_48.png debian/devilutionx/usr/share/icons/hicolor/48x48/apps/devilutionx.png 
+	install -pdm755 debian/devilutionx/usr/share/icons/hicolor/48x48/apps/
+	install -pdm755 debian/devilutionx/usr/share/applications/
+	install -pdm755 debian/devilutionx/usr/share/fonts/truetype/
+	install -pdm755 debian/devilutionx/usr/share/icons/hicolor/16x16/apps/
+	install -pdm755 debian/devilutionx/usr/share/icons/hicolor/32x32/apps/
+	install -pdm755 debian/devilutionx/usr/share/icons/hicolor/48x48/apps/
+	install -pdm755 debian/devilutionx/usr/share/games/diablo/
+	install -Dm664 Packaging/resources/16.png debian/devilutionx/usr/share/icons/hicolor/16x16/apps/devilutionx.png 
+	install -Dm664 Packaging/resources/Diablo_32.png debian/devilutionx/usr/share/icons/hicolor/32x32/apps/devilutionx.png 
+	install -Dm664 Packaging/resources/Diablo_48.png debian/devilutionx/usr/share/icons/hicolor/48x48/apps/devilutionx.png 
+	install -Dm664 Packaging/fedora/devilutionx.desktop debian/devilutionx/usr/share/applications/
+	install -Dm664 Packaging/resources/CharisSILB.ttf debian/devilutionx/usr/share/fonts/truetype/
+	install -Dm755 obj-${DEB_HOST_MULTIARCH}/devilutionx debian/devilutionx/usr/share/games/diablo/ 
+

Packaging/fedora/devilutionx.desktop

@@ -2,6 +2,8 @@
 Name=devilutionX
 GenericName=DevilutionX
 Comment=Play Diablo I on Linux
+Comment[da]=Spil Diablo I på Linux
+Comment[hr]=Igrajte Diablo I na Linuxu
 Exec=devilutionx
 Icon=devilutionx.png
 Terminal=false