On Thu, Sep 19, 2013 at 11:42:29AM -0400, Andrew Starr-Bochicchio wrote: > Package: git-buildpackage > Version: 0.6.0~git20130414 > Severity: wishlist > Tags: patch > > First of all, thanks for adding support for Ubuntu to the test suite. > Unfortunately, adding that support actually caused the package to FTBFS on > Ubuntu due to test failures. Luckily the solution is simple. You forgot to > remove the work-around for not supporting Ubuntu in the past. > > debian/rules exports DEB_VENDOR="Debian" so dch acts like it would under > Debian > not Ubuntu, but the tests are correctly detecting that they are being run on > Ubuntu.
So we should revert 323bdcfa2f7bfa2f2402c22c4c90ca060243daaf ? commit 323bdcfa2f7bfa2f2402c22c4c90ca060243daaf Author: Dmitrijs Ledkovs <[email protected]> Date: Sun Nov 4 17:56:29 2012 +0000 Fix testsuite failure if DEB_VENDOR != Debian The package fails to build from source if the DEB_VENDOR is not Debian, as the test output from git-dch expects Debian distribution specific behaviour. You can see the failed build log with DEB_VENDOR=Ubuntu here: https://launchpadlibrarian.net/121690052/buildlog_ubuntu-raring-i386.git-buildpackage_0.6.0~git20120822_FAILEDTOBUILD.txt.gz Closes: #692289 Could you check what happens with latest git please? Cheers, -- Guido > > Patch attached. > > Thanks! > > -- Andrew Starr-Bochicchio > > Ubuntu Developer <https://launchpad.net/~andrewsomething> > Debian Developer <http://qa.debian.org/developer.php?login=asb> > PGP/GPG Key ID: D53FDCB1 > >From eb13bb7cf96f673f4cb80cc1d84136e2d1cdb0f1 Mon Sep 17 00:00:00 2001 > From: Andrew Starr-Bochicchio <[email protected]> > Date: Thu, 19 Sep 2013 11:31:13 -0400 > Subject: [PATCH] debian/rules: Don't export DEB_VENDOR="Debian" as tests now > take Ubuntu versions into consideration. > > --- > debian/changelog | 7 +++++++ > debian/rules | 1 - > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/debian/changelog b/debian/changelog > index f680fcf..1b71dad 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -1,3 +1,10 @@ > +git-buildpackage (0.6.4) UNRELEASED; urgency=low > + > + * debian/rules: Don't export DEB_VENDOR="Debian" as tests now > + take Ubuntu versions into consideration. > + > + -- Andrew Starr-Bochicchio <[email protected]> Thu, 19 Sep 2013 11:30:05 > -0400 > + > git-buildpackage (0.6.3) unstable; urgency=low > > * [60ffe95] --git-hooks doesn't take an argument > diff --git a/debian/rules b/debian/rules > index d09a7c2..2c40bef 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -17,7 +17,6 @@ PYCHECKER_ARGS=-boptparse --no-override --no-shadowbuiltin > override_dh_auto_test: > ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) > dh_auto_test > - export DEB_VENDOR="Debian"; \ > export GIT_AUTHOR_NAME="Gbp Tests"; \ > export [email protected]; \ > export GIT_COMMITTER_NAME=$$GIT_AUTHOR_NAME; \ > -- > 1.8.3.2 > -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
