r1976 - in vdr/vdr-plugin-cdda/trunk: . debian debian/patches

Thomas Günther tom-guest at costa.debian.org
Fri Mar 3 23:26:58 UTC 2006 

Author: tom-guest
Date: 2006-03-03 23:26:57 +0000 (Fri, 03 Mar 2006)
New Revision: 1976

Added:
   vdr/vdr-plugin-cdda/trunk/debian/
   vdr/vdr-plugin-cdda/trunk/debian/changelog
   vdr/vdr-plugin-cdda/trunk/debian/compat
   vdr/vdr-plugin-cdda/trunk/debian/control
   vdr/vdr-plugin-cdda/trunk/debian/copyright
   vdr/vdr-plugin-cdda/trunk/debian/dirs
   vdr/vdr-plugin-cdda/trunk/debian/docs
   vdr/vdr-plugin-cdda/trunk/debian/install
   vdr/vdr-plugin-cdda/trunk/debian/patches/
   vdr/vdr-plugin-cdda/trunk/debian/patches/00list
   vdr/vdr-plugin-cdda/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
   vdr/vdr-plugin-cdda/trunk/debian/patches/02_fix-cdda_menu.h.dpatch
   vdr/vdr-plugin-cdda/trunk/debian/patches/90_cdda-1.3.38.dpatch
   vdr/vdr-plugin-cdda/trunk/debian/plugin.cdda.conf
   vdr/vdr-plugin-cdda/trunk/debian/postinst
   vdr/vdr-plugin-cdda/trunk/debian/postrm
   vdr/vdr-plugin-cdda/trunk/debian/rules
   vdr/vdr-plugin-cdda/trunk/debian/watch
Log:
Load newtrunk into vdr/vdr-plugin-cdda/trunk.


Added: vdr/vdr-plugin-cdda/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/changelog	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/changelog	2006-03-03 23:26:57 UTC (rev 1976)
@@ -0,0 +1,6 @@
+vdr-plugin-cdda (0.1.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Fri,  3 Mar 2006 14:09:35 +0100
+

Added: vdr/vdr-plugin-cdda/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/compat	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/compat	2006-03-03 23:26:57 UTC (rev 1976)
@@ -0,0 +1 @@
+4

Added: vdr/vdr-plugin-cdda/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/control	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/control	2006-03-03 23:26:57 UTC (rev 1976)
@@ -0,0 +1,17 @@
+Source: vdr-plugin-cdda
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
+Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.41-1), libcdio-dev (>= 0.76-1), libmad0-dev, dpatch
+Standards-Version: 3.6.2
+
+Package: vdr-plugin-cdda
+Architecture: any
+Depends: ${shlibs:Depends}, ${vdr:Depends}
+Conflicts: ${vdr:Conflicts}
+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.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}

Added: vdr/vdr-plugin-cdda/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/copyright	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/copyright	2006-03-03 23:26:57 UTC (rev 1976)
@@ -0,0 +1,11 @@
+This package was debianized by Stefan Wagner <stefanwag at gmx.at> on
+Fri,  3 Mar 2006 14:09:35 +0100.
+
+It was downloaded from http://www.wahnadium.org
+
+Upstream Author: Christian Alexander Moser <cm_vdr at wahnadium.org>
+
+Copyright:
+
+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 .

Added: vdr/vdr-plugin-cdda/trunk/debian/dirs
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/dirs	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/dirs	2006-03-03 23:26:57 UTC (rev 1976)
@@ -0,0 +1 @@
+/var/cache/vdr-plugin-cdda

Added: vdr/vdr-plugin-cdda/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/docs	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/docs	2006-03-03 23:26:57 UTC (rev 1976)
@@ -0,0 +1 @@
+README

Added: vdr/vdr-plugin-cdda/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/install	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/install	2006-03-03 23:26:57 UTC (rev 1976)
@@ -0,0 +1,2 @@
+libvdr-cdda.so.*                usr/lib/vdr/plugins/
+debian/plugin.cdda.conf         etc/vdr/plugins/

Added: vdr/vdr-plugin-cdda/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/patches/00list	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/patches/00list	2006-03-03 23:26:57 UTC (rev 1976)
@@ -0,0 +1,4 @@
+01_Makefile-fPIC-fix
+02_fix-cdda_menu.h
+
+90_cdda-1.3.38

Added: vdr/vdr-plugin-cdda/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-03-03 23:26:57 UTC (rev 1976)
@@ -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.
+
+ at 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:
+ 

Added: vdr/vdr-plugin-cdda/trunk/debian/patches/02_fix-cdda_menu.h.dpatch
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/patches/02_fix-cdda_menu.h.dpatch	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/patches/02_fix-cdda_menu.h.dpatch	2006-03-03 23:26:57 UTC (rev 1976)
@@ -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.
+
+ at 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:

Added: vdr/vdr-plugin-cdda/trunk/debian/patches/90_cdda-1.3.38.dpatch
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/patches/90_cdda-1.3.38.dpatch	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/patches/90_cdda-1.3.38.dpatch	2006-03-03 23:26:57 UTC (rev 1976)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_cdda-1.3.38.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.38.
+
+ at 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);
+ 

Added: vdr/vdr-plugin-cdda/trunk/debian/plugin.cdda.conf
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/plugin.cdda.conf	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/plugin.cdda.conf	2006-03-03 23:26:57 UTC (rev 1976)
@@ -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

Added: vdr/vdr-plugin-cdda/trunk/debian/postinst
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/postinst	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/postinst	2006-03-03 23:26:57 UTC (rev 1976)
@@ -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#

Added: vdr/vdr-plugin-cdda/trunk/debian/postrm
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/postrm	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/postrm	2006-03-03 23:26:57 UTC (rev 1976)
@@ -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#

Added: vdr/vdr-plugin-cdda/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/rules	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/rules	2006-03-03 23:26:57 UTC (rev 1976)
@@ -0,0 +1,97 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+# Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
+VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+ifeq ($(VDR), vdrdevel)
+    DPATCH=yes
+endif
+
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
+
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+	dh_testdir
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+	$(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
+	touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+	-$(MAKE) -o .dependencies clean
+	rm -f libvdr-*.so.*
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+#	dh_installdebconf
+	dh_installdocs
+	dh_installexamples
+#	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installman
+#	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs HISTORY
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_makeshlibs
+	dh_installdeb
+#	dh_perl
+	dh_shlibdeps
+	/usr/lib/$(VDR)-dev/patchlevel.sh subst
+	/usr/lib/$(VDR)-dev/dependencies.sh
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure \
+        clean-patched patch unpatch


Property changes on: vdr/vdr-plugin-cdda/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: vdr/vdr-plugin-cdda/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-cdda/trunk/debian/watch	2006-03-03 23:26:42 UTC (rev 1975)
+++ vdr/vdr-plugin-cdda/trunk/debian/watch	2006-03-03 23:26:57 UTC (rev 1976)
@@ -0,0 +1,2 @@
+version=2
+ftp://ftp.wahnadium.org/pub/vdr-cdda/vdr-cdda-(.*)\.tar\.gz

More information about the pkg-vdr-dvb-changes mailing list