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

[Thomas Schmidt]

Author: tschmidt
Date: 2006-01-17 20:53:15 +0000 (Tue, 17 Jan 2006)
New Revision: 1733

Removed:
   vdr/vdr/trunk/debian/patches/18_vdr-1.3.38-root-fix.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
   vdr/vdr/trunk/debian/patches/06_default_svdrp_port_0.dpatch
   vdr/vdr/trunk/debian/patches/09_sort_options.dpatch
Log:
vdr: New upstream release 1.3.39

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-01-15 23:44:00 UTC (rev 1732)
+++ vdr/vdr/trunk/debian/changelog	2006-01-17 20:53:15 UTC (rev 1733)
@@ -1,9 +1,19 @@
-vdr (1.3.38-1) unstable; urgency=low
+vdr (1.3.39-1) unstable; urgency=low
 
   * NOT RELEASED YET
 
   * Thomas Schmidt <tschmidt at debian.org>
     - New upstream release
+      + Updated 06_default_svdrp_port_0.dpatch
+      + Updated 09_sort_options.dpatch
+      + Removed 18_vdr-1.3.38-root-fix.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 17 Jan 2006 21:22:07 +0100
+
+vdr (1.3.38-1) unstable; urgency=low
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - New upstream release
       + Removed 05_set_system_time_as_user.dpatch
       + Updated 06_default_svdrp_port_0.dpatch
       + Removed 07_not_as_root.dpatch

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2006-01-15 23:44:00 UTC (rev 1732)
+++ vdr/vdr/trunk/debian/patches/00list	2006-01-17 20:53:15 UTC (rev 1733)
@@ -9,7 +9,6 @@
 13_epgfix
 15_dvbplayer
 17_replay
-18_vdr-1.3.38-root-fix
 
 # Patch needed for DVB subtitles or ttxtsubs (does not work with AC3-patch)
 # opt-21_subtitles_and_ttxtsubs

Modified: vdr/vdr/trunk/debian/patches/06_default_svdrp_port_0.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/06_default_svdrp_port_0.dpatch	2006-01-15 23:44:00 UTC (rev 1732)
+++ vdr/vdr/trunk/debian/patches/06_default_svdrp_port_0.dpatch	2006-01-17 20:53:15 UTC (rev 1733)
@@ -8,13 +8,13 @@
 ## DP: another port with the --port option when starting vdr
 
 @DPATCH@
-diff -urNad vdr-1.3.38/vdr.c /tmp/dpep.gHaEyx/vdr-1.3.38/vdr.c
---- vdr-1.3.38/vdr.c	2006-01-08 20:17:04.526755250 +0100
-+++ /tmp/dpep.gHaEyx/vdr-1.3.38/vdr.c	2006-01-08 20:17:22.595884500 +0100
-@@ -158,7 +158,7 @@
+diff -urNad vdr-1.3.39/vdr.c /tmp/dpep.zhqxZj/vdr-1.3.39/vdr.c
+--- vdr-1.3.39/vdr.c	2006-01-17 21:24:47.597411250 +0100
++++ /tmp/dpep.zhqxZj/vdr-1.3.39/vdr.c	2006-01-17 21:25:18.987672000 +0100
+@@ -157,7 +157,7 @@
+ 
    // Command line options:
  
- #define DEFAULTVDRUSER   "vdr"
 -#define DEFAULTSVDRPPORT 2001
 +#define DEFAULTSVDRPPORT 0
  #define DEFAULTWATCHDOG     0 // seconds

Modified: vdr/vdr/trunk/debian/patches/09_sort_options.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/09_sort_options.dpatch	2006-01-15 23:44:00 UTC (rev 1732)
+++ vdr/vdr/trunk/debian/patches/09_sort_options.dpatch	2006-01-17 20:53:15 UTC (rev 1733)
@@ -7,10 +7,10 @@
 ## DP: [DS] Add sort-by-provider-then-channel-number options.
 
 @DPATCH@
-diff -urNad vdr-1.3.17/menu.c /tmp/dpep.AB4AkR/vdr-1.3.17/menu.c
---- vdr-1.3.17/menu.c	2004-12-04 20:12:35.000000000 +0000
-+++ /tmp/dpep.AB4AkR/vdr-1.3.17/menu.c	2004-12-04 20:22:04.000000000 +0000
-@@ -328,14 +328,18 @@
+diff -urNad vdr-1.3.39/menu.c /tmp/dpep.qiROad/vdr-1.3.39/menu.c
+--- vdr-1.3.39/menu.c	2006-01-17 21:39:00.149290750 +0100
++++ /tmp/dpep.qiROad/vdr-1.3.39/menu.c	2006-01-17 21:43:50.899461500 +0100
+@@ -315,14 +315,18 @@
  
  class cMenuChannelItem : public cOsdItem {
  public:
@@ -28,10 +28,10 @@
    static void SetSortMode(eChannelSortMode SortMode) { sortMode = SortMode; }
 -  static void IncSortMode(void) { sortMode = eChannelSortMode((sortMode == csmProvider) ? csmNumber : sortMode + 1); }
 +  static void IncSortMode(void) { sortMode = eChannelSortMode(sortMode + 1); if (sortMode == csmLAST) sortMode = csmNumber; }
+   static eChannelSortMode SortMode(void) { return sortMode; }
    virtual int Compare(const cListObject &ListObject) const;
    virtual void Set(void);
-   cChannel *Channel(void) { return channel; }
-@@ -352,13 +356,46 @@
+@@ -339,13 +343,46 @@
    Set();
  }
  
@@ -80,7 +80,7 @@
       r = strcoll(channel->Name(), p->channel->Name());
    if (sortMode == csmNumber || r == 0)
       r = channel->Number() - p->channel->Number();
-@@ -369,10 +406,17 @@
+@@ -356,10 +393,17 @@
  {
    char *buffer = NULL;
    if (!channel->GroupSep()) {

Deleted: vdr/vdr/trunk/debian/patches/18_vdr-1.3.38-root-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/18_vdr-1.3.38-root-fix.dpatch	2006-01-15 23:44:00 UTC (rev 1732)
+++ vdr/vdr/trunk/debian/patches/18_vdr-1.3.38-root-fix.dpatch	2006-01-17 20:53:15 UTC (rev 1733)
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 18_vdr-1.3.38-root-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Do not try to change capabilities when running as root
-
- at DPATCH@
-diff -urNad vdr-1.3.38/vdr.c /tmp/dpep.tm8hXN/vdr-1.3.38/vdr.c
---- vdr-1.3.38/vdr.c	2006-01-08 12:49:03.000000000 +0100
-+++ /tmp/dpep.tm8hXN/vdr-1.3.38/vdr.c	2006-01-09 20:12:03.632027750 +0100
-@@ -339,14 +339,16 @@
- 
-   if (getuid() == 0) {
-      StartedAsRoot = true;
--     if (!SetKeepCaps(true))
--        return 2;
--     if (!SetUser(VdrUser))
--        return 2;
--     if (!SetKeepCaps(false))
--        return 2;
--     if (!SetCapSysTime())
--        return 2;
-+     if (strcmp(VdrUser, "root")) {
-+        if (!SetKeepCaps(true))
-+           return 2;
-+        if (!SetUser(VdrUser))
-+           return 2;
-+        if (!SetKeepCaps(false))
-+           return 2;
-+        if (!SetCapSysTime())
-+           return 2;
-+        }
-      }
- 
-   // Help and version info: