[SCM] libbluray/master: Use gbp pq

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Jun 14 18:00:16 UTC 2017


The following commit has been merged in the master branch:
commit b8da1b02048eb325acee958b91b676d0d4736148
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jun 14 19:33:29 2017 +0200

    Use gbp pq

diff --git a/debian/patches/02_online-image.patch b/debian/patches/02_online-image.patch
index b04ef66..2714e39 100644
--- a/debian/patches/02_online-image.patch
+++ b/debian/patches/02_online-image.patch
@@ -1,7 +1,13 @@
-Description: Do not download image from the web.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2014-02-09
+From: Sebastian Ramacher <sramacher at debian.org>
+Date: Wed, 14 Jun 2017 19:32:24 +0200
+Subject: Do not download image from the web.
 
+---
+ doc/doxygen-footer.html | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/doxygen-footer.html b/doc/doxygen-footer.html
+index b45f295..11cbc77 100644
 --- a/doc/doxygen-footer.html
 +++ b/doc/doxygen-footer.html
 @@ -5,7 +5,6 @@
diff --git a/debian/patches/04_kfreebsd-include.patch b/debian/patches/04_kfreebsd-include.patch
index e814f00..1175b0b 100644
--- a/debian/patches/04_kfreebsd-include.patch
+++ b/debian/patches/04_kfreebsd-include.patch
@@ -1,13 +1,18 @@
-Description: Work around #751532
- Once #751532 is fixed, this patch should be removed again or adapted
- accordingly.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Bug-Debian: http://bugs.debian.org/751433
-Last-Update: 2014-06-28
+From: Sebastian Ramacher <sramacher at debian.org>
+Date: Wed, 14 Jun 2017 19:32:24 +0200
+Subject: Work around #751532
 
+Once #751532 is fixed, this patch should be removed again or adapted
+accordingly.
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4e83ee5..e649191 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -206,6 +206,7 @@
+@@ -206,6 +206,7 @@ case $host_os in
       freebsd*) java_os=freebsd ;;
       solaris*) java_os=solaris ;;
       darwin*)  java_os=darwin ;;
diff --git a/debian/patches/05_use-system-asm.patch b/debian/patches/05_use-system-asm.patch
index 5ca202e..cd129d3 100644
--- a/debian/patches/05_use-system-asm.patch
+++ b/debian/patches/05_use-system-asm.patch
@@ -1,7 +1,13 @@
-Description: Use system asm4 instead of embedded copy
-Author: Sebastian Ramacher <sramacher at debian.org>>
-Last-Update: 2015-11-04
+From: "sramacher at debian.org" <sramacher at debian.org>
+Date: Wed, 14 Jun 2017 19:32:24 +0200
+Subject: Use system asm4 instead of embedded copy
 
+---
+ src/libbluray/bdj/build.xml | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/libbluray/bdj/build.xml b/src/libbluray/bdj/build.xml
+index 938cd44..7404699 100644
 --- a/src/libbluray/bdj/build.xml
 +++ b/src/libbluray/bdj/build.xml
 @@ -19,22 +19,23 @@

-- 
libbluray packaging



More information about the pkg-multimedia-commits mailing list