From cace1d9bf178d447599fe7caa5ccad9a89babe03 Mon Sep 17 00:00:00 2001
From: Ondřej Surý <ondrej@sury.org>
Date: Sun, 27 Sep 2020 11:46:31 +0200
Subject: debian: Remove the changelog-auto automation in favor of dch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ondřej Surý <ondrej@sury.org>
---
 .gitignore                         |  1 -
 configure.ac                       |  1 -
 debian/changelog-auto.in           |  7 -------
 doc/developer/packaging-debian.rst |  9 +++------
 tools/tarsource.sh                 | 11 +++++------
 5 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 debian/changelog-auto.in

diff --git a/.gitignore b/.gitignore
index 974d13ce8..da48308bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,6 @@
 /aclocal.m4
 /libtool
 /libtool.orig
-/debian/changelog-auto
 
 /Makefile
 /Makefile.in
diff --git a/configure.ac b/configure.ac
index b98105322..f4af2366f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2484,7 +2484,6 @@ AC_CONFIG_FILES([Makefile],[
 
 AC_CONFIG_FILES([
 	  config.version
-	  debian/changelog-auto
 	  redhat/frr.spec
 	  alpine/APKBUILD
 	  snapcraft/snapcraft.yaml
diff --git a/debian/changelog-auto.in b/debian/changelog-auto.in
deleted file mode 100644
index 86783eee3..000000000
--- a/debian/changelog-auto.in
+++ /dev/null
@@ -1,7 +0,0 @@
-frr (@VERSION@-0) UNRELEASED; urgency=medium
-
-  * autoconf changelog entry -- for git autobuilds only.
-    remove and replace when creating releases!
-    (tools/tarsource.sh will handle this)
-
- -- FRRouting-Dev <dev@lists.frrouting.org>  @DATE@
diff --git a/doc/developer/packaging-debian.rst b/doc/developer/packaging-debian.rst
index b57286d5a..e643cf19d 100644
--- a/doc/developer/packaging-debian.rst
+++ b/doc/developer/packaging-debian.rst
@@ -35,14 +35,11 @@ buster.)
    Alternatively, you can manually install build dependencies for your
    platform as outlined in :ref:`building`.
 
-4. Run ``tools/tarsource.sh -V``:
+4. Install `git-buildpackage` package:
 
    .. code-block:: shell
 
-      ./tools/tarsource.sh -V
-
-   This script sets up the ``debian/changelog-auto`` file with proper version
-   information.
+      sudo apt-get install git-buildpackage
 
 5. (optional) Append a distribution identifier if needed (see below under
    :ref:`multi-dist`.)
@@ -51,7 +48,7 @@ buster.)
 
    .. code-block:: shell
 
-      dpkg-buildpackage $options
+      gbp-buildpackage --git-builder=debuild $options
 
    Where `$options` may contain any or all of the following items:
 
diff --git a/tools/tarsource.sh b/tools/tarsource.sh
index 645982ece..b548fb8ac 100755
--- a/tools/tarsource.sh
+++ b/tools/tarsource.sh
@@ -271,17 +271,16 @@ lsfiles="frr-${PACKAGE_VERSION}.tar.$zip"
 
 if $debian; then
 	if ! $adjchangelog; then
-		GIT_DATE=$(git log --format=format:%ad -1 --date=rfc)
-		sed -e "s/@DATE@/$GIT_DATE/" \
-			< debian/changelog-auto \
-			> "$tmpdir/debian/changelog"
+		dch --force-bad-version \
+		    --force-distribution \
+		    --preserve \
+		    --newversion "$DEBVER" \
+		    "autoconf changelog entry -- for git autobuilds only."
 	fi
 	cat debian/changelog >> "$tmpdir/debian/changelog"
 	DEBVER="`dpkg-parsechangelog -l\"$tmpdir/debian/changelog\" -SVersion`"
 
 	eval $debsrc | tar -cho $taropt \
-		--exclude debian/changelog \
-		--exclude debian/subdir.am \
 		-T - -f ../frr_${DEBVER}.debian.tar
 	# add specially prepared files from above
 	tar -uf ../frr_${DEBVER}.debian.tar $taropt -C "$tmpdir" debian/changelog
-- 
cgit v1.2.3