Revert "debian: Adjust tarsource.sh to use native debian/changelog"

This reverts commit 4ffb9a4c9d.

.gitignore

@@ -28,7 +28,7 @@
 /aclocal.m4
 /libtool
 /libtool.orig
-/debian/changelog-auto
+/changelog-auto
 
 /Makefile
 /Makefile.in

Makefile.am

@@ -181,6 +181,8 @@ EXTRA_DIST += \
 	m4/README.txt \
 	m4/libtool-whole-archive.patch \
 	config.version \
+	changelog-auto \
+	changelog-auto.in \
 	\
 	python/clidef.py \
 	python/clippy/__init__.py \

configure.ac

@@ -2484,7 +2484,7 @@ AC_CONFIG_FILES([Makefile],[
 
 AC_CONFIG_FILES([
 	  config.version
-	  debian/changelog-auto
+	  changelog-auto
 	  redhat/frr.spec
 	  alpine/APKBUILD
 	  snapcraft/snapcraft.yaml

debian/changelog-auto.in

@@ -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@

doc/developer/frr-release-procedure.rst

@@ -49,14 +49,23 @@ FRR Release Procedure
 
 5. Update Changelog for Debian Packages:
 
-   Update :file:`debian/changelog`:
+   Edit :file:`changelog-auto.in`:
 
-   - Run following with **last** release version number and debian revision
-     (usually -1) as argument to ``dch --newversion VERSION``. For example, if
-     ``<version>`` is ``7.3`` then you will run ``dch --newversion 7.3-1``.
+   - Change last (top of list) entry from ``@VERSION@`` to the **last**
+     released version number. For example, if ``<version>`` is ``7.3`` and the
+     last public release was ``7.2``, you would use ``7.2``, changing the file
+     like so::
 
-   - The ``dch`` will run an editor, and you should add the changelog text below
-     this entry, usually that would be: **New upstream version**.
+        frr (@VERSION@) RELEASED; urgency=medium
+
+     to::
+
+        frr (7.2) RELEASED; urgency=medium
+
+   - Add a new entry to the top of the list with a ``@VERSION@`` tag. Make sure
+     to watch the format.
+
+   - Add the changelog text below this entry.
 
    - Verify the changelog format using ``dpkg-parsechangelog``. In the
      repository root:

tools/tarsource.sh

@@ -234,7 +234,9 @@ DIST_PACKAGE_VERSION="$pkgver$extraver"
 gitts="$gitts"
 taropt="$taropt"
 EOF
-
+	sed -e "s%@VERSION@%$pkgver$extraver%" \
+		< changelog-auto.in \
+		> changelog-auto
 	exit 0
 fi
 
@@ -270,21 +272,25 @@ mv frr-${PACKAGE_VERSION}.tar.$zip "$outdir" || true
 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"
+	mkdir -p "$tmpdir/debian/source"
+	cat debian/changelog > "$tmpdir/debian/changelog"
+	if $adjchangelog; then
+		if grep -q 'autoconf changelog entry' debian/changelog; then
+			tail -n +9 debian/changelog > "$tmpdir/debian/changelog"
+		fi
 	fi
-	cat debian/changelog >> "$tmpdir/debian/changelog"
+	echo '3.0 (quilt)' > "$tmpdir/debian/source/format"
 	DEBVER="`dpkg-parsechangelog -l\"$tmpdir/debian/changelog\" -SVersion`"
 
 	eval $debsrc | tar -cho $taropt \
+		--exclude-vcs --exclude debian/source/format \
 		--exclude debian/changelog \
+		--exclude debian/changelog-auto \
+		--exclude debian/changelog-auto.in \
 		--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
+	tar -uf ../frr_${DEBVER}.debian.tar $taropt -C "$tmpdir" debian/source/format debian/changelog
 
 	test -f ../frr_${DEBVER}.debian.tar.$zip && rm -f ../frr_${DEBVER}.debian.tar.$zip
 	$ziptool ../frr_${DEBVER}.debian.tar