Control: tags 611647 + pending

Dear maintainer,

I've prepared an NMU for bombardier (versioned as 0.8.3+nmu3) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru bombardier-0.8.3+nmu2/debian/bombardier.dirs bombardier-
0.8.3+nmu3/debian/bombardier.dirs
--- bombardier-0.8.3+nmu2/debian/bombardier.dirs        1969-12-31
19:00:00.000000000 -0500
+++ bombardier-0.8.3+nmu3/debian/bombardier.dirs        2021-01-11
18:26:39.000000000 -0500
@@ -0,0 +1 @@
+var/games/
diff -Nru bombardier-0.8.3+nmu2/debian/bombardier.install bombardier-
0.8.3+nmu3/debian/bombardier.install
--- bombardier-0.8.3+nmu2/debian/bombardier.install     2009-10-11
09:03:07.000000000 -0400
+++ bombardier-0.8.3+nmu3/debian/bombardier.install     1969-12-31
19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-usr/share/man/man6/bombardier.6
-usr/games/bombardier
diff -Nru bombardier-0.8.3+nmu2/debian/changelog bombardier-
0.8.3+nmu3/debian/changelog
--- bombardier-0.8.3+nmu2/debian/changelog      2020-02-20
15:13:46.000000000 -0500
+++ bombardier-0.8.3+nmu3/debian/changelog      2021-01-11
18:40:39.000000000 -0500
@@ -1,3 +1,12 @@
+bombardier (0.8.3+nmu3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/rules: Migrate to dh syntax.
+  * Makefile: Fix FTBFS with ld.gold. (Closes: #611647)
+  * Makefile: Also accept external build environment variables.
+
+ -- Boyuan Yang <by...@debian.org>  Mon, 11 Jan 2021 18:40:39 -0500
+
 bombardier (0.8.3+nmu2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru bombardier-0.8.3+nmu2/debian/compat bombardier-
0.8.3+nmu3/debian/compat
--- bombardier-0.8.3+nmu2/debian/compat 2009-10-10 13:48:52.000000000
-0400
+++ bombardier-0.8.3+nmu3/debian/compat 1969-12-31 19:00:00.000000000
-0500
@@ -1 +0,0 @@
-7
diff -Nru bombardier-0.8.3+nmu2/debian/control bombardier-
0.8.3+nmu3/debian/control
--- bombardier-0.8.3+nmu2/debian/control        2020-02-20
15:13:46.000000000 -0500
+++ bombardier-0.8.3+nmu3/debian/control        2021-01-11
18:36:25.000000000 -0500
@@ -2,8 +2,10 @@
 Section: games
 Priority: optional
 Maintainer: RISKO Gergely <ri...@debian.org>
-Build-Depends: libncurses5-dev, debhelper (>>7)
-Standards-Version: 3.8.3.0
+Build-Depends:
+ debhelper-compat (= 13),
+ libncurses-dev,
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/debian/bombardier
 Vcs-Git: https://salsa.debian.org/debian/bombardier.git
 
diff -Nru bombardier-0.8.3+nmu2/debian/rules bombardier-
0.8.3+nmu3/debian/rules
--- bombardier-0.8.3+nmu2/debian/rules  2020-02-20 09:18:50.000000000
-0500
+++ bombardier-0.8.3+nmu3/debian/rules  2021-01-11 18:40:39.000000000
-0500
@@ -1,43 +1,19 @@
 #!/usr/bin/make -f
 
-build: build-stamp
-build-stamp:
-       dh_testdir
-       dh_auto_build
-       touch build-stamp
+export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic -Wno-error=format-
security
 
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-       $(MAKE) clean
-       dh_clean
+DPKG_EXPORT_BUILDFLAGS = 1
+DPKG_EXPORT_BUILDTOOLS = 1
+include /usr/share/dpkg/default.mk
+include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/buildtools.mk
 
-install: build
-       dh_testdir
-       dh_testroot
-       dh_prep
-       dh_installdirs var/games
-       $(MAKE) install DESTDIR=`pwd`/debian/tmp
+%:
+       dh $@
 
-binary-indep: build install
-
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_install
-       dh_installdocs
-       dh_installmenu
-       dh_installman
-       dh_installchangelogs
-       dh_strip
-       dh_compress
+override_dh_fixperms:
        dh_fixperms -Xgames/bombardier
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+execute_after_dh_auto_install:
+       # Let postinst handle content
+       $(RM) -r $(CURDIR)/debian/bombardier/var/games/bombardier
diff -Nru bombardier-0.8.3+nmu2/Makefile bombardier-0.8.3+nmu3/Makefile
--- bombardier-0.8.3+nmu2/Makefile      2020-02-20 09:13:39.000000000
-0500
+++ bombardier-0.8.3+nmu3/Makefile      2021-01-11 18:40:33.000000000
-0500
@@ -3,17 +3,17 @@
 # Copyright (C) 2001, 2009 Gergely Risko
 # Can be licensed under the terms of GPL v3 or above
 
-CC=gcc
-CFLAGS=-Wall -g -O2 -pedantic
-LDFLAGS=-g
+CC ?= gcc
+CFLAGS ?= -Wall -g -O2 -pedantic
+LDFLAGS ?= -g
 LIBS=-lncurses
 OBJS=bombardier.o display.o date.o randomhouse.o step.o hof.o signal.o
gcurses.o
-DESTDIR=/
+DESTDIR ?= /
 
 all: bombardier
 
 bombardier: $(OBJS)
-       $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+       $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
 
 clean:
        rm -f $(OBJS) bombardier

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to