From c614c7e73079f630251549728dd13475c208bab9 Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Fri, 30 Dec 2016 14:32:25 +0100
Subject: [PATCH 1/9] Fix empty paragraph in description; remove article from
 short description

---
 packaging/linux/deb/DEBIAN/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control
index cbf7cefd95..285acf7107 100644
--- a/packaging/linux/deb/DEBIAN/control
+++ b/packaging/linux/deb/DEBIAN/control
@@ -7,12 +7,12 @@ Depends: libopenal1, mono-runtime (>= 3.2), libmono-system-core4.0-cil, libmono-
 Section: games
 Priority: extra
 Homepage: http://www.openra.net/
-Description: A multiplayer re-envisioning of early RTS games by Westwood Studios
- .
+Description: Multiplayer re-envisioning of early RTS games by Westwood Studios
  OpenRA is a Libre/Free Real Time Strategy game engine supporting early
  Westwood games like Command & Conquer and Command & Conquer: Red Alert.
  The engine is designed from the ground up to be extremely moddable and
  natively supports user-created maps and mods.
+ .
  Support can be obtained from our IRC channel (#openra on irc.freenode.net),
  our forum (http://www.sleipnirstuff.com/forum/viewforum.php?f=80), and our
  bug tracker (http://bugs.openra.net).

From 53c67bc8c2c161c0cab6da00f91ca5d26e11440f Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Fri, 30 Dec 2016 14:34:34 +0100
Subject: [PATCH 2/9] Fix permissions of the DLL files and game executables

The DLL files should not be exectable, nor should the game executables
be writeable by the group.
---
 packaging/linux/deb/buildpackage.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index 446c9e97b3..424a8aef2f 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -22,12 +22,14 @@ mkdir "${DEB_BUILD_ROOT}"
 cp -R DEBIAN "${DEB_BUILD_ROOT}"
 cp -R "${LINUX_BUILD_ROOT}/usr" "${DEB_BUILD_ROOT}"
 cp -R Eluant.dll.config "${DEB_BUILD_ROOT}/${LIBDIR}/"
+chmod 0644 "${DEB_BUILD_ROOT}/${LIBDIR}/"*.dll
+chmod 0644 "${DEB_BUILD_ROOT}/${LIBDIR}/"*/**/*.dll
 
 # Binaries go in /usr/games
 mv "${DEB_BUILD_ROOT}/usr/bin/" "${DEB_BUILD_ROOT}/usr/games/"
 sed "s|/usr/bin|/usr/games|g" "${DEB_BUILD_ROOT}/usr/games/openra" > temp
 mv -f temp "${DEB_BUILD_ROOT}/usr/games/openra"
-chmod +x "${DEB_BUILD_ROOT}/usr/games/openra"
+chmod 0755 "${DEB_BUILD_ROOT}/usr/games/openra"*
 
 # Put the copyright and changelog in /usr/share/doc/openra/
 mkdir -p "${DEB_BUILD_ROOT}/${DOCDIR}"

From 0210711fad744fcfac67de1aa2bbba9e8fd1f29d Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Fri, 30 Dec 2016 14:35:56 +0100
Subject: [PATCH 3/9] Create a link for the OpenRA server manpage; compress the
 normal one

The command-line arguments of the openra-server executable are the
same as for openra.
---
 packaging/linux/deb/buildpackage.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index 424a8aef2f..244385d1e7 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -31,6 +31,10 @@ sed "s|/usr/bin|/usr/games|g" "${DEB_BUILD_ROOT}/usr/games/openra" > temp
 mv -f temp "${DEB_BUILD_ROOT}/usr/games/openra"
 chmod 0755 "${DEB_BUILD_ROOT}/usr/games/openra"*
 
+# Link and compress the man pages
+gzip -9n "${DEB_BUILD_ROOT}/usr/share/man/man6/openra.6"
+ln -s openra.6.gz "${DEB_BUILD_ROOT}/usr/share/man/man6/openra-server.6.gz"
+
 # Put the copyright and changelog in /usr/share/doc/openra/
 mkdir -p "${DEB_BUILD_ROOT}/${DOCDIR}"
 cp copyright "${DEB_BUILD_ROOT}/${DOCDIR}/copyright"

From 2ae5dba961b8b561526d7a7ab04086cba439983f Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Fri, 30 Dec 2016 14:37:03 +0100
Subject: [PATCH 4/9] Fix up the changelog

Just use a dummy changelog entry about the release and fix
a syntax error in the entry footer.

The changelog should not contain the contents of Changelog.md as this
results in an unparsable Debian changelog.  The game's changelog is already
available as CHANGELOG.html in /usr/share/doc/openra.
---
 packaging/linux/deb/buildpackage.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index 244385d1e7..59f8b37401 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -43,8 +43,8 @@ gzip -9 "${DEB_BUILD_ROOT}/${DOCDIR}/AUTHORS"
 DATE=`date -R`
 
 echo -e "openra (${VERSION}) unstable; urgency=low\n" > "${DEB_BUILD_ROOT}/${DOCDIR}/changelog"
-cat "../../../Changelog.md" >> "${DEB_BUILD_ROOT}/${DOCDIR}/changelog"
-echo -e "\n\n-- Paul Chote <paul@chote.net> ${DATE}" >> "${DEB_BUILD_ROOT}/${DOCDIR}/changelog"
+echo -e "  * New upstream release: $TAG" >> "${DEB_BUILD_ROOT}/${DOCDIR}/changelog"
+echo -e "\n -- Paul Chote <paul@chote.net>  ${DATE}" >> "${DEB_BUILD_ROOT}/${DOCDIR}/changelog"
 gzip -9 "${DEB_BUILD_ROOT}/${DOCDIR}/changelog"
 rm "${DEB_BUILD_ROOT}/${LIBDIR}/COPYING"
 

From 41dfaaf564e1dd4dea3e80d3226bbf79d78f8d0b Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Fri, 30 Dec 2016 14:39:21 +0100
Subject: [PATCH 5/9] Add a lintian override for the font duplication

This will probably never be fixed and the override is there to document
that this is ignored explicitly.
---
 packaging/linux/deb/buildpackage.sh          | 5 +++++
 packaging/linux/deb/openra.lintian-overrides | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 packaging/linux/deb/openra.lintian-overrides

diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index 59f8b37401..9d64bf3e61 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -6,6 +6,7 @@ DEB_BUILD_ROOT=./root
 
 LIBDIR=/usr/lib/openra
 DOCDIR=/usr/share/doc/openra
+LINTIANORDIR=/usr/share/lintian/overrides
 
 E_BADARGS=85
 if [ $# -ne "3" ]
@@ -42,6 +43,10 @@ cp "${DEB_BUILD_ROOT}/${LIBDIR}/AUTHORS" "${DEB_BUILD_ROOT}/${DOCDIR}"
 gzip -9 "${DEB_BUILD_ROOT}/${DOCDIR}/AUTHORS"
 DATE=`date -R`
 
+# Put the lintian overrides in /usr/share/lintian/overrides/
+mkdir -p "${DEB_BUILD_ROOT}/${LINTIANORDIR}"
+cp openra.lintian-overrides "${DEB_BUILD_ROOT}/${LINTIANORDIR}/openra"
+
 echo -e "openra (${VERSION}) unstable; urgency=low\n" > "${DEB_BUILD_ROOT}/${DOCDIR}/changelog"
 echo -e "  * New upstream release: $TAG" >> "${DEB_BUILD_ROOT}/${DOCDIR}/changelog"
 echo -e "\n -- Paul Chote <paul@chote.net>  ${DATE}" >> "${DEB_BUILD_ROOT}/${DOCDIR}/changelog"
diff --git a/packaging/linux/deb/openra.lintian-overrides b/packaging/linux/deb/openra.lintian-overrides
new file mode 100644
index 0000000000..dcd46a6d7a
--- /dev/null
+++ b/packaging/linux/deb/openra.lintian-overrides
@@ -0,0 +1,2 @@
+openra: duplicate-font-file usr/lib/openra/mods/common/FreeSans.ttf also in fonts-freefont-ttf
+openra: duplicate-font-file usr/lib/openra/mods/common/FreeSansBold.ttf also in fonts-freefont-ttf

From 84c5a72986a3a809be6ca1ddc21993f822ce1640 Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Fri, 30 Dec 2016 14:40:34 +0100
Subject: [PATCH 6/9] Fix the issues with filenames for the md5sums

Lintian reported missing md5sums for all files under usr/ and reported the
existence of md5sums for all files under /usr that we're not in the
package.
---
 packaging/linux/deb/buildpackage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index 9d64bf3e61..e1481455e5 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -61,7 +61,7 @@ sed "s/{VERSION}/$VERSION/" DEBIAN/control | sed "s/{SIZE}/$PACKAGE_SIZE/" > "${
 pushd "${DEB_BUILD_ROOT}" >/dev/null
 
 # Calculate md5sums and clean up the ./usr/ part of them
-find . -type f -not -path "./DEBIAN/*" -print0 | xargs -0 -n1 md5sum | sed 's|\./usr/|/usr/|' > DEBIAN/md5sums
+find . -type f -not -path "./DEBIAN/*" -print0 | xargs -0 -n1 md5sum | sed 's|\./usr/|usr/|' > DEBIAN/md5sums
 chmod 0644 DEBIAN/md5sums
 
 # Replace any dashes in the version string with periods

From 2dd6376a39641f663f51315928a4dc3ad9173105 Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Fri, 30 Dec 2016 15:56:57 +0100
Subject: [PATCH 7/9] Leave the openra-server man page out for now; add an
 lintian override

See also issue #12525.
---
 packaging/linux/deb/buildpackage.sh          | 3 +--
 packaging/linux/deb/openra.lintian-overrides | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index e1481455e5..00eda6fa27 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -32,9 +32,8 @@ sed "s|/usr/bin|/usr/games|g" "${DEB_BUILD_ROOT}/usr/games/openra" > temp
 mv -f temp "${DEB_BUILD_ROOT}/usr/games/openra"
 chmod 0755 "${DEB_BUILD_ROOT}/usr/games/openra"*
 
-# Link and compress the man pages
+# Compress the man page
 gzip -9n "${DEB_BUILD_ROOT}/usr/share/man/man6/openra.6"
-ln -s openra.6.gz "${DEB_BUILD_ROOT}/usr/share/man/man6/openra-server.6.gz"
 
 # Put the copyright and changelog in /usr/share/doc/openra/
 mkdir -p "${DEB_BUILD_ROOT}/${DOCDIR}"
diff --git a/packaging/linux/deb/openra.lintian-overrides b/packaging/linux/deb/openra.lintian-overrides
index dcd46a6d7a..549fd6b9a7 100644
--- a/packaging/linux/deb/openra.lintian-overrides
+++ b/packaging/linux/deb/openra.lintian-overrides
@@ -1,2 +1,3 @@
 openra: duplicate-font-file usr/lib/openra/mods/common/FreeSans.ttf also in fonts-freefont-ttf
 openra: duplicate-font-file usr/lib/openra/mods/common/FreeSansBold.ttf also in fonts-freefont-ttf
+openra: binary-without-manpage usr/games/openra-server

From 55a17f61535d36f1fcc026bb144700848691ad44 Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Thu, 5 Jan 2017 20:38:35 +0100
Subject: [PATCH 8/9] Add comments to the overrides; drop the missing manpage
 override

The missing openra-server manpage warning should not be overriden,
as the manpage should be there. (See also: #12525).
---
 packaging/linux/deb/openra.lintian-overrides | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packaging/linux/deb/openra.lintian-overrides b/packaging/linux/deb/openra.lintian-overrides
index 549fd6b9a7..8303406eb8 100644
--- a/packaging/linux/deb/openra.lintian-overrides
+++ b/packaging/linux/deb/openra.lintian-overrides
@@ -1,3 +1,4 @@
+# We don't want to have need to add an extra dependency and create symlinks to
+# be able to access the FreeSans font.
 openra: duplicate-font-file usr/lib/openra/mods/common/FreeSans.ttf also in fonts-freefont-ttf
 openra: duplicate-font-file usr/lib/openra/mods/common/FreeSansBold.ttf also in fonts-freefont-ttf
-openra: binary-without-manpage usr/games/openra-server

From 17617334ddc7bc61411aa9c046357b7cf9bd2285 Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Sun, 22 Jan 2017 20:40:39 +0100
Subject: [PATCH 9/9] Nothing should have group writable permissions

These might occur due to difference in umask values.
---
 packaging/linux/deb/buildpackage.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index 00eda6fa27..b8cfeed828 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -52,6 +52,10 @@ echo -e "\n -- Paul Chote <paul@chote.net>  ${DATE}" >> "${DEB_BUILD_ROOT}/${DOC
 gzip -9 "${DEB_BUILD_ROOT}/${DOCDIR}/changelog"
 rm "${DEB_BUILD_ROOT}/${LIBDIR}/COPYING"
 
+# Nothing should have group writable permissions
+# (These might occur due to difference in umask values.)
+chmod -R g-w "${DEB_BUILD_ROOT}"
+
 # Create the control file
 PACKAGE_SIZE=`du --apparent-size -c "${DEB_BUILD_ROOT}/usr" | grep "total" | awk '{print $1}'`
 sed "s/{VERSION}/$VERSION/" DEBIAN/control | sed "s/{SIZE}/$PACKAGE_SIZE/" > "${DEB_BUILD_ROOT}/DEBIAN/control"