diff -Nru libbluray-0.0~git20110717.3477b65/build-aux/ltmain.sh libbluray-0.2~git20111001.8e5d241/build-aux/ltmain.sh --- libbluray-0.0~git20110717.3477b65/build-aux/ltmain.sh 2011-07-18 00:28:27.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/build-aux/ltmain.sh 2011-10-01 21:47:02.000000000 +0000 @@ -69,7 +69,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 Debian-2.4-2 +# $progname: (GNU libtool) 2.4 Debian-2.4-4 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,7 +79,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4 Debian-2.4-2" +VERSION="2.4 Debian-2.4-4" TIMESTAMP="" package_revision=1.3293 diff -Nru libbluray-0.0~git20110717.3477b65/debian/changelog libbluray-0.2~git20111001.8e5d241/debian/changelog --- libbluray-0.0~git20110717.3477b65/debian/changelog 2011-10-24 12:31:26.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/debian/changelog 2011-12-05 05:45:30.000000000 +0000 @@ -1,8 +1,46 @@ -libbluray (1:0.0~git20110717.3477b65-3~ppa1~lucid) lucid; urgency=low +libbluray (1:0.2~git20111001.8e5d241-1~ppa2~lucid) lucid; urgency=low - * Backport from oneiric + * [fixed] Missed multiarch changes in libbluray-dev - -- Nathan Rennie-Waldock Mon, 24 Oct 2011 13:31:20 +0100 + -- Nathan Rennie-Waldock Mon, 05 Dec 2011 05:45:10 +0000 + +libbluray (1:0.2~git20111001.8e5d241-1~ppa1~lucid) lucid; urgency=low + + * Backport from precise + * Drop multiarch support (not supported below natty) + + -- Nathan Rennie-Waldock Mon, 05 Dec 2011 03:16:35 +0000 + +libbluray (1:0.2~git20111001.8e5d241-1) unstable; urgency=low + + * Include all files from upstream source. + * Remove gbp options which are always default. + * Use different mechanism to set soname. + * Don't use dh-autoreconf. + * Put dh sequence as first option. + * Use dh --parallel. + * Update this package so it supports multiarch. + * Update upstream version to '0.2', which upstream uses. + * Include static lib. + + -- Andres Mejia Sat, 01 Oct 2011 17:57:33 -0400 + +libbluray (1:0.0~git20110717.3477b65-5) unstable; urgency=low + + * Restrict JAVA related checks to Linux architectures (Fixes FTBFS on !Linux) + Thanks to Christoph Egger for reporting on IRC + * normalize debian/copyright with config-edit. + Thanks to lintian for finding an obsoleted field + + -- Reinhard Tartler Fri, 30 Sep 2011 08:58:32 +0200 + +libbluray (1:0.0~git20110717.3477b65-4) unstable; urgency=low + + * Set JAVA_HOME variable correctly to accommodate the multiarch changes. + Thanks to Mònica Ramírez Arceda for reporting + (Closes: #640337) + + -- Reinhard Tartler Thu, 29 Sep 2011 18:22:24 +0200 libbluray (1:0.0~git20110717.3477b65-3) unstable; urgency=low diff -Nru libbluray-0.0~git20110717.3477b65/debian/compat libbluray-0.2~git20111001.8e5d241/debian/compat --- libbluray-0.0~git20110717.3477b65/debian/compat 2011-08-18 20:25:38.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/debian/compat 2011-10-01 21:35:22.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru libbluray-0.0~git20110717.3477b65/debian/control libbluray-0.2~git20111001.8e5d241/debian/control --- libbluray-0.0~git20110717.3477b65/debian/control 2011-08-18 20:34:32.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/debian/control 2011-12-05 03:18:51.000000000 +0000 @@ -7,7 +7,7 @@ Reinhard Tartler , Alessio Treglia DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7.0.50~), +Build-Depends: debhelper (>= 8.1.3~), javahelper, openjdk-6-jdk [linux-any], ant, @@ -18,7 +18,6 @@ texlive-latex-extra, latex-xcolor, texlive-fonts-recommended, - dh-autoreconf Standards-Version: 3.9.2 Homepage: http://www.videolan.org/developers/libbluray.html Vcs-Git: git://git.debian.org/git/pkg-multimedia/libbluray.git @@ -43,6 +42,7 @@ Package: libbluray1 Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: libbluray-bdj, libaacs0 Description: Blu-ray disc playback support library (shared library) diff -Nru libbluray-0.0~git20110717.3477b65/debian/copyright libbluray-0.2~git20111001.8e5d241/debian/copyright --- libbluray-0.0~git20110717.3477b65/debian/copyright 2011-08-18 20:25:38.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/debian/copyright 2011-10-01 20:49:44.000000000 +0000 @@ -1,6 +1,5 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 +Format: http://dep.debian.net/deps/dep5/ Upstream-Name: libbluray -Upstream-Contact: ? Source: http://git.videolan.org/?p=libbluray.git Files: * @@ -76,7 +75,7 @@ Files: debian/* Copyright: 2010-2011 Andres Mejia - 2011, Rico Tzschichholz + 2011, Rico Tzschichholz License: LGPL-2.1+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -92,3 +91,4 @@ . On Debian systems, the full text of the GNU Lesser General Public License version 2.1 can be found in the file '/usr/share/common-licenses/LGPL-2.1'. + diff -Nru libbluray-0.0~git20110717.3477b65/debian/gbp.conf libbluray-0.2~git20111001.8e5d241/debian/gbp.conf --- libbluray-0.0~git20110717.3477b65/debian/gbp.conf 2011-08-18 20:25:38.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/debian/gbp.conf 2011-10-01 20:53:15.000000000 +0000 @@ -1,6 +1,2 @@ [DEFAULT] -upstream-branch = upstream -debian-branch = master -upstream-tag = upstream/%(version)s -debian-tag = debian/%(version)s pristine-tar = True diff -Nru libbluray-0.0~git20110717.3477b65/debian/libbluray-dev.install libbluray-0.2~git20111001.8e5d241/debian/libbluray-dev.install --- libbluray-0.0~git20110717.3477b65/debian/libbluray-dev.install 2011-08-18 20:25:38.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/debian/libbluray-dev.install 2011-12-05 05:44:05.000000000 +0000 @@ -1,3 +1,4 @@ usr/include usr/lib/libbluray.so +usr/lib/libbluray.a usr/lib/pkgconfig diff -Nru libbluray-0.0~git20110717.3477b65/debian/libbluray-get-orig-source libbluray-0.2~git20111001.8e5d241/debian/libbluray-get-orig-source --- libbluray-0.0~git20110717.3477b65/debian/libbluray-get-orig-source 2011-08-18 20:25:38.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/debian/libbluray-get-orig-source 2011-10-01 21:46:49.000000000 +0000 @@ -3,11 +3,11 @@ # Script used to generate the orig source tarball for libbluray. LIBBLURAY_GIT_URL="git://git.videolan.org/libbluray.git" -LIBBLURAY_GIT_COMMIT="3477b654b71fbdb69f64e6aa2bb1c42950457d0d" -DATE_RETRIEVED="20110717" +LIBBLURAY_GIT_COMMIT="8e5d241ea1ebb131941c3279b2363d4eb2479eca" +DATE_RETRIEVED="20111001" COMMIT_SHORT_FORM="$(echo $LIBBLURAY_GIT_COMMIT | \ sed -e 's/^\([[:xdigit:]]\{,7\}\).*/\1/')" -LIBBLURAY_VERSION="0.0~git${DATE_RETRIEVED}.${COMMIT_SHORT_FORM}" +LIBBLURAY_VERSION="0.2~git${DATE_RETRIEVED}.${COMMIT_SHORT_FORM}" git clone "$LIBBLURAY_GIT_URL" "libbluray-${LIBBLURAY_VERSION}" diff -Nru libbluray-0.0~git20110717.3477b65/debian/patches/autoreconf.patch libbluray-0.2~git20111001.8e5d241/debian/patches/autoreconf.patch --- libbluray-0.0~git20110717.3477b65/debian/patches/autoreconf.patch 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/debian/patches/autoreconf.patch 2011-10-01 21:14:06.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Patch used to set changes to build system. +Origin: Debian +Forwarded: non-needed + +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -339,10 +339,10 @@ + top_srcdir = @top_srcdir@ + + # library version info +-# NOTE: this is not the same as the library's release number +-LIB_CURRENT = 0 +-LIB_REVISION = 0 +-LIB_AGE = 0 ++# NOTE: soname version is retrieved from bluray.h. ++LIB_CURRENT = $(shell grep -e 'define LIBBLURAY_VERSION_MAJOR' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/') ++LIB_REVISION = $(shell grep -e 'define LIBBLURAY_VERSION_MINOR' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/') ++LIB_AGE = $(shell grep -e 'define LIBBLURAY_VERSION_MICRO' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/') + LIB_VERSION_INFO = "$(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE)" + SUBDIRS = . examples + SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT diff -Nru libbluray-0.0~git20110717.3477b65/debian/patches/series libbluray-0.2~git20111001.8e5d241/debian/patches/series --- libbluray-0.0~git20110717.3477b65/debian/patches/series 2011-08-18 20:25:38.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/debian/patches/series 2011-10-01 20:56:52.000000000 +0000 @@ -1 +1,2 @@ soname-bump.patch +autoreconf.patch diff -Nru libbluray-0.0~git20110717.3477b65/debian/patches/soname-bump.patch libbluray-0.2~git20111001.8e5d241/debian/patches/soname-bump.patch --- libbluray-0.0~git20110717.3477b65/debian/patches/soname-bump.patch 2011-08-18 20:25:38.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/debian/patches/soname-bump.patch 2011-10-01 21:13:36.000000000 +0000 @@ -1,13 +1,52 @@ -Description: Patch that does basic spell check. -Origin: Debian +Description: Patch that will correctly set soname through bluray.h. Much of + these changes was taken from code used to set library soname for libav + libraries. +Author: Andres Mejia --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -1,6 +1,6 @@ +@@ -1,8 +1,8 @@ # library version info - # NOTE: this is not the same as the library's release number +-# NOTE: this is not the same as the library's release number -LIB_CURRENT=0 -+LIB_CURRENT=1 - LIB_REVISION=0 - LIB_AGE=0 +-LIB_REVISION=0 +-LIB_AGE=0 ++# NOTE: soname version is retrieved from bluray.h. ++LIB_CURRENT = $(shell grep -e 'define LIBBLURAY_VERSION_MAJOR' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/') ++LIB_REVISION = $(shell grep -e 'define LIBBLURAY_VERSION_MINOR' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/') ++LIB_AGE = $(shell grep -e 'define LIBBLURAY_VERSION_MICRO' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/') LIB_VERSION_INFO="$(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE)" + + SUBDIRS= . examples +--- a/src/libbluray/bluray.h ++++ b/src/libbluray/bluray.h +@@ -31,6 +31,29 @@ + * external API header + */ + ++/* NOTE: Formatting of these is important. ++ * Also, this version is not the same as the library's release version. ++ */ ++#define LIBBLURAY_VERSION_MAJOR 1 ++#define LIBBLURAY_VERSION_MINOR 0 ++#define LIBBLURAY_VERSION_MICRO 0 ++ ++#define LB_STRINGIFY(s) LB_TOSTRING(s) ++#define LB_TOSTRING(s) #s ++#define LB_VERSION_INT(a, b, c) (a<<16 | b<<8 | c) ++#define LB_VERSION_DOT(a, b, c) a ##.## b ##.## c ++#define LB_VERSION(a, b, c) LB_VERSION_DOT(a, b, c) ++ ++#define LIBBLURAY_VERSION_INT LB_VERSION_INT(LIBBLURAY_VERSION_MAJOR, \ ++ LIBBLURAY_VERSION_MINOR, \ ++ LIBBLURAY_VERSION_MICRO) ++#define LIBBLURAY_VERSION LB_VERSION(LIBBLURAY_VERSION_MAJOR, \ ++ LIBBLURAY_VERSION_MINOR, \ ++ LIBBLURAY_VERSION_MICRO) ++#define LIBBLURAY_BUILD LIBBLURAY_VERSION_INT ++ ++#define LIBBLURAY_IDENT "Lbluray" LB_STRINGIFY(LIBBLURAY_VERSION) ++ + #include + + #define TITLES_ALL 0 /**< all titles. */ diff -Nru libbluray-0.0~git20110717.3477b65/debian/rules libbluray-0.2~git20111001.8e5d241/debian/rules --- libbluray-0.0~git20110717.3477b65/debian/rules 2011-08-18 20:25:38.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/debian/rules 2011-12-05 03:18:25.000000000 +0000 @@ -1,13 +1,24 @@ #!/usr/bin/make -f -export JAVA_HOME=/usr/lib/jvm/java-6-openjdk -export DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) +DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) -confflags := --enable-doxygen-doc +confflags := --libdir=/usr/lib --enable-doxygen-doc # enable bdjava on linux hosts only ifneq (,$(findstring linux,$(DEB_BUILD_ARCH_OS))) -confflags += --enable-bdjava + +# openjdk-6_6b23~pre8-2 and later have multiarchified JAVA_HOME +JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH) +ifeq (,$(wildcard $(JAVA_HOME))) +JAVA_HOME=/usr/lib/jvm/java-6-openjdk +ifeq (,$(wildcard $(JAVA_HOME))) + $(info "warning: No suitable jni.h was found. Package will most probably FTBFS!") +endif +endif + +$(info Located java at $(JAVA_HOME)) +confflags += --enable-bdjava --with-jdk=$(JAVA_HOME) endif # Set CFLAGS to DEB_CFLAGS @@ -15,10 +26,10 @@ ifneq (,$(findstring linux,$(DEB_BUILD_ARCH_OS))) %: - dh --with javahelper,autoreconf $@ + dh $@ --parallel --with javahelper else %: - dh --with autoreconf $@ + dh $@ --parallel endif override_dh_auto_configure: diff -Nru libbluray-0.0~git20110717.3477b65/debian/source/lintian-overrides libbluray-0.2~git20111001.8e5d241/debian/source/lintian-overrides --- libbluray-0.0~git20110717.3477b65/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/debian/source/lintian-overrides 2011-10-01 21:36:11.000000000 +0000 @@ -0,0 +1,2 @@ +# Ignore this, since currently only debhelper (>= 8.1.3~) is needed. +package-needs-versioned-debhelper-build-depends 9 diff -Nru libbluray-0.0~git20110717.3477b65/src/libbluray/bluray.h libbluray-0.2~git20111001.8e5d241/src/libbluray/bluray.h --- libbluray-0.0~git20110717.3477b65/src/libbluray/bluray.h 2011-07-18 00:28:23.000000000 +0000 +++ libbluray-0.2~git20111001.8e5d241/src/libbluray/bluray.h 2011-10-01 21:46:58.000000000 +0000 @@ -44,22 +44,24 @@ typedef struct bluray BLURAY; typedef enum { - BLURAY_STREAM_TYPE_VIDEO_MPEG1 = 0x01, - BLURAY_STREAM_TYPE_VIDEO_MPEG2 = 0x02, - BLURAY_STREAM_TYPE_AUDIO_MPEG1 = 0x03, - BLURAY_STREAM_TYPE_AUDIO_MPEG2 = 0x04, - BLURAY_STREAM_TYPE_AUDIO_LPCM = 0x80, - BLURAY_STREAM_TYPE_AUDIO_AC3 = 0x81, - BLURAY_STREAM_TYPE_AUDIO_DTS = 0x82, - BLURAY_STREAM_TYPE_AUDIO_TRUHD = 0x83, - BLURAY_STREAM_TYPE_AUDIO_AC3PLUS = 0x84, - BLURAY_STREAM_TYPE_AUDIO_DTSHD = 0x85, - BLURAY_STREAM_TYPE_AUDIO_DTSHD_MASTER = 0x86, - BLURAY_STREAM_TYPE_VIDEO_VC1 = 0xea, - BLURAY_STREAM_TYPE_VIDEO_H264 = 0x1b, - BLURAY_STREAM_TYPE_SUB_PG = 0x90, - BLURAY_STREAM_TYPE_SUB_IG = 0x91, - BLURAY_STREAM_TYPE_SUB_TEXT = 0x92 + BLURAY_STREAM_TYPE_VIDEO_MPEG1 = 0x01, + BLURAY_STREAM_TYPE_VIDEO_MPEG2 = 0x02, + BLURAY_STREAM_TYPE_AUDIO_MPEG1 = 0x03, + BLURAY_STREAM_TYPE_AUDIO_MPEG2 = 0x04, + BLURAY_STREAM_TYPE_AUDIO_LPCM = 0x80, + BLURAY_STREAM_TYPE_AUDIO_AC3 = 0x81, + BLURAY_STREAM_TYPE_AUDIO_DTS = 0x82, + BLURAY_STREAM_TYPE_AUDIO_TRUHD = 0x83, + BLURAY_STREAM_TYPE_AUDIO_AC3PLUS = 0x84, + BLURAY_STREAM_TYPE_AUDIO_DTSHD = 0x85, + BLURAY_STREAM_TYPE_AUDIO_DTSHD_MASTER = 0x86, + BLURAY_STREAM_TYPE_VIDEO_VC1 = 0xea, + BLURAY_STREAM_TYPE_VIDEO_H264 = 0x1b, + BLURAY_STREAM_TYPE_SUB_PG = 0x90, + BLURAY_STREAM_TYPE_SUB_IG = 0x91, + BLURAY_STREAM_TYPE_SUB_TEXT = 0x92, + BLURAY_STREAM_TYPE_AUDIO_AC3PLUS_SECONDARY = 0xa1, + BLURAY_STREAM_TYPE_AUDIO_DTSHD_SECONDARY = 0xa2 } bd_stream_type_e; typedef enum {