[SCM] vdr packaging repository branch, master, updated. upstream/2.0.0-496-g96a9a6e

[etobi]

The following commit has been merged in the master branch:
commit 96a9a6e87cc41f1eb1cab06daa1600a11881c941
Author: Lars Hanisch <dvb at flensrocker.de>
Date:   Sun Apr 7 00:09:24 2013 +0200

    Fixed collection of patch info to work with quilt patches

diff --git a/debian/changelog b/debian/changelog
index 075bb98..0b5bb82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ vdr (2.0.0-1) UNRELEASED; urgency=low
   * Added upstream fix vdr-2.0.0-fixkeeptracksinit.diff
   * Simplified the commands loader and dropped the ordering via
     order.reccmds.conf / order.commands.conf
+  * Fixed collection of patch info to work with quilt patches
 
  -- Tobias Grimm <etobi at debian.org>  Sun, 31 Mar 2013 13:41:03 +0200
 
diff --git a/debian/extract-patchinfo b/debian/extract-patchinfo
index 890f61a..2a940a3 100644
--- a/debian/extract-patchinfo
+++ b/debian/extract-patchinfo
@@ -2,9 +2,9 @@
 
 print_patch()
 {
-    author=`dpatch cat --author-only $1`
+    author=`quilt header $1 | grep -e '^Author' | cut -d : -f 2`
     patch_name=`echo $1 | sed 's/[^_]*_\(.*\)/\1/'`
-    patch_description=`dpatch cat --no-meta $patch` 
+    patch_description=`quilt header $1 | grep -e '^Description' | cut -d : -f 2`
     echo $patch_name:
     if [ ! -z "$author" ] ; then
        echo "    $author"
@@ -20,7 +20,7 @@ echo "Patches applied to vanilla vdr sources"
 echo "--------------------------------------"
 echo
 
-patches_applied=`dpatch list-all`
+patches_applied=`quilt series |  sed 's/\(.*\)\.patch/\1/'`
 for patch in $patches_applied ; do
     print_patch $patch
 done
@@ -30,7 +30,7 @@ echo "Patches available in source package, but not active"
 echo "---------------------------------------------------"
 echo
 
-patches_available=`find debian/patches -name *.dpatch -printf "%f\n" | sed 's/\(.*\)\.dpatch/\1/'`
+patches_available=`find debian/patches -name *.patch -printf "%f\n" | sed 's/\(.*\)\.patch/\1/'`
 for patch in $patches_available ; do
     is_applied="no"
 

-- 
vdr packaging repository