From 02dfaaf5643c2684c1709a37f91f73b9065b43a0 Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@diac24.net>
Date: Fri, 14 Dec 2018 16:08:25 +0100
Subject: [PATCH] debian: cleanly split off from dist tarball

The debian/ directory is distributed separately for tarballs in 3.0
(quilt) format.  Including it in the dist tarball causes problems with
automake when the separately distributed debian directory is unpacked on
top of the dist tarball;  the clean and correct thing to do here is to
not include the debian/ directory in dist tarballs.

Users have two choices for building FRR Debian packages:
- build straight off git
- build from a "frr.tar" + "frr-debian.tar"

The tarsource.sh tool does the right thing when invoked with the -D
("Debian") option.

Signed-off-by: David Lamparter <equinox@diac24.net>
---
 .gitignore                                    |  1 +
 Makefile.am                                   |  3 +-
 debian/changelog-auto.in => changelog-auto.in |  0
 configure.ac                                  |  2 +-
 debian/.gitignore                             |  1 -
 debian/changelog                              |  2 +-
 debian/subdir.am                              | 45 -------------------
 tools/tarsource.sh                            |  4 +-
 8 files changed, 7 insertions(+), 51 deletions(-)
 rename debian/changelog-auto.in => changelog-auto.in (100%)
 delete mode 100644 debian/.gitignore
 delete mode 100644 debian/subdir.am

diff --git a/.gitignore b/.gitignore
index ad3e3c80e0..54f5bd8f73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@
 /conftest.err
 /aclocal.m4
 /libtool
+/changelog-auto
 
 /Makefile
 /Makefile.in
diff --git a/Makefile.am b/Makefile.am
index ac9f73081c..5be32649fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,7 +118,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
@@ -160,6 +159,8 @@ EXTRA_DIST += \
 	README.md \
 	m4/README.txt \
 	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
similarity index 100%
rename from debian/changelog-auto.in
rename to changelog-auto.in
diff --git a/configure.ac b/configure.ac
index 92121fda86..7e07fabf8b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2013,9 +2013,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 b48b513813..0000000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/changelog-auto
diff --git a/debian/changelog b/debian/changelog
index be6099f8d4..021c52c2f3 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 05dd77e62c..0000000000
--- 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 a197244f84..673187079d 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
 
-- 
2.39.5