git-debrebase: fix changelog manip

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

diff --git a/git-debrebase b/git-debrebase
index c89e598f599a713a9903d7dedd159d840426b7d7..9a71bd30e4607039aa79b47307be4e797664356e 100755 (executable)
--- 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