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

[Thomas Schmidt]

Author: tschmidt
Date: 2005-05-31 12:16:22 +0000 (Tue, 31 May 2005)
New Revision: 601

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/05_set_system_time_as_user.dpatch
Log:
vdr: New upstream release (1.3.25)
     + Updated 05_set_system_time_as_user.dpatch


Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-05-31 12:05:32 UTC (rev 600)
+++ vdr/vdr/trunk/debian/changelog	2005-05-31 12:16:22 UTC (rev 601)
@@ -1,7 +1,15 @@
+vdr (1.3.25-1) experimental; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+
+  * Thomas Schmidt <tschmidt@debian.org>
+    - New upstream release
+      + Updated 05_set_system_time_as_user.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Tue, 31 May 2005 14:06:49 +0200
+
 vdr (1.3.24-1) experimental; urgency=low
 
-  * (NOT RELEASED YET) 
-  
   * Thomas Schmidt <tschmidt@debian.org>
     - New upstream release
       + Removed 10_livelock.dpatch

Modified: vdr/vdr/trunk/debian/patches/05_set_system_time_as_user.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/05_set_system_time_as_user.dpatch	2005-05-31 12:05:32 UTC (rev 600)
+++ vdr/vdr/trunk/debian/patches/05_set_system_time_as_user.dpatch	2005-05-31 12:16:22 UTC (rev 601)
@@ -7,21 +7,21 @@
 ## DP: <ludwig.nussel@gmx.de>
 
 @DPATCH@
-diff -urNad vdr-1.3.23/Makefile /tmp/dpep.RJebnB/vdr-1.3.23/Makefile
---- vdr-1.3.23/Makefile	2005-04-09 21:28:46.585169512 +0200
-+++ /tmp/dpep.RJebnB/vdr-1.3.23/Makefile	2005-04-09 21:28:46.810135312 +0200
-@@ -109,7 +109,7 @@
- # The main program:
+diff -urNad vdr-1.3.25/Makefile /tmp/dpep.6f25Et/vdr-1.3.25/Makefile
+--- vdr-1.3.25/Makefile	2005-05-31 14:09:22.490646536 +0200
++++ /tmp/dpep.6f25Et/vdr-1.3.25/Makefile	2005-05-31 14:11:43.003285368 +0200
+@@ -18,7 +18,7 @@
+ LSIDIR   = ./libsi
+ MANDIR   = /usr/local/man
+ BINDIR   = /usr/local/bin
+-LIBS     = -ljpeg -lpthread -ldl
++LIBS     = -ljpeg -lpthread -ldl -lcap
+ INCLUDES =
  
- vdr: $(OBJS) $(SILIB)
--	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(SILIB) -o vdr
-+	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -lcap -ljpeg -lpthread -ldl $(LIBDIRS) $(SILIB) -o vdr
- 
- # The font files:
- 
-diff -urNad vdr-1.3.23/vdr.c /tmp/dpep.RJebnB/vdr-1.3.23/vdr.c
---- vdr-1.3.23/vdr.c	2005-04-09 21:28:46.551174680 +0200
-+++ /tmp/dpep.RJebnB/vdr-1.3.23/vdr.c	2005-04-09 21:28:46.811135160 +0200
+ PLUGINDIR= ./PLUGINS
+diff -urNad vdr-1.3.25/vdr.c /tmp/dpep.6f25Et/vdr-1.3.25/vdr.c
+--- vdr-1.3.25/vdr.c	2005-05-31 14:09:22.479648208 +0200
++++ /tmp/dpep.6f25Et/vdr-1.3.25/vdr.c	2005-05-31 14:09:22.795600176 +0200
 @@ -31,6 +31,10 @@
  #include <stdlib.h>
  #include <termios.h>
@@ -129,8 +129,8 @@
 +
  int main(int argc, char *argv[])
  {
- #ifdef _CS_GNU_LIBPTHREAD_VERSION
-@@ -135,6 +229,8 @@
+   // Save terminal settings:
+@@ -116,6 +210,8 @@
    const char *Terminal = NULL;
    const char *Shutdown = NULL;
    cPluginManager PluginManager(DEFAULTPLUGINDIR);
@@ -139,7 +139,7 @@
    int ExitCode = 0;
  
    static struct option long_options[] = {
-@@ -155,11 +251,13 @@
+@@ -136,11 +232,13 @@
        { "version",  no_argument,       NULL, 'V' },
        { "video",    required_argument, NULL, 'v' },
        { "watchdog", required_argument, NULL, 'w' },
@@ -154,7 +154,7 @@
          switch (c) {
            case 'a': AudioCommand = optarg;
                      break;
-@@ -249,6 +347,10 @@
+@@ -230,6 +328,10 @@
                      fprintf(stderr, "vdr: invalid watchdog timeout: %s\n", optarg);
                      return 2;
                      break;
@@ -165,7 +165,7 @@
            default:  return 2;
            }
          }
-@@ -291,6 +393,8 @@
+@@ -272,6 +374,8 @@
                 "  -V,       --version      print version information and exit\n"
                 "  -w SEC,   --watchdog=SEC activate the watchdog timer with a timeout of SEC\n"
                 "                           seconds (default: %d); '0' disables the watchdog\n"
@@ -175,7 +175,7 @@
                 DEFAULTEPGDATAFILENAME,
                 DEFAULTPLUGINDIR,
 @@ -321,6 +425,21 @@
-      return 0;
+      return 2;
       }
  
 +  // Only try to change capabilities/user when vdr is called by