diff -Nru xbmc-addon-xvdr-0.9.8-411~77a27f8/addons/pvr.vdr.xvdr/resources/language/Finnish/strings.xml xbmc-addon-xvdr-0.9.8-432~82b5093/addons/pvr.vdr.xvdr/resources/language/Finnish/strings.xml --- xbmc-addon-xvdr-0.9.8-411~77a27f8/addons/pvr.vdr.xvdr/resources/language/Finnish/strings.xml 2014-03-06 17:25:17.000000000 +0000 +++ xbmc-addon-xvdr-0.9.8-432~82b5093/addons/pvr.vdr.xvdr/resources/language/Finnish/strings.xml 2014-07-19 16:09:05.000000000 +0000 @@ -2,13 +2,16 @@ VDR-palvelimen nimi tai IP-osoite + Protokollan pakkaus Tärkeysaste Kirjainmerkistön muunnos Yhteyden aikakatkaisu (s) Salli VDR-palvelimen viestit - Lue nauhoitukset kansiosta - VDR-nauhoitusten kansio + Lue tallenteet hakemisto + VDR-tallenteiden hakemisto XVDR Kanavahaku + Pysäytä + Käynnistä Lähteen tyyppi TV-kanavat Radiokanavat @@ -36,9 +39,54 @@ Uudet kanavat Kanavahaku valmis Ei laitetta saatavilla - lopetetaan + %i%% valmiina / %i kanavaa Käynnissä Pysäytetty Valmis Kanavahaku peruutettu Kanavahaku virhe + Yhteys VDR-palvelimeen katkesi + Yhteys VDR-palvelimeen palautettu + Luo kanavaryhmät automaattisesti + TV signaali kadotettu + TV signaali palautettu + Haluttu äänikanava + Yhteys + VDR + Kanavapäivitys + Ei mitään + Vain nimet + Vain PIDit + Nimet ja PIDit + Lisää uusia kanavia + Lisää uusia transpondereita + Matala + Keskitaso + Korkea + Tallennus käynnissä. Kanavanvaihto epäonnistui + Kaikki vastaanottimet käytössä + Virhe kanavanvaihdossa + Tuntematon kanava '%s' + Salattu kanava + Kanavasuodatus + Ilmaiskanavat + Vain alkuperäinen kieli + Tuetut CaID:t + Salatut kanavat + Kanavahaku aloitettu + Pysäytetään kanavahakua... + Kanavahakuasetusten lataus epäonnistui! + TV-kanavalistasi on tyhjä. + Haluatko aloittaa kanavahaun? + Picons + Ajansiirto + Muistipuskurin koko (Mb) + Puskurin hakemisto + Menetelmä + Yksinkertainen ajansiirto (Pysäytä LiveTV) + Täysi ajansiirto (RAM) + Täysi ajansiirto (HDD) + HDD puskurin koko (Mb) + Aloita I-kuvasta (Raspberry Pi) + Asiakasnimi diff -Nru xbmc-addon-xvdr-0.9.8-411~77a27f8/autogen.sh xbmc-addon-xvdr-0.9.8-432~82b5093/autogen.sh --- xbmc-addon-xvdr-0.9.8-411~77a27f8/autogen.sh 2014-03-06 17:25:17.000000000 +0000 +++ xbmc-addon-xvdr-0.9.8-432~82b5093/autogen.sh 2014-07-19 16:09:05.000000000 +0000 @@ -1,75 +1,3 @@ -found_bin="" +#!/bin/sh -checkbin() { - echo -n "Checking for $1 ... " - found_bin=`which $1` - - if [ "x$found_bin" != "x" ] ; then - echo $found_bin - return 0 - fi - - echo "not found !" - return 1 -} - -# check for libtoolize - -checkbin libtoolize || { - checkbin glibtoolize || { - echo "neither \"libtoolize\" nor \"glibtoolize\" found !" - exit 1 - } -} -LIBTOOLIZE=$found_bin - -# check for aclocal - -checkbin aclocal || { - exit 1 -} -ACLOCAL=$found_bin - -# check for automake - -checkbin automake || { - exit 1 -} -AUTOMAKE=$found_bin - -# check for autoconf - -checkbin autoconf || { - exit 1 -} -AUTOCONF=$found_bin - -echo - -echo "Generating build information ..." -cd `dirname $0` -aclocalinclude="$ACLOCAL_FLAGS" -mkdir -p autotools - -echo "Running libtoolize ..." -$LIBTOOLIZE --copy --force --automake || exit 1 - -echo "Running aclocal $aclocalinclude ..." -$ACLOCAL $aclocalinclude || { - echo - echo "**Error**: aclocal failed. This may mean that you have not" - echo "installed all of the packages you need, or you may need to" - echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\"" - echo "for the prefix where you installed the packages whose" - echo "macros were not found" - exit 1 -} - -echo "Running automake ..." -$AUTOMAKE -c -a --foreign || ( echo "***ERROR*** automake failed." ; exit 1 ) - -echo "Running autoconf ..." -$AUTOCONF || ( echo "***ERROR*** autoconf failed." ; exit 1 ) - -echo -echo "Please run ./configure now." +autoreconf -f -i diff -Nru xbmc-addon-xvdr-0.9.8-411~77a27f8/configure.ac xbmc-addon-xvdr-0.9.8-432~82b5093/configure.ac --- xbmc-addon-xvdr-0.9.8-411~77a27f8/configure.ac 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-addon-xvdr-0.9.8-432~82b5093/configure.ac 2014-07-19 16:09:05.000000000 +0000 @@ -0,0 +1,100 @@ +m4_define([MAJOR], 0) +m4_define([MINOR], 9) +m4_define([MICRO], 8) + +dnl Process this file with autoconf to produce a configure script. +AC_INIT([xbmc-addon-xvdr], [MAJOR.MINOR.MICRO], [alexander.pipelka@gmail.com]) + +AC_CONFIG_AUX_DIR(autotools) +AC_PREFIX_DEFAULT(/usr/lib/xbmc) + +AC_CANONICAL_HOST +AC_CANONICAL_TARGET + +dnl Setup for automake +AM_INIT_AUTOMAKE([foreign]) + +dnl Check for tools + +AC_LIBTOOL_WIN32_DLL +AM_PROG_LIBTOOL +AC_PROG_MAKE_SET +AC_PROG_CXX +AC_PROG_CPP +AC_PROG_INSTALL +AC_EXEEXT + +dnl Check for zlib +zlib_found=yes +ZLIB_LIBS= +AC_CHECK_HEADER(zlib.h,,[zlib_found="no"]) +if test x$zlib_found = xyes; then + AC_SEARCH_LIBS(compress, z, [AC_DEFINE([HAVE_ZLIB], 1, [haev zlib compression library installed])]) + ZLIB_LIBS="-lz" + AC_SUBST(ZLIB_LIBS) +fi + +dnl Check for libpthread +PTHREAD_LIBS= +AC_SEARCH_LIBS(pthread_create, pthread, [if test "$ac_res" != "none required"; then PTHREAD_LIBS="-lpthread"; fi]) +AC_SUBST(PTHREAD_LIBS) + +AC_SUBST(VERSIONEXT) + +ISMINGW32=false +ADDONNAME=XBMC_VDR_xvdr.pvr +SOEXT=so +ISAPPLE=false + +case $host in + *-*-cygwin* | *-*-mingw32*) + LDFLAGS+="-no-undefined -no-cygwin" + ISMINGW32=true + ADDONNAME=XBMC_VDR_xvdr_WIN32.pvr + SOEXT=dll + AC_DEFINE(TARGET_WINDOWS, 1) + ;; + arm*-*-linux-gnu*) + AC_SUBST(ARCH_DEFINES, "-D_ARMEL") + ;; + powerpc-*-linux-gnu*) + AC_SUBST(ARCH_DEFINES, "-D_POWERPC") + ;; + powerpc64-*-linux-gnu*) + AC_SUBST(ARCH_DEFINES, "-D_POWERPC64") + ;; + *-apple-*) + ADDONNAME=XBMC_VDR_xvdr_OSX.pvr + SOEXT=dylib + ISAPPLE=true + ;; + *-androideabi) + AC_MSG_ERROR([for Android please use the "xvdr-addon-android" repository ! + +You may clone the repository with: +git clone --recursive git://github.com/pipelka/xvdr-addon-android.git +]); + ;; +esac + +AM_CONDITIONAL([MINGW32], $ISMINGW32) +AM_CONDITIONAL([APPLE], $ISAPPLE) +AC_SUBST(ADDONNAME) +AC_SUBST(SOEXT) + +# Finally create all the generated files +AC_OUTPUT([ +Makefile +addons/Makefile +addons/pvr.vdr.xvdr/Makefile +addons/pvr.vdr.xvdr/addon.xml +data/addons.xml +data/Makefile +src/Makefile +src/libxvdr/Makefile +src/libxvdr/include/Makefile +src/libxvdr/src/Makefile +src/libxvdr/tests/Makefile +src/xvdr/dialogs/Makefile +src/xvdr/Makefile +]) diff -Nru xbmc-addon-xvdr-0.9.8-411~77a27f8/configure.in xbmc-addon-xvdr-0.9.8-432~82b5093/configure.in --- xbmc-addon-xvdr-0.9.8-411~77a27f8/configure.in 2014-03-06 17:25:17.000000000 +0000 +++ xbmc-addon-xvdr-0.9.8-432~82b5093/configure.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -m4_define([MAJOR], 0) -m4_define([MINOR], 9) -m4_define([MICRO], 8) - -dnl Process this file with autoconf to produce a configure script. -AC_INIT([xbmc-addon-xvdr], [MAJOR.MINOR.MICRO], [alexander.pipelka@gmail.com]) - -AC_CONFIG_AUX_DIR(autotools) -AC_PREFIX_DEFAULT(/usr/lib/xbmc) - -AC_CANONICAL_HOST -AC_CANONICAL_TARGET - -dnl Setup for automake -AM_INIT_AUTOMAKE - -dnl Check for tools - -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL -AC_PROG_MAKE_SET -AC_PROG_CXX -AC_PROG_CPP -AC_PROG_INSTALL -AC_EXEEXT - -dnl Check for zlib -zlib_found=yes -ZLIB_LIBS= -AC_CHECK_HEADER(zlib.h,,[zlib_found="no"]) -if test x$zlib_found = xyes; then - AC_SEARCH_LIBS(compress, z, [AC_DEFINE([HAVE_ZLIB], 1, [haev zlib compression library installed])]) - ZLIB_LIBS="-lz" - AC_SUBST(ZLIB_LIBS) -fi - -dnl Check for libpthread -PTHREAD_LIBS= -AC_SEARCH_LIBS(pthread_create, pthread, [if test "$ac_res" != "none required"; then PTHREAD_LIBS="-lpthread"; fi]) -AC_SUBST(PTHREAD_LIBS) - -AC_SUBST(VERSIONEXT) - -ISMINGW32=false -ADDONNAME=XBMC_VDR_xvdr.pvr -SOEXT=so -ISAPPLE=false - -case $host in - *-*-cygwin* | *-*-mingw32*) - LDFLAGS+="-no-undefined -no-cygwin" - ISMINGW32=true - ADDONNAME=XBMC_VDR_xvdr_WIN32.pvr - SOEXT=dll - AC_DEFINE(TARGET_WINDOWS, 1) - ;; - arm*-*-linux-gnu*) - AC_SUBST(ARCH_DEFINES, "-D_ARMEL") - ;; - powerpc-*-linux-gnu*) - AC_SUBST(ARCH_DEFINES, "-D_POWERPC") - ;; - powerpc64-*-linux-gnu*) - AC_SUBST(ARCH_DEFINES, "-D_POWERPC64") - ;; - *-apple-*) - ADDONNAME=XBMC_VDR_xvdr_OSX.pvr - SOEXT=dylib - ISAPPLE=true - ;; - *-androideabi) - AC_MSG_ERROR([for Android please use the "xvdr-addon-android" repository ! - -You may clone the repository with: -git clone --recursive git://github.com/pipelka/xvdr-addon-android.git -]); - ;; -esac - -AM_CONDITIONAL([MINGW32], $ISMINGW32) -AM_CONDITIONAL([APPLE], $ISAPPLE) -AC_SUBST(ADDONNAME) -AC_SUBST(SOEXT) - -# Finally create all the generated files -AC_OUTPUT([ -Makefile -addons/Makefile -addons/pvr.vdr.xvdr/Makefile -addons/pvr.vdr.xvdr/addon.xml -data/addons.xml -data/Makefile -src/Makefile -src/libxvdr/Makefile -src/libxvdr/include/Makefile -src/libxvdr/src/Makefile -src/libxvdr/tests/Makefile -src/xvdr/dialogs/Makefile -src/xvdr/Makefile -]) diff -Nru xbmc-addon-xvdr-0.9.8-411~77a27f8/debian/changelog xbmc-addon-xvdr-0.9.8-432~82b5093/debian/changelog --- xbmc-addon-xvdr-0.9.8-411~77a27f8/debian/changelog 2014-03-06 17:25:22.000000000 +0000 +++ xbmc-addon-xvdr-0.9.8-432~82b5093/debian/changelog 2014-07-19 16:09:13.000000000 +0000 @@ -1,5 +1,47 @@ -xbmc-addon-xvdr (0.9.8-411~77a27f8-ppa1~precise) precise; urgency=medium +xbmc-addon-xvdr (0.9.8-432~82b5093-ppa1~precise) precise; urgency=medium + * [01ac3fa3c191284691f49a10e983f3827bc8f3f0] + configure.in: rename to configure.ac + + The correct name is configure.ac, see: + https://www.gnu.org/software/autoconf/manual/autoconf.html#Writing-Autoconf-Input + + --- + Previous versions of Autoconf promoted the name configure.in, + which is somewhat ambiguous [...]. Using configure.ac is now + preferred. + --- + + Signed-off-by: "Yann E. MORIN" + + + * [5082864c15461e2ddaf1fe9640dbe014d0412d15] + autogen: cleanup, now that we can run autoreconf + + Signed-off-by: "Yann E. MORIN" + + + * [84e5860f488e67a3a3386c779f9a56adeb3dc220] + configure: set the foreign flag + + This is required since we do not bundle the necessary files (NEWS, + INSTALL et al.) Setting it in configure.in is needed to be able + to run autoreconf (in lieu of the weird autogen.sh), with just: + + autoreconf -f -i + + Signed-off-by: "Yann E. MORIN" + + + * [0c7ab7697dfa61f4acdeb2a8dc61d6cc4a655f1d] + Updated finnish translation + + + * [23b45d1833658458dab67fd16d6a950c1bb5eabb] + Fixed broken link + + Updated the VDR link to point to the correct page + * [77a27f8345cb665f9aca8baf00019eda5a7ca388] never mark a timer as conlicting when it's recording @@ -1725,4 +1767,4 @@ merge pvr-testing2 svn rev 32591 into trunk - -- bigbax Thu, 06 Mar 2014 21:25:21 +0400 + -- bigbax Sat, 19 Jul 2014 20:09:13 +0400 diff -Nru xbmc-addon-xvdr-0.9.8-411~77a27f8/README xbmc-addon-xvdr-0.9.8-432~82b5093/README --- xbmc-addon-xvdr-0.9.8-411~77a27f8/README 2014-03-06 17:25:17.000000000 +0000 +++ xbmc-addon-xvdr-0.9.8-432~82b5093/README 2014-07-19 16:09:05.000000000 +0000 @@ -11,7 +11,7 @@ ------------------------------------------ -This is a PVR add-on for XBMC to add VDR (http://www.cadsoft.de/vdr) as a TV/PVR Backend to XBMC. +This is a PVR add-on for XBMC to add VDR (http://tvdr.de/) as a TV/PVR Backend to XBMC. It adds support for Live TV watching, replaying of Recordings, programming Timers and EPG TV Guide to use on same computer or over the Network.