r1079 - in vdr/vdr/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2005-08-28 16:28:14 +0000 (Sun, 28 Aug 2005)
New Revision: 1079

Added:
   vdr/vdr/trunk/debian/patches/11_sortrecordings.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
Log:
vdr: New upstream release 1.3.30+1.3.31, added 11_sortrecordings.dpatch

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-08-28 16:20:07 UTC (rev 1078)
+++ vdr/vdr/trunk/debian/changelog	2005-08-28 16:28:14 UTC (rev 1079)
@@ -1,9 +1,26 @@
-vdr (1.3.29-1) unstable; urgency=low
+vdr (1.3.31-1) unstable; urgency=low
 
-  * NOT YET RELEASED
+  * NOT RELEASED YET
+  
+  * Thomas Schmidt <tschmidt at debian.org>
+    - New upstream release
 
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 28 Aug 2005 18:25:00 +0200
+
+vdr (1.3.30-1) unstable; urgency=low
+
   * Thomas Schmidt <tschmidt at debian.org>
     - New upstream release
+      + Should fix the FTBFS on several arches (closes: #324082)
+    - Added 11_sortrecordings.dpatch, to allow changing the sort-order
+      of the recordings
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat, 27 Aug 2005 19:34:47 +0200
+
+vdr (1.3.29-1) unstable; urgency=low
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - New upstream release
   * Thomas Günther <tom at toms-cafe.de>
     - Improved newplugin script
     - Updated opt-24_jumpplay-0.6.dpatch

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2005-08-28 16:20:07 UTC (rev 1078)
+++ vdr/vdr/trunk/debian/patches/00list	2005-08-28 16:28:14 UTC (rev 1079)
@@ -8,6 +8,7 @@
 08_security_CAN-2005-0071
 09_sort_options
 10_dd-record-option
+11_sortrecordings
 12_osdbase-maxitems
 13_epgfix
 14_update-resume

Added: vdr/vdr/trunk/debian/patches/11_sortrecordings.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/11_sortrecordings.dpatch	2005-08-28 16:20:07 UTC (rev 1078)
+++ vdr/vdr/trunk/debian/patches/11_sortrecordings.dpatch	2005-08-28 16:28:14 UTC (rev 1079)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 11_sortrecordings.dpatch by FrankJepsen at vdrportal.de
+## http://www.jepsennet.de/vdr/download/11_sortrecordings.dpatch
+##
+## 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) ));
+      int l = strxfrm(NULL, s, 0) + 1;
+      sortBuffer = MALLOC(char, l);
+      strxfrm(sortBuffer, s, l);