From 818981d4039f9212bb0b8e7345c79bd460f55c96 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Fri, 7 Dec 2018 22:33:57 +0100 Subject: [PATCH] debian: move changelog out of the way The official Debian package will have a manually maintained changelog in place of the symlink. Signed-off-by: David Lamparter --- configure.ac | 2 +- debianpkg/.gitignore | 2 +- debianpkg/changelog | 1 + debianpkg/{changelog.in => changelog-auto.in} | 0 debianpkg/subdir.am | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) create mode 120000 debianpkg/changelog rename debianpkg/{changelog.in => changelog-auto.in} (100%) diff --git a/configure.ac b/configure.ac index 0d75f7d319..7bc7d0d4a8 100755 --- a/configure.ac +++ b/configure.ac @@ -2169,7 +2169,7 @@ AC_CONFIG_FILES([ config.version redhat/frr.spec solaris/Makefile - debianpkg/changelog + debianpkg/changelog-auto alpine/APKBUILD snapcraft/snapcraft.yaml lib/version.h diff --git a/debianpkg/.gitignore b/debianpkg/.gitignore index 6d10dce740..b48b513813 100644 --- a/debianpkg/.gitignore +++ b/debianpkg/.gitignore @@ -1 +1 @@ -changelog +/changelog-auto diff --git a/debianpkg/changelog b/debianpkg/changelog new file mode 120000 index 0000000000..be6099f8d4 --- /dev/null +++ b/debianpkg/changelog @@ -0,0 +1 @@ +changelog-auto \ No newline at end of file diff --git a/debianpkg/changelog.in b/debianpkg/changelog-auto.in similarity index 100% rename from debianpkg/changelog.in rename to debianpkg/changelog-auto.in diff --git a/debianpkg/subdir.am b/debianpkg/subdir.am index 0a48ac7c35..196363c68b 100644 --- a/debianpkg/subdir.am +++ b/debianpkg/subdir.am @@ -6,6 +6,7 @@ EXTRA_DIST += \ debianpkg/README.Debian \ debianpkg/README.Maintainer \ debianpkg/changelog \ + debianpkg/changelog-auto \ debianpkg/compat \ debianpkg/control \ debianpkg/copyright \ -- 2.39.5