debian: Remove the changelog-auto automation in favor of dch

Signed-off-by: Ondřej Surý <ondrej@sury.org>

diff --git a/.gitignore b/.gitignore
index 8d72eb2224f6158f7c8cfb3a15bfb43fe8ec585f..40f6475a26f66518fbbd573c063ec5b86b35ac1f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,6 @@
 /aclocal.m4
 /libtool
 /libtool.orig
-/debian/changelog-auto
 /test-driver
 /test-suite.log
 

diff --git a/configure.ac b/configure.ac
index 6bdf235f37e5f0cea8c0cea17227948f15e3b05a..c049569283c6f8ed4c34fbab80798cccc108788f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2628,7 +2628,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 (file)
index 86783ee..0000000
--- 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 b57286d5a1ecd57c36ef5d468866dadc736eedaa..e643cf19d4fda656f1afbff20a2904f622c82104 100644 (file)
--- 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 645982eceda782cdec362bbe639910ef482c9adb..b548fb8ac8e7ac2106bad6e63414dc5e497478fe 100755 (executable)
--- 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