r8455 - in /vdr/vdr-plugin-iptv/branches: ./ devel-1.7.x/ devel-1.7.x/debian/README.Debian devel-1.7.x/debian/changelog devel-1.7.x/debian/control devel-1.7.x/debian/copyright devel-1.7.x/debian/patches/ devel-1.7.x/debian/rules

tom-guest at users.alioth.debian.org tom-guest at users.alioth.debian.org
Sat Mar 6 23:35:47 UTC 2010


Author: tom-guest
Date: Sat Mar  6 23:35:47 2010
New Revision: 8455

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8455
Log:
* New upstream release for vdr 1.7.x
* Removed INCLUDES from debian/rules ("INCLUDES +=" in Makefile not applied)
* Removed 02_libsi-include.dpatch
* Removed dpatch from Build-Depends
* Build-Depend on vdr-dev (>= 1.6.0-16)
* Adapted README.Debian
* Updated debian/copyright

Added:
    vdr/vdr-plugin-iptv/branches/
    vdr/vdr-plugin-iptv/branches/devel-1.7.x/
      - copied from r8441, vdr/vdr-plugin-iptv/trunk/
Removed:
    vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/patches/
Modified:
    vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/README.Debian
    vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/changelog
    vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/control
    vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/copyright
    vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/rules

Modified: vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/README.Debian?rev=8455&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/README.Debian (original)
+++ vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/README.Debian Sat Mar  6 23:35:47 2010
@@ -10,9 +10,9 @@
 
 In the channels.conf:
 
-    IPTV-EXT;IPTV:1:IPTV|EXT|vlc2iptv|1:P:0:2:3:0:0:1:0:0:0
-      ^                               ^
-      |- <Channel Name>               |- <Parameter>
+    IPTV-EXT;IPTV:1:S=0|P=0|F=EXT|U=vlc2iptv|A=1:I:0:2:3:0:0:4:0:0:0
+      ^                                        ^
+      |- <Channel Name>                        |- <Parameter>
 
 <Channel Name> specifies, which URL should be transcoded. To configure this URL,
 create a file `/etc/vdr/plugins/iptv/vlcinput/<Channel Name>.conf` with the
@@ -24,7 +24,7 @@
     SPID=4
 
 VPID, APID and SPID are the PID-Values you have to use in the channels.conf
-entry.                            
+entry.
 
 <Channel Name> must be unique and you still have to set the numeric <Parameter>
 for `vlc2iptv` to a unique value.

Modified: vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/changelog?rev=8455&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/changelog (original)
+++ vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/changelog Sat Mar  6 23:35:47 2010
@@ -1,3 +1,15 @@
+vdr-plugin-iptv (0.4.0-1) experimental; urgency=low
+
+  * New upstream release for vdr 1.7.x
+  * Removed INCLUDES from debian/rules ("INCLUDES +=" in Makefile not applied)
+  * Removed 02_libsi-include.dpatch
+  * Removed dpatch from Build-Depends
+  * Build-Depend on vdr-dev (>= 1.6.0-16)
+  * Adapted README.Debian
+  * Updated debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sat, 06 Mar 2010 23:32:48 +0100
+
 vdr-plugin-iptv (0.3.1-2) experimental; urgency=low
 
   * Removed non-standard shebang line from debian/rules

Modified: vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/control?rev=8455&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/control (original)
+++ vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/control Sat Mar  6 23:35:47 2010
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), gettext
+Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.6.0-16), gettext
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/

Modified: vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/copyright?rev=8455&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/copyright (original)
+++ vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/copyright Sat Mar  6 23:35:47 2010
@@ -2,18 +2,18 @@
     http://www.saunalahti.fi/~rahrenbe/vdr/iptv/
 
 Upstream Authors:
-    Rolf Ahrenberg
-    Antti Seppälä
+    Rolf Ahrenberg <Rolf.Ahrenberg AT sci.fi>
+    Antti Seppälä  <a.seppala AT gmail.com>
 
 Debian Maintainers:
     Tobias Grimm <etobi at debian.org>
     Thomas Günther <tom at toms-cafe.de>
 
 Copyright:
-    (C) 2007 - 2009 Rolf Ahrenberg, Antti Seppälä
+    (C) 2007 - 2010 Rolf Ahrenberg, Antti Seppälä
 
 Copyright (Debian packaging):
-    (C) 2007 - 2009 Tobias Grimm, Thomas Günther
+    (C) 2007 - 2010 Tobias Grimm, Thomas Günther
 
 License:
     This program is free software; you can redistribute it and/or modify
@@ -25,10 +25,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    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.
+    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 Street, 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-2 on most Debian systems.

Modified: vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/rules?rev=8455&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/rules (original)
+++ vdr/vdr-plugin-iptv/branches/devel-1.7.x/debian/rules Sat Mar  6 23:35:47 2010
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+#include /usr/share/cdbs/1/rules/dpatch.mk
 
 DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
 MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. \
-               INCLUDES=-I/usr/include/vdr \
                LOCALEDIR=debian/tmp/usr/share/locale
 
 common-build-arch::




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