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

[etobi]

The following commit has been merged in the e-tobi branch:
commit f782b62e2d0b9b1b9a5d38c86b82ebe6a466905a
Author: etobi <git at e-tobi.net>
Date:   Wed Mar 28 20:07:00 2012 +0200

    Dropped 17_epg_channel_name_width.patch - fixed upstream

diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index be7a42d..95721ab 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,9 +1,8 @@
-debian/patches/12_osdbase-maxitems.patch:f6fc7c5a100f8e891280195b3e1d69ba
+debian/patches/12_osdbase-maxitems.patch:10ab91b6a8619bdb50d37e2de6ec50d0
 debian/patches/16_channels.conf.terr-fix.patch:933f8daa6bb6d26c711d0ae987a2b03e
-debian/patches/17_epg_channel_name_width.patch:12180ba935fa7834f818fcae9e0ed182
+debian/patches/82_valgrind.patch:60ad50e72eabb0861d096d1002fddca7
 debian/patches/04_newplugin.patch:5877f4f62dab4f3d437d4eef7cae3ac0
 debian/patches/99_ncursesw-include.patch:9bafeb768f7921015a5bab5e47786950
-debian/patches/82_valgrind.patch:60ad50e72eabb0861d096d1002fddca7
 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 66b8951..730d937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 vdr (1.7.27-1) unstable; urgency=low
 
   * New upstream release
+  * Dropped 17_epg_channel_name_width.patch - fixed upstream
 
  -- Tobias Grimm <etobi at debian.org>  Wed, 28 Mar 2012 19:57:27 +0200
 
diff --git a/debian/patches/12_osdbase-maxitems.patch b/debian/patches/12_osdbase-maxitems.patch
index 869cfef..204680b 100644
--- a/debian/patches/12_osdbase-maxitems.patch
+++ b/debian/patches/12_osdbase-maxitems.patch
@@ -4,9 +4,9 @@ Origin: http://vdrportal.de/board/thread.php?postid=343665#post343665
 
 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 @@
+--- vdr.orig/osdbase.c	2012-03-11 21:54:10.000000000 +0100
++++ vdr/osdbase.c	2012-03-28 20:00:48.000000000 +0200
+@@ -312,6 +312,7 @@
  
  void cOsdMenu::CursorUp(void)
  {
@@ -14,7 +14,7 @@ Index: vdr/osdbase.c
    int tmpCurrent = current;
    int lastOnScreen = first + displayMenuItems - 1;
    int last = Count() - 1;
-@@ -335,6 +336,7 @@
+@@ -350,6 +351,7 @@
  
  void cOsdMenu::CursorDown(void)
  {
@@ -22,7 +22,7 @@ Index: vdr/osdbase.c
    int tmpCurrent = current;
    int lastOnScreen = first + displayMenuItems - 1;
    int last = Count() - 1;
-@@ -375,6 +377,7 @@
+@@ -390,6 +392,7 @@
  
  void cOsdMenu::PageUp(void)
  {
@@ -30,7 +30,7 @@ Index: vdr/osdbase.c
    int oldCurrent = current;
    int oldFirst = first;
    current -= displayMenuItems;
-@@ -409,6 +412,7 @@
+@@ -424,6 +427,7 @@
  
  void cOsdMenu::PageDown(void)
  {
diff --git a/debian/patches/17_epg_channel_name_width.patch b/debian/patches/17_epg_channel_name_width.patch
deleted file mode 100644
index 0eb1057..0000000
--- a/debian/patches/17_epg_channel_name_width.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Show more of the channel names in the EPG now/next listings.
- Without this, I see 'BBC ON', BBC TW', 'ITV1', 'Channe', 'Channe' etc.
-Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
-
-diff --git a/menu.c b/menu.c
-index eb07c81..739e18a 100644
---- a/menu.c
-+++ b/menu.c
-@@ -1340,9 +1340,9 @@ bool cMenuScheduleItem::Update(bool Force)
-      const char *csn = channel ? channel->ShortName(true) : NULL;
-      cString eds = event->GetDateString();
-      if (channel && withDate)
--        buffer = cString::sprintf("%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
-+        buffer = cString::sprintf("%d\t%.*s\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 16), csn, Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
-      else if (channel)
--        buffer = cString::sprintf("%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 6), csn, *event->GetTimeString(), t, v, r, event->Title());
-+        buffer = cString::sprintf("%d\t%.*s\t%s\t%c%c%c\t%s", channel->Number(), Utf8SymChars(csn, 16), csn, *event->GetTimeString(), t, v, r, event->Title());
-      else
-         buffer = cString::sprintf("%.*s\t%s\t%c%c%c\t%s", Utf8SymChars(eds, 6), *eds, *event->GetTimeString(), t, v, r, event->Title());
-      SetText(buffer);
diff --git a/debian/patches/series b/debian/patches/series
index caca8ca..4086912 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
 11_sortrecordings.patch
 12_osdbase-maxitems.patch
 16_channels.conf.terr-fix.patch
-17_epg_channel_name_width.patch
 
 81_Make_config.patch
 82_valgrind.patch

-- 
vdr packaging repository