Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/obs-studio
This commit is contained in:
commit
e5ae9e9791
2 changed files with 5 additions and 2 deletions
2
debian/control
vendored
2
debian/control
vendored
|
@ -18,7 +18,7 @@ Build-Depends:
|
||||||
libfontconfig-dev,
|
libfontconfig-dev,
|
||||||
libfreetype6-dev,
|
libfreetype6-dev,
|
||||||
libgl1-mesa-dev | libgl-dev,
|
libgl1-mesa-dev | libgl-dev,
|
||||||
libjack-dev,
|
libjack-dev | libjack-jackd2-dev,
|
||||||
libjansson-dev (>= 2.5),
|
libjansson-dev (>= 2.5),
|
||||||
libpulse-dev,
|
libpulse-dev,
|
||||||
libqt5x11extras5-dev,
|
libqt5x11extras5-dev,
|
||||||
|
|
5
debian/gbp.conf
vendored
5
debian/gbp.conf
vendored
|
@ -1,6 +1,9 @@
|
||||||
|
[DEFAULT]
|
||||||
|
pristine-tar = True
|
||||||
|
|
||||||
[buildpackage]
|
[buildpackage]
|
||||||
upstream-tree = tag
|
upstream-tree = tag
|
||||||
upstream-tag = %(version)s
|
upstream-tag = upstream/%(version)s
|
||||||
upstream-branch = upstream
|
upstream-branch = upstream
|
||||||
debian-branch = master
|
debian-branch = master
|
||||||
submodules = true
|
submodules = true
|
||||||
|
|
Loading…
Reference in a new issue