From b8fa59616955ba49b4ab1fabced9bd3294aa413d Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sat, 28 Nov 2020 19:29:46 -0700
Subject: rebuild-for-athena: invoke 'dgit setup-mergechangelogs'

---
 bin/rebuild-for-athena | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin')

diff --git a/bin/rebuild-for-athena b/bin/rebuild-for-athena
index c62f957e..a4d77255 100755
--- a/bin/rebuild-for-athena
+++ b/bin/rebuild-for-athena
@@ -68,6 +68,7 @@ sub rebuild_for_suite {
             }
         } else {
             $git->checkout($branch);
+	    system "dgit", "setup-mergechangelogs";
             $git->merge($branch_to_build);
             system "dch", "-D$codename", "-l$local",
               "Rebuild for athena's apt repository.";
-- 
cgit v1.2.3