r3146 - in vdr/vdr/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2006-08-15 20:33:05 +0000 (Tue, 15 Aug 2006)
New Revision: 3146

Added:
   vdr/vdr/trunk/debian/patches/16_channels.conf.terr-fix.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/control
   vdr/vdr/trunk/debian/copyright
   vdr/vdr/trunk/debian/patches/00list
   vdr/vdr/trunk/debian/vdr.postinst
Log:
vdr:
  * Added 16_channels.conf.terr-fix.dpatch to fix the example
    channels.conf.terr
  * Bumped Standards-Version to 3.7.2
  * Do not fail silently in postinst if invoke-rc.d vdr fails



Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-08-15 19:36:08 UTC (rev 3145)
+++ vdr/vdr/trunk/debian/changelog	2006-08-15 20:33:05 UTC (rev 3146)
@@ -1,7 +1,5 @@
 vdr (1.4.1-1) UNRELEASED; urgency=low
 
-  * (NOT RELEASED YET)
-
   [ Thomas Günther ]
   * Upgraded opt-24_jumpplay-0.8.dpatch to opt-24_jumpplay.dpatch version 0.9
 
@@ -25,8 +23,12 @@
     configurable in /etc/default/vdr
   * Added Tobias Grimm, Thomas Günther and myself to debian/copyright
   * Added LSB-Headers and status action to debian/vdr.init
+  * Added 16_channels.conf.terr-fix.dpatch to fix the example
+    channels.conf.terr
+  * Bumped Standards-Version to 3.7.2
+  * Do not fail silently in postinst if invoke-rc.d vdr fails
 
- -- Thomas Schmidt <tschmidt at debian.org>  Tue, 18 Jul 2006 21:22:31 +0200
+ -- Thomas Schmidt <tschmidt at debian.org>  Tue, 15 Aug 2006 07:49:08 +0200
 
 vdr (1.4.0-2) unstable; urgency=low
 

Modified: vdr/vdr/trunk/debian/control
===================================================================
--- vdr/vdr/trunk/debian/control	2006-08-15 19:36:08 UTC (rev 3145)
+++ vdr/vdr/trunk/debian/control	2006-08-15 20:33:05 UTC (rev 3146)
@@ -4,7 +4,7 @@
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org> 
 Build-Depends: debhelper (>= 4.1.16), linux-kernel-headers (>=2.5.999-test7-bk-6), libjpeg62-dev, dpatch (>= 2.0.9), libcap-dev, libncurses5-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: vdr
 Architecture: any

Modified: vdr/vdr/trunk/debian/copyright
===================================================================
--- vdr/vdr/trunk/debian/copyright	2006-08-15 19:36:08 UTC (rev 3145)
+++ vdr/vdr/trunk/debian/copyright	2006-08-15 20:33:05 UTC (rev 3146)
@@ -24,7 +24,7 @@
 Debian Maintainers:
 
   Tobias Grimm <tg at e-tobi.net>
-  Thomas Günther <tom at toms-cafe.de>
+  Thomas Günther <tom at toms-cafe.de>
   Thomas Schmidt <tschmidt at debian.org>
 
 Copyright:

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2006-08-15 19:36:08 UTC (rev 3145)
+++ vdr/vdr/trunk/debian/patches/00list	2006-08-15 20:33:05 UTC (rev 3146)
@@ -9,6 +9,7 @@
 12_osdbase-maxitems
 14_cap-memsize
 15_dvbplayer
+16_channels.conf.terr-fix
 
 # Patch needed for DVB subtitles or ttxtsubs (does not work with AC3-patch)
 # opt-21_subtitles_and_ttxtsubs

Added: vdr/vdr/trunk/debian/patches/16_channels.conf.terr-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/16_channels.conf.terr-fix.dpatch	2006-08-15 19:36:08 UTC (rev 3145)
+++ vdr/vdr/trunk/debian/patches/16_channels.conf.terr-fix.dpatch	2006-08-15 20:33:05 UTC (rev 3146)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 16_channels.conf.terr-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Removes Ch 14 fom example channels.conf.terr, because the entry is 
+## DP: invalid (reported as Ubuntu Bug #45721)
+
+ at DPATCH@
+diff -urNad vdr-1.4.1~/channels.conf.terr vdr-1.4.1/channels.conf.terr
+--- vdr-1.4.1~/channels.conf.terr	2005-01-16 16:54:57.000000000 +0100
++++ vdr-1.4.1/channels.conf.terr	2006-08-13 15:19:13.000000000 +0200
+@@ -9,7 +9,6 @@
+ bid-up.tv (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6273:6274:0:0:14272:0:0:0
+ CBBC (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4671:0:0:0
+ Cbeebies (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16960:0:0:0
+-Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841:2843:0:0:8800:0:0
+ Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984:0:0:0
+ Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:0
+ Channel 4 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2827:2828,2830:0:0:8384:0:0:0


Property changes on: vdr/vdr/trunk/debian/patches/16_channels.conf.terr-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: vdr/vdr/trunk/debian/vdr.postinst
===================================================================
--- vdr/vdr/trunk/debian/vdr.postinst	2006-08-15 19:36:08 UTC (rev 3145)
+++ vdr/vdr/trunk/debian/vdr.postinst	2006-08-15 20:33:05 UTC (rev 3146)
@@ -39,9 +39,9 @@
            if `dpkg --compare-versions $2 lt 1.2.6-9`; then
               if [ -x "/etc/init.d/vdr" ]; then
                  if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                    invoke-rc.d vdr stop || exit 0
+                    invoke-rc.d vdr stop
                  else
-                    /etc/init.d/vdr stop || exit 0
+                    /etc/init.d/vdr stop
                  fi
               fi
            fi