r3742 - in vdr/vdr-plugin-decruft/trunk: . debian debian/patches
Tobias Grimm
tiber-guest at alioth.debian.org
Sat Nov 11 22:34:24 CET 2006
Author: tiber-guest
Date: 2006-11-11 22:34:24 +0100 (Sat, 11 Nov 2006)
New Revision: 3742
Added:
vdr/vdr-plugin-decruft/trunk/debian/
vdr/vdr-plugin-decruft/trunk/debian/changelog
vdr/vdr-plugin-decruft/trunk/debian/compat
vdr/vdr-plugin-decruft/trunk/debian/control
vdr/vdr-plugin-decruft/trunk/debian/copyright
vdr/vdr-plugin-decruft/trunk/debian/decruft.conf
vdr/vdr-plugin-decruft/trunk/debian/docs
vdr/vdr-plugin-decruft/trunk/debian/examples
vdr/vdr-plugin-decruft/trunk/debian/install
vdr/vdr-plugin-decruft/trunk/debian/links
vdr/vdr-plugin-decruft/trunk/debian/patches/
vdr/vdr-plugin-decruft/trunk/debian/patches/00list
vdr/vdr-plugin-decruft/trunk/debian/patches/01_avoid-vdr-patch.dpatch
vdr/vdr-plugin-decruft/trunk/debian/rules
vdr/vdr-plugin-decruft/trunk/debian/watch
Log:
Load newtrunk into vdr/vdr-plugin-decruft/trunk.
Added: vdr/vdr-plugin-decruft/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/changelog 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/changelog 2006-11-11 21:34:24 UTC (rev 3742)
@@ -0,0 +1,15 @@
+vdr-plugin-decruft (0.0.4-2) unstable; urgency=low
+
+ * Bumped Standards-Version to 3.7.2
+ * Removed empty README.Debian
+ * Changed Maintainer to Debian VDR Team
+ * Added note about the Debian Maintainers to debian/copyright
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 11 Nov 2006 21:43:10 +0100
+
+vdr-plugin-decruft (0.0.4-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Thomas Creutz <thomas.creutz at gmx.de> Sat, 11 Nov 2006 19:32:49 +0100
+
Added: vdr/vdr-plugin-decruft/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/compat 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/compat 2006-11-11 21:34:24 UTC (rev 3742)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-decruft/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/control 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/control 2006-11-11 21:34:24 UTC (rev 3742)
@@ -0,0 +1,14 @@
+Source: vdr-plugin-decruft
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.4-1)
+Standards-Version: 3.7.2
+
+Package: vdr-plugin-decruft
+Architecture: any
+Depends: ${shlibs:Depends}, ${vdr:Depends}
+Description: VDR-Plugin to remove unwanted channels
+ The Decruft plugin adds the capability to define rules for automatic
+ removing of unwanted channels.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
Added: vdr/vdr-plugin-decruft/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/copyright 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/copyright 2006-11-11 21:34:24 UTC (rev 3742)
@@ -0,0 +1,16 @@
+This package was debianized by Thomas Creutz <thomas.creutz at gmx.de> on
+Sat, 11 Nov 2006 19:32:49 +0100.
+
+It was downloaded from http://www.rst38.org.uk/vdr/decruft/
+
+Upstream Author: Dominic Morris <dom at suborbital.org.uk>
+
+Debian Maintainers:
+
+ Thomas Creutz <thomas.creutz at gmx.de>
+ Tobias Grimm <tg at e-tobi.net>
+
+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-decruft/trunk/debian/decruft.conf
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/decruft.conf 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/decruft.conf 2006-11-11 21:34:24 UTC (rev 3742)
@@ -0,0 +1,11 @@
+#
+# Define the rules for the decruft plugin here.
+#
+# For documentation see:
+#
+# /usr/share/doc/vdr-plugin-decruft/README.gz
+#
+# For example rules see:
+#
+# /usr/share/doc/vdr-plugin-decruft/examples/decruft.conf.gz
+#
Added: vdr/vdr-plugin-decruft/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/docs 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/docs 2006-11-11 21:34:24 UTC (rev 3742)
@@ -0,0 +1 @@
+README
Added: vdr/vdr-plugin-decruft/trunk/debian/examples
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/examples 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/examples 2006-11-11 21:34:24 UTC (rev 3742)
@@ -0,0 +1 @@
+examples/decruft.conf
Added: vdr/vdr-plugin-decruft/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/install 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/install 2006-11-11 21:34:24 UTC (rev 3742)
@@ -0,0 +1,2 @@
+libvdr-decruft.so.* usr/lib/vdr/plugins/
+debian/decruft.conf etc/vdr/plugins/
Added: vdr/vdr-plugin-decruft/trunk/debian/links
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/links 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/links 2006-11-11 21:34:24 UTC (rev 3742)
@@ -0,0 +1 @@
+etc/vdr/plugins/decruft.conf var/lib/vdr/plugins/decruft.conf
Added: vdr/vdr-plugin-decruft/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/patches/00list 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/patches/00list 2006-11-11 21:34:24 UTC (rev 3742)
@@ -0,0 +1 @@
+01_avoid-vdr-patch
Added: vdr/vdr-plugin-decruft/trunk/debian/patches/01_avoid-vdr-patch.dpatch
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/patches/01_avoid-vdr-patch.dpatch 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/patches/01_avoid-vdr-patch.dpatch 2006-11-11 21:34:24 UTC (rev 3742)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_avoid-vdr-patch.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Avoids the need to patch VDR.
+
+ at DPATCH@
+diff -urNad vdr-plugin-decruft-0.0.4~/cruft.c vdr-plugin-decruft-0.0.4/cruft.c
+--- vdr-plugin-decruft-0.0.4~/cruft.c 2005-02-20 19:34:01.000000000 +0100
++++ vdr-plugin-decruft-0.0.4/cruft.c 2006-11-11 21:57:24.000000000 +0100
+@@ -535,8 +535,10 @@
+ /* Not defined, so define it */
+ if ( !groupSep ) {
+ groupSep = new cChannel();
+- groupSep->SetName(settings->group_name,"","");
+- groupSep->SetGroupSep(true);
++ char* groupSepString;
++ asprintf(&groupSepString, ":%s", settings->group_name);
++ groupSep->Parse(groupSepString);
++ free(groupSepString);
+ Channels.Add(groupSep);
+ }
+ /* Move the channel to the end of the group */
Property changes on: vdr/vdr-plugin-decruft/trunk/debian/patches/01_avoid-vdr-patch.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-decruft/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/rules 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/rules 2006-11-11 21:34:24 UTC (rev 3742)
@@ -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-decruft/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-decruft/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-decruft/trunk/debian/watch 2006-11-11 21:33:59 UTC (rev 3741)
+++ vdr/vdr-plugin-decruft/trunk/debian/watch 2006-11-11 21:34:24 UTC (rev 3742)
@@ -0,0 +1,2 @@
+version=2
+http://www.rst38.org.uk/vdr/decruft/ .*vdr-decruft-(.*)\.tgz
More information about the pkg-vdr-dvb-changes
mailing list