diff options
| author | David Lamparter <equinox@diac24.net> | 2018-12-07 22:33:57 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2019-02-19 21:30:53 +0100 |
| commit | 93b389bb9ebdcae0f598d2f48110149cb50e2854 (patch) | |
| tree | 67a6b5f4c892e4682e5300190bdb58e470b17c7d | |
| parent | 98b429c40bb96d6fa9b304aceb606e050a6fe657 (diff) | |
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 <equinox@diac24.net>
| -rwxr-xr-x | configure.ac | 2 | ||||
| -rw-r--r-- | debianpkg/.gitignore | 2 | ||||
| l--------- | debianpkg/changelog | 1 | ||||
| -rw-r--r-- | debianpkg/changelog-auto.in (renamed from debianpkg/changelog.in) | 0 | ||||
| -rw-r--r-- | debianpkg/subdir.am | 1 |
5 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 488a1380b2..710c5e9a52 100755 --- a/configure.ac +++ b/configure.ac @@ -2198,7 +2198,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 index 127d7fe147..127d7fe147 100644 --- a/debianpkg/changelog.in +++ b/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 \ |