The following commit has been merged in the master branch:
commit 09f5a68e54adcf0c37647aa2832d46e72df88096
Author: Gianfranco Costamagna <costamagnagianfra...@yahoo.it>
Date: Wed Jun 12 19:38:20 2013 +0200
Simplified debian/rules and changed libpng12-dev to libpng-dev
diff --git a/debian/changelog b/debian/changelog
index b7f52ae..1075f43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hedgewars (0.9.19.3-2) UNRELEASED; urgency=low
+
+ * Simplified debian/rules, no linking of libgcc_s.so.1
+ needed anymore
+ * Changed build-dep libpng12-dev to libpng-dev.
+
+ -- Gianfranco Costamagna <costamagnagianfra...@yahoo.it> Thu, 27 Jun 2013
15:59:59 +0200
+
hedgewars (0.9.19.3-1) unstable; urgency=low
* New upstream tarball.
diff --git a/debian/control b/debian/control
index 2421fc6..1d37990 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 9), cmake, cdbs, dpkg-dev (>=
1.16.1~),
imagemagick,
libghc-bytestring-show-dev,
fpc,
- libpng12-dev,
+ libpng-dev,
libavcodec-dev,
libavformat-dev,
freeglut3-dev,
diff --git a/debian/rules b/debian/rules
index bd00305..1c5e6b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,22 +2,9 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-CFLAGS+=$(CPPFLAGS)
-CXXFLAGS+=$(CPPFLAGS)
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-#Helping libc >= 2.17, see launchpad bug #1179850
-TYPE_FLAGS = -DFPFLAGS="-k/lib/$(DEB_HOST_MULTIARCH)/libgcc_s.so.1"
-
DEB_CMAKE_INSTALL_PREFIX := /usr/lib/hedgewars
DEB_CMAKE_EXTRA_FLAGS := -DNOSERVER=0 \
- -DDATA_INSTALL_DIR=/usr/share/games/hedgewars $(TYPE_FLAGS)
-
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog \
- |grep ^Version|awk '{print $$2}'|sed 's/-[[:digit:]]\+$$//' \
-)
+ -DDATA_INSTALL_DIR=/usr/share/games/hedgewars
clean::
rm -fr tmp-icon stamp-icon
@@ -34,11 +21,3 @@ stamp-icon:
mkdir -p tmp-icon/$$dirname/apps; \
convert $$icon tmp-icon/$$dirname/apps/$$basename.png; \
done
-
-tarball:
- cd .. && \
- tar --exclude=debian \
- --exclude=.git \
- -czf hedgewars_$(UPSTREAM_VERSION).orig.tar.gz \
- hedgewars-$(UPSTREAM_VERSION)
-
--
Worms style game
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
