[hedgewars] 01/01: Revert "Consider BUILD_ENGINE_C defaulted to YES"
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Mon May 4 16:45:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository hedgewars.
commit cecb2783464392992985cee82b9a21369b42374f
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Mon May 4 18:44:53 2015 +0200
Revert "Consider BUILD_ENGINE_C defaulted to YES"
This reverts commit 9eb40bf49958231795e26018ca83d3c05a1d6b31.
---
debian/changelog | 7 -------
debian/control | 5 +++--
debian/rules | 8 +++++++-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dba9445..c91f2c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-hedgewars (0.9.21.1-6) UNRELEASED; urgency=medium
-
- * Default BUILD_ENGINE_C to YES.
- - upstream says it is confident now with it.
-
- -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Sat, 14 Feb 2015 19:29:39 +0100
-
hedgewars (0.9.21.1-5) unstable; urgency=medium
* Add a debug package, per upstream request.
diff --git a/debian/control b/debian/control
index 6971516..b3482e5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,11 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Dmitry E. Oboukhov <unera at debian.org>,
Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Standards-Version: 3.9.6
-Build-Depends: clang,
+Build-Depends: clang [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64el s390x alpha hppa m68k powerpcspe sh4 x32],
cmake,
debhelper (>= 9),
dpkg-dev (>= 1.16.1~),
+ fpc [amd64 armel armhf i386 powerpc sparc ppc64],
freeglut3-dev,
ghc,
# convert function
@@ -27,7 +28,7 @@ Build-Depends: clang,
libghc-utf8-string-dev,
libghc-vector-dev,
libghc-zlib-dev,
- libglew-dev,
+ libglew-dev [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64el s390x alpha hppa m68k powerpcspe sh4 x32],
liblua5.1-dev,
libphysfs-dev,
libpng-dev,
diff --git a/debian/rules b/debian/rules
index 46a26ff..03f23fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,13 +5,19 @@
DEJAVU_DIRECTORY := $(shell dirname `readlink -f /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf`)
+ifeq ($(shell dpkg-query --status fpc |grep -o Package), Package)
+ BUILD_ENGINE_C := NO
+else
+ BUILD_ENGINE_C := YES
+endif
+
HEDGEWARS_OPTIONS= \
-DCMAKE_INSTALL_PREFIX=/usr/lib/hedgewars \
-DDATA_INSTALL_DIR=/usr/share/games/hedgewars \
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPHYSFS_SYSTEM=ON \
-DFONTS_DIRS='/usr/share/fonts/truetype/wqy;$(DEJAVU_DIRECTORY)' \
-DNOVERSIONINFOUPDATE=1 \
- -DBUILD_ENGINE_C=YES
+ -DBUILD_ENGINE_C=$(BUILD_ENGINE_C)
override_dh_clean:
rm -rf tmp-icon
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git
More information about the Pkg-games-commits
mailing list