[SCM] libbluray/master: Upstream installs libbluray-.jar properly now

[ricotz-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 35d1fddf6947f169146eeeaab865b812d7f2b629
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Sat Jun 7 10:45:37 2014 +0200

    Upstream installs libbluray-.jar properly now

diff --git a/debian/libbluray-bdj.install b/debian/libbluray-bdj.install
new file mode 100644
index 0000000..4d640f5
--- /dev/null
+++ b/debian/libbluray-bdj.install
@@ -0,0 +1 @@
+usr/share/java/libbluray-*.jar
diff --git a/debian/libbluray-bdj.jlibs b/debian/libbluray-bdj.jlibs
deleted file mode 100644
index f1c0b62..0000000
--- a/debian/libbluray-bdj.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-src/.libs/libbluray.jar
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 ce84100..0f81015 100644
--- a/debian/patches/03_split-jar-build-for-arch-all.patch
+++ b/debian/patches/03_split-jar-build-for-arch-all.patch
@@ -44,10 +44,10 @@ Last-Update: 2014-02-09
  
  if USING_BDJAVA
 +if USING_BDJAVA_BUILD_JAR
- jardir=$(libdir)/libbluray/
- jar_DATA=$(top_builddir)/src/.libs/libbluray.jar
+ jardir=$(datadir)/java/
+ jar_DATA=$(top_builddir)/src/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar
  
- $(top_builddir)/src/.libs/libbluray.jar: all-local
+ $(top_builddir)/src/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar: all-local
 +endif
  
  libbluray_la_SOURCES += \
@@ -61,7 +61,7 @@ Last-Update: 2014-02-09
  	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
  	    -Dbuild='$(abs_builddir)/libbluray/bdj/build' \
 @@ -167,6 +170,7 @@
- 	    -Ddist='$(abs_builddir)/.libs' \
+ 	    -Dversion='$(BDJ_TYPE)-$(VERSION)' \
  	    clean
  endif
 +endif
diff --git a/debian/rules b/debian/rules
index 29aadde..c96b880 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ override_dh_installdocs:
 	dh_installdocs --exclude=jquery.js
 
 override_dh_install:
-	dh_install -X.la -Xlibbluray.jar --fail-missing
+	dh_install -X.la --fail-missing
 
 override_dh_clean:
 	dh_clean

-- 
libbluray packaging