r5470 - in /vdr/vdr-plugin-radio/trunk/debian: changelog control copyright examples install patches/00list patches/01_kernel-headers-workaround.dpatch patches/02_radio-0.1.1-fix-DataDir.dpatch patches/91_radio-1.5.0.dpatch plugin.radio.conf rules
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Fri Oct 5 22:09:23 UTC 2007
Author: tom-guest
Date: Fri Oct 5 22:09:23 2007
New Revision: 5470
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5470
Log:
New upstream release 0.2.3
Added:
vdr/vdr-plugin-radio/trunk/debian/examples
Removed:
vdr/vdr-plugin-radio/trunk/debian/patches/01_kernel-headers-workaround.dpatch
vdr/vdr-plugin-radio/trunk/debian/patches/91_radio-1.5.0.dpatch
Modified:
vdr/vdr-plugin-radio/trunk/debian/changelog
vdr/vdr-plugin-radio/trunk/debian/control
vdr/vdr-plugin-radio/trunk/debian/copyright
vdr/vdr-plugin-radio/trunk/debian/install
vdr/vdr-plugin-radio/trunk/debian/patches/00list
vdr/vdr-plugin-radio/trunk/debian/patches/02_radio-0.1.1-fix-DataDir.dpatch
vdr/vdr-plugin-radio/trunk/debian/plugin.radio.conf
vdr/vdr-plugin-radio/trunk/debian/rules
Modified: vdr/vdr-plugin-radio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/changelog?rev=5470&op=diff
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-radio/trunk/debian/changelog Fri Oct 5 22:09:23 2007
@@ -1,3 +1,17 @@
+vdr-plugin-radio (0.2.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed 01_kernel-headers-workaround.dpatch (integrated in upstream)
+ * Removed 91_radio-1.5.0.dpatch (integrated in upstream)
+ * Adapted 02_radio-0.1.1-fix-DataDir.dpatch
+ * Added gettext to Build-Depends
+ * Added installation of locale files (if VDR >= 1.5.7)
+ * Added installation of radioinfo scripts as examples
+ * Fixed debian-rules-ignores-make-clean-error
+ * Added full license disclaimer and copyright years to debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de> Fri, 5 Oct 2007 01:15:08 +0200
+
vdr-plugin-radio (0.2.0-8) unstable; urgency=low
* 01_kernel-headers-workaround.dpatch
Modified: vdr/vdr-plugin-radio/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/control?rev=5470&op=diff
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/control (original)
+++ vdr/vdr-plugin-radio/trunk/debian/control Fri Oct 5 22:09:23 2007
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.5-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.5-1), dpatch, gettext
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/
Modified: vdr/vdr-plugin-radio/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/copyright?rev=5470&op=diff
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-radio/trunk/debian/copyright Fri Oct 5 22:09:23 2007
@@ -1,19 +1,44 @@
-This package was debianized by Roman Müllenschläder <qwasi_1999 at yahoo.de> on
-Thu, 9 Dec 2004 13:23:45 +0100.
+Upstream Homepage:
+ http://www.egal-vdr.de/plugins/
+ http://homepages.uni-paderborn.de/tegeler/vdr/
-It was downloaded from http://homepages.uni-paderborn.de/tegeler/vdr/
-
-Upstream Authors: Lars Tegeler
- U.Hanke <egal at gmx.info>
+Upstream Authors:
+ Uwe Hanke <egal at egal-vdr.de> (current version)
+ Lars Tegeler, F. Pecourt (old versions)
Debian Maintainers:
-
- Roman Müllenschläder <qwasi_1999 at yahoo.de>
- Tobias Grimm <tg at e-tobi.net>
- Thomas Günther <tom at toms-cafe.de>
- Thomas Schmidt <tschmidt at debian.org>
+ Roman Müllenschläder <qwasi_1999 at yahoo.de>
+ Tobias Grimm <tg at e-tobi.net>
+ Thomas Günther <tom at toms-cafe.de>
+ Thomas Schmidt <tschmidt at debian.org>
Copyright:
+ (C) 2004 Lars Tegeler
+ (C) 2005 F. Pecourt
+ (C) 2005 - 2007 Uwe Hanke
-It may be redistributed under the terms of the GNU GPL, Version 2
-found on Debian systems in the file /usr/share/common-licenses/GPL .
+Copyright (Debian packaging):
+ (C) 2004 - 2007 Roman Müllenschläder, Tobias Grimm, Thomas Günther,
+ Thomas Schmidt
+
+License:
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ The complete text of the GNU General Public License can be found
+ in /usr/share/common-licenses/GPL on most Debian systems.
+
+License (Debian packaging):
+ The Debian packaging is licensed under the GPL, version 2 or any
+ later version, see /usr/share/common-licenses/GPL.
Added: vdr/vdr-plugin-radio/trunk/debian/examples
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/examples?rev=5470&op=file
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/examples (added)
+++ vdr/vdr-plugin-radio/trunk/debian/examples Fri Oct 5 22:09:23 2007
@@ -1,0 +1,1 @@
+config/scripts
Modified: vdr/vdr-plugin-radio/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/install?rev=5470&op=diff
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/install (original)
+++ vdr/vdr-plugin-radio/trunk/debian/install Fri Oct 5 22:09:23 2007
@@ -1,3 +1,3 @@
-libvdr-radio.so.* usr/lib/vdr/plugins/
-mpegstill/*rtext*.mpg usr/share/vdr-plugin-radio/
-debian/plugin.radio.conf etc/vdr/plugins/
+libvdr-radio.so.* usr/lib/vdr/plugins/
+config/mpegstill/*rtext*.mpg usr/share/vdr-plugin-radio/
+debian/plugin.radio.conf etc/vdr/plugins/
Modified: vdr/vdr-plugin-radio/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/patches/00list?rev=5470&op=diff
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-radio/trunk/debian/patches/00list Fri Oct 5 22:09:23 2007
@@ -1,3 +1,1 @@
-01_kernel-headers-workaround
02_radio-0.1.1-fix-DataDir
-91_radio-1.5.0
Modified: vdr/vdr-plugin-radio/trunk/debian/patches/02_radio-0.1.1-fix-DataDir.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/patches/02_radio-0.1.1-fix-DataDir.dpatch?rev=5470&op=diff
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/patches/02_radio-0.1.1-fix-DataDir.dpatch (original)
+++ vdr/vdr-plugin-radio/trunk/debian/patches/02_radio-0.1.1-fix-DataDir.dpatch Fri Oct 5 22:09:23 2007
@@ -10,89 +10,19 @@
## DP: - When no DataDir argument is passed, create temp dir /tmp/radio.XXXXXX
@DPATCH@
-diff -urNad vdr-plugin-radio-0.2.0~/radio.c vdr-plugin-radio-0.2.0/radio.c
---- vdr-plugin-radio-0.2.0~/radio.c 2007-01-17 02:41:14.000000000 +0100
-+++ vdr-plugin-radio-0.2.0/radio.c 2007-01-17 02:43:23.000000000 +0100
-@@ -429,7 +429,10 @@
+--- radio-0.2.3/radio.c
++++ radio-0.2.3/radio.c
+@@ -498,7 +498,12 @@ bool cPluginRadio::Start(void)
if (!ConfigDirParam)
- ConfigDir = strdup(ConfigDirectory(Name()));
+ ConfigDir = strdup(ConfigDirectory(Name()));
if (!DataDirParam)
-- DataDir = strdup(ConfigDirectory(Name()));
+- DataDir = strdup(ConfigDirectory(Name()));
+ {
-+ DataDir = strdup("/tmp/radio.XXXXXX");
-+ mkdtemp((char*)DataDir);
++ DataDir = strdup("/tmp/radio.XXXXXX");
++ mkdtemp(DataDir);
+ }
++ else
++ MakeDirs(DataDir, true);
if (!LiveFileParam)
- asprintf(&LiveFile, "%s/radio.mpg", ConfigDir);
+ asprintf(&LiveFile, "%s/radio.mpg", ConfigDir);
if (!ReplayFileParam)
-diff -urNad vdr-plugin-radio-0.2.0~/radioaudio.c vdr-plugin-radio-0.2.0/radioaudio.c
---- vdr-plugin-radio-0.2.0~/radioaudio.c 2007-01-17 02:41:14.000000000 +0100
-+++ vdr-plugin-radio-0.2.0/radioaudio.c 2007-01-17 02:42:29.000000000 +0100
-@@ -1016,7 +1016,7 @@
- }
-
- // show & save file ?
-- if (index == filemax) {
-+ if ((index == filemax) && enforce_directory(DataDir)) {
- if (slideshow || (slidecan && QDar_Show == -1)) {
- if (filetype == 1) { // show only mpeg-still
- char *filepath;
-@@ -1926,6 +1926,11 @@
- char *fname, *fpath;
- FILE *fd;
- int ind, lfd = 0;
-+
-+ if (!enforce_directory(DataDir))
-+ {
-+ return;
-+ }
-
- time_t t = time(NULL);
- ts = localtime_r(&t, &tm_store);
-diff -urNad vdr-plugin-radio-0.2.0~/radiotools.c vdr-plugin-radio-0.2.0/radiotools.c
---- vdr-plugin-radio-0.2.0~/radiotools.c 2007-01-17 02:41:14.000000000 +0100
-+++ vdr-plugin-radio-0.2.0/radiotools.c 2007-01-17 02:42:29.000000000 +0100
-@@ -9,6 +9,8 @@
- #include "radiotools.h"
- #include <string.h>
- #include <stdio.h>
-+#include <sys/stat.h>
-+#include <vdr/tools.h>
-
- /* for timetest */
- //#include <time.h>
-@@ -50,5 +52,24 @@
- return text;
- }
-
-+bool enforce_directory(const char* path)
-+{
-+ struct stat sbuf;
-+ if (stat(path, &sbuf) != 0) {
-+ dsyslog("vdr-radio: creating directory %s", path);
-+ if (mkdir(path, ACCESSPERMS)) {
-+ esyslog("ERROR: Failed to create directory %s", path);
-+ return false;
-+ }
-+ }
-+ else {
-+ if (!S_ISDIR(sbuf.st_mode)) {
-+ esyslog("ERROR: Failed to create directory %s: file exists but is not a directory", path);
-+ return false;
-+ }
-+ }
-+
-+ return true;
-+}
-
- //--------------- End -----------------------------------------------------------------
-diff -urNad vdr-plugin-radio-0.2.0~/radiotools.h vdr-plugin-radio-0.2.0/radiotools.h
---- vdr-plugin-radio-0.2.0~/radiotools.h 2007-01-17 02:41:14.000000000 +0100
-+++ vdr-plugin-radio-0.2.0/radiotools.h 2007-01-17 02:42:29.000000000 +0100
-@@ -6,4 +6,6 @@
-
- char *rtrim(char *text);
-
-+bool enforce_directory(const char* path);
-+
- #endif //__RADIO_TOOLS_H
Modified: vdr/vdr-plugin-radio/trunk/debian/plugin.radio.conf
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/plugin.radio.conf?rev=5470&op=diff
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/plugin.radio.conf (original)
+++ vdr/vdr-plugin-radio/trunk/debian/plugin.radio.conf Fri Oct 5 22:09:23 2007
@@ -4,14 +4,17 @@
# see /usr/share/doc/vdr-plugin-radio
#
-# image directory
+# image directory (default: /var/lib/vdr/plugins/radio)
--files=/usr/share/vdr-plugin-radio
-# default mpegfile in livemode
+# default mpegfile in livemode
--live=/usr/share/vdr-plugin-radio/rtextUnten-kleo2-live.mpg
# default mpegfile in replaymode
--replay=/usr/share/vdr-plugin-radio/rtextUnten-kleo2-replay.mpg
+
+# use transfermode/backgroundimage @ encrypted radiochannels (default: 0)
+--encrypted=0
# set verbosity level
#
@@ -19,4 +22,6 @@
# 1 = RDS-Text+Tags (default)
# 2 = +RDS-Telegram/Debug
# 3 = +RawData 0xfd
+# += 16 = Rass-Info
+# += 32 = TMC-Info
--verbose=1
Modified: vdr/vdr-plugin-radio/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-radio/trunk/debian/rules?rev=5470&op=diff
==============================================================================
--- vdr/vdr-plugin-radio/trunk/debian/rules (original)
+++ vdr/vdr-plugin-radio/trunk/debian/rules Fri Oct 5 22:09:23 2007
@@ -23,7 +23,7 @@
unpatch:
endif
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=.
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
configure: configure-stamp
configure-stamp: patch-stamp
@@ -41,8 +41,9 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- -$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+ $(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
rm -f libvdr-*.so.*
+ rm -rf locale
dh_clean
install: build
@@ -51,6 +52,8 @@
dh_clean -k
dh_installdirs
dh_install
+ [ ! -d locale ] || (mkdir -p debian/vdr-plugin-radio/usr/share/ && \
+ cp -r locale debian/vdr-plugin-radio/usr/share/)
# Build architecture-independent files here.
binary-indep: build install
More information about the pkg-vdr-dvb-changes
mailing list