From b43a47933ba6f29403c1eb53f965065d8233993f Mon Sep 17 00:00:00 2001 From: Petter Reinholdtsen Date: Sat, 21 May 2016 13:55:16 +0000 Subject: [PATCH 1/2] Adjust git-buildpackage setup. Correct tag pattern for the upstream source, and enforce the use of pristine-tar. --- debian/gbp.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index 213ea5b..1c45620 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,6 +1,9 @@ +[DEFAULT] +pristine-tar = True + [buildpackage] upstream-tree = tag -upstream-tag = %(version)s +upstream-tag = upstream/%(version)s upstream-branch = upstream debian-branch = master submodules = true From 4fd43f1c03bf3e3543fdfbd8d20371f1b6c3b4ac Mon Sep 17 00:00:00 2001 From: Petter Reinholdtsen Date: Sat, 21 May 2016 14:27:01 +0000 Subject: [PATCH 2/2] Allow libjack-jackd2-dev as build alternative for libjack-dev. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 2e5ad9d..337a68d 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: libfontconfig-dev, libfreetype6-dev, libgl1-mesa-dev | libgl-dev, - libjack-dev, + libjack-dev | libjack-jackd2-dev, libjansson-dev (>= 2.5), libpulse-dev, libqt5x11extras5-dev,