summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
Diffstat (limited to 'os')
-rw-r--r--os/debian/control5
-rw-r--r--os/debian/menu2
-rwxr-xr-xos/debian/rules20
3 files changed, 17 insertions, 10 deletions
diff --git a/os/debian/control b/os/debian/control
index bfaa4cf3a..d4d4fcdf9 100644
--- a/os/debian/control
+++ b/os/debian/control
@@ -3,11 +3,10 @@ Section: games
Priority: optional
Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
Uploaders: Jordi Mallach <jordi@debian.org>
-DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, libicu-dev, liblzma-dev, liblzo2-dev, libxdg-basedir-dev
Standards-Version: 3.8.4
-Vcs-Browser: http://git.debian.org/?p=collab-maint/openttd.git
-Vcs-Git: git://git.debian.org/collab-maint/openttd.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/openttd.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/openttd.git
Homepage: http://www.openttd.org/
Package: openttd
diff --git a/os/debian/menu b/os/debian/menu
index 58e23aaa0..3afa6e08e 100644
--- a/os/debian/menu
+++ b/os/debian/menu
@@ -1,2 +1,2 @@
?package(openttd):needs="X11" section="Games/Simulation" title="OpenTTD"\
-command="/usr/share/games/openttd/openttd-wrapper" icon="/usr/share/pixmaps/openttd.32.xpm"
+command="/usr/games/openttd" icon="/usr/share/pixmaps/openttd.32.xpm"
diff --git a/os/debian/rules b/os/debian/rules
index e2ae9db85..18a73db9e 100755
--- a/os/debian/rules
+++ b/os/debian/rules
@@ -4,7 +4,7 @@
# Use debhelper default for all targets (but some are overridden below).
%:
- dh $@
+ dh --parallel $@
DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -12,21 +12,29 @@ ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
+# This prevents linking uselessly to libicudata and silences a warning
+# in the build process.
+DEB_LDFLAGS_MAINT_APPEND="-Wl,-as-needed"
+
+# Enable all hardening options (since openttd offers a network-listening
+# service that handles untrusted data).
+DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+# Load buildflags (this uses dpkg-buildflags). Note that we don't export
+# them, but instead pass them to ./configure explicitly.
+include /usr/share/dpkg/buildflags.mk
+
# Pass custom options to configure. Since it's not autoconf but a custom
# script, some of the option names are slightly different. We also need
# to be explicit about the dependencies, in case we're not running in a
# clean build root.
override_dh_auto_configure:
- ./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-sdl --with-png --with-freetype --with-fontconfig --with-icu --with-liblzo2 --with-lzma --with-xdg-basedir --without-iconv --disable-strip CFLAGS="$(CFLAGS) -g" LDFLAGS="$(LDFLAGS) -Wl,-as-needed"
+ ./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-sdl --with-png --with-freetype --with-fontconfig --with-icu --with-liblzo2 --with-lzma --with-xdg-basedir --without-iconv --disable-strip CFLAGS="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CFLAGS_BUILD="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS_BUILD="$(CXXFLAGS) $(CPPFLAGS)" LDFLAGS_BUILD="$(LDFLAGS)"
# Do some extra installation
override_dh_auto_install:
$(MAKE) install DO_NOT_INSTALL_CHANGELOG=1 DO_NOT_INSTALL_LICENSE=1
- # Install the wrapper and make it executable
- install -d debian/openttd/usr/share/games/openttd/
- install -m755 debian/openttd-wrapper debian/openttd/usr/share/games/openttd/
-
# Don't do testing. Because the OpenTTD Makefile always does dependency
# generation (even on invalid targets), dh_auto_test thinks there is a
# "test" target, while there isn't.