From 3fdad08cc0d365364b9075e02261c5941bfe3cf5 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 31 Jan 2018 15:31:16 +0000
Subject: [PATCH 1/1] git-debrebase: fix changelog manip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/git-debrebase b/git-debrebase
index c89e598f..9a71bd30 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -967,8 +967,9 @@ sub cmd_new_upstream_v0 () {
 	# Now we have to add a changelog stanza so the Debian version
 	# is right.
 	die if unlink "debian";
-	die $! unless $!==ENOTEMPTY;
-	unlink "debian/changelog" or die $!;
+	die $! unless $!==ENOENT or $!==ENOTEMPTY;
+	unlink "debian/changelog" or $!==ENOENT or die $!;
+        mkdir "debian" or die $!;
 	open CN, ">", "debian/changelog" or die $!;
 	my $oldclog = git_cat_file ":debian/changelog";
 	$oldclog =~ m/^($package_re) \(\S+\) / or
-- 
2.30.2