[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.28-1_etobi1-2-g6a5b878

[etobi]

The following commit has been merged in the e-tobi branch:
commit 6a5b8781d8957cb629c778ee41996366751a5e61
Merge: 28103471c37508653bbe996261859a0df26c40a5 51dd132adb7dab21a84baa19e2448b9a7f4b389b
Author: etobi <git at e-tobi.net>
Date:   Thu Jun 7 00:29:50 2012 +0200

    Merge branch 'master' into e-tobi
    
    Conflicts:
    	debian/.vdr-patches
    	debian/patches/series

diff --combined debian/.vdr-patches
index 6b928ad,af2d848..98686e9
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@@ -1,19 -1,10 +1,20 @@@
 -debian/patches/12_osdbase-maxitems.patch:10ab91b6a8619bdb50d37e2de6ec50d0
 -debian/patches/16_channels.conf.terr-fix.patch:933f8daa6bb6d26c711d0ae987a2b03e
 -debian/patches/82_valgrind.patch:27e07a83103317b9bc90ac9b836e2c47
 +debian/patches/opt-20_liemikuutio.patch:0623db6ca26f22d370ed76ac6d33c32b
 +debian/patches/opt-27_ttxtsubs.patch:ca69efb83cc4a6c52756255f3699be5f
 +debian/patches/12_osdbase-maxitems.patch:2c1da1d095dac066237d77f8dedde68d
 +debian/patches/16_channels.conf.terr-fix.patch:d8b141b9ffdbb9841625f1671eacd25d
 +debian/patches/opt-50_graphtft-liemikuutio.patch:0a69b092b9e3b0391c693904aac319c9
 +debian/patches/82_valgrind.patch:02f07d119ac1f7c9112060bdbe105e54
+ debian/patches/fix-gcc-issue.patch:da7db4f1f426823da318956836995667
 -debian/patches/04_newplugin.patch:5877f4f62dab4f3d437d4eef7cae3ac0
 +debian/patches/opt-45_yaepg.patch:cf3dcab06c31c75ae975b6476ea4b426
 +debian/patches/04_newplugin.patch:1caa94c8f161b8f5cee8848ad5ed617c
  debian/patches/99_ncursesw-include.patch:202634ae3e5d18b35edd5d04d2390e01
 +debian/patches/opt-24_jumpplay.patch:c3c55532ea955ced6c5fce27107e7cc1
 +debian/patches/opt-41-x_timer-info.patch:6d2ef9eb7928d8767b003801e0ea383c
 +debian/patches/opt-42-x_MainMenuHooks.patch:35d440930b32c270b8239d3fa55f8f15
  debian/patches/fix-no-hddvbdevice-segfault.patch:51fca90c1a05d8ddfa6a8988c11be6f2
 -debian/patches/06_default_svdrp_port_0.patch:4835f681f185991262a3160146f43f2f
 -debian/patches/11_sortrecordings.patch:3e3a2f988cb7db03f8f56a44012a65f4
 -debian/patches/81_Make_config.patch:76dc4a78d1da16e3e524e41587d0c90d
 +debian/patches/06_default_svdrp_port_0.patch:961fed0d8413e21265d9d9a75910663b
 +debian/patches/opt-50_graphtft.patch:f8a96457c65a5cb3893b0f9425eb26d9
 +debian/patches/opt-37-x_menuorg.patch:6ead4164e6b78018529e6e15c08439dd
 +debian/patches/opt-22-x_edit_marks.patch:8d97ff831572f8942144aae66f99ff0a
 +debian/patches/11_sortrecordings.patch:faf3aa6ba793831039e45090db3ee099
 +debian/patches/81_Make_config.patch:2c8d5f7511ebaaf156fcf96c3310b290
diff --combined debian/patches/series
index 6b213eb,db62469..82dc54e
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -10,41 -10,4 +10,42 @@@
  99_ncursesw-include.patch
  
  fix-no-hddvbdevice-segfault.patch
+ fix-gcc-issue.patch
 +
 +# Patch collection (replaces enAIO).
 +opt-20_liemikuutio.patch
 +
 +# Easy editing of cutting marks
 +# (Requires opt-20_liemikuutio!)
 +opt-22-x_edit_marks.patch
 +
 +# The Jump patch allows automatic jumping over cutting marks.
 +opt-24_jumpplay.patch
 +
 +# Patch needed for the ttxtsubs plugin.
 +opt-27_ttxtsubs.patch
 +
 +# Speed up zapping channels.
 +# opt-29_syncearly.patch
 +
 +# Patch that shows if there is a valid setup value left or right with < and >.
 +# opt-35_setup-show-valid.patch
 +
 +# Patch needed for the menuorg plugin.
 +opt-37-x_menuorg.patch
 +
 +# Patch to show an info, if it is possible to record an event in the timer-info.
 +opt-41-x_timer-info.patch
 +
 +# Patch to allow plugins to replace the VDR mainmenus
 +opt-42-x_MainMenuHooks.patch
 +
 +# Patch needed for the yaepg plugin.
 +opt-45_yaepg.patch
 +
 +# Patch required for the GraphTFT plugin
 +opt-50_graphtft.patch
 +opt-50_graphtft-liemikuutio.patch
 +
 +# Setup for AC3 transfer, QAM_256, disable primary tuner
 +# opt-53_dvbsetup.patch

-- 
vdr packaging repository