r15845 - packages/trunk/liquidwar/debian
Paul Wise
pabs at moszumanska.debian.org
Fri Jul 15 10:55:21 UTC 2016
Author: pabs
Date: 2016-07-15 10:55:21 +0000 (Fri, 15 Jul 2016)
New Revision: 15845
Modified:
packages/trunk/liquidwar/debian/changelog
packages/trunk/liquidwar/debian/rules
Log:
* Team upload.
* Add build-arch/build-indep targets to fix FTBFS with unreleased dpkg (Closes: #822050)
Modified: packages/trunk/liquidwar/debian/changelog
===================================================================
--- packages/trunk/liquidwar/debian/changelog 2016-07-13 15:38:33 UTC (rev 15844)
+++ packages/trunk/liquidwar/debian/changelog 2016-07-15 10:55:21 UTC (rev 15845)
@@ -1,7 +1,13 @@
liquidwar (5.6.4-4) UNRELEASED; urgency=low
+ * Team upload.
+
+ [ Evgeni Golov ]
* Correct Vcs-* URLs to point to anonscm.debian.org
+ [ Paul Wise ]
+ * Add build-arch/build-indep targets to fix FTBFS with unreleased dpkg (Closes: #822050)
+
-- Evgeni Golov <evgeni at debian.org> Mon, 15 Jul 2013 22:21:41 +0200
liquidwar (5.6.4-3) unstable; urgency=low
Modified: packages/trunk/liquidwar/debian/rules
===================================================================
--- packages/trunk/liquidwar/debian/rules 2016-07-13 15:38:33 UTC (rev 15844)
+++ packages/trunk/liquidwar/debian/rules 2016-07-15 10:55:21 UTC (rev 15845)
@@ -40,6 +40,7 @@
--bindir=\$${prefix}/games \
--disable-target-opt \
CFLAGS="$(CFLAGS)"
+ sed -i 's/install_nolink: install_bin/install_nolink: /' Makefile
touch configure-stamp
@@ -53,15 +54,26 @@
touch autotools
-build: configure-stamp build-stamp
-build-stamp:
- dh_testdir
+build-indep: build-indep-stamp
+build-indep-stamp: configure
+ dh_testdir -i
- $(MAKE) build_bin build_data
- cd doc; make man/liquidwar.6.gz ; make html_yes
+ $(MAKE) build_data
+ cd doc; make html_yes
- touch build-stamp
+ touch build-indep-stamp
+build-arch: build-arch-stamp
+build-arch-stamp: configure
+ dh_testdir -a
+
+ $(MAKE) build_bin
+ cd doc; make man/liquidwar.6.gz
+
+ touch build-arch-stamp
+
+build: build-indep build-arch
+
clean:
dh_testdir
dh_testroot
@@ -69,25 +81,35 @@
[ ! -f Makefile ] || $(MAKE) distclean
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
- rm -f build-stamp configure-stamp autotools
+ rm -f build-arch-stamp build-indep-stamp configure-stamp autotools
rm -f config.sub config.guess
rm -rf .pc
dh_clean
#install: DH_OPTIONS=
-install: build
- dh_testdir
- dh_testroot
+install-indep: build-indep
+ dh_testdir -i
+ dh_testroot -i
+ dh_clean -i -k
+ dh_installdirs -i
+
+ $(MAKE) install_nolink DESTDIR=$(CURDIR)/debian/tmp
+
+install-arch: build-arch
+ dh_testdir -i
+ dh_testroot -i
dh_clean -k
dh_installdirs
- $(MAKE) install_nolink DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) install_bin install_doc DESTDIR=$(CURDIR)/debian/tmp
+install: install-indep install-arch
+
# Build architecture-independent files here.
# Pass -i to all debhelper commands in this target to reduce clutter.
binary-indep: #DH_OPTIONS=-i
-binary-indep: build install
+binary-indep: install-indep
dh_testdir -i
dh_testroot -i
dh_installdocs -i
@@ -103,7 +125,7 @@
# Build architecture-dependent files here.
# Pass -a to all debhelper commands in this target to reduce clutter.
binary-arch: #DH_OPTIONS=-a
-binary-arch: build install
+binary-arch: install-arch
dh_testdir -a
dh_testroot -a
dh_install --sourcedir=debian/tmp -a
@@ -128,4 +150,4 @@
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install #autotools
+.PHONY: build-indep build-arch build clean binary-indep binary-arch binary install-indep install-arch install #autotools
More information about the Pkg-games-commits
mailing list