diff options
| author | rubidium <rubidium@openttd.org> | 2014-01-07 19:31:46 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2014-01-07 19:31:46 +0000 |
| commit | ce72195cf328e5f343ab377533df0d2b27342987 (patch) | |
| tree | 0d257e0fa28daa784ab1e567f9d17387b89335f1 | |
| parent | 014813141daffb2e920b763f83dfcace0d5613fa (diff) | |
| download | openttd-ce72195cf328e5f343ab377533df0d2b27342987.tar.xz | |
(svn r26229) -Revert-ish: do not use libxdg in the Debian/Ubuntu packages just yet; it seems unmaintained, and might not even be kicked out in the next release of Debian
| -rw-r--r-- | os/debian/control | 2 | ||||
| -rwxr-xr-x | os/debian/rules | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/os/debian/control b/os/debian/control index d4d4fcdf9..54e14ce5d 100644 --- a/os/debian/control +++ b/os/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: Matthijs Kooijman <matthijs@stdin.nl> Uploaders: Jordi Mallach <jordi@debian.org> -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 +Build-Depends: debhelper (>= 7.0.50), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, libicu-dev, liblzma-dev, liblzo2-dev Standards-Version: 3.8.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/openttd.git Vcs-Git: git://anonscm.debian.org/collab-maint/openttd.git diff --git a/os/debian/rules b/os/debian/rules index 18a73db9e..dfd39253e 100755 --- a/os/debian/rules +++ b/os/debian/rules @@ -29,7 +29,7 @@ include /usr/share/dpkg/buildflags.mk # 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) $(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CFLAGS_BUILD="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS_BUILD="$(CXXFLAGS) $(CPPFLAGS)" LDFLAGS_BUILD="$(LDFLAGS)" + ./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 --without-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: |