[SCM] libbluray/master: Refresh patches
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Wed Nov 4 19:10:09 UTC 2015
The following commit has been merged in the master branch:
commit bcd9466bd273a06b18084d3ba1f29d27ed8d7597
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Wed Nov 4 19:40:31 2015 +0100
Refresh patches
diff --git a/debian/patches/01_java-compat.patch b/debian/patches/01_java-compat.patch
index bb89d1c..104b999 100644
--- a/debian/patches/01_java-compat.patch
+++ b/debian/patches/01_java-compat.patch
@@ -9,8 +9,8 @@ Forwarded: no
--- a/src/libbluray/bdj/build.xml
+++ b/src/libbluray/bdj/build.xml
-@@ -20,7 +20,7 @@
- description="compile the source " >
+@@ -27,7 +27,7 @@
+ </javac>
<javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes"
bootclasspath="${bootclasspath}"
- source="1.4" target="1.4">
diff --git a/debian/patches/03_split-jar-build-for-arch-all.patch b/debian/patches/03_split-jar-build-for-arch-all.patch
index 89f5312..327c716 100644
--- a/debian/patches/03_split-jar-build-for-arch-all.patch
+++ b/debian/patches/03_split-jar-build-for-arch-all.patch
@@ -48,7 +48,7 @@ Last-Update: 2015-05-03
fi
--- a/Makefile.am
+++ b/Makefile.am
-@@ -185,10 +185,12 @@
+@@ -186,10 +186,12 @@
if USING_BDJAVA
@@ -61,7 +61,7 @@ Last-Update: 2015-05-03
libbluray_la_SOURCES += \
src/libbluray/bdj/bdj.h \
-@@ -213,6 +215,7 @@
+@@ -214,6 +216,7 @@
AM_CFLAGS += $(BDJAVA_CFLAGS)
@@ -69,7 +69,7 @@ Last-Update: 2015-05-03
all-local:
ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
-Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \
-@@ -228,6 +231,7 @@
+@@ -229,6 +232,7 @@
-Dversion='$(BDJ_TYPE)-$(VERSION)' \
clean
endif
--
libbluray packaging
More information about the pkg-multimedia-commits
mailing list