From: David Lamparter <equinox@diac24.net>
Date: Mon, 10 Dec 2018 23:18:12 +0000 (+0100)
Subject: tools/tarsource.sh: create debian changelog
X-Git-Tag: frr-7.0~5^2~30
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=585d1c29d2b5185197812936719907e36eda6180;p=matthieu%2Ffrr.git

tools/tarsource.sh: create debian changelog

Signed-off-by: David Lamparter <equinox@diac24.net>
---

diff --git a/doc/developer/packaging-debian.rst b/doc/developer/packaging-debian.rst
index 1ace8f5f78..8745bf9063 100644
--- a/doc/developer/packaging-debian.rst
+++ b/doc/developer/packaging-debian.rst
@@ -31,21 +31,15 @@ buster.)
 
       sudo mk-build-deps --install debian/control
 
-5. Run ``bootstrap.sh``:
-
-   (This step should be omitted if you are using a "debian" branch, as opposed
-   to the "master", a "stable/X.X" or any other non-"debian" branch.)
+5. Run ``tools/tarsource.sh -V``:
 
    .. code-block:: shell
 
-      ./bootstrap.sh
-      ./configure --with-pkg-extra-version=-MyDebPkgVersion
-
-   .. note::
+      ./tools/tarsource.sh -V
 
-      Configure parameters are not important for the Debian Package building -
-      except the `with-pkg-extra-version` if you want to give the Debian
-      package a specific name to mark your own unoffical build.
+   This script sets up the `debian/changelog-auto` file with proper version
+   information.  If you want to append a local build identifier, look at the
+   `-e` option.
 
 6. Build Debian Package
 
diff --git a/tools/tarsource.sh b/tools/tarsource.sh
index 78efae3577..a197244f84 100755
--- a/tools/tarsource.sh
+++ b/tools/tarsource.sh
@@ -232,6 +232,9 @@ DIST_PACKAGE_VERSION="$pkgver$extraver"
 gitts="$gitts"
 taropt="$taropt"
 EOF
+	sed -e "s%@VERSION@%$pkgver$extraver%" \
+		< debian/changelog-auto.in \
+		> debian/changelog-auto
 	exit 0
 fi