r6801 - in /vdr/vdr-plugin-xineliboutput/branches/etch/debian: README.Debian changelog compat control patches/00list patches/01_gnome-screensaver.dpatch patches/02_vdr-include-path.dpatch plugin.xineliboutput.conf watch

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Mon May 12 08:07:59 UTC 2008 

Author: tiber-guest
Date: Mon May 12 08:07:59 2008
New Revision: 6801

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6801
Log:
* New upstream release
* Modified debian/watch to mangle rc and pre upstream versions to ~rc and ~pre
* Updated 01_gnome-screensaver.dpatch
* Dropped 02_vdr-include-path.dpatch
* By default now setting --remote=127.0.0.1:37890, which allows vdr-sxfe to
  connect locally by default. Also documented this in README.Debian so that
  there should be no obscurities about this anymore (Closes: #438116)
* COMPAT=5, Depend on debhelper (>= 5)

Removed:
    vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/02_vdr-include-path.dpatch
Modified:
    vdr/vdr-plugin-xineliboutput/branches/etch/debian/README.Debian
    vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog
    vdr/vdr-plugin-xineliboutput/branches/etch/debian/compat
    vdr/vdr-plugin-xineliboutput/branches/etch/debian/control
    vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list
    vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/01_gnome-screensaver.dpatch
    vdr/vdr-plugin-xineliboutput/branches/etch/debian/plugin.xineliboutput.conf
    vdr/vdr-plugin-xineliboutput/branches/etch/debian/watch

Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/README.Debian?rev=6801&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/README.Debian (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/README.Debian Mon May 12 08:07:59 2008
@@ -20,10 +20,13 @@
 
 The plugin can be configured in /etc/vdr/plugins/plugin.xineliboutput.conf:
 
---remote=<PORT>
-    Listen on <PORT> for remote clients
-    Use --remote=37890 to allow remote clients to connect
-    default: 0
+--remote=<LOCALIP>:<PORT>
+    Listen on <LOCALIP>:<PORT> for remote clients. If <LOCALIP> is provided,
+    it will bind to this address. You can completely omit <LOCALIP>
+    (--remote=<PORT>) to bind to all interfaces.
+    The default (if --remote is totally ommitted) is, that the remote port 37890,
+    bound to all interfaces is used, but remote access is disabeld. In this
+    case, the remote access can be enabled/disabled in VDR's OSD settings menu.
 
 
 --primary

Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog?rev=6801&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog Mon May 12 08:07:59 2008
@@ -1,3 +1,16 @@
+vdr-plugin-xineliboutput (1.0.0-1-0etch1) experimental; urgency=low
+
+  * New upstream release
+  * Modified debian/watch to mangle rc and pre upstream versions to ~rc and ~pre
+  * Updated 01_gnome-screensaver.dpatch
+  * Dropped 02_vdr-include-path.dpatch
+  * By default now setting --remote=127.0.0.1:37890, which allows vdr-sxfe to
+    connect locally by default. Also documented this in README.Debian so that
+    there should be no obscurities about this anymore (Closes: #438116)
+  * COMPAT=5, Depend on debhelper (>= 5)
+
+ -- Tobias Grimm <tg at e-tobi.net>  Mon, 12 May 2008 10:02:21 +0200
+
 vdr-plugin-xineliboutput (1.0.0~rc2+cvs20080223.2030-2etch1) experimental; urgency=low
 
   * Build-Depend on vdr-dev (>=1.6.0)

Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/compat
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/compat?rev=6801&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/compat (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/compat Mon May 12 08:07:59 2008
@@ -1,1 +1,1 @@
-4
+5

Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/control?rev=6801&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/control (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/control Mon May 12 08:07:59 2008
@@ -3,11 +3,11 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), cdbs, dpatch, vdr-dev (>= 1.6.0), gettext, libxine-dev (<< 1.1.3), libxine-dev (>= 1.1.2), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev, sharutils, libdbus-glib-1-dev
+Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0), gettext, libxine-dev (<< 1.1.3), libxine-dev (>= 1.1.2), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev, sharutils, libdbus-glib-1-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/
-Homepage: http://sourceforge.net/projects/xineliboutput 
+Homepage: http://sourceforge.net/projects/xineliboutput
 
 Package: vdr-plugin-xineliboutput
 Architecture: any

Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list?rev=6801&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list Mon May 12 08:07:59 2008
@@ -1,3 +1,2 @@
 01_gnome-screensaver
-02_vdr-include-path
 10_nosignal

Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/01_gnome-screensaver.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/01_gnome-screensaver.dpatch?rev=6801&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/01_gnome-screensaver.dpatch (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/01_gnome-screensaver.dpatch Mon May 12 08:07:59 2008
@@ -5,28 +5,28 @@
 ## DP: Allows vdr-sxfe to disable gnome-screensaver
 
 @DPATCH@
-diff -urNad vdr-plugin-xineliboutput-1.0.0~rc2~/Makefile vdr-plugin-xineliboutput-1.0.0~rc2/Makefile
---- vdr-plugin-xineliboutput-1.0.0~rc2~/Makefile	2007-05-18 13:10:37.000000000 +0200
-+++ vdr-plugin-xineliboutput-1.0.0~rc2/Makefile	2007-07-02 21:42:19.000000000 +0200
-@@ -27,6 +27,9 @@
- 
-     ifeq ($(XINELIBOUTPUT_X11), 1)
-         #$(warning Detected X11)
+diff -urNad vdr-plugin-xineliboutput-1.0.0-1~/Makefile vdr-plugin-xineliboutput-1.0.0-1/Makefile
+--- vdr-plugin-xineliboutput-1.0.0-1~/Makefile	2008-04-23 22:14:06.000000000 +0200
++++ vdr-plugin-xineliboutput-1.0.0-1/Makefile	2008-04-26 10:19:40.000000000 +0200
+@@ -53,6 +53,9 @@
+         else
+             $(warning XDPMS extension not detected. )
+         endif
 +
 +        # Check for DBUS libs, if they exist we'll compile gnome screensaver support
 +        XINELIBOUTPUT_DBUS = $(shell (pkg-config --exists dbus-glib-1 >/dev/null 2>&1 && echo "1") || echo "0")
      else
          $(warning ********************************************************)
          $(warning X11 not detected ! X11 frontends will not be compiled.  )
-@@ -46,6 +49,7 @@
+@@ -75,6 +78,7 @@
  
  USE_ICONV = 1
  #XINELIBOUTPUT_X11        = 1
 +#XINELIBOUTPUT_DBUS       = 1
- #XINELIBOUTPUT_FB         = 1
- #XINELIBOUTPUT_XINEPLUGIN = 1
- #XINELIBOUTPUT_VDRPLUGIN  = 1
-@@ -233,6 +237,14 @@
+ #HAVE_XRENDER             = 1
+ #HAVE_XDPMS               = 1
+ #HAVE_EXTRACTOR_H         = 1
+@@ -289,6 +293,14 @@
    DEFINES += -DSTARTUP_IMAGE_FILE='"$(STARTUP_IMAGE_FILE)"'
  endif
  
@@ -41,7 +41,7 @@
  
  ###
  ### configuration
-@@ -259,8 +271,13 @@
+@@ -315,8 +327,13 @@
  endif
  
  ifeq ($(XINELIBOUTPUT_X11), 1)
@@ -57,7 +57,7 @@
  else
    OBJS_SXFE_SO = 
    OBJS_SXFE = 
-@@ -330,7 +347,7 @@
+@@ -388,7 +405,7 @@
  
  xine_sxfe_frontend.o: xine_sxfe_frontend.c xine_frontend.c xine_frontend.h \
  		xine_input_vdr.h xine_osd_command.h xine/post.h logdefs.h \
@@ -66,7 +66,7 @@
  	$(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(OPTFLAGS) xine_sxfe_frontend.c
  xine_fbfe_frontend.o: xine_fbfe_frontend.c xine_frontend.c xine_frontend.h \
  		xine_input_vdr.h xine_osd_command.h xine/post.h logdefs.h \
-@@ -339,13 +356,15 @@
+@@ -397,13 +414,15 @@
  xine_sxfe_frontend_standalone.o: xine_sxfe_frontend.c xine_frontend.c \
  		xine_frontend.h xine_input_vdr.h xine_osd_command.h \
  		xine/post.h logdefs.h xine_frontend_main.c xine_frontend_lirc.c \
@@ -81,9 +81,9 @@
 +gnome_screensaver.o: gnome_screensaver.c gnome_screensaver.h
 +	$(CC) $(CFLAGS) -c $(DEFINES) -DFE_STANDALONE $(INCLUDES) $(OPTFLAGS) gnome_screensaver.c
  
- 
- ###
-@@ -383,11 +402,11 @@
+ ### Internationalization (I18N):
+ 
+@@ -465,11 +484,11 @@
  
  ifeq ($(XINELIBOUTPUT_X11), 1)
  $(VDRPLUGIN_SXFE_SO): $(OBJS_SXFE_SO)
@@ -97,9 +97,9 @@
  endif
  
  ifeq ($(XINELIBOUTPUT_FB), 1)
-diff -urNad vdr-plugin-xineliboutput-1.0.0~rc2~/gnome_screensaver.c vdr-plugin-xineliboutput-1.0.0~rc2/gnome_screensaver.c
---- vdr-plugin-xineliboutput-1.0.0~rc2~/gnome_screensaver.c	1970-01-01 01:00:00.000000000 +0100
-+++ vdr-plugin-xineliboutput-1.0.0~rc2/gnome_screensaver.c	2007-07-02 21:42:19.000000000 +0200
+diff -urNad vdr-plugin-xineliboutput-1.0.0-1~/gnome_screensaver.c vdr-plugin-xineliboutput-1.0.0-1/gnome_screensaver.c
+--- vdr-plugin-xineliboutput-1.0.0-1~/gnome_screensaver.c	1970-01-01 01:00:00.000000000 +0100
++++ vdr-plugin-xineliboutput-1.0.0-1/gnome_screensaver.c	2008-04-26 10:18:03.000000000 +0200
 @@ -0,0 +1,122 @@
 +/*
 + * gnome_screensaver.c v0.0.7
@@ -223,9 +223,9 @@
 +
 +    g_object_unref(proxy);
 +}
-diff -urNad vdr-plugin-xineliboutput-1.0.0~rc2~/gnome_screensaver.h vdr-plugin-xineliboutput-1.0.0~rc2/gnome_screensaver.h
---- vdr-plugin-xineliboutput-1.0.0~rc2~/gnome_screensaver.h	1970-01-01 01:00:00.000000000 +0100
-+++ vdr-plugin-xineliboutput-1.0.0~rc2/gnome_screensaver.h	2007-07-02 21:42:19.000000000 +0200
+diff -urNad vdr-plugin-xineliboutput-1.0.0-1~/gnome_screensaver.h vdr-plugin-xineliboutput-1.0.0-1/gnome_screensaver.h
+--- vdr-plugin-xineliboutput-1.0.0-1~/gnome_screensaver.h	1970-01-01 01:00:00.000000000 +0100
++++ vdr-plugin-xineliboutput-1.0.0-1/gnome_screensaver.h	2008-04-26 10:18:03.000000000 +0200
 @@ -0,0 +1,6 @@
 +#ifndef _GNOME_SCREENSAVER_H
 +#define _GNOME_SCREENSAVER_H
@@ -233,10 +233,10 @@
 +extern void gnome_screensaver_control(int enable);
 +
 +#endif /* !_GNOME_SCREENSAVER_H */
-diff -urNad vdr-plugin-xineliboutput-1.0.0~rc2~/xine_sxfe_frontend.c vdr-plugin-xineliboutput-1.0.0~rc2/xine_sxfe_frontend.c
---- vdr-plugin-xineliboutput-1.0.0~rc2~/xine_sxfe_frontend.c	2007-03-17 13:41:21.000000000 +0100
-+++ vdr-plugin-xineliboutput-1.0.0~rc2/xine_sxfe_frontend.c	2007-07-02 21:42:19.000000000 +0200
-@@ -63,6 +63,10 @@
+diff -urNad vdr-plugin-xineliboutput-1.0.0-1~/xine_sxfe_frontend.c vdr-plugin-xineliboutput-1.0.0-1/xine_sxfe_frontend.c
+--- vdr-plugin-xineliboutput-1.0.0-1~/xine_sxfe_frontend.c	2008-04-10 17:01:31.000000000 +0200
++++ vdr-plugin-xineliboutput-1.0.0-1/xine_sxfe_frontend.c	2008-04-26 10:18:03.000000000 +0200
+@@ -71,6 +71,10 @@
  
  #include "xine_frontend.h"
  #include "xine/post.h"
@@ -245,9 +245,9 @@
 +#  include "gnome_screensaver.h"
 +#endif
  
- #define MWM_HINTS_DECORATIONS       (1L << 1)
- #define PROP_MWM_HINTS_ELEMENTS     5
-@@ -561,6 +565,10 @@
+ #ifndef WIN_LAYER_NORMAL
+   #define WIN_LAYER_NORMAL 4
+@@ -1025,6 +1029,10 @@
    }
  #endif
  
@@ -258,7 +258,7 @@
    this->xine_visual_type     = XINE_VISUAL_TYPE_X11;
    this->vis.display          = this->display;
    this->vis.screen           = this->screen;
-@@ -881,6 +889,10 @@
+@@ -1415,6 +1423,10 @@
  
    if(this && this->display) {
      

Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/plugin.xineliboutput.conf
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/plugin.xineliboutput.conf?rev=6801&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/plugin.xineliboutput.conf (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/plugin.xineliboutput.conf Mon May 12 08:07:59 2008
@@ -8,4 +8,5 @@
 #
 
 --local=none
---primary      
+--primary
+--remote=127.0.0.1:37890

Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/watch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/watch?rev=6801&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/watch (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/watch Mon May 12 08:07:59 2008
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/_//g" \
+opts="uversionmangle=s/_//g;s/(.*)((rc|pre)\d)/$1~$2/g" \
     http://qa.debian.org/watch/sf.php/xineliboutput/ vdr-xineliboutput-(.*)\.(?:tgz|tar\.bz2)

More information about the pkg-vdr-dvb-changes mailing list