debian->debianpkg: Move debian files from debian dir to debianpkg dir.

Debian build systems use debian subdir for building and having a debian
dir in the source package causes issues.
Moving it to debianpkg avoids the issue and allows us to ship debian
package files in the source distribution

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

64 files changed, 3 insertions, 4 deletions

diff --git a/Makefile.am b/Makefile.am
index ec633c83d5..7aeb91be5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \
 DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \
 	  isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \
 	  solaris pimd @LIBRFP@ @RFPTEST@ tools cumulus snapcraft \
-	  debian
+	  debianpkg
 
 EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \
 	update-autotools \
diff --git a/configure.ac b/configure.ac
index 1e84929b3a..7132d30b73 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1598,7 +1598,7 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile
 	  pimd/Makefile
 	  redhat/Makefile
 	  tools/Makefile
-	  debian/Makefile
+	  debianpkg/Makefile
 	  cumulus/Makefile
 	  pkgsrc/Makefile
 	  fpm/Makefile
diff --git a/debian/Makefile.am b/debianpkg/Makefile.am
index 6078b6a1f4..6078b6a1f4 100644
--- a/debian/Makefile.am
+++ b/debianpkg/Makefile.am
diff --git a/debian/README.Debian b/debianpkg/README.Debian
index 4cf35d7e32..4cf35d7e32 100644
--- a/debian/README.Debian
+++ b/debianpkg/README.Debian
diff --git a/debian/README.Maintainer b/debianpkg/README.Maintainer
index aa8ac0cf35..aa8ac0cf35 100644
--- a/debian/README.Maintainer
+++ b/debianpkg/README.Maintainer
diff --git a/debian/backports/.gitignore b/debianpkg/backports/.gitignore
index 3b20d26891..3b20d26891 100644
--- a/debian/backports/.gitignore
+++ b/debianpkg/backports/.gitignore
diff --git a/debian/backports/README b/debianpkg/backports/README
index efd322e1d9..efd322e1d9 100644
--- a/debian/backports/README
+++ b/debianpkg/backports/README
diff --git a/debian/backports/rules b/debianpkg/backports/rules
index 63bbedf777..63bbedf777 100644
--- a/debian/backports/rules
+++ b/debianpkg/backports/rules
diff --git a/debian/backports/ubuntu12.04/debian/control b/debianpkg/backports/ubuntu12.04/debian/control
index 31862f4099..31862f4099 120000
--- a/debian/backports/ubuntu12.04/debian/control
+++ b/debianpkg/backports/ubuntu12.04/debian/control
diff --git a/debian/backports/ubuntu12.04/debian/frr.install b/debianpkg/backports/ubuntu12.04/debian/frr.install
index 83ecca5958..83ecca5958 120000
--- a/debian/backports/ubuntu12.04/debian/frr.install
+++ b/debianpkg/backports/ubuntu12.04/debian/frr.install
diff --git a/debian/backports/ubuntu12.04/debian/frr.postinst b/debianpkg/backports/ubuntu12.04/debian/frr.postinst
index d4c33cd5cd..d4c33cd5cd 100644
--- a/debian/backports/ubuntu12.04/debian/frr.postinst
+++ b/debianpkg/backports/ubuntu12.04/debian/frr.postinst
diff --git a/debian/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules
index 34528d54b7..34528d54b7 100644
--- a/debian/backports/ubuntu12.04/debian/rules
+++ b/debianpkg/backports/ubuntu12.04/debian/rules
diff --git a/debian/backports/ubuntu12.04/debian/source/format b/debianpkg/backports/ubuntu12.04/debian/source/format
index 163aaf8d82..163aaf8d82 100644
--- a/debian/backports/ubuntu12.04/debian/source/format
+++ b/debianpkg/backports/ubuntu12.04/debian/source/format
diff --git a/debian/backports/ubuntu12.04/exclude b/debianpkg/backports/ubuntu12.04/exclude
index e69de29bb2..e69de29bb2 100644
--- a/debian/backports/ubuntu12.04/exclude
+++ b/debianpkg/backports/ubuntu12.04/exclude
diff --git a/debian/backports/ubuntu12.04/versionext b/debianpkg/backports/ubuntu12.04/versionext
index 0a8f3c956e..0a8f3c956e 100644
--- a/debian/backports/ubuntu12.04/versionext
+++ b/debianpkg/backports/ubuntu12.04/versionext
diff --git a/debian/backports/ubuntu14.04/debian/control b/debianpkg/backports/ubuntu14.04/debian/control
index c05cdd04f8..c05cdd04f8 100644
--- a/debian/backports/ubuntu14.04/debian/control
+++ b/debianpkg/backports/ubuntu14.04/debian/control
diff --git a/debian/backports/ubuntu14.04/debian/frr.install b/debianpkg/backports/ubuntu14.04/debian/frr.install
index 147d15279f..147d15279f 100644
--- a/debian/backports/ubuntu14.04/debian/frr.install
+++ b/debianpkg/backports/ubuntu14.04/debian/frr.install
diff --git a/debian/backports/ubuntu14.04/debian/rules b/debianpkg/backports/ubuntu14.04/debian/rules
index 84d4b177c8..84d4b177c8 100644
--- a/debian/backports/ubuntu14.04/debian/rules
+++ b/debianpkg/backports/ubuntu14.04/debian/rules
diff --git a/debian/backports/ubuntu14.04/debian/source/format b/debianpkg/backports/ubuntu14.04/debian/source/format
index 163aaf8d82..163aaf8d82 100644
--- a/debian/backports/ubuntu14.04/debian/source/format
+++ b/debianpkg/backports/ubuntu14.04/debian/source/format
diff --git a/debian/backports/ubuntu14.04/exclude b/debianpkg/backports/ubuntu14.04/exclude
index e69de29bb2..e69de29bb2 100644
--- a/debian/backports/ubuntu14.04/exclude
+++ b/debianpkg/backports/ubuntu14.04/exclude
diff --git a/debian/backports/ubuntu14.04/versionext b/debianpkg/backports/ubuntu14.04/versionext
index 5ebeee771d..5ebeee771d 100644
--- a/debian/backports/ubuntu14.04/versionext
+++ b/debianpkg/backports/ubuntu14.04/versionext
diff --git a/debian/backports/ubuntu16.04/debian/source/format b/debianpkg/backports/ubuntu16.04/debian/source/format
index 163aaf8d82..163aaf8d82 100644
--- a/debian/backports/ubuntu16.04/debian/source/format
+++ b/debianpkg/backports/ubuntu16.04/debian/source/format
diff --git a/debian/backports/ubuntu16.04/exclude b/debianpkg/backports/ubuntu16.04/exclude
index e69de29bb2..e69de29bb2 100644
--- a/debian/backports/ubuntu16.04/exclude
+++ b/debianpkg/backports/ubuntu16.04/exclude
diff --git a/debian/backports/ubuntu16.04/versionext b/debianpkg/backports/ubuntu16.04/versionext
index 56339e8367..56339e8367 100644
--- a/debian/backports/ubuntu16.04/versionext
+++ b/debianpkg/backports/ubuntu16.04/versionext
diff --git a/debian/changelog b/debianpkg/changelog
index e4635baa5d..e4635baa5d 100644
--- a/debian/changelog
+++ b/debianpkg/changelog
diff --git a/debian/compat b/debianpkg/compat
index 7f8f011eb7..7f8f011eb7 100644
--- a/debian/compat
+++ b/debianpkg/compat
diff --git a/debian/control b/debianpkg/control
index 46627173df..46627173df 100644
--- a/debian/control
+++ b/debianpkg/control
diff --git a/debian/copyright b/debianpkg/copyright
index 7b873abd31..7b873abd31 100644
--- a/debian/copyright
+++ b/debianpkg/copyright
diff --git a/debian/frr-doc.docs b/debianpkg/frr-doc.docs
index a0776fd68a..a0776fd68a 100644
--- a/debian/frr-doc.docs
+++ b/debianpkg/frr-doc.docs
diff --git a/debian/frr-doc.info b/debianpkg/frr-doc.info
index c4f181cdb0..c4f181cdb0 100644
--- a/debian/frr-doc.info
+++ b/debianpkg/frr-doc.info
diff --git a/debian/frr-doc.install b/debianpkg/frr-doc.install
index d2d3f1bbd9..d2d3f1bbd9 100644
--- a/debian/frr-doc.install
+++ b/debianpkg/frr-doc.install
diff --git a/debian/frr-doc.lintian-overrides b/debianpkg/frr-doc.lintian-overrides
index 1fe64ffd53..1fe64ffd53 100644
--- a/debian/frr-doc.lintian-overrides
+++ b/debianpkg/frr-doc.lintian-overrides
diff --git a/debian/frr.conf b/debianpkg/frr.conf
index dee3cd849a..dee3cd849a 100644
--- a/debian/frr.conf
+++ b/debianpkg/frr.conf
diff --git a/debian/frr.config b/debianpkg/frr.config
index f642bea1d5..f642bea1d5 100644
--- a/debian/frr.config
+++ b/debianpkg/frr.config
diff --git a/debian/frr.dirs b/debianpkg/frr.dirs
index 58290080d0..58290080d0 100644
--- a/debian/frr.dirs
+++ b/debianpkg/frr.dirs
diff --git a/debian/frr.docs b/debianpkg/frr.docs
index f72aae1967..f72aae1967 100644
--- a/debian/frr.docs
+++ b/debianpkg/frr.docs
diff --git a/debian/frr.install b/debianpkg/frr.install
index 45b3b973be..45b3b973be 100644
--- a/debian/frr.install
+++ b/debianpkg/frr.install
diff --git a/debian/frr.lintian-overrides b/debianpkg/frr.lintian-overrides
index e21bd9256d..e21bd9256d 100644
--- a/debian/frr.lintian-overrides
+++ b/debianpkg/frr.lintian-overrides
diff --git a/debian/frr.logrotate b/debianpkg/frr.logrotate
index 0dd68fb257..0dd68fb257 100644
--- a/debian/frr.logrotate
+++ b/debianpkg/frr.logrotate
diff --git a/debian/frr.manpages b/debianpkg/frr.manpages
index 17a128b7e3..17a128b7e3 100644
--- a/debian/frr.manpages
+++ b/debianpkg/frr.manpages
diff --git a/debian/frr.pam b/debianpkg/frr.pam
index 2b106d43bc..2b106d43bc 100644
--- a/debian/frr.pam
+++ b/debianpkg/frr.pam
diff --git a/debian/frr.postinst b/debianpkg/frr.postinst
index 9020d7bf7a..9020d7bf7a 100644
--- a/debian/frr.postinst
+++ b/debianpkg/frr.postinst
diff --git a/debian/frr.postrm b/debianpkg/frr.postrm
index 26576fd136..26576fd136 100644
--- a/debian/frr.postrm
+++ b/debianpkg/frr.postrm
diff --git a/debian/frr.preinst b/debianpkg/frr.preinst
index 29162e3b56..29162e3b56 100644
--- a/debian/frr.preinst
+++ b/debianpkg/frr.preinst
diff --git a/debian/frr.prerm b/debianpkg/frr.prerm
index e0df24e10f..e0df24e10f 100644
--- a/debian/frr.prerm
+++ b/debianpkg/frr.prerm
diff --git a/debian/po/POTFILES.in b/debianpkg/po/POTFILES.in
index 04d24252cd..04d24252cd 100644
--- a/debian/po/POTFILES.in
+++ b/debianpkg/po/POTFILES.in
diff --git a/debian/po/cs.po b/debianpkg/po/cs.po
index df4f47d914..df4f47d914 100644
--- a/debian/po/cs.po
+++ b/debianpkg/po/cs.po
diff --git a/debian/po/da.po b/debianpkg/po/da.po
index 22b2d56c66..22b2d56c66 100644
--- a/debian/po/da.po
+++ b/debianpkg/po/da.po
diff --git a/debian/po/de.po b/debianpkg/po/de.po
index cbf919e2e5..cbf919e2e5 100644
--- a/debian/po/de.po
+++ b/debianpkg/po/de.po
diff --git a/debian/po/es.po b/debianpkg/po/es.po
index 3b9e421a48..3b9e421a48 100644
--- a/debian/po/es.po
+++ b/debianpkg/po/es.po
diff --git a/debian/po/fr.po b/debianpkg/po/fr.po
index a96649d2fd..a96649d2fd 100644
--- a/debian/po/fr.po
+++ b/debianpkg/po/fr.po
diff --git a/debian/po/it.po b/debianpkg/po/it.po
index d305956685..d305956685 100644
--- a/debian/po/it.po
+++ b/debianpkg/po/it.po
diff --git a/debian/po/ja.po b/debianpkg/po/ja.po
index 0991d99236..0991d99236 100644
--- a/debian/po/ja.po
+++ b/debianpkg/po/ja.po
diff --git a/debian/po/nl.po b/debianpkg/po/nl.po
index a9df615e0c..a9df615e0c 100644
--- a/debian/po/nl.po
+++ b/debianpkg/po/nl.po
diff --git a/debian/po/pt.po b/debianpkg/po/pt.po
index 05f9b2e383..05f9b2e383 100644
--- a/debian/po/pt.po
+++ b/debianpkg/po/pt.po
diff --git a/debian/po/pt_BR.po b/debianpkg/po/pt_BR.po
index 49b399c3e7..49b399c3e7 100644
--- a/debian/po/pt_BR.po
+++ b/debianpkg/po/pt_BR.po
diff --git a/debian/po/ru.po b/debianpkg/po/ru.po
index e1db9d37d3..e1db9d37d3 100644
--- a/debian/po/ru.po
+++ b/debianpkg/po/ru.po
diff --git a/debian/po/sv.po b/debianpkg/po/sv.po
index f97c5b8276..f97c5b8276 100644
--- a/debian/po/sv.po
+++ b/debianpkg/po/sv.po
diff --git a/debian/po/templates.pot b/debianpkg/po/templates.pot
index c6fb636872..c6fb636872 100644
--- a/debian/po/templates.pot
+++ b/debianpkg/po/templates.pot
diff --git a/debian/rules b/debianpkg/rules
index a03e3acb9a..3577f06e13 100755
--- a/debian/rules
+++ b/debianpkg/rules
@@ -111,8 +111,7 @@ ifeq ($(wildcard frr-$(ORIG_VERSION).tar.gz),frr-$(ORIG_VERSION).tar.gz)
 
 $(TARBALLDIR)/$(SRCPKG)_$(ORIG_VERSION).orig.tar.gz: \
 		frr-$(ORIG_VERSION).tar.gz
-	gunzip -c < $< | tar --delete frr-$(ORIG_VERSION)/debian/ \
-		| gzip -c > $@
+	cp $< $@
 
 else # wildcard frr-$(ORIG_VERSION).tar.gz
 
diff --git a/debian/source/format b/debianpkg/source/format
index af745b310b..af745b310b 100644
--- a/debian/source/format
+++ b/debianpkg/source/format
diff --git a/debian/tests/control b/debianpkg/tests/control
index 53fd537e2e..53fd537e2e 100644
--- a/debian/tests/control
+++ b/debianpkg/tests/control
diff --git a/debian/tests/daemons b/debianpkg/tests/daemons
index ac35ecd950..ac35ecd950 100644
--- a/debian/tests/daemons
+++ b/debianpkg/tests/daemons
diff --git a/debian/watchfrr.rc b/debianpkg/watchfrr.rc
index 4110b86399..4110b86399 100644
--- a/debian/watchfrr.rc
+++ b/debianpkg/watchfrr.rc