Bug#859967: unblock: vnstat/1.15-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package vnstat
The upload fixes a sometimes FTBFS bug #859712
A missing Makefile dependency and autoconf regeneration is added.
I'm attaching the corresponding debdiff.
unblock vnstat/1.15-2
diff -Nru vnstat-1.15/debian/changelog vnstat-1.15/debian/changelog
--- vnstat-1.15/debian/changelog 2016-10-20 21:08:28.000000000 +0200
+++ vnstat-1.15/debian/changelog 2017-04-09 18:27:14.000000000 +0200
@@ -1,3 +1,10 @@
+vnstat (1.15-2) unstable; urgency=medium
+
+ * Fix Makefile install-data-hook dependency. (Closes: #859712)
+ - Add install-ordering.diff, thanks to Adrian Bunk.
+
+ -- Felix Geyer <fgeyer@debian.org> Sun, 09 Apr 2017 18:27:14 +0200
+
vnstat (1.15-1) unstable; urgency=medium
* New upstream release.
diff -Nru vnstat-1.15/debian/control vnstat-1.15/debian/control
--- vnstat-1.15/debian/control 2016-10-08 16:52:03.000000000 +0200
+++ vnstat-1.15/debian/control 2017-04-09 18:27:14.000000000 +0200
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Felix Geyer <fgeyer@debian.org>
-Build-Depends: debhelper (>= 9), libgd-dev, check, dh-systemd (>= 1.4)
+Build-Depends: debhelper (>= 9), libgd-dev, check, dh-systemd (>= 1.4), dh-autoreconf | debhelper (>= 9.20160403~)
Standards-Version: 3.9.5
Homepage: http://humdi.net/vnstat/
Vcs-Git: https://anonscm.debian.org/git/collab-maint/vnstat.git
diff -Nru vnstat-1.15/debian/patches/install-ordering.diff vnstat-1.15/debian/patches/install-ordering.diff
--- vnstat-1.15/debian/patches/install-ordering.diff 1970-01-01 01:00:00.000000000 +0100
+++ vnstat-1.15/debian/patches/install-ordering.diff 2017-04-09 18:27:08.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Makefile.am: install-data-hook depends on install-exec
+ Calling $(DESTDIR)$(bindir)/vnstat$(EXEEXT) fails when
+ installation of this program is not yet finished.
+Author: Adrian Bunk <bunk@debian.org>
+
+--- vnstat-1.15.orig/Makefile.am
++++ vnstat-1.15/Makefile.am
+@@ -93,7 +93,7 @@ release: distcheck
+ rm -fr $(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ ls -l $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz
+
+-install-data-hook:
++install-data-hook: install-exec
+ $(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
+ $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
+ mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
diff -Nru vnstat-1.15/debian/patches/series vnstat-1.15/debian/patches/series
--- vnstat-1.15/debian/patches/series 2016-10-08 16:49:07.000000000 +0200
+++ vnstat-1.15/debian/patches/series 2017-04-09 18:27:14.000000000 +0200
@@ -1,2 +1,3 @@
pidfile_path.diff
systemd_user.diff
+install-ordering.diff
diff -Nru vnstat-1.15/debian/rules vnstat-1.15/debian/rules
--- vnstat-1.15/debian/rules 2015-11-22 11:11:54.000000000 +0100
+++ vnstat-1.15/debian/rules 2017-04-09 18:27:08.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@ --parallel --with systemd
+ dh $@ --parallel --with systemd,autoreconf
override_dh_auto_build:
dh_auto_build -- all
Reply to: