[SCM] vdr-plugin-live packaging repository branch, master, updated. debian/0.2.0-17-3-g163ff70
etobi
git at e-tobi.net
Sun Jan 15 11:27:16 UTC 2012
The following commit has been merged in the master branch:
commit 163ff7072f93b4c0b3d3b9d2f2cb73ae4a550ed5
Author: etobi <git at e-tobi.net>
Date: Sat Jan 14 23:29:59 2012 +0100
New Upstream Snapshot (commit d2a85a6) (Closes: #654879)
* New Upstream Snapshot (commit d2a85a6) (Closes: #654879)
* Dropped 02_timers_colon patch - fixed upstream
* Dropped 04_tntnet-2.0.patch - fixed upstream
* Dropped 01_ipv6.patch - fixed upstream
* Dropped 03_live-0.2.0-fix-INCLUDES.patch - fixed upstream
* Updated debian/copyright
diff --git a/debian/changelog b/debian/changelog
index fb3166a..0d6e011 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+vdr-plugin-live (0.2.0+git20120114-1) unstable; urgency=low
+
+ * New Upstream Snapshot (commit d2a85a6) (Closes: #654879)
+ * Dropped 02_timers_colon patch - fixed upstream
+ * Dropped 04_tntnet-2.0.patch - fixed upstream
+ * Dropped 01_ipv6.patch - fixed upstream
+ * Dropped 03_live-0.2.0-fix-INCLUDES.patch - fixed upstream
+ * Build-depend on libpcre3-dev
+ * Updated debian/copyright
+
+ -- Tobias Grimm <etobi at debian.org> Sun, 15 Jan 2012 10:22:53 +0100
+
vdr-plugin-live (0.2.0-17) unstable; urgency=low
* Build-depend on vdr-dev (>= 1.7.22)
diff --git a/debian/control b/debian/control
index d0a6efa..34b9d3c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.22),
libtntnet-dev (>= 1.6.0.1-1.1), libcxxtools-dev (>= 1.4.3.6-1.1),
- libssl-dev, libboost-dev, gettext
+ libssl-dev, libboost-dev, gettext, libpcre3-dev
Standards-Version: 3.9.2
Homepage: http://live.vdr-developer.org
Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-live.git
diff --git a/debian/copyright b/debian/copyright
index 585050b..21d606a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,7 @@ Debian Maintainers:
Thomas Schmidt <tschmidt at debian.org>
Copyright:
- (C) 2007 - 2008 Thomas Keil, Sascha Volkenandt, Dieter Hametner,
+ (C) 2007 - 2012 Thomas Keil, Sascha Volkenandt, Dieter Hametner,
Christian Wieninger, Michael Brueckner
(C) 2003 - 2006 Tommi Maekitalo (Tntnet httpd)
@@ -29,7 +29,7 @@ Copyright (MD5 Message-Digest Algorithm / md5.cpp):
(C) 2002 Gary McNickle
Copyright (Debian packaging):
- (C) 2007 - 2011 Tobias Grimm, Thomas Günther, Thomas Schmidt
+ (C) 2007 - 2012 Tobias Grimm, Thomas Günther, Thomas Schmidt
License:
This program is free software; you can redistribute it and/or modify
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1412cf0..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-#90_clean
diff --git a/debian/patches/01_ipv6.patch b/debian/patches/01_ipv6.patch
deleted file mode 100644
index 827b6b5..0000000
--- a/debian/patches/01_ipv6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Allows to use IPV6 addresses
-Forwarded: not-needed
-Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630627#10
-Bug-Debian: http://bugs.debian.org/630627
-Author: Luboš Doležel <lubos at dolezel.info>
-
---- live-0.2.0/setup.cpp.orig 2008-04-23 01:01:53.000000000 +0200
-+++ live-0.2.0/setup.cpp 2011-06-15 20:22:36.577961061 +0200
-@@ -151,13 +151,28 @@
-
- bool Setup::CheckServerIps()
- {
-+ bool v6supported = false;
-+ int s = socket(AF_INET6, SOCK_STREAM, 0);
-+
-+ if (s != -1) {
-+ close(s);
-+ v6supported = true;
-+ }
-+
- if ( m_serverIps.empty() ) {
-- m_serverIps.push_back( "0.0.0.0" );
-+ if (v6supported)
-+ m_serverIps.push_back( "::" );
-+ else
-+ m_serverIps.push_back( "0.0.0.0" );
- return true;
- }
-
-+ union {
-+ in_addr in4;
-+ in6_addr in6;
-+ };
- for ( IpList::const_iterator ip = m_serverIps.begin(); ip != m_serverIps.end(); ++ip ) {
-- if ( inet_addr( ip->c_str() ) == static_cast< in_addr_t >( -1 ) ) {
-+ if ( !inet_pton(AF_INET, ip->c_str(), &in4) && !inet_pton(AF_INET6, ip->c_str(), &in6) ) {
- esyslog( "ERROR: live server ip %s is not a valid ip address", ip->c_str() );
- cerr << "ERROR: live server ip " << *ip << " is not a valid ip address" << endl;
- return false;
diff --git a/debian/patches/02_timers_colon.patch b/debian/patches/02_timers_colon.patch
deleted file mode 100644
index f84d00d..0000000
--- a/debian/patches/02_timers_colon.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_timers_colon.dpatch by Timo Weingärtner <timo at tiwe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: colons have to be replaced by pipes in timer titles.
-
- at DPATCH@
---- vdr-plugin-live-0.2.0/timers.cpp 2008-04-10 22:06:05.000000000 +0200
-+++ vdr-plugin-live-0.2.0.new/timers.cpp 2009-07-25 23:39:02.000000000 +0200
-@@ -138,7 +138,7 @@
- ostringstream builder;
- builder << flags << ":" << channel << ":" << ( weekdays != "-------" ? weekdays : "" )
- << ( weekdays == "-------" || day.empty() ? "" : "@" ) << day << ":" << start << ":" << stop << ":"
-- << priority << ":" << lifetime << ":" << title << ":" << aux;
-+ << priority << ":" << lifetime << ":" << StringReplace(title, ":", "|") << ":" << aux;
- // dsyslog("%s", builder.str().c_str());
-
- TimerPair timerData( timer, builder.str() );
diff --git a/debian/patches/03_live-0.2.0-fix-INCLUDES.patch b/debian/patches/03_live-0.2.0-fix-INCLUDES.patch
deleted file mode 100644
index 1b8760f..0000000
--- a/debian/patches/03_live-0.2.0-fix-INCLUDES.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_live-0.2.0-fix-INCLUDES.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes compilation with VDR >= 1.7.13.
-
- at DPATCH@
---- live-0.2.0/Makefile
-+++ live-0.2.0/Makefile
-@@ -38,6 +38,7 @@
- ### Allow user defined options to overwrite defaults:
-
- -include $(VDRDIR)/Make.config
-+EXTRA_INCLUDES = $(INCLUDES)
-
- ### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-@@ -139,10 +140,10 @@
- subdirs: $(SUBDIRS)
-
- $(SUBDIRS):
-- $(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" $(MAKECMDGOALS)
-+ $(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" EXTRA_INCLUDES="$(EXTRA_INCLUDES)" $(MAKECMDGOALS)
-
- PAGES:
-- $(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" .dependencies
-+ $(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" EXTRA_INCLUDES="$(EXTRA_INCLUDES)" .dependencies
-
- $(VERSIONSUFFIX): FORCE
- ./buildutil/version-util $(VERSIONSUFFIX) || ./buildutil/version-util -F $(VERSIONSUFFIX)
---- live-0.2.0/css/Makefile
-+++ live-0.2.0/css/Makefile
-@@ -7,6 +7,7 @@
- CXXFLAGS += `tntnet-config --cxxflags`
- LDFLAGS += `tntnet-config --libs`
-
-+INCLUDES += $(EXTRA_INCLUDES)
- INCLUDES += -I..
-
- ### The directory environment:
---- live-0.2.0/httpd/Makefile
-+++ live-0.2.0/httpd/Makefile
-@@ -7,6 +7,7 @@
-
- ### Includes and Defines (add further entries here):
-
-+INCLUDES += $(EXTRA_INCLUDES)
- INCLUDES += -I.
-
- ### The object files (add further files here):
---- live-0.2.0/javascript/Makefile
-+++ live-0.2.0/javascript/Makefile
-@@ -7,6 +7,7 @@
- CXXFLAGS += `tntnet-config --cxxflags`
- LDFLAGS += `tntnet-config --libs`
-
-+INCLUDES += $(EXTRA_INCLUDES)
- INCLUDES += -I.. -I$(VDRDIR)/include
-
- ### The directory environment:
---- live-0.2.0/pages/Makefile
-+++ live-0.2.0/pages/Makefile
-@@ -2,6 +2,7 @@
- AR ?= ar
- ECPPC ?= ecppc
-
-+INCLUDES += $(EXTRA_INCLUDES)
- INCLUDES += -I.. -I$(VDRDIR)/include
-
- ### The directory environment:
diff --git a/debian/patches/04_tntnet-2.0.patch b/debian/patches/04_tntnet-2.0.patch
deleted file mode 100644
index add77c9..0000000
--- a/debian/patches/04_tntnet-2.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: vdr-plugin-live-0.2.0/thread.cpp
-===================================================================
---- vdr-plugin-live-0.2.0.orig/thread.cpp 2011-08-25 21:58:33.000000000 +0200
-+++ vdr-plugin-live-0.2.0/thread.cpp 2011-08-25 21:58:37.000000000 +0200
-@@ -3,6 +3,7 @@
- #include <stdexcept>
- #include <vdr/tools.h>
- #include <tnt/tntnet.h>
-+#include <tnt/tntconfig.h>
- #include "thread.h"
- #include "tntconfig.h"
-
diff --git a/debian/patches/90_clean.dpatch b/debian/patches/90_clean.dpatch
deleted file mode 100755
index a6dea38..0000000
--- a/debian/patches/90_clean.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## 99_clean.dpatch - Tobias Grimm <tg at e-tobi.nez>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes clean target
-
- at DPATCH@
---- vdr-plugin-live-0.1.0.orig/pages/Makefile
-+++ vdr-plugin-live-0.1.0/pages/Makefile
-@@ -53,4 +53,4 @@
- $(AR) r $@ $^
-
- clean:
-- @rm -f *~ *.o core* libpages.a $(OBJS:%.o=%.cpp)
-+ @rm -f *~ *.o core* libpages.a $(OBJS:%.o=%.cpp) $(DEPFILE)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d18bfd3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-01_ipv6.patch
-02_timers_colon.patch
-03_live-0.2.0-fix-INCLUDES.patch
-04_tntnet-2.0.patch
--
vdr-plugin-live packaging repository
More information about the pkg-vdr-dvb-changes
mailing list