[hedgewars] 01/01: Consider BUILD_ENGINE_C defaulted to YES
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Sat Feb 14 18:34:49 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 9eb40bf49958231795e26018ca83d3c05a1d6b31
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sat Feb 14 19:34:36 2015 +0100
Consider BUILD_ENGINE_C defaulted to YES
---
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 c91f2c6..dba9445 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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 b3482e5..6971516 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,10 @@ 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 [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64el s390x alpha hppa m68k powerpcspe sh4 x32],
+Build-Depends: clang,
cmake,
debhelper (>= 9),
dpkg-dev (>= 1.16.1~),
- fpc [amd64 armel armhf i386 powerpc sparc ppc64],
freeglut3-dev,
ghc,
# convert function
@@ -28,7 +27,7 @@ Build-Depends: clang [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel p
libghc-utf8-string-dev,
libghc-vector-dev,
libghc-zlib-dev,
- libglew-dev [arm64 hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel ppc64el s390x alpha hppa m68k powerpcspe sh4 x32],
+ libglew-dev,
liblua5.1-dev,
libphysfs-dev,
libpng-dev,
diff --git a/debian/rules b/debian/rules
index 03f23fc..46a26ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,19 +5,13 @@
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=$(BUILD_ENGINE_C)
+ -DBUILD_ENGINE_C=YES
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