debian: Fix some incorrect references to Quagga instead of FRR

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

diff --git a/debian/Makefile.am b/debian/Makefile.am
index 56e37088a170fe67e1d46915e871a3588df8576e..5555a3e01e1fe1bebc089183a3e2707c116f4ce9 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -2,17 +2,17 @@
 EXTRA_DIST = README.Debian README.Maintainer \
        changelog compat control copyright \
        rules source/format tests/control \
-       tests/daemons watch watchquagga.rc \
+       tests/daemons watch watchfrr.rc \
        backports/README backports/rules \
        backports/ubuntu12.04/debian/control \
-       backports/ubuntu12.04/debian/quagga.install \
-       backports/ubuntu12.04/debian/quagga.postinst \
+       backports/ubuntu12.04/debian/frr.install \
+       backports/ubuntu12.04/debian/frr.postinst \
        backports/ubuntu12.04/debian/rules \
        backports/ubuntu12.04/debian/source/format \
        backports/ubuntu12.04/exclude \
        backports/ubuntu12.04/versionext \
        backports/ubuntu14.04/debian/control \
-       backports/ubuntu14.04/debian/quagga.install \
+       backports/ubuntu14.04/debian/frr.install \
        backports/ubuntu14.04/debian/rules \
        backports/ubuntu14.04/debian/source/format \
        backports/ubuntu14.04/exclude \
@@ -28,9 +28,9 @@ EXTRA_DIST = README.Debian README.Maintainer \
        po/POTFILES.in po/cs.po po/da.po po/de.po po/es.po po/fr.po \
        po/it.po po/ja.po po/nl.po po/pt.po po/pt_BR.po po/ru.po \
        po/sv.po po/templates.pot \
-       quagga-doc.docs quagga-doc.info quagga-doc.install \
-       quagga-doc.lintian-overrides quagga.conf quagga.config \
-       quagga.dirs quagga.docs quagga.install \
-       quagga.lintian-overrides quagga.logrotate \
-       quagga.manpages quagga.pam quagga.postinst quagga.postrm \
-       quagga.preinst quagga.prerm
+       frr-doc.docs frr-doc.info frr-doc.install \
+       frr-doc.lintian-overrides frr.conf frr.config \
+       frr.dirs frr.docs frr.install \
+       frr.lintian-overrides frr.logrotate \
+       frr.manpages frr.pam frr.postinst frr.postrm \
+       frr.preinst frr.prerm

diff --git a/debian/rules b/debian/rules
index 4713a7848c7f217fca0722cd2168a50f3f322f1c..7a5efdd765d5c9f18766bfbae901bafc98639e95 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -111,14 +111,14 @@ DEBIAN_VERSION := $(shell dh_testdir && \
 -include debian/backports/rules
 
 ifneq ($(TARBALLDIR),)
-ifeq ($(wildcard quagga-$(ORIG_VERSION).tar.gz),quagga-$(ORIG_VERSION).tar.gz)
+ifeq ($(wildcard frr-$(ORIG_VERSION).tar.gz),frr-$(ORIG_VERSION).tar.gz)
 
 $(TARBALLDIR)/$(SRCPKG)_$(ORIG_VERSION).orig.tar.gz: \
-               quagga-$(ORIG_VERSION).tar.gz
-       gunzip -c < $< | tar --delete quagga-$(ORIG_VERSION)/debian/ \
+               frr-$(ORIG_VERSION).tar.gz
+       gunzip -c < $< | tar --delete frr-$(ORIG_VERSION)/debian/ \
                | gzip -c > $@
 
-else # wildcard quagga-$(ORIG_VERSION).tar.gz
+else # wildcard frr-$(ORIG_VERSION).tar.gz
 
 # better error message on missing .orig.tar.gz
 $(TARBALLDIR)/$(SRCPKG)_$(ORIG_VERSION).orig.tar.gz:
@@ -128,5 +128,5 @@ $(TARBALLDIR)/$(SRCPKG)_$(ORIG_VERSION).orig.tar.gz:
                "\"./bootstrap.sh && ./configure && make dist\"".
        exit 1
 
-endif # wildcard quagga-$(ORIG_VERSION).tar.gz
+endif # wildcard frr-$(ORIG_VERSION).tar.gz
 endif # TARBALLDIR nonempty

diff --git a/debian/watch b/debian/watch
index 46ff1c7daba6026678f35c42e6e5967aed002b32..06c21eb2c70b8c601bfd555545c5a9b1e3a6077d 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -2,7 +2,7 @@
 # Rename this file to "watch" and then you can run the "uscan" command
 # to check for upstream updates and more.
 # Site         Directory               Pattern                 Version Script
-version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
-    http://download.savannah.gnu.org/releases/frr/quagga-(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz))
+##version=3
+##opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
+##    http://download.savannah.gnu.org/releases/frr/quagga-(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz))
 # Bart Martens <bartm@debian.org>  Fri, 25 Jan 2013 06:38:53 +0000