[SCM] obs-studio/master: Refresh patches

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Mon Oct 10 19:18:50 UTC 2016


The following commit has been merged in the master branch:
commit fee8f10b53e39a62240266f09aab0c0a99d445a8
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Oct 10 21:16:06 2016 +0200

    Refresh patches

diff --git a/debian/patches/0001-Use-common-license.patch b/debian/patches/0001-Use-common-license.patch
index 39c4fd8..f1aa7b4 100644
--- a/debian/patches/0001-Use-common-license.patch
+++ b/debian/patches/0001-Use-common-license.patch
@@ -8,11 +8,9 @@ copy
  obs/window-license-agreement.cpp | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
-diff --git a/obs/window-license-agreement.cpp b/obs/window-license-agreement.cpp
-index a7a5f3b..60cad40 100644
---- a/obs/window-license-agreement.cpp
-+++ b/obs/window-license-agreement.cpp
-@@ -13,9 +13,7 @@ OBSLicenseAgreement::OBSLicenseAgreement(QWidget *parent)
+--- a/UI/window-license-agreement.cpp
++++ b/UI/window-license-agreement.cpp
+@@ -13,9 +13,7 @@
  {
  	ui->setupUi(this);
  
diff --git a/debian/patches/0003-override-path.patch b/debian/patches/0003-override-path.patch
index c5d065a..3aec060 100644
--- a/debian/patches/0003-override-path.patch
+++ b/debian/patches/0003-override-path.patch
@@ -5,7 +5,7 @@ Last-Update: 2016-02-24
 
 --- a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
 +++ b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
-@@ -175,7 +175,11 @@
+@@ -193,7 +193,11 @@
  		num_tracks++;
  	}
  
diff --git a/debian/patches/0004-no-update-check.patch b/debian/patches/0004-no-update-check.patch
index 2221e5b..3f02a65 100644
--- a/debian/patches/0004-no-update-check.patch
+++ b/debian/patches/0004-no-update-check.patch
@@ -3,9 +3,9 @@ Author: Sebastian Ramacher <sramacher at debian.org>
 Forwarded: not-needed
 Last-Update: 2016-02-24
 
---- obs-studio-0.13.2+dfsg1.orig/obs/window-basic-main.cpp
-+++ obs-studio-0.13.2+dfsg1/obs/window-basic-main.cpp
-@@ -1729,7 +1729,7 @@ void OBSBasic::TimedCheckForUpdates()
+--- a/UI/window-basic-main.cpp
++++ b/UI/window-basic-main.cpp
+@@ -1926,7 +1926,7 @@
  #ifdef UPDATE_SPARKLE
  	init_sparkle_updater(config_get_bool(App()->GlobalConfig(), "General",
  				"UpdateToUndeployed"));

-- 
obs-studio packaging



More information about the pkg-multimedia-commits mailing list