diff -Nru xfireworks-1.3/debian/changelog xfireworks-1.3/debian/changelog --- xfireworks-1.3/debian/changelog 2018-04-03 12:52:13.000000000 +0000 +++ xfireworks-1.3/debian/changelog 2018-11-29 07:43:19.000000000 +0000 @@ -1,16 +1,26 @@ -xfireworks (1.3-10build1) bionic; urgency=high +xfireworks (1.3-11) unstable; urgency=low - * No change rebuild to pick up -fPIE compiler default + [ Yukiharu YABUKI ] + * Apply dh_auto_build patch (Closes: #913841). + * Bump up Standards-Version + * Remove dh_clean -k and Added dh_prep + * Bump up debian/compat + + [ Helmut Grohne ] + * Fix FTCBFS + * Let dh_auto_bild pass cross tools to make. + * cross.patch: Use the build architecture compiler for mkconf.c. - -- Balint Reczey Tue, 03 Apr 2018 12:52:13 +0000 + -- Yukiharu YABUKI Thu, 29 Nov 2018 16:43:19 +0900 xfireworks (1.3-10) unstable; urgency=low [ Yukiharu YABUKI ] - * Apply reproducible builds patch (closes: #777402) * Update Standards-Version + * Start to use git-buildpackage + * Added Vcs-Git and Vcs-Browser field - -- Yukiharu YABUKI Sat, 16 Aug 2015 00:15:35 +0900 + -- Yukiharu YABUKI Sat, 28 Dec 2013 16:28:59 +0900 xfireworks (1.3-9) unstable; urgency=low diff -Nru xfireworks-1.3/debian/compat xfireworks-1.3/debian/compat --- xfireworks-1.3/debian/compat 2010-03-18 08:29:12.000000000 +0000 +++ xfireworks-1.3/debian/compat 2018-11-29 07:43:19.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru xfireworks-1.3/debian/control xfireworks-1.3/debian/control --- xfireworks-1.3/debian/control 2018-04-03 12:52:13.000000000 +0000 +++ xfireworks-1.3/debian/control 2018-11-29 07:43:19.000000000 +0000 @@ -1,10 +1,11 @@ Source: xfireworks Section: games Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Yukiharu YABUKI -Standards-Version: 3.9.6 -Build-Depends: libx11-dev, debhelper (>= 5) +Maintainer: Yukiharu YABUKI +Standards-Version: 4.2.1 +Build-Depends: libx11-dev, debhelper (>= 7) +Vcs-Git: https://github.com/yabuki/xfireworks +Vcs-Browser: https://github.com/yabuki/xfireworks Package: xfireworks Architecture: any diff -Nru xfireworks-1.3/debian/patches/cross-build-dh_auto_build xfireworks-1.3/debian/patches/cross-build-dh_auto_build --- xfireworks-1.3/debian/patches/cross-build-dh_auto_build 1970-01-01 00:00:00.000000000 +0000 +++ xfireworks-1.3/debian/patches/cross-build-dh_auto_build 2018-11-29 07:43:19.000000000 +0000 @@ -0,0 +1,44 @@ +Description: cross build patch + This patch enable us to build in cross environment. + . + xfireworks (1.3-11) unstable; urgency=low + . + [ Yukiharu YABUKI ] + * Apply dh_auto_build patch (Closes: #913841). + * Update Standards-Version + . + [ Helmut Grohne ] + * Fix FTCBFS + * Let dh_auto_bild pass cross tools to make. + * cross.patch: Use the build architecture compiler for mkconf.c. +Author: Yukiharu YABUKI +Bug-Debian: https://bugs.debian.org/913841 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug-Debian: https://bugs.debian.org/913841 +Last-Update: 2018-11-29 + +--- xfireworks-1.3.orig/Makefile ++++ xfireworks-1.3/Makefile +@@ -13,6 +13,7 @@ XLIBDIR = $(X11BASE)/lib + CFLAGS = -O + LFLAGS = -lm -lX11 + CC = cc ++CC_FOR_BUILD ?= $(CC) + CP = cp + RM = rm -f + MKDIR = mkdir -p +@@ -66,7 +67,7 @@ xfireworks_conf.h : xfireworks.conf mkco + cat xfireworks.conf | ./mkconf > xfireworks_conf.h + + mkconf : mkconf.c +- $(CC) $(CPPFLAGS) $(CFLAGS) mkconf.c -o mkconf ++ $(CC_FOR_BUILD) $(CPPFLAGS) $(CFLAGS) mkconf.c -o mkconf + + etc.o : etc.c + $(CC) -c etc.c $(CPPFLAGS) $(CFLAGS) diff -Nru xfireworks-1.3/debian/patches/series xfireworks-1.3/debian/patches/series --- xfireworks-1.3/debian/patches/series 2012-07-10 19:52:56.000000000 +0000 +++ xfireworks-1.3/debian/patches/series 2018-11-29 07:43:19.000000000 +0000 @@ -1,2 +1,3 @@ debian-changes-1.3-7 hardening +cross-build-dh_auto_build diff -Nru xfireworks-1.3/debian/rules xfireworks-1.3/debian/rules --- xfireworks-1.3/debian/rules 2015-08-15 15:32:31.000000000 +0000 +++ xfireworks-1.3/debian/rules 2018-11-29 07:43:19.000000000 +0000 @@ -2,6 +2,8 @@ # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. +export CC_FOR_BUILD ?= $(CC) + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -16,7 +18,7 @@ # Add here commands to compile the package. - $(MAKE) BINDIR=/usr/games LIBDIR=/etc/X11/xfireworks MANDIR=/usr/share/man/man6 GZIP=-9n + dh_auto_build -- BINDIR=/usr/games LIBDIR=/etc/X11/xfireworks MANDIR=/usr/share/man/man6 GZIP=-9n touch build-stamp @@ -33,7 +35,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Add here commands to install the package into debian/xfireworks.