[SCM] vdr packaging repository branch, master, updated. debian/1.7.22-1-4-g5d72282

[Darren Salt]

The following commit has been merged in the master branch:
commit 5d722823dbcb0f4d4630432de9a6da5b890c84d8
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Tue Jan 24 22:19:44 2012 +0000

    Show more of the channel names in the EPG now/next listings.
    Without this, I see 'BBC ON', BBC TW', 'ITV1', 'Channe', 'Channe' etc.

diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 9bd74bc..be7a42d 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,8 +1,9 @@
 debian/patches/12_osdbase-maxitems.patch:f6fc7c5a100f8e891280195b3e1d69ba
 debian/patches/16_channels.conf.terr-fix.patch:933f8daa6bb6d26c711d0ae987a2b03e
-debian/patches/82_valgrind.patch:60ad50e72eabb0861d096d1002fddca7
+debian/patches/17_epg_channel_name_width.patch:12180ba935fa7834f818fcae9e0ed182
 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 6037d45..2477e3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,12 @@ vdr (1.7.23-1) unstable; urgency=low
 
   * New upstream release
 
- -- Tobias Grimm <etobi at debian.org>  Sun, 15 Jan 2012 20:50:20 +0100
+  [Darren Salt]
+  * 17_epg_channel_name_width.patch
+    Show more of the channel names in the EPG now/next listings.
+    Without this, I see 'BBC ON', BBC TW', 'ITV1', 'Channe', 'Channe' etc.
+
+ -- Tobias Grimm <etobi at debian.org>  Tue, 24 Jan 2012 22:17:29 +0000
 
 vdr (1.7.22-1) unstable; urgency=low
 
diff --git a/debian/patches/17_epg_channel_name_width.patch b/debian/patches/17_epg_channel_name_width.patch
new file mode 100644
index 0000000..0eb1057
--- /dev/null
+++ b/debian/patches/17_epg_channel_name_width.patch
@@ -0,0 +1,20 @@
+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 4086912..caca8ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
 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