Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/obs-studio

2016-05-21 16:38:37 +02:00 · 2016-05-21 16:38:37 +02:00 · e5ae9e9791
commit e5ae9e9791
parent 447e87cf41 4fd43f1c03
2 changed files with 5 additions and 2 deletions
--- 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,
--- 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