8 files changed, 7 insertions, 51 deletions

diff --git a/.gitignore b/.gitignore
index 05fcd6ce4..bf6df9ad6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@
 /aclocal.m4
 /libtool
 /libtool.orig
+/changelog-auto
 
 /Makefile
 /Makefile.in
diff --git a/Makefile.am b/Makefile.am
index 72db44e19..6e3c2a418 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,7 +124,6 @@ include watchfrr/subdir.am
 include qpb/subdir.am
 include fpm/subdir.am
 include tools/subdir.am
-include debian/subdir.am
 include solaris/subdir.am
 
 include bgpd/subdir.am
@@ -170,6 +169,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 \
diff --git a/debian/changelog-auto.in b/changelog-auto.in
index 127d7fe14..127d7fe14 100644
--- a/debian/changelog-auto.in
+++ b/changelog-auto.in
diff --git a/configure.ac b/configure.ac
index 7a748e9fd..8ae1a7bbc 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2196,9 +2196,9 @@ AC_CONFIG_FILES([Makefile],[sed -e 's/^#AUTODERP# //' -i Makefile])
 
 AC_CONFIG_FILES([
 	  config.version
+	  changelog-auto
 	  redhat/frr.spec
 	  solaris/Makefile
-	  debian/changelog-auto
 	  alpine/APKBUILD
 	  snapcraft/snapcraft.yaml
 	  lib/version.h
diff --git a/debian/.gitignore b/debian/.gitignore
deleted file mode 100644
index b48b51381..000000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/changelog-auto
diff --git a/debian/changelog b/debian/changelog
index be6099f8d..021c52c2f 120000
--- a/debian/changelog
+++ b/debian/changelog
@@ -1 +1 @@
-changelog-auto
\ No newline at end of file
+../changelog-auto
\ No newline at end of file
diff --git a/debian/subdir.am b/debian/subdir.am
deleted file mode 100644
index 05dd77e62..000000000
--- a/debian/subdir.am
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# debian
-#
-
-EXTRA_DIST += \
-	debian/README.Debian \
-	debian/README.Maintainer \
-	debian/changelog \
-	debian/changelog-auto \
-	debian/compat \
-	debian/control \
-	debian/copyright \
-	debian/rules \
-	debian/source/format \
-	debian/source/lintian-overrides \
-	debian/tests/control \
-	debian/tests/daemons \
-	debian/watchfrr.rc \
-	debian/watch \
-	\
-	debian/frr-dbg.lintian-overrides \
-	debian/frr-doc.doc-base \
-	debian/frr-doc.info \
-	debian/frr-doc.install \
-	debian/frr-doc.lintian-overrides \
-	debian/frr-pythontools.install \
-	debian/frr-pythontools.lintian-overrides \
-	debian/frr-rpki-rtrlib.install \
-	debian/frr-rpki-rtrlib.lintian-overrides \
-	debian/frr-snmp.install \
-	debian/frr-snmp.lintian-overrides \
-	debian/frr.conf \
-	debian/frr.dirs \
-	debian/frr.docs \
-	debian/frr.install \
-	debian/frr.lintian-overrides \
-	debian/frr.logrotate \
-	debian/frr.manpages \
-	debian/frr.pam \
-	debian/frr.postinst \
-	debian/frr.postrm \
-	debian/frr.preinst \
-	debian/frr.prerm \
-	debian/not-installed \
-	# end
diff --git a/tools/tarsource.sh b/tools/tarsource.sh
index a197244f8..673187079 100755
--- a/tools/tarsource.sh
+++ b/tools/tarsource.sh
@@ -233,8 +233,8 @@ gitts="$gitts"
 taropt="$taropt"
 EOF
 	sed -e "s%@VERSION@%$pkgver$extraver%" \
-		< debian/changelog-auto.in \
-		> debian/changelog-auto
+		< changelog-auto.in \
+		> changelog-auto
 	exit 0
 fi