[SCM] vdr-plugin-iptv packaging repository branch, master, updated. debian/0.3.1-4-4-g002c7d7

etobi git at e-tobi.net
Sun Oct 30 04:11:53 UTC 2011 

The following commit has been merged in the master branch:
commit 002c7d79fc60275a501120c57aab1e8d0bac1eab
Author: etobi <git at e-tobi.net>
Date:   Sun Oct 30 05:11:04 2011 +0100

    New upstream release
    
    * New upstream release
    * source/format 3.0
    * Removed README.source
    * New upstream release
    * 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
    * Standards-Version: 3.8.4
    * Updated debian/copyright

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..0c49787
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,6 @@
+vdr-plugin-iptv (0.4.0-1) experimental; urgency=low
+
+  The format of the parameters in channels.conf has been changed - see
+  the configuration section in the README for details.
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 07 Mar 2010 15:32:58 +0100
diff --git a/debian/README.Debian b/debian/README.Debian
index 2d89392..b7616d9 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -10,9 +10,9 @@ as follows:
 
 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,11 +24,9 @@ following contents:
     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.
 
 Please see also the section about the external streaming in the README.
-
- -- Tobias Grimm <tg at e-tobi.net>  Sat, 27 Oct 2007 11:56:47 +0200
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 54d6fec..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-This package uses the dpatch system to save and apply patches to the
-upstream source code of the software that is packaged. For details
-about how to use dpatch read
-
-   /usr/share/doc/dpatch/README.source.gz
-
-from the dpatch package.
diff --git a/debian/changelog b/debian/changelog
index f0cf78f..3d76ed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+vdr-plugin-iptv (0.4.2-1) experimental; urgency=low
+
+  * New upstream release
+  * source/format 3.0
+  * Removed README.source
+
+ -- Thomas Günther <tom at toms-cafe.de>  Tue, 08 Jun 2010 22:56:26 +0200
+
+vdr-plugin-iptv (0.4.1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Thomas Günther <tom at toms-cafe.de>  Fri, 12 Mar 2010 23:12:34 +0100
+
+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
+  * Standards-Version: 3.8.4
+  * Updated debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 07 Mar 2010 15:32:58 +0100
+
 vdr-plugin-iptv (0.3.1-4) experimental; urgency=low
 
   * Switched to GIT using pristine tar
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index b67ad91..4517e6d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: video
 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, vdr-dev (>= 1.6.0-16), gettext
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7), cdbs, vdr-dev (>= 1.6.0-16), gettext
+Standards-Version: 3.8.4
+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/
 Homepage: http://www.saunalahti.fi/~rahrenbe/vdr/iptv/
-Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-iptv.git
-Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr-plugin-iptv.git
 
 Package: vdr-plugin-iptv
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index b0dee43..0e9d814 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,18 +2,18 @@ Upstream Homepage:
     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 @@ License:
     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.
diff --git a/debian/rules b/debian/rules
index a8eb0d7..bd4c399 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,10 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.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::
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
vdr-plugin-iptv packaging repository

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