absurd git-apply fallback: defend against debian/patches/series being an unusual...

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/absurd/git b/absurd/git
index 039bbf0c6a95033a7f470d5218b3c7667fbeba87..b78ec3b6a71c7503e766917854cf82412347fb26 100755 (executable)
--- a/absurd/git
+++ b/absurd/git
@@ -58,6 +58,7 @@ fi
 
 pwd=`pwd`
 patch=${patch#$pwd/debian/patches/}
 
 pwd=`pwd`
 patch=${patch#$pwd/debian/patches/}

+rm -f debian/patches/series

 printf "%s\n" "$patch" >debian/patches/series
 
 dpkg-source --before-build .
 printf "%s\n" "$patch" >debian/patches/series
 
 dpkg-source --before-build .

diff --git a/debian/changelog b/debian/changelog
index f093fc5133aca95ea1ff7d9b07286b1e22574e4d..14fbbebea9f61c446726c95dd5001b6b71578890 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (2.8~) unstable; urgency=low
 
 dgit (2.8~) unstable; urgency=low
 

-  * 
+  * absurd git-apply fallback: defend against debian/patches/series
+    being an unusual object, in case dpkg-source doesn't.

 
  --
 
 
  --