[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.21-1_ctvdr3-19-g0495185
etobi
git at e-tobi.net
Mon Dec 12 21:27:25 UTC 2011
The following commit has been merged in the e-tobi branch:
commit 34e1660494cc8e0b6d487ad23dee3876120540b7
Author: etobi <git at e-tobi.net>
Date: Sun Dec 11 02:03:33 2011 +0100
Dropped dpatch and use quilt for the patches - no PATCHVARIANT support anymore! To build VDR with a different set of patches, grab the appropriate branch from the Git.
diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 8c6f78e..9bd74bc 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,8 +1,8 @@
-debian/patches/81_Make_config.dpatch:da281b9af48273bcbd19f3052ee993fd
-debian/patches/12_osdbase-maxitems.dpatch:e45d1b62f7d66c3e5d279e3561034107
-debian/patches/11_sortrecordings.dpatch:9ed4cd1e144ee59dab34d4df4aa9af51
-debian/patches/04_newplugin.dpatch:e99f8d21734a19b3eb93d9e3f11b680a
-debian/patches/16_channels.conf.terr-fix.dpatch:72595733d0b46aa4093a640708d19226
-debian/patches/06_default_svdrp_port_0.dpatch:653e14e8ab093c456f9bbd8faa5e1ff7
-debian/patches/99_ncursesw-include.dpatch:90810d58108ff8d9afd768fec67be904
-debian/patches/82_valgrind.dpatch:503ddba49c243fff798a36a1c12bb5ae
+debian/patches/12_osdbase-maxitems.patch:f6fc7c5a100f8e891280195b3e1d69ba
+debian/patches/16_channels.conf.terr-fix.patch:933f8daa6bb6d26c711d0ae987a2b03e
+debian/patches/82_valgrind.patch:60ad50e72eabb0861d096d1002fddca7
+debian/patches/04_newplugin.patch:5877f4f62dab4f3d437d4eef7cae3ac0
+debian/patches/99_ncursesw-include.patch:9bafeb768f7921015a5bab5e47786950
+debian/patches/06_default_svdrp_port_0.patch:4835f681f185991262a3160146f43f2f
+debian/patches/11_sortrecordings.patch:3e3a2f988cb7db03f8f56a44012a65f4
+debian/patches/81_Make_config.patch:76dc4a78d1da16e3e524e41587d0c90d
diff --git a/debian/changelog b/debian/changelog
index 02a02c5..b873a15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ vdr (1.7.22-1) unstable; urgency=low
* Dropped 99_dvbc-unitiymedia-fix.dpatch - fixed upstream
* Dropped multipatch patches - these are available in the etobi-branch
of the Git repository
+ * Dropped dpatch and use quilt for the patches - no PATCHVARIANT support
+ anymore! To build VDR with a different set of patches, grab the
+ appropriate branch from the Git.
-- Tobias Grimm <etobi at debian.org> Sat, 10 Dec 2011 21:51:31 +0100
diff --git a/debian/control b/debian/control
index e0e8d73..e0dac72 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: video
Priority: extra
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~), dpatch, libjpeg-dev, libcap-dev,
+Build-Depends: debhelper (>= 7.0.50~), libjpeg-dev, libcap-dev,
libncursesw5-dev, libfreetype6-dev, libfontconfig-dev, gettext,
txt2man, python, linux-libc-dev (>= 2.6.29), libfribidi-dev
Standards-Version: 3.9.2
diff --git a/debian/patchcheck.py b/debian/patchcheck.py
index bd47086..1a3f248 100644
--- a/debian/patchcheck.py
+++ b/debian/patchcheck.py
@@ -7,34 +7,28 @@ from optparse import OptionParser
PATCHES_FILE = 'debian/.vdr-patches'
-def file_name_for_patch_variant(baseFileName):
- if options.patchVariant:
- return baseFileName + "." + options.patchVariant
- else:
- return baseFileName
-
def get_active_patches():
active_patches = {}
- for line in open(file_name_for_patch_variant("debian/patches/00list"), "r"):
+ for line in open("debian/patches/series", "r"):
match = re.match('^(?!00_)([^#]+)', line.rstrip())
if match:
patchFileName = "debian/patches/" + match.group(1)
if not os.path.exists(patchFileName):
- patchFileName += ".dpatch"
+ patchFileName += ".patch"
if os.path.exists(patchFileName):
active_patches[patchFileName] = hashlib.md5(open(patchFileName).read()).hexdigest()
return active_patches
def get_last_patches():
lastPatches = {}
- for line in open(file_name_for_patch_variant(PATCHES_FILE), "r"):
+ for line in open(PATCHES_FILE, "r"):
match = re.match('(.+):(.+)', line.rstrip())
if match:
lastPatches[match.group(1)] = match.group(2)
return lastPatches
def update_patchlist():
- patchListFile = open(file_name_for_patch_variant(PATCHES_FILE), "w")
+ patchListFile = open(PATCHES_FILE, "w")
patches = get_active_patches()
for fileName in patches:
patchListFile.write(fileName + ":" + patches[fileName] + "\n")
@@ -61,9 +55,6 @@ def check_patches():
if len(new_patches) + len(removed_patches) + len(changed_patches) > 0:
commandLine = "debian/rules accept-patches"
abiVersion = "abi-version"
- if options.patchVariant:
- commandLine = "PATCHVARIANT=" + options.patchVariant + " " + commandLine
- abiVersion += "." + options.patchVariant
print "Please check, if any of the above changes affects VDR's ABI!"
print "If this is the case, then update %s and run" % abiVersion
print "'%s' to update the snapshot of" % commandLine
@@ -78,7 +69,6 @@ parser = OptionParser()
parser.add_option("-u", "--update", action="store_true", dest="doUpdate", help="updated the list of accepted patches")
parser.add_option("-c", "--check", action="store_true", dest="doCheck", help="check patches")
-parser.add_option("-p", "--patchvariant", dest="patchVariant", help="use a patch variant")
(options, args) = parser.parse_args()
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 267f7f3..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,10 +0,0 @@
-04_newplugin
-06_default_svdrp_port_0
-11_sortrecordings
-12_osdbase-maxitems
-16_channels.conf.terr-fix
-
-81_Make_config
-82_valgrind
-
-99_ncursesw-include
diff --git a/debian/patches/04_newplugin.dpatch b/debian/patches/04_newplugin.patch
similarity index 74%
rename from debian/patches/04_newplugin.dpatch
rename to debian/patches/04_newplugin.patch
index 2e71a73..58bf8bb 100644
--- a/debian/patches/04_newplugin.dpatch
+++ b/debian/patches/04_newplugin.patch
@@ -1,15 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_newplugin.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## Thomas Günther <tom at toms-cafe.de>:
-## - adapted to VDR-1.5.7
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch for the newplugin-script, to not require a normal vdr-source-dir
+Description: Patch for the newplugin-script, to not require a normal
+ vdr-source-dir
+Author: Thomas Schmidt <tschmidt at debian.org>
- at DPATCH@
---- vdr-1.5.7/newplugin
-+++ vdr-1.5.7/newplugin
+Index: vdr/newplugin
+===================================================================
+--- vdr.orig/newplugin 2011-12-10 22:22:04.000000000 +0100
++++ vdr/newplugin 2011-12-11 01:48:22.000000000 +0100
@@ -24,7 +24,7 @@
$PLUGIN_DESCRIPTION = "Enter description for '$PLUGIN_NAME' plugin";
$PLUGIN_MAINENTRY = $PLUGIN_CLASS;
@@ -19,7 +15,7 @@
$README = qq
{This is a "plugin" for the Video Disk Recorder (VDR).
-@@ -159,7 +159,7 @@
+@@ -165,7 +165,7 @@
\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
\@mkdir \$(TMPDIR)/\$(ARCHIVE)
\@cp -a * \$(TMPDIR)/\$(ARCHIVE)
@@ -28,7 +24,7 @@
\@-rm -rf \$(TMPDIR)/\$(ARCHIVE)
\@echo Distribution package created as \$(PACKAGE).tgz
-@@ -311,7 +311,7 @@
+@@ -317,7 +317,7 @@
VDRPLUGINCREATOR(cPlugin$PLUGIN_CLASS); // Don't touch this!
};
@@ -37,7 +33,7 @@
die "The directory $PLUGINS_SRC doesn't exist!\n" unless (-d "$PLUGINS_SRC");
die "A plugin named '$PLUGIN_NAME' already exists in $PLUGINS_SRC!\n" if (-e "$PLUGINDIR");
-@@ -332,7 +332,8 @@
+@@ -338,7 +338,8 @@
* fill in the code skeleton in "$PLUGIN_NAME.c" to implement your plugin function
* add further source files if necessary
* adapt the "Makefile" if necessary
diff --git a/debian/patches/06_default_svdrp_port_0.dpatch b/debian/patches/06_default_svdrp_port_0.dpatch
deleted file mode 100644
index 94f558d..0000000
--- a/debian/patches/06_default_svdrp_port_0.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_default_svdrp_port_0.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## Thomas Günther <tom at toms-cafe.de>:
-## - adapted to VDR-1.7.15
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This sets the default svdrp-port to 0, which means that
-## DP: SVDRP is disabled by default unless someone specifies
-## DP: another port with the --port option when starting vdr
-
- at DPATCH@
---- vdr-1.7.15/vdr.c
-+++ vdr-1.7.15/vdr.c
-@@ -177,7 +177,7 @@
-
- // Command line options:
-
--#define DEFAULTSVDRPPORT 6419
-+#define DEFAULTSVDRPPORT 0
- #define DEFAULTWATCHDOG 0 // seconds
- #define DEFAULTCONFDIR CONFDIR
- #define DEFAULTPLUGINDIR PLUGINDIR
diff --git a/debian/patches/06_default_svdrp_port_0.patch b/debian/patches/06_default_svdrp_port_0.patch
new file mode 100644
index 0000000..b00c000
--- /dev/null
+++ b/debian/patches/06_default_svdrp_port_0.patch
@@ -0,0 +1,18 @@
+Description: This sets the default svdrp-port to 0, which means that
+ SVDRP is disabled by default unless someone specifies
+ another port with the --port option when starting vdr
+Author: Thomas Schmidt <tschmidt at debian.org>
+
+Index: vdr/vdr.c
+===================================================================
+--- vdr.orig/vdr.c 2011-12-10 22:22:04.000000000 +0100
++++ vdr/vdr.c 2011-12-11 01:48:50.000000000 +0100
+@@ -177,7 +177,7 @@
+
+ // Command line options:
+
+-#define DEFAULTSVDRPPORT 6419
++#define DEFAULTSVDRPPORT 0
+ #define DEFAULTWATCHDOG 0 // seconds
+ #define DEFAULTCONFDIR CONFDIR
+ #define DEFAULTPLUGINDIR PLUGINDIR
diff --git a/debian/patches/11_sortrecordings.dpatch b/debian/patches/11_sortrecordings.dpatch
deleted file mode 100644
index ca7c412..0000000
--- a/debian/patches/11_sortrecordings.dpatch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_sortrecordings.dpatch by FrankJepsen at vdrportal.de
-## http://www.jepsennet.de/vdr/download/11_sortrecordings.dpatch
-##
-## Thomas Günther <tom at toms-cafe.de>:
-## - adapted to VDR-1.3.42
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Sort recordings dirs first and by name, recs by date or name (if last
-## DP: char in dir is one of '.-$ª').
-
- at DPATCH@
---- vdrdevel-1.3.24.org/recording.c 2005-05-07 17:25:15.000000000 +0200
-+++ vdrdevel-1.3.24/recording.c 2005-06-17 00:24:44.000000000 +0200
-@@ -445,8 +445,8 @@
- s1 = t;
- }
- t++;
-- }
-- if (s1 && s2)
-+ } *s1 = 255;
-+ if (s1 && s2 && s1 != s && !strchr(".-$ª", *(s1 - 1)))
- memmove(s1 + 1, s2, t - s2 + 1);
- return s;
- }
-@@ -454,7 +454,7 @@
- char *cRecording::SortName(void) const
- {
- if (!sortBuffer) {
-- char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
-+ char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) ));
- strreplace(s, '/', 'a'); // some locales ignore '/' when sorting
- int l = strxfrm(NULL, s, 0) + 1;
- sortBuffer = MALLOC(char, l);
diff --git a/debian/patches/11_sortrecordings.patch b/debian/patches/11_sortrecordings.patch
new file mode 100644
index 0000000..0f10a6c
--- /dev/null
+++ b/debian/patches/11_sortrecordings.patch
@@ -0,0 +1,29 @@
+Description: Sort recordings dirs first and by name, recs by date or name
+ (if last char in dir is one of '.-$ª').
+Author: FrankJepsen at vdrportal.de
+Origin: http://www.jepsennet.de/vdr/download/11_sortrecordings.dpatch
+
+Index: vdr/recording.c
+===================================================================
+--- vdr.orig/recording.c 2011-12-10 22:22:04.000000000 +0100
++++ vdr/recording.c 2011-12-11 01:48:54.000000000 +0100
+@@ -811,8 +811,8 @@
+ s1 = t;
+ }
+ t++;
+- }
+- if (s1 && s2)
++ } *s1 = 255;
++ if (s1 && s2 && s1 != s && !strchr(".-$ª", *(s1 - 1)))
+ memmove(s1 + 1, s2, t - s2 + 1);
+ return s;
+ }
+@@ -820,7 +820,7 @@
+ char *cRecording::SortName(void) const
+ {
+ if (!sortBuffer) {
+- char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
++ char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) ));
+ strreplace(s, '/', 'a'); // some locales ignore '/' when sorting
+ int l = strxfrm(NULL, s, 0) + 1;
+ sortBuffer = MALLOC(char, l);
diff --git a/debian/patches/12_osdbase-maxitems.dpatch b/debian/patches/12_osdbase-maxitems.patch
similarity index 50%
rename from debian/patches/12_osdbase-maxitems.dpatch
rename to debian/patches/12_osdbase-maxitems.patch
index d3d73f2..869cfef 100644
--- a/debian/patches/12_osdbase-maxitems.dpatch
+++ b/debian/patches/12_osdbase-maxitems.patch
@@ -1,18 +1,12 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
+Description: Fixes problems with text2skin skin enigma.
+Author: Andreas Brugger <brougs78 at gmx.net>
+Origin: http://vdrportal.de/board/thread.php?postid=343665#post343665
-## 12_osdbase-maxitems.dpatch by Andreas Brugger <brougs78 at gmx.net>
-##
-## downloaded from http://vdrportal.de/board/thread.php?postid=343665#post343665
-## original filename: vdr-1.3.28-osdbase-maxitems.diff
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes problems with text2skin skin enigma.
-
- at DPATCH@
-diff -Nru vdr_plain/osdbase.c vdr_patched/osdbase.c
---- vdr_plain/osdbase.c 2005-06-18 12:30:51.000000000 +0200
-+++ vdr_patched/osdbase.c 2005-08-07 20:26:55.000000000 +0200
-@@ -261,6 +261,7 @@
+Index: vdr/osdbase.c
+===================================================================
+--- vdr.orig/osdbase.c 2011-12-10 22:22:04.000000000 +0100
++++ vdr/osdbase.c 2011-12-11 01:48:58.000000000 +0100
+@@ -297,6 +297,7 @@
void cOsdMenu::CursorUp(void)
{
@@ -20,7 +14,7 @@ diff -Nru vdr_plain/osdbase.c vdr_patched/osdbase.c
int tmpCurrent = current;
int lastOnScreen = first + displayMenuItems - 1;
int last = Count() - 1;
-@@ -291,6 +292,7 @@
+@@ -335,6 +336,7 @@
void cOsdMenu::CursorDown(void)
{
@@ -28,7 +22,7 @@ diff -Nru vdr_plain/osdbase.c vdr_patched/osdbase.c
int tmpCurrent = current;
int lastOnScreen = first + displayMenuItems - 1;
int last = Count() - 1;
-@@ -323,6 +325,7 @@
+@@ -375,6 +377,7 @@
void cOsdMenu::PageUp(void)
{
@@ -36,9 +30,9 @@ diff -Nru vdr_plain/osdbase.c vdr_patched/osdbase.c
int oldCurrent = current;
int oldFirst = first;
current -= displayMenuItems;
-@@ -357,6 +360,7 @@
+@@ -409,6 +412,7 @@
- void cOsdMenu::PageDown(void)
+ void cOsdMenu::PageDown(void)
{
+ displayMenuItems = displayMenu->MaxItems();
int oldCurrent = current;
diff --git a/debian/patches/16_channels.conf.terr-fix.dpatch b/debian/patches/16_channels.conf.terr-fix.patch
similarity index 50%
rename from debian/patches/16_channels.conf.terr-fix.dpatch
rename to debian/patches/16_channels.conf.terr-fix.patch
index ea809e6..36cd42d 100644
--- a/debian/patches/16_channels.conf.terr-fix.dpatch
+++ b/debian/patches/16_channels.conf.terr-fix.patch
@@ -1,15 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
+Description: Removes Ch 14 fom example channels.conf.terr, because the entry is
+ invalid (reported as Ubuntu Bug #45721)
+Author: Thomas Schmidt <tschmidt at debian.org>
-## 16_channels.conf.terr-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removes Ch 14 fom example channels.conf.terr, because the entry is
-## DP: invalid (reported as Ubuntu Bug #45721)
-
- at DPATCH@
-diff -urNad vdr-1.4.1~/channels.conf.terr vdr-1.4.1/channels.conf.terr
---- vdr-1.4.1~/channels.conf.terr 2005-01-16 16:54:57.000000000 +0100
-+++ vdr-1.4.1/channels.conf.terr 2006-08-13 15:19:13.000000000 +0200
+Index: vdr/channels.conf.terr
+===================================================================
+--- vdr.orig/channels.conf.terr 2011-12-10 22:22:04.000000000 +0100
++++ vdr/channels.conf.terr 2011-12-11 01:49:01.000000000 +0100
@@ -9,7 +9,6 @@
bid-up.tv (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6273:6274:0:0:14272:0:0:0
CBBC (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4671:0:0:0
diff --git a/debian/patches/81_Make_config.dpatch b/debian/patches/81_Make_config.patch
similarity index 71%
rename from debian/patches/81_Make_config.dpatch
rename to debian/patches/81_Make_config.patch
index 03d2896..1a07cf1 100644
--- a/debian/patches/81_Make_config.dpatch
+++ b/debian/patches/81_Make_config.patch
@@ -1,12 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 81_Make_config.dpatch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add Make.config to compile debug versions.
+Description: Add Make.config to compile debug versions.
+Author: Tobias Grimm <vdr at e-tobi.net>
- at DPATCH@
---- vdr-1.7.16/Make.config 1970-01-01 00:00:00.000000000 +0000
-+++ vdr-1.7.16/Make.config
+Index: vdr/Make.config
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr/Make.config 2011-12-11 01:49:05.000000000 +0100
@@ -0,0 +1,30 @@
+#
+# The following compiler settings are required for Debian builds and will be
diff --git a/debian/patches/82_valgrind.dpatch b/debian/patches/82_valgrind.patch
similarity index 69%
rename from debian/patches/82_valgrind.dpatch
rename to debian/patches/82_valgrind.patch
index 335fea7..6f261d2 100644
--- a/debian/patches/82_valgrind.dpatch
+++ b/debian/patches/82_valgrind.patch
@@ -1,20 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 82_valgrind.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## Thomas Günther <tom at toms-cafe.de>:
-## - adapted to VDR-1.7.4
-## - adapted to VDR-1.7.11
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: In order to allow valgrind to find memory leaks in VDR plugins, VDR
-## DP: must not unload the plugin libraries when shutting down. This
-## DP: patch adds a new option -k / --keep-plugins (which is only available
-## DP: in the debug build) to disable plugin unloading.
+Description: In order to allow valgrind to find memory leaks in VDR plugins,
+ VDR must not unload the plugin libraries when shutting down. This patch adds a
+ new option -k / --keep-plugins (which is only available in the debug build)
+ to disable plugin unloading.
+Author: Tobias Grimm <tg at e-tobi.net>
- at DPATCH@
---- vdr-1.7.11/plugin.c
-+++ vdr-1.7.11/plugin.c
-@@ -152,6 +152,10 @@ const char *cPlugin::ConfigDirectory(con
+Index: vdr/plugin.c
+===================================================================
+--- vdr.orig/plugin.c 2011-12-10 22:22:04.000000000 +0100
++++ vdr/plugin.c 2011-12-11 01:49:08.000000000 +0100
+@@ -152,6 +152,10 @@
// --- cDll ------------------------------------------------------------------
@@ -25,7 +19,7 @@
cDll::cDll(const char *FileName, const char *Args)
{
fileName = strdup(FileName);
-@@ -163,8 +167,16 @@ cDll::cDll(const char *FileName, const c
+@@ -163,8 +167,16 @@
cDll::~cDll()
{
delete plugin;
@@ -42,9 +36,11 @@
free(args);
free(fileName);
}
---- vdr-1.7.11/plugin.h
-+++ vdr-1.7.11/plugin.h
-@@ -68,6 +68,9 @@ private:
+Index: vdr/plugin.h
+===================================================================
+--- vdr.orig/plugin.h 2011-12-10 22:22:04.000000000 +0100
++++ vdr/plugin.h 2011-12-11 01:49:08.000000000 +0100
+@@ -68,6 +68,9 @@
void *handle;
cPlugin *plugin;
public:
@@ -54,9 +50,11 @@
cDll(const char *FileName, const char *Args);
virtual ~cDll();
bool Load(bool Log = false);
---- vdr-1.7.11/vdr.c
-+++ vdr-1.7.11/vdr.c
-@@ -226,6 +226,9 @@ int main(int argc, char *argv[])
+Index: vdr/vdr.c
+===================================================================
+--- vdr.orig/vdr.c 2011-12-11 01:48:50.000000000 +0100
++++ vdr/vdr.c 2011-12-11 01:49:08.000000000 +0100
+@@ -228,6 +228,9 @@
{ "grab", required_argument, NULL, 'g' },
{ "help", no_argument, NULL, 'h' },
{ "instance", required_argument, NULL, 'i' },
@@ -66,7 +64,7 @@
{ "lib", required_argument, NULL, 'L' },
{ "lirc", optional_argument, NULL, 'l' | 0x100 },
{ "localedir",required_argument, NULL, 'l' | 0x200 },
-@@ -248,7 +251,7 @@ int main(int argc, char *argv[])
+@@ -251,7 +254,7 @@
};
int c;
@@ -75,7 +73,7 @@
switch (c) {
case 'a': AudioCommand = optarg;
break;
-@@ -282,6 +285,10 @@ int main(int argc, char *argv[])
+@@ -292,6 +295,10 @@
}
fprintf(stderr, "vdr: invalid instance id: %s\n", optarg);
return 2;
@@ -86,7 +84,7 @@
case 'l': {
char *p = strchr(optarg, '.');
if (p)
-@@ -425,6 +432,9 @@ int main(int argc, char *argv[])
+@@ -440,6 +447,9 @@
" or symlinks (default: none, same as -g-)\n"
" -h, --help print this help and exit\n"
" -i ID, --instance=ID use ID as the id of this VDR instance (default: 0)\n"
diff --git a/debian/patches/99_fix-recording-problem-vdr-1.7.20.dpatch b/debian/patches/99_fix-recording-problem-vdr-1.7.20.dpatch
deleted file mode 100644
index 1962822..0000000
--- a/debian/patches/99_fix-recording-problem-vdr-1.7.20.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_fix-recording-problem-vdr-1.7.20.dpatch by Klaus Schmidinger <Klaus.Schmidinger at tvdr.de>
-##
-## DP: Fixes bug in 1.7.20 - should be dropped with >= 1.7.21 !
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/remux.c vdr/remux.c
---- vdr~/remux.c 2011-08-19 23:24:39.000000000 +0200
-+++ vdr/remux.c 2011-08-20 01:37:09.000000000 +0200
-@@ -974,8 +974,10 @@
- payloadUnitOfFrame = (payloadUnitOfFrame + 1) % -framesPerPayloadUnit;
- if (payloadUnitOfFrame != 0 && independentFrame)
- payloadUnitOfFrame = 0;
-- if (payloadUnitOfFrame)
-+ if (payloadUnitOfFrame) {
-+ newPayload = false;
- newFrame = false;
-+ }
- }
- if (framesPerPayloadUnit <= 1)
- scanning = false;
diff --git a/debian/patches/99_ncursesw-include.dpatch b/debian/patches/99_ncursesw-include.dpatch
deleted file mode 100644
index feb554e..0000000
--- a/debian/patches/99_ncursesw-include.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_ncursesw-include.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use ncursesw header file
-
- at DPATCH@
-diff -urNad vdr-1.5.16~/PLUGINS/src/skincurses/skincurses.c vdr-1.5.16/PLUGINS/src/skincurses/skincurses.c
---- vdr-1.5.16~/PLUGINS/src/skincurses/skincurses.c 2008-02-23 11:38:04.000000000 +0100
-+++ vdr-1.5.16/PLUGINS/src/skincurses/skincurses.c 2008-02-28 00:52:23.000000000 +0100
-@@ -6,7 +6,7 @@
- * $Id: skincurses.c 1.22 2008/02/23 10:38:04 kls Exp $
- */
-
--#include <ncurses.h>
-+#include <ncursesw/ncurses.h>
- #include <vdr/osd.h>
- #include <vdr/plugin.h>
- #include <vdr/skins.h>
diff --git a/debian/patches/99_ncursesw-include.patch b/debian/patches/99_ncursesw-include.patch
new file mode 100644
index 0000000..d454520
--- /dev/null
+++ b/debian/patches/99_ncursesw-include.patch
@@ -0,0 +1,16 @@
+Description: Use ncursesw header file
+Author: Tobias Grimm <tg at e-tobi.net>
+
+Index: vdr/PLUGINS/src/skincurses/skincurses.c
+===================================================================
+--- vdr.orig/PLUGINS/src/skincurses/skincurses.c 2011-12-10 22:22:04.000000000 +0100
++++ vdr/PLUGINS/src/skincurses/skincurses.c 2011-12-11 01:49:11.000000000 +0100
+@@ -6,7 +6,7 @@
+ * $Id: skincurses.c 2.7 2011/08/21 11:04:38 kls Exp $
+ */
+
+-#include <ncurses.h>
++#include <ncursesw/ncurses.h>
+ #include <vdr/osd.h>
+ #include <vdr/plugin.h>
+ #include <vdr/skins.h>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4086912
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,10 @@
+04_newplugin.patch
+06_default_svdrp_port_0.patch
+11_sortrecordings.patch
+12_osdbase-maxitems.patch
+16_channels.conf.terr-fix.patch
+
+81_Make_config.patch
+82_valgrind.patch
+
+99_ncursesw-include.patch
diff --git a/debian/rules b/debian/rules
index d713cc0..4bbce9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,17 +12,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-# To use dpatch uncomment the following line and set Build-Depends to dpatch
-DPATCH=yes
-
-ifdef DPATCH
-include /usr/share/dpatch/dpatch.make
-else
-patch:
-patch-stamp:
-unpatch:
-endif
-
TXT2MANPAGES = debian/vdr-dbg.1
MANPAGES = debian/vdrdbg-buildpackage.1 debian/debugvdr.1 debian/vdrleaktest.1
@@ -37,28 +26,16 @@ $(TXT2MANPAGES): %.1: %.1.txt
cat $< | grep -v "^###" | \
eval "`cat $< | grep "^### txt2man" | sed "s/### //"`" >$@
-OOLIST := debian/patches/00list
ABIVERSION := debian/abi-version
-ifdef PATCHVARIANT
- OOLIST := $(OOLIST).$(PATCHVARIANT)
- ABIVERSION := $(ABIVERSION).$(PATCHVARIANT)
- PATCHCHECKOPTION := -p $(PATCHVARIANT)
-endif
-prepare-00list:
+check-patches:
python debian/patchcheck.py -c $(PATCHCHECKOPTION)
- cmp -s $(OOLIST) debian/patches/00list || \
- cp -b --suffix=.save $(OOLIST) debian/patches/00list
-
-restore-00list:
- [ ! -e debian/patches/00list.save ] || \
- mv debian/patches/00list.save debian/patches/00list
accept-patches:
python debian/patchcheck.py -u $(PATCHCHECKOPTION)
configure: configure-stamp
-configure-stamp: prepare-00list patch-stamp
+configure-stamp: check-patches
dh_testdir
touch configure-stamp
@@ -93,8 +70,7 @@ build-stamp: configure-stamp
patchinfo:
sh debian/extract-patchinfo >debian/patchinfo
-clean: clean-patched unpatch restore-00list
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -129,14 +105,6 @@ install: patchinfo build
echo -n "vdr:Provides=" >> debian/vdr.substvars
cat $(ABIVERSION) >> debian/vdr.substvars
install -m644 $(ABIVERSION) $(CURDIR)/debian/vdr-dev/usr/share/vdr-dev/abi-version
-ifdef PATCHVARIANT
- mkdir -p $(CURDIR)/debian/vdr/usr/share/doc/vdr
- mkdir -p $(CURDIR)/debian/vdr-dev/usr/share/doc/vdr-dev
- grep ^opt- $(OOLIST) >$(CURDIR)/debian/vdr/usr/share/doc/vdr/optional-patches.txt
- cp $(CURDIR)/debian/vdr/usr/share/doc/vdr/optional-patches.txt \
- $(CURDIR)/debian/vdr-dev/usr/share/doc/vdr-dev/optional-patches.txt
-endif
-
# Build architecture-independent files here.
binary-indep: build install
@@ -201,5 +169,4 @@ binary-arch: build install
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure \
- clean-patched patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install configure
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list