Bug#856205: unblock: vbrfix/0.24+dfsg-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package vbrfix
unblock vbrfix/0.24+dfsg-1
diffstat for vbrfix-0.24 vbrfix-0.24+dfsg
debian/changelog | 10 ++++++++++
debian/control | 5 ++---
debian/patches/armhf-ftbfs.patch | 16 ++++++++++++++++
debian/patches/no-local-libtool.patch | 17 +++++++++++++++++
debian/patches/series | 2 ++
debian/rules | 10 +++++++++-
vbrfixc/vbrfixc |binary
7 files changed, 56 insertions(+), 4 deletions(-)
diff -Nru vbrfix-0.24/debian/changelog vbrfix-0.24+dfsg/debian/changelog
--- vbrfix-0.24/debian/changelog 2010-05-21 07:10:24.000000000 +0300
+++ vbrfix-0.24+dfsg/debian/changelog 2017-02-26 13:07:11.000000000 +0200
@@ -1,3 +1,13 @@
+vbrfix (0.24+dfsg-1) unstable; urgency=medium
+
+ * QA upload.
+ * Set maintainer to Debian QA Group. (see #646384)
+ * Repackage the upstream tarball without the vbrfixc/vbrfixc binary.
+ * Fix FTBFS on armhf. (Closes: #856199)
+ * autoreconf for the FTBFS fix.
+
+ -- Adrian Bunk <bunk@debian.org> Sun, 26 Feb 2017 13:07:11 +0200
+
vbrfix (0.24-7) unstable; urgency=low
* Improve the manpage slightly
diff -Nru vbrfix-0.24/debian/control vbrfix-0.24+dfsg/debian/control
--- vbrfix-0.24/debian/control 2010-05-21 06:57:59.000000000 +0300
+++ vbrfix-0.24+dfsg/debian/control 2017-02-26 13:07:11.000000000 +0200
@@ -1,10 +1,9 @@
Source: vbrfix
Section: sound
Priority: optional
-Maintainer: Rogério Brito <rbrito@ime.usp.br>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev
+Maintainer: Debian QA Group <packages@qa.debian.org>
+Build-Depends: debhelper (>= 9.20160403~), autotools-dev
Standards-Version: 3.8.4
-DM-Upload-Allowed: yes
VCS-Browser: http://git.debian.org/?p=users/rbrito-guest/vbrfix.git
VCS-Git: git://git.debian.org/users/rbrito-guest/vbrfix.git
diff -Nru vbrfix-0.24/debian/patches/armhf-ftbfs.patch vbrfix-0.24+dfsg/debian/patches/armhf-ftbfs.patch
--- vbrfix-0.24/debian/patches/armhf-ftbfs.patch 1970-01-01 02:00:00.000000000 +0200
+++ vbrfix-0.24+dfsg/debian/patches/armhf-ftbfs.patch 2017-02-26 13:07:11.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Fix FTBFS on armhf
+ *-*-linux-gnu does not match arm-unknown-linux-gnueabihf
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/856199
+
+--- vbrfix-0.24+dfsg.orig/admin/acinclude.m4.in
++++ vbrfix-0.24+dfsg/admin/acinclude.m4.in
+@@ -2818,7 +2818,7 @@ AC_DEFUN(AC_CHECK_COMPILERS,
+ if test "$kde_use_warnings" = "yes"; then
+ if test "$GCC" = "yes"; then
+ case $host in
+- *-*-linux-gnu)
++ *-*-linux-gnu*)
+ CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+ CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion $CXXFLAGS"
+ ;;
diff -Nru vbrfix-0.24/debian/patches/no-local-libtool.patch vbrfix-0.24+dfsg/debian/patches/no-local-libtool.patch
--- vbrfix-0.24/debian/patches/no-local-libtool.patch 1970-01-01 02:00:00.000000000 +0200
+++ vbrfix-0.24+dfsg/debian/patches/no-local-libtool.patch 2017-02-26 13:07:11.000000000 +0200
@@ -0,0 +1,17 @@
+Description: Stop adding outdated libtool macros to acinclude.m4
+Author: Adrian Bunk <bunk@debian.org>
+
+--- vbrfix-0.24+dfsg.orig/Makefile.am
++++ vbrfix-0.24+dfsg/Makefile.am
+@@ -15,10 +15,7 @@ $(top_srcdir)/configure.in: configure.in
+ $(top_srcdir)/subdirs:
+ cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
+
+-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
+- @cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
+-
+-MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
++MAINTAINERCLEANFILES = subdirs configure.in configure.files
+
+ package-messages:
+ $(MAKE) -f admin/Makefile.common package-messages
diff -Nru vbrfix-0.24/debian/patches/series vbrfix-0.24+dfsg/debian/patches/series
--- vbrfix-0.24/debian/patches/series 2010-05-21 06:57:59.000000000 +0300
+++ vbrfix-0.24+dfsg/debian/patches/series 2017-02-26 13:07:11.000000000 +0200
@@ -2,3 +2,5 @@
fix-endianness.diff
gcc-4.3.diff
exit-error-code.diff
+no-local-libtool.patch
+armhf-ftbfs.patch
diff -Nru vbrfix-0.24/debian/rules vbrfix-0.24+dfsg/debian/rules
--- vbrfix-0.24/debian/rules 2010-05-21 07:03:36.000000000 +0300
+++ vbrfix-0.24+dfsg/debian/rules 2017-02-26 13:07:11.000000000 +0200
@@ -1,7 +1,15 @@
#!/usr/bin/make -f
%:
- dh --with autotools_dev $@
+ dh --with autoreconf $@
+
+override_dh_autoreconf:
+ cat admin/acinclude.m4.in > acinclude.m4
+ dh_autoreconf
override_dh_auto_install:
dh_auto_install
mv debian/vbrfix/usr/bin/vbrfixc debian/vbrfix/usr/bin/vbrfix
+
+override_dh_clean:
+ rm -f acinclude.m4
+ dh_clean
Binary files /tmp/Fpy9Cml9Zh/vbrfix-0.24/vbrfixc/vbrfixc and /tmp/zfcwtR2Ms0/vbrfix-0.24+dfsg/vbrfixc/vbrfixc differ
Reply to: