r7052 - in /vdr/vdr/trunk/debian: .vdr-patches.multipatch abi-version abi-version.multipatch abi-version.txt dependencies.sh patchcheck.py patches/00list.multipatch rules vdr-dev.install
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Fri Jul 11 22:41:40 UTC 2008
Author: tiber-guest
Date: Fri Jul 11 22:41:40 2008
New Revision: 7052
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7052
Log:
added support for patchvariants
Added:
vdr/vdr/trunk/debian/.vdr-patches.multipatch
vdr/vdr/trunk/debian/abi-version
vdr/vdr/trunk/debian/abi-version.multipatch
vdr/vdr/trunk/debian/patches/00list.multipatch
Removed:
vdr/vdr/trunk/debian/abi-version.txt
Modified:
vdr/vdr/trunk/debian/dependencies.sh
vdr/vdr/trunk/debian/patchcheck.py
vdr/vdr/trunk/debian/rules
vdr/vdr/trunk/debian/vdr-dev.install
Added: vdr/vdr/trunk/debian/.vdr-patches.multipatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/.vdr-patches.multipatch?rev=7052&op=file
==============================================================================
--- vdr/vdr/trunk/debian/.vdr-patches.multipatch (added)
+++ vdr/vdr/trunk/debian/.vdr-patches.multipatch Fri Jul 11 22:41:40 2008
@@ -1,0 +1,36 @@
+debian/patches/opt-52_hard_link_cutter.dpatch:2a82f643d53300c33da530935c8016a4
+debian/patches/opt-43-x_recordshowfree.dpatch:66152f345b03259d28e89135cda42310
+debian/patches/12_osdbase-maxitems.dpatch:e45d1b62f7d66c3e5d279e3561034107
+debian/patches/11_sortrecordings.dpatch:9ed4cd1e144ee59dab34d4df4aa9af51
+debian/patches/opt-50_graphtft.dpatch:aeba283cc500591fa0b6d112c063fadf
+debian/patches/16_channels.conf.terr-fix.dpatch:72595733d0b46aa4093a640708d19226
+debian/patches/06_default_svdrp_port_0.dpatch:b49237a9ee246acfa01ee7ec92ad0a52
+debian/patches/82_valgrind.dpatch:ebcc8c81559eeea1dc856e472e1f7b56
+debian/patches/opt-42-x_MainMenuHooks.dpatch:1c4c782b5c88c4f0408890a5f50b217b
+debian/patches/opt-44_rotor.dpatch:bbcc27512e0a0b610efadcde8fa67d02
+debian/patches/opt-20_liemikuutio.dpatch:bb8bb6b250b8b2ee24dad87a7c4490f8
+debian/patches/10_dd-record-option.dpatch:56f2327b5930da8d40873b0140f5e051
+debian/patches/09_sort_options.dpatch:3b561fcd7645b216b4dab989d7786fda
+debian/patches/opt-41-x_timer-info.dpatch:92ee6cdf60b795d9fbcf4fdcafe401b4
+debian/patches/opt-24_jumpplay.dpatch:31906df69c18642ddd0996fa0b82a527
+debian/patches/opt-30-x_analogtv.dpatch:3789ff68d9dc9a2482f78519634b27b6
+debian/patches/17_vdr-maintenance-1.6.0-1.dpatch:3a2ff2c6d3b13489c19eda4e32f2537c
+debian/patches/03_cmdsubmenu.dpatch:abff754a3d760764796f06cdf1cf5105
+debian/patches/opt-28_audioindexer.dpatch:eab872310fd03a175b3b93a90d22d5db
+debian/patches/opt-31-x_reelchannelscan.dpatch:f8c06ac51888248f68badcab8533c2be
+debian/patches/81_Make_config.dpatch:dcff6a00ef9474bca19d955d19574009
+debian/patches/opt-51_cuttime.dpatch:cfbf0a7934f109148fef4e385c3eb465
+debian/patches/opt-40_iptv.dpatch:2cca9430e7f83eaf9d25b1e8ca9e5fa7
+debian/patches/14_cap-memsize.dpatch:7beb9bcecb1bdce4a03c1729acfbbdb3
+debian/patches/opt-48-x_pin.dpatch:5e8f7e1b1ad5ed8ac51736d2aed02f9c
+debian/patches/opt-47_sourcecaps.dpatch:626ed6d141802b9cae8c4b6cab97311e
+debian/patches/opt-37-x_menuorg.dpatch:9fb02cc8bd848add50b3866b6f476644
+debian/patches/opt-45_yaepg.dpatch:351c08a687755050e1140766b56dc27b
+debian/patches/opt-27_ttxtsubs.dpatch:c0b18cf05be89d87b0dff02ddeb14f05
+debian/patches/opt-29_syncearly-audioindexer.dpatch:4093d09329d441bd25703a4892633efb
+debian/patches/opt-39_noepg.dpatch:424391fa1176800ec3a13ec608fafcd7
+debian/patches/opt-49-x_pvrinput.dpatch:213c07a003000b6b93f1a8d004787220
+debian/patches/04_newplugin.dpatch:e99f8d21734a19b3eb93d9e3f11b680a
+debian/patches/opt-38_disableDoubleEpgEntrys.dpatch:7899100c3c242d7bcd35f1d3cee9ef9d
+debian/patches/99_ncursesw-include.dpatch:7b5ffe19bfc180049cb32b434b666587
+debian/patches/15_dvbplayer.dpatch:d1f31f0687c917dea48bc0ba26b7f3bb
Added: vdr/vdr/trunk/debian/abi-version
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/abi-version?rev=7052&op=file
==============================================================================
--- vdr/vdr/trunk/debian/abi-version (added)
+++ vdr/vdr/trunk/debian/abi-version Fri Jul 11 22:41:40 2008
@@ -1,0 +1,1 @@
+vdr-abi-1.6.0-debian
Added: vdr/vdr/trunk/debian/abi-version.multipatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/abi-version.multipatch?rev=7052&op=file
==============================================================================
--- vdr/vdr/trunk/debian/abi-version.multipatch (added)
+++ vdr/vdr/trunk/debian/abi-version.multipatch Fri Jul 11 22:41:40 2008
@@ -1,0 +1,1 @@
+vdr-abi-1.6.0-multipatch-2008-07-11
Modified: vdr/vdr/trunk/debian/dependencies.sh
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/dependencies.sh?rev=7052&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/dependencies.sh (original)
+++ vdr/vdr/trunk/debian/dependencies.sh Fri Jul 11 22:41:40 2008
@@ -13,7 +13,7 @@
set -e
-ABI_VERSION=`cat /usr/share/vdr-dev/abi-version.txt`
+ABI_VERSION=`cat /usr/share/vdr-dev/abi-version`
# A plugin requires exactly the VDR ABI version it was compiled for
for p in $(dh_listpackages); do
Modified: vdr/vdr/trunk/debian/patchcheck.py
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patchcheck.py?rev=7052&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patchcheck.py (original)
+++ vdr/vdr/trunk/debian/patchcheck.py Fri Jul 11 22:41:40 2008
@@ -7,9 +7,15 @@
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("debian/patches/00list", "r"):
+ for line in open(file_name_for_patch_variant("debian/patches/00list"), "r"):
match = re.match('^(?!00_)([^#]+)', line.rstrip())
if match:
patchFileName = "debian/patches/" + match.group(1)
@@ -21,14 +27,14 @@
def get_last_patches():
lastPatches = {}
- for line in open(PATCHES_FILE, "r"):
+ for line in open(file_name_for_patch_variant(PATCHES_FILE), "r"):
match = re.match('(.+):(.+)', line.rstrip())
if match:
lastPatches[match.group(1)] = match.group(2)
return lastPatches
def update_patchlist():
- patchListFile = open(PATCHES_FILE, "w")
+ patchListFile = open(file_name_for_patch_variant(PATCHES_FILE), "w")
patches = get_active_patches()
for fileName in patches:
patchListFile.write(fileName + ":" + patches[fileName] + "\n")
@@ -53,9 +59,14 @@
report_patches(changed_patches, "The following patches have been modified:")
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 abi-version.txt and run"
- print "'python debian/patchcheck.py -u' to update the snapshot of"
+ print "If this is the case, then update %s and run" % abiVersion
+ print "'%s' to update the snapshot of" % commandLine
print "the current patch level."
exit(1)
@@ -67,6 +78,7 @@
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()
Added: vdr/vdr/trunk/debian/patches/00list.multipatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/00list.multipatch?rev=7052&op=file
==============================================================================
--- vdr/vdr/trunk/debian/patches/00list.multipatch (added)
+++ vdr/vdr/trunk/debian/patches/00list.multipatch Fri Jul 11 22:41:40 2008
@@ -1,0 +1,88 @@
+03_cmdsubmenu
+04_newplugin
+06_default_svdrp_port_0
+09_sort_options
+10_dd-record-option
+11_sortrecordings
+12_osdbase-maxitems
+14_cap-memsize
+15_dvbplayer
+16_channels.conf.terr-fix
+17_vdr-maintenance-1.6.0-1
+
+81_Make_config
+82_valgrind
+
+99_ncursesw-include
+
+# Patch collection (replaces enAIO).
+opt-20_liemikuutio
+
+# The Jump patch allows automatic jumping over cutting marks.
+opt-24_jumpplay
+
+# Patch needed for the ttxtsubs plugin.
+opt-27_ttxtsubs
+
+# Fixes length calculation for radio recordings
+opt-28_audioindexer
+
+# Speed up zapping channels.
+# opt-29_syncearly
+opt-29_syncearly-audioindexer
+
+# Patch needed for the analogtv plugin.
+opt-30-x_analogtv
+
+# Makes VDR aware of the reelchannelscan plugin
+opt-31-x_reelchannelscan
+
+# Patch that shows if there is a valid setup value left or right with < and >.
+# opt-35_setup-show-valid
+
+# Patch needed for the menuorg plugin.
+opt-37-x_menuorg
+
+# Patch that suppresses double EPG entries.
+opt-38_disableDoubleEpgEntrys
+
+# Patch to disable normal epg update for specified channels.
+opt-39_noepg
+
+# Patch required by the IPTV plugin
+opt-40_iptv
+
+# Patch to show an info, if it is possible to record an event in the timer-info.
+opt-41-x_timer-info
+
+# Patch to allow plugins to replace the VDR mainmenus
+opt-42-x_MainMenuHooks
+
+# Shows remaining recording capacity in recordings menu.
+# (Requires opt-41-x_timer-info !)
+opt-43-x_recordshowfree
+
+# Patch needed for the rotor plugin.
+opt-44_rotor
+
+# Patch needed for the yaepg plugin.
+opt-45_yaepg
+
+# Patch for assigning special satellites to one dvb card.
+opt-47_sourcecaps
+
+# Patch for the PIN plugin
+opt-48-x_pin
+
+# Patch for the pvrinput plugin
+opt-49-x_pvrinput
+
+# Patch required for the GraphTFT plugin
+opt-50_graphtft
+
+# Modifies the start time of recordings to the first cutting mark
+# (disabled by default - enable in VDR's recording setup)
+opt-51_cuttime
+
+# Records into smaller files and uses hardlinks to speed up cutting
+opt-52_hard_link_cutter
Modified: vdr/vdr/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/rules?rev=7052&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/rules (original)
+++ vdr/vdr/trunk/debian/rules Fri Jul 11 22:41:40 2008
@@ -37,8 +37,27 @@
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:
+ python debian/patchcheck.py -c $(PATCHCHECKOPTION)
+ [ "$(OOLIST)" == "debian/patches/00list" ] || \
+ cp -b $(OOLIST) debian/patches/00list
+
+restore-00list:
+ [ ! -e debian/patches/00list~ ] || mv debian/patches/00list~ debian/patches/00list
+
+accept-patches:
+ python debian/patchcheck.py -u $(PATCHCHECKOPTION)
+
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: prepare-00list patch-stamp
dh_testdir
touch configure-stamp
@@ -68,10 +87,9 @@
touch build-stamp
patchinfo:
- python debian/patchcheck.py -c
sh debian/extract-patchinfo >debian/patchinfo
-clean: clean-patched unpatch
+clean: clean-patched unpatch restore-00list
clean-patched:
dh_testdir
dh_testroot
@@ -98,7 +116,8 @@
install -D PLUGINS/src/$$example/README $(CURDIR)/debian/vdr-plugin-examples/usr/share/doc/vdr-plugin-examples/README.$$example; \
done
echo -n "vdr:Provides=" >> debian/vdr.substvars
- cat debian/abi-version.txt >> debian/vdr.substvars
+ cat $(ABIVERSION) >> debian/vdr.substvars
+ install -m644 $(ABIVERSION) $(CURDIR)/debian/vdr-dev/usr/share/vdr-dev/abi-version
# Build architecture-independent files here.
Modified: vdr/vdr/trunk/debian/vdr-dev.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/vdr-dev.install?rev=7052&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/vdr-dev.install (original)
+++ vdr/vdr/trunk/debian/vdr-dev.install Fri Jul 11 22:41:40 2008
@@ -15,4 +15,3 @@
Make.config usr/include/vdr/
debian/make-special-vdr.sh usr/share/vdr-dev/
-debian/abi-version.txt usr/share/vdr-dev/
More information about the pkg-vdr-dvb-changes
mailing list