r1495 - in vdr/vdr-plugin-playlist/trunk/debian: . patches
Thomas Günther
tom-guest at costa.debian.org
Thu Nov 24 23:13:55 UTC 2005
Author: tom-guest
Date: 2005-11-24 23:13:54 +0000 (Thu, 24 Nov 2005)
New Revision: 1495
Added:
vdr/vdr-plugin-playlist/trunk/debian/compat
vdr/vdr-plugin-playlist/trunk/debian/install
vdr/vdr-plugin-playlist/trunk/debian/patches/
vdr/vdr-plugin-playlist/trunk/debian/patches/00list
vdr/vdr-plugin-playlist/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-playlist/trunk/debian/patches/91_playlist-0.0.2-compile-fix.dpatch
vdr/vdr-plugin-playlist/trunk/debian/patches/92_playlist-0.0.2-buffer.dpatch
vdr/vdr-plugin-playlist/trunk/debian/watch
Modified:
vdr/vdr-plugin-playlist/trunk/debian/changelog
vdr/vdr-plugin-playlist/trunk/debian/control
vdr/vdr-plugin-playlist/trunk/debian/copyright
vdr/vdr-plugin-playlist/trunk/debian/dirs
vdr/vdr-plugin-playlist/trunk/debian/rules
Log:
Load newtrunk into vdr/vdr-plugin-playlist/trunk.
Modified: vdr/vdr-plugin-playlist/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/changelog 2005-11-24 23:13:36 UTC (rev 1494)
+++ vdr/vdr-plugin-playlist/trunk/debian/changelog 2005-11-24 23:13:54 UTC (rev 1495)
@@ -1,9 +1,29 @@
-vdr-plugin-playlist (0.0.2-1) unstable; urgency=low
+vdr-plugin-playlist (0.0.1+0.0.2rc3-2) unstable; urgency=low
- * Bug fixes
- -
+ * Thomas Günther <tom at toms-cafe.de>
+ - Added 91_playlist-0.0.2-compile-fix.dpatch
+ - Added 92_playlist-0.0.2-buffer.dpatch
+ - Use dependencies.sh from vdr-dev to set vdr dependencies and
+ conflicts
+ - Bumped Standards-Version to 3.6.2
+ - Converted changelog to UTF-8
+ - Build-Depend on vdr-dev (>= 1.3.33-1)
- -- Hardy Flor <HFlor at gmx.de> Fri, 08 Okt 2004 02:34:00 +0200
+ -- Thomas Günther <tom at toms-cafe.de> Fri, 18 Nov 2005 01:29:32 +0100
+
+vdr-plugin-playlist (0.0.1+0.0.2rc3-1) unstable; urgency=low
+
+ * Hardy Flor <HFlor at gmx.de>:
+ - Bug fixes
+ * Thomas Günther <tom at toms-cafe.de>:
+ - Adapted to vdr-1.2.6-27
+ * Tobias Grimm <tg at e-tobi.net>:
+ - removed debian/dirs
+ - Added Makefile-fPIC-fix patch to fix potential FTBFS
+ - using debian/compat
+
+ -- Hardy Flor <HFlor at gmx.de> Fri, 08 Oct 2004 02:34:00 +0200
+
vdr-plugin-playlist (0.0.1-1) unstable; urgency=low
* Initial revision
Added: vdr/vdr-plugin-playlist/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/compat 2005-11-24 23:13:36 UTC (rev 1494)
+++ vdr/vdr-plugin-playlist/trunk/debian/compat 2005-11-24 23:13:54 UTC (rev 1495)
@@ -0,0 +1 @@
+4
Modified: vdr/vdr-plugin-playlist/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/control 2005-11-24 23:13:36 UTC (rev 1494)
+++ vdr/vdr-plugin-playlist/trunk/debian/control 2005-11-24 23:13:54 UTC (rev 1495)
@@ -2,11 +2,15 @@
Section: misc
Priority: extra
Maintainer: Hardy Flor <HFlor at gmx.de>
-Build-Depends: debhelper (>> 3.0.0), vdr-dev (>= 1.2.6-5)
-Standards-Version: 3.5.2
+Origin: ctvdr
+Bugs: mailto:pkg-vdr-dvb-devel at lists.alioth.debian.org
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.33-1), dpatch (>= 2.0.9)
+Standards-Version: 3.6.2
Package: vdr-plugin-playlist
-Architecture: i386
-Depends: ${shlibs:Depends}, vdr (>= 1.2.6-5)
-Description: Plugin for VDR to display playlist for recordings
- Patchlevel: ${patchlevel}
\ No newline at end of file
+Architecture: any
+Depends: ${shlibs:Depends}, ${vdr:Depends}
+Conflicts: ${vdr:Conflicts}
+Description: Plugin for VDR to display playlists for recordings
+ This is a plugin to create and play playlists of recordings.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
Modified: vdr/vdr-plugin-playlist/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/copyright 2005-11-24 23:13:36 UTC (rev 1494)
+++ vdr/vdr-plugin-playlist/trunk/debian/copyright 2005-11-24 23:13:54 UTC (rev 1495)
@@ -1,8 +1,10 @@
This package was debianized by Hardy Flor on Thu, 23 Sep 2004 23:42:32 +0200.
+It was downloaded from http://www.fast-info.de/vdr/playlist
+
+Upstream Author: Hardy Flor <HFlor at gmx.de>
+
Copyright:
- You are free to distribute this software under the terms of
- the GNU General Public License.
- On Debian systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL file.
+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 .
Modified: vdr/vdr-plugin-playlist/trunk/debian/dirs
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/dirs 2005-11-24 23:13:36 UTC (rev 1494)
+++ vdr/vdr-plugin-playlist/trunk/debian/dirs 2005-11-24 23:13:54 UTC (rev 1495)
@@ -1 +0,0 @@
-usr/lib/vdr/plugins
Added: vdr/vdr-plugin-playlist/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/install 2005-11-24 23:13:36 UTC (rev 1494)
+++ vdr/vdr-plugin-playlist/trunk/debian/install 2005-11-24 23:13:54 UTC (rev 1495)
@@ -0,0 +1 @@
+libvdr-playlist.so.* usr/lib/vdr/plugins/
Added: vdr/vdr-plugin-playlist/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/patches/00list 2005-11-24 23:13:36 UTC (rev 1494)
+++ vdr/vdr-plugin-playlist/trunk/debian/patches/00list 2005-11-24 23:13:54 UTC (rev 1495)
@@ -0,0 +1,3 @@
+01_Makefile-fPIC-fix
+91_playlist-0.0.2-compile-fix
+92_playlist-0.0.2-buffer
Added: vdr/vdr-plugin-playlist/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-11-24 23:13:36 UTC (rev 1494)
+++ vdr/vdr-plugin-playlist/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-11-24 23:13:54 UTC (rev 1495)
@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## Makefile-fPIC-fix patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile to fix potential FTBFS.
+
+ at DPATCH@
+diff -urNad /usr/src/cvs/vdrdevel-plugin-screenshot/Makefile vdrdevel-plugin-screenshot/Makefile
+--- /usr/src/cvs/vdrdevel-plugin-screenshot/Makefile Wed Feb 25 20:37:25 2004
++++ vdrdevel-plugin-screenshot/Makefile Sat Sep 11 00:52:09 2004
+@@ -15,7 +15,7 @@
+ ### The C++ compiler and options:
+
+ CXX ?= g++
+-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
+
+ ### The directory environment:
+
Added: vdr/vdr-plugin-playlist/trunk/debian/patches/91_playlist-0.0.2-compile-fix.dpatch
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/patches/91_playlist-0.0.2-compile-fix.dpatch 2005-11-24 23:13:36 UTC (rev 1494)
+++ vdr/vdr-plugin-playlist/trunk/debian/patches/91_playlist-0.0.2-compile-fix.dpatch 2005-11-24 23:13:54 UTC (rev 1495)
@@ -0,0 +1,65 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## 91_playlist-0.0.2-compile-fix.dpatch by Frank99 at vdrportal.de
+## http://vdrportal.de/board/thread.php?postid=315107#post315107
+##
+## added compatibility to VDR < 1.3.25 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.25.
+
+ at DPATCH@
+diff -ruN playlist/dataplaylist.c playlist-patched/dataplaylist.c
+--- playlist/dataplaylist.c 2004-10-08 02:34:00.000000000 +0200
++++ playlist-patched/dataplaylist.c 2005-05-30 19:16:26.000000000 +0200
+@@ -145,7 +145,11 @@
+ char *temp = strrchr(title, '\t');
+ if (temp)
+ *temp = 0;
++#if VDRVERSNUM >= 10325
++ summary = recording->Info()->Title() ? strdup(recording->Info()->Title()) : NULL;
++#else
+ summary = recording->Summary() ? strdup(recording->Summary()) : NULL;
++#endif
+ return true;
+ }
+ isdel = true;
+diff -ruN playlist/menuplaylist.c playlist-patched/menuplaylist.c
+--- playlist/menuplaylist.c 2004-10-08 02:34:00.000000000 +0200
++++ playlist-patched/menuplaylist.c 2005-05-30 19:19:25.000000000 +0200
+@@ -154,7 +154,11 @@
+ else
+ {
+ cRecording *recording = GetRecording(ri);
++#if VDRVERSNUM >= 10325
++ SetHelp(singleselect ? tr("Select") : tr("Add"), singleselect ? NULL : ri->IsMark() ? tr("UnMark") : tr("Mark"), deleterecords.u ? tr("Delete") : NULL, (recording && recording->Info()->Title() && *recording->Info()->Title()) ? tr("Summary") : NULL);
++#else
+ SetHelp(singleselect ? tr("Select") : tr("Add"), singleselect ? NULL : ri->IsMark() ? tr("UnMark") : tr("Mark"), deleterecords.u ? tr("Delete") : NULL, (recording && recording->Summary() && *recording->Summary()) ? tr("Summary") : NULL);
++#endif
+ }
+ } else
+ {
+@@ -256,11 +260,23 @@
+ if (ri && !ri->IsDirectory())
+ {
+ cRecording *recording = GetRecording(ri);
++#if VDRVERSNUM >= 10325
++ if (recording && recording->Info()->Title() && *recording->Info()->Title())
++#else
+ if (recording && recording->Summary() && *recording->Summary())
++#endif
+ #if VDRVERSNUM >= 10307
++#if VDRVERSNUM >= 10325
++ return AddSubMenu(new cMenuText(tr("Summary"), recording->Info()->Title()));
++#else
+ return AddSubMenu(new cMenuText(tr("Summary"), recording->Summary()));
++#endif
+ #else
++#if VDRVERSNUM >= 10325
++ return AddSubMenu(new cMenuItemText(tr("Summary"), recording->Info()->Title()));
++#else
+ return AddSubMenu(new cMenuItemText(tr("Summary"), recording->Summary()));
++#endif
+ #endif
+ }
+ return osContinue;
Added: vdr/vdr-plugin-playlist/trunk/debian/patches/92_playlist-0.0.2-buffer.dpatch
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/patches/92_playlist-0.0.2-buffer.dpatch 2005-11-24 23:13:36 UTC (rev 1494)
+++ vdr/vdr-plugin-playlist/trunk/debian/patches/92_playlist-0.0.2-buffer.dpatch 2005-11-24 23:13:54 UTC (rev 1495)
@@ -0,0 +1,44 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## 92_playlist-0.0.2-buffer.dpatch by C.Y.M <syphir at syphir.sytes.net>
+## posted on vdr at linuxtv.org mailing list on Sun, 06 Nov 2005 15:00:58 -0800
+## with Message-ID: <436E8B2A.1050704 at syphir.sytes.net>
+##
+## added compatibility to VDR < 1.3.18 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.36.
+
+ at DPATCH@
+diff -ru playlist-0.0.2.orig/playlist.c playlist-0.0.2/playlist.c
+--- playlist-0.0.2.orig/playlist.c 2004-10-07 17:34:00.000000000 -0700
++++ playlist-0.0.2/playlist.c 2005-11-06 14:18:45.000000000 -0800
+@@ -381,7 +381,12 @@
+ #define MAXARGS 100
+ int fargc = 1;
+ char *fargv[MAXARGS];
++#if VDRVERSNUM < 10318
+ char buffer[MAXPARSEBUFFER];
++#else
++ cReadLine ReadLine;
++ char *s;
++#endif
+ bool done;
+ FILE *f;
+
+@@ -405,9 +406,15 @@
+ esyslog("%s: ERROR: cannot open config file: [%s]%s", plugin_name, ConfigDirectory(""), playlistconfigfile.u);
+ return false;
+ }
++#if VDRVERSNUM < 10318
+ while (fgets(buffer, sizeof(buffer), f) > 0)
+ {
+ p = skipspace(stripspace(buffer));
++#else
++ while ((s = ReadLine.Read(f)) != NULL)
++ {
++ p = skipspace(stripspace(s));
++#endif
+ q = NULL;
+ done = false;
+ while (!done)
Modified: vdr/vdr-plugin-playlist/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/rules 2005-11-24 23:13:36 UTC (rev 1494)
+++ vdr/vdr-plugin-playlist/trunk/debian/rules 2005-11-24 23:13:54 UTC (rev 1495)
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
@@ -15,30 +12,41 @@
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:
+configure-stamp: patch-stamp
dh_testdir
-
touch configure-stamp
-
build: build-stamp
-
build-stamp: configure-stamp
dh_testdir
-
- $(MAKE) all DVBDIR=/usr/include VDRDIR=/usr/include/vdr LIBDIR=. REMOTE=lirc
-
+ $(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
touch build-stamp
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- rm -f debian/vdr-plugin-playlist.substvars
- rm -f libvdr-*.so*
- make clean
-
+ -$(MAKE) -o .dependencies clean VDRDIR=/usr/include/$(VDR)
+ rm -f libvdr-*.so.*
dh_clean
install: build
@@ -46,9 +54,8 @@
dh_testroot
dh_clean -k
dh_installdirs
- cp libvdr-playlist*.so.* $(CURDIR)/debian/vdr-plugin-playlist/usr/lib/vdr/plugins/
+ dh_install
-
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
@@ -57,23 +64,34 @@
binary-arch: build install
dh_testdir
dh_testroot
+# dh_installdebconf
dh_installdocs
dh_installexamples
- dh_installmenu
- dh_installcron
- dh_installman
- dh_installinfo
+# 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
- cd debian; mv vdr-plugin-playlist.substvars substvars.old; cat /usr/include/vdr/patchlevel substvars.old > vdr-plugin-playlist.substvars; rm -f substvars.old
+ /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
+.PHONY: build clean binary-indep binary-arch binary install configure \
+ clean-patched patch unpatch
Property changes on: vdr/vdr-plugin-playlist/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
-
+ *
Added: vdr/vdr-plugin-playlist/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-playlist/trunk/debian/watch 2005-11-24 23:13:36 UTC (rev 1494)
+++ vdr/vdr-plugin-playlist/trunk/debian/watch 2005-11-24 23:13:54 UTC (rev 1495)
@@ -0,0 +1,2 @@
+version=2
+http://www.fast-info.de/vdr/playlist/vdr-playlist-(.*)\.tgz
More information about the pkg-vdr-dvb-changes
mailing list