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>

Makefile.am

@@ -64,7 +64,7 @@ DIST_SUBDIRS = . bgpd \
 	  vtysh doc tests \
 	  solaris bgpd/rfp-example/librfp \
 	  bgpd/rfp-example/rfptest \
-	  debian
+	  debianpkg
 	  # end
 
 if PKGSRC

configure.ac

@@ -1839,7 +1839,7 @@ AC_CONFIG_FILES([Makefile
 	  doc/Makefile tests/Makefile
 	  bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile
 	  redhat/frr.spec
-	  debian/Makefile
+	  debianpkg/Makefile
 	  snapcraft/snapcraft.yaml
 	  lib/version.h
 	  tests/lib/cli/test_cli.refout

debianpkg/rules

@@ -115,8 +115,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