diff --git a/Makefile.am b/Makefile.am index a4841490e5..d9698d7cbd 100644 --- a/Makefile.am +++ b/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 diff --git a/configure.ac b/configure.ac index c535ed8d5b..35577ab119 100755 --- a/configure.ac +++ b/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 diff --git a/debian/Makefile.am b/debianpkg/Makefile.am similarity index 100% rename from debian/Makefile.am rename to debianpkg/Makefile.am diff --git a/debian/README.Debian b/debianpkg/README.Debian similarity index 100% rename from debian/README.Debian rename to debianpkg/README.Debian diff --git a/debian/README.Maintainer b/debianpkg/README.Maintainer similarity index 100% rename from debian/README.Maintainer rename to debianpkg/README.Maintainer diff --git a/debian/backports/.gitignore b/debianpkg/backports/.gitignore similarity index 100% rename from debian/backports/.gitignore rename to debianpkg/backports/.gitignore diff --git a/debian/backports/README b/debianpkg/backports/README similarity index 100% rename from debian/backports/README rename to debianpkg/backports/README diff --git a/debian/backports/rules b/debianpkg/backports/rules similarity index 100% rename from debian/backports/rules rename to debianpkg/backports/rules diff --git a/debian/backports/ubuntu12.04/debian/control b/debianpkg/backports/ubuntu12.04/debian/control similarity index 100% rename from debian/backports/ubuntu12.04/debian/control rename to debianpkg/backports/ubuntu12.04/debian/control diff --git a/debian/backports/ubuntu12.04/debian/frr.install b/debianpkg/backports/ubuntu12.04/debian/frr.install similarity index 100% rename from debian/backports/ubuntu12.04/debian/frr.install rename to 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 similarity index 100% rename from debian/backports/ubuntu12.04/debian/frr.postinst rename to debianpkg/backports/ubuntu12.04/debian/frr.postinst diff --git a/debian/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules similarity index 100% rename from debian/backports/ubuntu12.04/debian/rules rename to debianpkg/backports/ubuntu12.04/debian/rules diff --git a/debian/backports/ubuntu12.04/debian/source/format b/debianpkg/backports/ubuntu12.04/debian/source/format similarity index 100% rename from debian/backports/ubuntu12.04/debian/source/format rename to debianpkg/backports/ubuntu12.04/debian/source/format diff --git a/debian/backports/ubuntu12.04/exclude b/debianpkg/backports/ubuntu12.04/exclude similarity index 100% rename from debian/backports/ubuntu12.04/exclude rename to debianpkg/backports/ubuntu12.04/exclude diff --git a/debian/backports/ubuntu12.04/versionext b/debianpkg/backports/ubuntu12.04/versionext similarity index 100% rename from debian/backports/ubuntu12.04/versionext rename to debianpkg/backports/ubuntu12.04/versionext diff --git a/debian/backports/ubuntu14.04/debian/control b/debianpkg/backports/ubuntu14.04/debian/control similarity index 100% rename from debian/backports/ubuntu14.04/debian/control rename to debianpkg/backports/ubuntu14.04/debian/control diff --git a/debian/backports/ubuntu14.04/debian/frr.install b/debianpkg/backports/ubuntu14.04/debian/frr.install similarity index 100% rename from debian/backports/ubuntu14.04/debian/frr.install rename to debianpkg/backports/ubuntu14.04/debian/frr.install diff --git a/debian/backports/ubuntu14.04/debian/rules b/debianpkg/backports/ubuntu14.04/debian/rules similarity index 100% rename from debian/backports/ubuntu14.04/debian/rules rename to debianpkg/backports/ubuntu14.04/debian/rules diff --git a/debian/backports/ubuntu14.04/debian/source/format b/debianpkg/backports/ubuntu14.04/debian/source/format similarity index 100% rename from debian/backports/ubuntu14.04/debian/source/format rename to debianpkg/backports/ubuntu14.04/debian/source/format diff --git a/debian/backports/ubuntu14.04/exclude b/debianpkg/backports/ubuntu14.04/exclude similarity index 100% rename from debian/backports/ubuntu14.04/exclude rename to debianpkg/backports/ubuntu14.04/exclude diff --git a/debian/backports/ubuntu14.04/versionext b/debianpkg/backports/ubuntu14.04/versionext similarity index 100% rename from debian/backports/ubuntu14.04/versionext rename to debianpkg/backports/ubuntu14.04/versionext diff --git a/debian/backports/ubuntu16.04/debian/source/format b/debianpkg/backports/ubuntu16.04/debian/source/format similarity index 100% rename from debian/backports/ubuntu16.04/debian/source/format rename to debianpkg/backports/ubuntu16.04/debian/source/format diff --git a/debian/backports/ubuntu16.04/exclude b/debianpkg/backports/ubuntu16.04/exclude similarity index 100% rename from debian/backports/ubuntu16.04/exclude rename to debianpkg/backports/ubuntu16.04/exclude diff --git a/debian/backports/ubuntu16.04/versionext b/debianpkg/backports/ubuntu16.04/versionext similarity index 100% rename from debian/backports/ubuntu16.04/versionext rename to debianpkg/backports/ubuntu16.04/versionext diff --git a/debian/changelog b/debianpkg/changelog similarity index 100% rename from debian/changelog rename to debianpkg/changelog diff --git a/debian/compat b/debianpkg/compat similarity index 100% rename from debian/compat rename to debianpkg/compat diff --git a/debian/control b/debianpkg/control similarity index 100% rename from debian/control rename to debianpkg/control diff --git a/debian/copyright b/debianpkg/copyright similarity index 100% rename from debian/copyright rename to debianpkg/copyright diff --git a/debian/frr-doc.docs b/debianpkg/frr-doc.docs similarity index 100% rename from debian/frr-doc.docs rename to debianpkg/frr-doc.docs diff --git a/debian/frr-doc.info b/debianpkg/frr-doc.info similarity index 100% rename from debian/frr-doc.info rename to debianpkg/frr-doc.info diff --git a/debian/frr-doc.install b/debianpkg/frr-doc.install similarity index 100% rename from debian/frr-doc.install rename to debianpkg/frr-doc.install diff --git a/debian/frr-doc.lintian-overrides b/debianpkg/frr-doc.lintian-overrides similarity index 100% rename from debian/frr-doc.lintian-overrides rename to debianpkg/frr-doc.lintian-overrides diff --git a/debian/frr.conf b/debianpkg/frr.conf similarity index 100% rename from debian/frr.conf rename to debianpkg/frr.conf diff --git a/debian/frr.config b/debianpkg/frr.config similarity index 100% rename from debian/frr.config rename to debianpkg/frr.config diff --git a/debian/frr.dirs b/debianpkg/frr.dirs similarity index 100% rename from debian/frr.dirs rename to debianpkg/frr.dirs diff --git a/debian/frr.docs b/debianpkg/frr.docs similarity index 100% rename from debian/frr.docs rename to debianpkg/frr.docs diff --git a/debian/frr.install b/debianpkg/frr.install similarity index 100% rename from debian/frr.install rename to debianpkg/frr.install diff --git a/debian/frr.lintian-overrides b/debianpkg/frr.lintian-overrides similarity index 100% rename from debian/frr.lintian-overrides rename to debianpkg/frr.lintian-overrides diff --git a/debian/frr.logrotate b/debianpkg/frr.logrotate similarity index 100% rename from debian/frr.logrotate rename to debianpkg/frr.logrotate diff --git a/debian/frr.manpages b/debianpkg/frr.manpages similarity index 100% rename from debian/frr.manpages rename to debianpkg/frr.manpages diff --git a/debian/frr.pam b/debianpkg/frr.pam similarity index 100% rename from debian/frr.pam rename to debianpkg/frr.pam diff --git a/debian/frr.postinst b/debianpkg/frr.postinst similarity index 100% rename from debian/frr.postinst rename to debianpkg/frr.postinst diff --git a/debian/frr.postrm b/debianpkg/frr.postrm similarity index 100% rename from debian/frr.postrm rename to debianpkg/frr.postrm diff --git a/debian/frr.preinst b/debianpkg/frr.preinst similarity index 100% rename from debian/frr.preinst rename to debianpkg/frr.preinst diff --git a/debian/frr.prerm b/debianpkg/frr.prerm similarity index 100% rename from debian/frr.prerm rename to debianpkg/frr.prerm diff --git a/debian/po/POTFILES.in b/debianpkg/po/POTFILES.in similarity index 100% rename from debian/po/POTFILES.in rename to debianpkg/po/POTFILES.in diff --git a/debian/po/cs.po b/debianpkg/po/cs.po similarity index 100% rename from debian/po/cs.po rename to debianpkg/po/cs.po diff --git a/debian/po/da.po b/debianpkg/po/da.po similarity index 100% rename from debian/po/da.po rename to debianpkg/po/da.po diff --git a/debian/po/de.po b/debianpkg/po/de.po similarity index 100% rename from debian/po/de.po rename to debianpkg/po/de.po diff --git a/debian/po/es.po b/debianpkg/po/es.po similarity index 100% rename from debian/po/es.po rename to debianpkg/po/es.po diff --git a/debian/po/fr.po b/debianpkg/po/fr.po similarity index 100% rename from debian/po/fr.po rename to debianpkg/po/fr.po diff --git a/debian/po/it.po b/debianpkg/po/it.po similarity index 100% rename from debian/po/it.po rename to debianpkg/po/it.po diff --git a/debian/po/ja.po b/debianpkg/po/ja.po similarity index 100% rename from debian/po/ja.po rename to debianpkg/po/ja.po diff --git a/debian/po/nl.po b/debianpkg/po/nl.po similarity index 100% rename from debian/po/nl.po rename to debianpkg/po/nl.po diff --git a/debian/po/pt.po b/debianpkg/po/pt.po similarity index 100% rename from debian/po/pt.po rename to debianpkg/po/pt.po diff --git a/debian/po/pt_BR.po b/debianpkg/po/pt_BR.po similarity index 100% rename from debian/po/pt_BR.po rename to debianpkg/po/pt_BR.po diff --git a/debian/po/ru.po b/debianpkg/po/ru.po similarity index 100% rename from debian/po/ru.po rename to debianpkg/po/ru.po diff --git a/debian/po/sv.po b/debianpkg/po/sv.po similarity index 100% rename from debian/po/sv.po rename to debianpkg/po/sv.po diff --git a/debian/po/templates.pot b/debianpkg/po/templates.pot similarity index 100% rename from debian/po/templates.pot rename to debianpkg/po/templates.pot diff --git a/debian/rules b/debianpkg/rules similarity index 97% rename from debian/rules rename to debianpkg/rules index 7a5efdd765..a152b9a175 100755 --- a/debian/rules +++ b/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 diff --git a/debian/source/format b/debianpkg/source/format similarity index 100% rename from debian/source/format rename to debianpkg/source/format diff --git a/debian/tests/control b/debianpkg/tests/control similarity index 100% rename from debian/tests/control rename to debianpkg/tests/control diff --git a/debian/tests/daemons b/debianpkg/tests/daemons similarity index 100% rename from debian/tests/daemons rename to debianpkg/tests/daemons diff --git a/debian/watchfrr.rc b/debianpkg/watchfrr.rc similarity index 100% rename from debian/watchfrr.rc rename to debianpkg/watchfrr.rc