--- vdr-plugin-cdda-0.1.0.orig/debian/watch +++ vdr-plugin-cdda-0.1.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/-/~/" \ + ftp://ftp.wahnadium.org/pub/vdr-cdda/vdr-cdda-(.*)\.tar\.gz --- vdr-plugin-cdda-0.1.0.orig/debian/rules +++ vdr-plugin-cdda-0.1.0/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/dpatch.mk + +DEB_INSTALL_CHANGELOGS_ALL = HISTORY + +MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \ + LOCALEDIR=debian/tmp/usr/share/locale + +common-build-arch:: + $(MAKE) all $(MAKE_OPTIONS) + +cleanbuilddir:: + $(MAKE) -o .dependencies clean $(MAKE_OPTIONS) + rm -f libvdr-*.so.* + +common-binary-predeb-arch:: + sh /usr/share/vdr-dev/dependencies.sh --- vdr-plugin-cdda-0.1.0.orig/debian/copyright +++ vdr-plugin-cdda-0.1.0/debian/copyright @@ -0,0 +1,40 @@ +Upstream Homepage: + http://www.wahnadium.org/vdr-cdda.html + +Upstream Author: + Christian Alexander Moser + +Debian Maintainers: + Tobias Grimm + Thomas Schmidt + Thomas Günther + Stefan Wagner + +Copyright: + (C) 2005 Christian Alexander Moser + +Copyright (Debian packaging): + (C) 2006 Stefan Wagner + (C) 2006 - 2009 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-2 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-2. --- vdr-plugin-cdda-0.1.0.orig/debian/postrm +++ vdr-plugin-cdda-0.1.0/debian/postrm @@ -0,0 +1,9 @@ +#! /bin/sh +set -e + +# Remove cache files +if [ "$1" = "purge" ]; then + /bin/rm -rf /var/cache/vdr-plugin-cdda/* +fi + +#DEBHELPER# --- vdr-plugin-cdda-0.1.0.orig/debian/dirs +++ vdr-plugin-cdda-0.1.0/debian/dirs @@ -0,0 +1 @@ +/var/cache/vdr-plugin-cdda --- vdr-plugin-cdda-0.1.0.orig/debian/compat +++ vdr-plugin-cdda-0.1.0/debian/compat @@ -0,0 +1 @@ +5 --- vdr-plugin-cdda-0.1.0.orig/debian/changelog +++ vdr-plugin-cdda-0.1.0/debian/changelog @@ -0,0 +1,231 @@ +vdr-plugin-cdda (0.1.0-34yavdr1) lucid; urgency=low + + * reb. vdr-1.7.14 + + -- Holger Schvestka Mon, 15 Mar 2010 22:23:14 +0100 + +vdr-plugin-cdda (0.1.0-33yavdr1) karmic; urgency=low + + * reb. vdr-1.7.12 + + -- Holger Schvestka Sun, 21 Feb 2010 19:54:06 +0100 + +vdr-plugin-cdda (0.1.0-32yavdr1) karmic; urgency=low + + * updated ABI version + + -- Holger Schvestka Fri, 25 Dec 2009 21:00:48 +0100 + +vdr-plugin-cdda (0.1.0-29tvt1) karmic; urgency=low + + * rebuild for vdr 1.7.10 + + -- Gerald Dachs Tue, 24 Nov 2009 15:44:44 +0100 + +vdr-plugin-cdda (0.1.0-28ubuntu1) karmic; urgency=low + + * Added gcc44.dpatch + + -- Holger Schvestka Thu, 08 Oct 2009 09:50:28 +0200 + +vdr-plugin-cdda (0.1.0-28) karmic; urgency=low + + * Ubuntu-Karmic + + -- Holger Schvestka Sun, 27 Sep 2009 11:55:03 +0200 + +vdr-plugin-cdda (0.1.0-27) experimental; urgency=low + + * Release for vdrdevel 1.7.6 + * Added ${misc:Depends} + * Bumped standards version to 3.8.1 + * Updated debian/copyright + * Changed section to "video" + + -- Thomas Günther Wed, 29 Apr 2009 23:10:47 +0200 + +vdr-plugin-cdda (0.1.0-26) experimental; urgency=low + + * Fixed debian/watch + * Changed my maintainer/uploader email address + * Updated debian/copyright + + -- Tobias Grimm Sat, 15 Nov 2008 17:50:17 +0100 + +vdr-plugin-cdda (0.1.0-25) experimental; urgency=low + + * Dropped patchlevel control field + * Build-Depend on vdr-dev (>=1.6.0-5) + * Bumped Standards-Version to 3.8.0 + + -- Tobias Grimm Fri, 25 Jul 2008 19:23:56 +0200 + +vdr-plugin-cdda (0.1.0-24) experimental; urgency=low + + * Increased package version to force rebuild for vdr 1.6.0-1ctvdr7 + + -- Tobias Grimm Mon, 12 May 2008 12:50:53 +0200 + +vdr-plugin-cdda (0.1.0-23) experimental; urgency=low + + * Build-depend on vdr-dev (>= 1.6.0) + * Switched Build-System to cdbs, Build-Depend on cdbs + * Renamed XS-Vcs-* fields to Vcs-* in debian/control + * Bumped Standards-Version to 3.7.3 + * Using COMPAT=5 now + + -- Tobias Grimm Fri, 04 Apr 2008 12:07:36 +0200 + +vdr-plugin-cdda (0.1.0-22) experimental; urgency=low + + * Force rebuild for vdr 1.5.15 + + -- Tobias Grimm Mon, 18 Feb 2008 21:07:27 +0100 + +vdr-plugin-cdda (0.1.0-21) experimental; urgency=low + + * Release for vdrdevel 1.5.13 + + -- Thomas Günther Wed, 16 Jan 2008 10:31:28 +0100 + +vdr-plugin-cdda (0.1.0-20) experimental; urgency=low + + * Release for vdrdevel 1.5.12 + + -- Thomas Günther Tue, 20 Nov 2007 23:46:12 +0100 + +vdr-plugin-cdda (0.1.0-19) experimental; urgency=low + + * Release for vdrdevel 1.5.11 + + -- Thomas Günther Tue, 6 Nov 2007 23:34:07 +0100 + +vdr-plugin-cdda (0.1.0-18) experimental; urgency=low + + * Release for vdrdevel 1.5.10 + + -- Thomas Günther Tue, 16 Oct 2007 23:50:49 +0200 + +vdr-plugin-cdda (0.1.0-17) experimental; urgency=low + + * Release for vdrdevel 1.5.9 + + -- Thomas Günther Tue, 28 Aug 2007 01:00:59 +0200 + +vdr-plugin-cdda (0.1.0-16) experimental; urgency=low + + * Release for vdrdevel 1.5.8 + + -- Thomas Günther Thu, 23 Aug 2007 01:08:53 +0200 + +vdr-plugin-cdda (0.1.0-15) experimental; urgency=low + + * Release for vdrdevel 1.5.6 + + -- Thomas Günther Tue, 14 Aug 2007 01:46:07 +0200 + +vdr-plugin-cdda (0.1.0-14) experimental; urgency=low + + [ Thomas Schmidt ] + * Added XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control + + [ Thomas Günther ] + * Release for vdrdevel 1.5.5 + + -- Thomas Günther Wed, 27 Jun 2007 23:02:28 +0200 + +vdr-plugin-cdda (0.1.0-13) experimental; urgency=low + + * Release for vdrdevel 1.5.2 + + -- Thomas Günther Sat, 28 Apr 2007 00:00:17 +0200 + +vdr-plugin-cdda (0.1.0-12) experimental; urgency=low + + * Release for vdrdevel 1.5.1 + + -- Thomas Günther Tue, 27 Feb 2007 19:59:09 +0100 + +vdr-plugin-cdda (0.1.0-11) experimental; urgency=low + + [ Thomas Günther ] + * Replaced VDRdevel adaptions in debian/rules with make-special-vdr + * Adapted call of dependencies.sh and patchlevel.sh to the new location + in /usr/share/vdr-dev/ + + [ Tobias Grimm ] + * Build-Depend on vdr-dev (>=1.4.5-1) + + -- Tobias Grimm Sun, 14 Jan 2007 20:19:06 +0100 + +vdr-plugin-cdda (0.1.0-10) unstable; urgency=low + + * Build-Depend on vdr-dev (>=1.4.4-1) + + -- Tobias Grimm Sun, 5 Nov 2006 00:00:40 +0100 + +vdr-plugin-cdda (0.1.0-9) unstable; urgency=low + + [ Thomas Schmidt ] + * Build-Depend on vdr-dev (>=1.4.3-1) + + -- Tobias Grimm Sat, 30 Sep 2006 16:21:31 +0200 + +vdr-plugin-cdda (0.1.0-8) unstable; urgency=low + + * Bumped Standards-Version to 3.7.2 + * Added note about the Debian Maintainers to debian/copyright + * Build-Depend on vdr-dev (>=1.4.2-1) + + -- Thomas Schmidt Mon, 28 Aug 2006 20:59:32 +0200 + +vdr-plugin-cdda (0.1.0-7) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.4.1-1) + + -- Debian VDR Team Sun, 18 Jun 2006 15:55:17 +0200 + +vdr-plugin-cdda (0.1.0-6) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.4.0-1) + + -- Debian VDR Team Wed, 3 May 2006 22:18:15 +0200 + +vdr-plugin-cdda (0.1.0-5) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.3.48-1) + * Tobias Grimm + - Added 90_APIVERSION.dpatch + + -- Debian VDR Team Mon, 24 Apr 2006 20:17:42 +0200 + +vdr-plugin-cdda (0.1.0-4) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.3.46-1) + + -- Debian VDR Team Thu, 13 Apr 2006 00:29:41 +0200 + +vdr-plugin-cdda (0.1.0-3) unstable; urgency=low + + * Thomas Schmidt + - Build-Depend on vdr-dev (>=1.3.45-1) + + -- Debian VDR Team Mon, 27 Mar 2006 23:18:44 +0200 + +vdr-plugin-cdda (0.1.0-2) unstable; urgency=low + + * Stefan Wagner + - Added 03_cdbremse.dpatch + + -- Debian VDR Team Wed, 8 Mar 2006 02:03:29 +0100 + +vdr-plugin-cdda (0.1.0-1) unstable; urgency=low + + * Initial Release. + + -- Debian VDR Team Fri, 3 Mar 2006 14:09:35 +0100 + --- vdr-plugin-cdda-0.1.0.orig/debian/plugin.cdda.conf +++ vdr-plugin-cdda-0.1.0/debian/plugin.cdda.conf @@ -0,0 +1,7 @@ +#--device | -d -> set the cdrom device (default: /dev/cdrom) +-d /dev/dvd + +#--cddbDir | -c - set the base directory to the cddb cache (no default +# argument). When no directory is set, then the local cache +# is automatically disabled. +-c /var/cache/vdr-plugin-cdda --- vdr-plugin-cdda-0.1.0.orig/debian/install +++ vdr-plugin-cdda-0.1.0/debian/install @@ -0,0 +1,2 @@ +libvdr-cdda.so.* usr/lib/vdr/plugins/ +debian/plugin.cdda.conf etc/vdr/plugins/ --- vdr-plugin-cdda-0.1.0.orig/debian/postinst +++ vdr-plugin-cdda-0.1.0/debian/postinst @@ -0,0 +1,10 @@ +#! /bin/sh +set -e + +if [ "$1" = "configure" ]; then + # ensure that the cache dir is correctly owned + CACHE_DIR=/var/cache/vdr-plugin-cdda + [ ! -d $CACHE_DIR ] || chown -R vdr:vdr $CACHE_DIR || true +fi + +#DEBHELPER# --- vdr-plugin-cdda-0.1.0.orig/debian/docs +++ vdr-plugin-cdda-0.1.0/debian/docs @@ -0,0 +1 @@ +README --- vdr-plugin-cdda-0.1.0.orig/debian/control +++ vdr-plugin-cdda-0.1.0/debian/control @@ -0,0 +1,17 @@ +Source: vdr-plugin-cdda +Section: video +Priority: extra +Maintainer: Debian VDR Team +Uploaders: Thomas Günther , Tobias Grimm , Thomas Schmidt +Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), libcdio-dev (>= 0.76), libmad0-dev +Standards-Version: 3.8.1 +Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-cdda/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-cdda/trunk/ + +Package: vdr-plugin-cdda +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends} +Description: VDR-Plugin to play audio cd's + The "cdda" plugin is an audio cd player with cd-text and cddb support. + You can play your favorite music cd's as like as you do it with your + standalone cd player. --- vdr-plugin-cdda-0.1.0.orig/debian/patches/04_gcc44.dpatch +++ vdr-plugin-cdda-0.1.0/debian/patches/04_gcc44.dpatch @@ -0,0 +1,92 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_gcc44.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad vdr-plugin-cdda-0.1.0~/cdda_cddb.c vdr-plugin-cdda-0.1.0/cdda_cddb.c +--- vdr-plugin-cdda-0.1.0~/cdda_cddb.c 2005-12-24 11:17:06.000000000 +0100 ++++ vdr-plugin-cdda-0.1.0/cdda_cddb.c 2009-10-08 09:48:37.446994515 +0200 +@@ -58,14 +58,14 @@ + + sscanf(key, "%a[^\n0-9]%d", &p_key, &track); + +- char *p_value1 = NULL, *p_value2 = NULL, *p_idx = index(value, '/'); ++ const char *p_value1 = NULL, *p_value2 = NULL, *p_idx = index(value, '/'); + if (NULL != p_idx && 0x20 == *(p_idx-1) && 0x20 == *(p_idx+1) && 0x00 != *(p_idx+2)) + sscanf(value, "%a[^/] / %a[^/]", &p_value1, &p_value2); + else + sscanf(value, "%a[^/]", &p_value1); + +- FixString(p_value1); +- FixString(p_value2); ++ FixString((char *)p_value1); ++ FixString((char *)p_value2); + #ifdef DEBUG + printf("S key=<%s> track=%d value1=<%s> value2=<%s>\n", p_key, track, p_value1, p_value2); + #endif +@@ -74,19 +74,19 @@ + char *p_str = NULL; + if (0 == strncmp("DISCID", p_key, 6)) { + p_str = ConCatString(tag[0]->GetDiscId(), p_value1); +- free(p_value1); ++ free((char *)p_value1); + p_value1 = p_str; + tag[0]->SetDiscId(p_value1); + tag[0]->SetGenre(genre); + } else if (0 == strncmp("DTITLE", p_key, 6)) { + if (NULL != p_value1 && NULL != p_value2) { + p_str = ConCatString(tag[0]->GetPerformer(), p_value1); +- free(p_value1); ++ free((char *)p_value1); + p_value1 = p_str; + tag[0]->SetPerformer(p_value1); + + p_str = ConCatString(tag[0]->GetTitle(), p_value2); +- free(p_value2); ++ free((char *)p_value2); + p_value2 = p_str; + tag[0]->SetTitle(p_value2); + } else if (NULL != p_value1 && NULL == p_value2) { +@@ -94,7 +94,7 @@ + tag[0]->SetPerformer(p_value1); + else { + p_str = ConCatString(tag[0]->GetTitle(), p_value1); +- free(p_value1); ++ free((char *)p_value1); + p_value1 = p_str; + tag[0]->SetTitle(p_value1); + } +@@ -108,17 +108,17 @@ + tag[track+1]->SetPerformer(tag[0]->GetPerformer()); + + p_str = ConCatString(tag[track+1]->GetTitle(), p_value1); +- free(p_value1); ++ free((char *)p_value1); + p_value1 = p_str; + tag[track+1]->SetTitle(p_value1); + } else { + p_str = ConCatString(tag[track+1]->GetPerformer(), p_value1); +- free(p_value1); ++ free((char *)p_value1); + p_value1 = p_str; + tag[track+1]->SetPerformer(p_value1); + + p_str = ConCatString(tag[track+1]->GetTitle(), p_value2); +- free(p_value2); ++ free((char *)p_value2); + p_value2 = p_str; + tag[track+1]->SetTitle(p_value2); + } +@@ -137,8 +137,8 @@ + } + } + free(p_key); +- free(p_value1); +- free(p_value2); ++ free((char *)p_value1); ++ free((char *)p_value2); + } + } + --- vdr-plugin-cdda-0.1.0.orig/debian/patches/02_fix-cdda_menu.h.dpatch +++ vdr-plugin-cdda-0.1.0/debian/patches/02_fix-cdda_menu.h.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_fix-cdda_menu.h.dpatch +## http://vdrportal.de/board/thread.php?postid=429273#post429273 +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes segfault in cdda_menu.h. + +@DPATCH@ +diff -Nur cdda-0.1.0.orig/cdda_menu.h cdda-0.1.0/cdda_menu.h +--- cdda-0.1.0.orig/cdda_menu.h 2005-12-15 13:45:07.000000000 +0100 ++++ cdda-0.1.0/cdda_menu.h 2006-03-03 15:19:16.000000000 +0100 +@@ -60,7 +60,7 @@ + char *mp_newCddbServerFqdn; + int m_newCddbServerPort; + int m_newInfoView; +- const char *m_cddbPrioTxt[3]; ++ const char *m_cddbPrioTxt[4]; + protected: + void Store(void); + public: --- vdr-plugin-cdda-0.1.0.orig/debian/patches/03_cdbremse.dpatch +++ vdr-plugin-cdda-0.1.0/debian/patches/03_cdbremse.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_cdbremse.dpatch by ramon.serrano at vdrportal.de +## http://vdr-portal.de/board/thread.php?postid=429254#post429254 +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Set speed of cd drive to 2. + +diff -Nur cdda-0.1.0.orig/cdda_device.c cdda-0.1.0/cdda_device.c +--- cdda-0.1.0.orig/cdda_device.c 2005-12-23 10:10:30.000000000 +0100 ++++ cdda-0.1.0/cdda_device.c 2006-03-06 21:59:25.000000000 +0100 +@@ -228,6 +228,7 @@ + mp_cdIo = cdio_open(mp_device, DRIVER_LINUX); + if (NULL == mp_cdIo) + return scCannotOpenDevice; ++ cdio_set_speed(mp_cdIo,2); + } else + return scOutOfMemory; + } else --- vdr-plugin-cdda-0.1.0.orig/debian/patches/90_APIVERSION.dpatch +++ vdr-plugin-cdda-0.1.0/debian/patches/90_APIVERSION.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh -e +## 90_APIVERSION.dpatch by Thomas Günther +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Support for the APIVERSION define as introduced in VDR-1.3.47. + +case "$1" in + -patch) + sed -i -e s/VDRVERSION/APIVERSION/g Makefile + ;; + -unpatch) + sed -i -e s/APIVERSION/VDRVERSION/g Makefile + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 + ;; +esac + +exit 0 --- vdr-plugin-cdda-0.1.0.orig/debian/patches/90_cdda-1.3.38.dpatch +++ vdr-plugin-cdda-0.1.0/debian/patches/90_cdda-1.3.38.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 90_cdda-1.3.38.dpatch by Thomas Günther +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changes for VDR >= 1.3.38. + +@DPATCH@ +--- cdda-0.1.0/audio_player.c ++++ cdda-0.1.0/audio_player.c +@@ -368,7 +368,11 @@ + } + + cAudioControl::~cAudioControl() { ++#if VDRVERSNUM >= 10338 ++ cStatus::MsgReplaying(this, NULL, NULL, false); ++#else + cStatus::MsgReplaying(this, NULL); ++#endif + free(mp_replayDescription); + + delete player; +@@ -469,7 +473,11 @@ + mp_replayDescription = p_str; + p_str = NULL; + ++#if VDRVERSNUM >= 10338 ++ cStatus::MsgReplaying(this, mp_replayDescription, NULL, true); ++#else + cStatus::MsgReplaying(this, mp_replayDescription); ++#endif + } else + free(p_str); + --- vdr-plugin-cdda-0.1.0.orig/debian/patches/01_Makefile-fPIC-fix.dpatch +++ vdr-plugin-cdda-0.1.0/debian/patches/01_Makefile-fPIC-fix.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_Makefile-fPIC-fix.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds -fPIC to Makefile to fix potential FTBFS. + +@DPATCH@ +--- old/Makefile ++++ new/Makefile +@@ -19,7 +19,7 @@ + ### The C++ compiler and options: + + CXX ?= g++ +-CXXFLAGS ?= -O0 -Wall -Woverloaded-virtual ++CXXFLAGS ?= -fPIC -O0 -Wall -Woverloaded-virtual + + ### The directory environment: + --- vdr-plugin-cdda-0.1.0.orig/debian/patches/00list +++ vdr-plugin-cdda-0.1.0/debian/patches/00list @@ -0,0 +1,7 @@ +01_Makefile-fPIC-fix +02_fix-cdda_menu.h +03_cdbremse +04_gcc44 + +90_APIVERSION.dpatch +90_cdda-1.3.38