r4580 - vdr/vdr-plugin-wirbelscan/trunk/debian

Thu May 10 18:07:02 UTC 2007

Author: tiber-guest
Date: 2007-05-10 18:07:02 +0000 (Thu, 10 May 2007)
New Revision: 4580

Modified:
   vdr/vdr-plugin-wirbelscan/trunk/debian/changelog
   vdr/vdr-plugin-wirbelscan/trunk/debian/compat
   vdr/vdr-plugin-wirbelscan/trunk/debian/control
   vdr/vdr-plugin-wirbelscan/trunk/debian/copyright
   vdr/vdr-plugin-wirbelscan/trunk/debian/rules
Log:
* Added copyright year and full GPL license header to debian/copyright
* Bumped compat to 5 and debhelper to (>= 5)
* Replaced VDRdevel adaptions in debian/rules with make-special-vdr
* Changed maintainer to Debian VDR Team

Modified: vdr/vdr-plugin-wirbelscan/trunk/debian/changelog
===================================================================

--- vdr/vdr-plugin-wirbelscan/trunk/debian/changelog	2007-05-10 18:00:43 UTC (rev 4579)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/changelog	2007-05-10 18:07:02 UTC (rev 4580)
@@ -1,3 +1,12 @@
+vdr-plugin-wirbelscan (0.0.2-2) unstable; urgency=low
+
+  * Added copyright year and full GPL license header to debian/copyright
+  * Bumped compat to 5 and debhelper to (>= 5)
+  * Replaced VDRdevel adaptions in debian/rules with make-special-vdr
+  * Changed maintainer to Debian VDR Team
+
+ -- Tobias Grimm <tg at e-tobi.net>  Thu, 10 May 2007 19:54:54 +0200
+
 vdr-plugin-wirbelscan (0.0.2-1) unstable; urgency=low
 
   * Initial Release.

Modified: vdr/vdr-plugin-wirbelscan/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/compat	2007-05-10 18:00:43 UTC (rev 4579)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/compat	2007-05-10 18:07:02 UTC (rev 4580)
@@ -1 +1 @@
-4
+5

Modified: vdr/vdr-plugin-wirbelscan/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/control	2007-05-10 18:00:43 UTC (rev 4579)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/control	2007-05-10 18:07:02 UTC (rev 4580)
@@ -1,15 +1,16 @@
 Source: vdr-plugin-wirbelscan
 Section: misc
 Priority: extra
-Maintainer: Horst Tritremmel <peter_weber69 at gmx.at>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-1)
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
+Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
+Build-Depends: debhelper (>= 5), vdr-dev (>= 1.4.6-2)
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-wirbelscan
 Architecture: any
 Depends: ${shlibs:Depends}, ${vdr:Depends}
 Conflicts: ${vdr:Conflicts}
-Description: Channelscan for VDR
+Description: Channelscan plugin for VDR
  This plugin allows you to scan for new channels. DVB-T and DVB-C are supported
- as well as DVB-S and pvrinput/ptv scan.
+ as well as DVB-S and pvrinput/ptv (analog) scan.
 XB-VDR-Patchlevel: ${vdr:Patchlevel}

Modified: vdr/vdr-plugin-wirbelscan/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/copyright	2007-05-10 18:00:43 UTC (rev 4579)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/copyright	2007-05-10 18:07:02 UTC (rev 4580)
@@ -3,15 +3,31 @@
 
 It was downloaded from http://free.pages.at/wirbel4vdr/wirbelscan/index2.html
 
-Upstream Author: Winfried Koehler <handygewinnspiel AET gmx dOt de>
+Upstream Author:
+    Winfried Koehler <handygewinnspiel AET gmx dOt de>
+    ( To contact the authors please use the forum at http://www.sidux.com/ )
 
-To contact the authors please use our
-forum at:
-   http://www.sidux.com/
+Debian Maintainers:
+    Horst Tritremmel <peter_weber69 at gmx.at>
+    
+Copyright:
+    (C) 2006 Winfried Koehler
 
-Debian Maintainers: Horst Tritremmel <peter_weber69 at gmx.at>
+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.
 
-Copyright:
+    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.
 
-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 .
+    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 St, 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.

Modified: vdr/vdr-plugin-wirbelscan/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/rules	2007-05-10 18:00:43 UTC (rev 4579)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/rules	2007-05-10 18:07:02 UTC (rev 4580)
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
@@ -12,12 +12,6 @@
 	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
 
@@ -29,6 +23,8 @@
 unpatch:
 endif
 
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
+
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -37,7 +33,7 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
+	$(MAKE) all $(MAKE_OPTIONS)
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -45,7 +41,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) -o .dependencies clean
+	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f libvdr-*.so.*
 	dh_clean
 
@@ -80,14 +76,14 @@
 	dh_installchangelogs HISTORY
 	dh_link
 	dh_strip
-	dh_compress
+	dh_compress --exclude=T3001
 	dh_fixperms
 #	dh_makeshlibs
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
-	/usr/lib/$(VDR)-dev/patchlevel.sh subst
-	/usr/lib/$(VDR)-dev/dependencies.sh
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb


