backports: minimize diffs with base debian files

minimize diffs between the base debian files and each backport to the
changes that actually matter, so that they aren't lost in the noise of
capitalization and ordering differences.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>

diff --git a/debian/backports/ubuntu12.04/debian/rules b/debian/backports/ubuntu12.04/debian/rules
index 122405aede7f07f6fc555df46b9ee63299c684a8..34528d54b749e16cddc66f76e18478fd3e1c4b25 100644 (file)
--- a/debian/backports/ubuntu12.04/debian/rules
+++ b/debian/backports/ubuntu12.04/debian/rules
@@ -23,7 +23,7 @@ endif
        dh $@ --with=autoreconf --parallel --dbg-package=frr-dbg --list-missing
 
 override_dh_auto_configure:
-       # FRR needs /proc to check some BSD vs Linux specific stuff.
+       # Frr needs /proc to check some BSD vs Linux specific stuff.
        # Else it fails with an obscure error message pointing out that
        # IPCTL_FORWARDING is an undefined symbol which is not very helpful.
        @if ! [ -d /proc/1 ]; then \
@@ -53,9 +53,9 @@ override_dh_auto_configure:
                --enable-systemd=no \
                --enable-poll=yes \
                --enable-cumulus=yes \
-               --disable-rr-semantics \
                --enable-pimd=no \
-               --enable-dependency-tracking; \
+               --enable-dependency-tracking \
+               --disable-rr-semantics; \
        fi
 
 override_dh_auto_build:
@@ -84,7 +84,7 @@ override_dh_auto_install:
        mkdir -p debian/tmp/etc/frr/
        perl -pi -e 's#^!log file #!log file /var/log/frr/#' debian/tmp/usr/share/doc/frr/examples/*sample*
 
-       # installing the FRR specific SNMP MIB
+       # installing the Frr specific SNMP MIB
        install -D -m 644 ./zebra/GNOME-PRODUCT-ZEBRA-MIB debian/tmp/usr/share/snmp/mibs/GNOME-PRODUCT-ZEBRA-MIB
 
        # cleaning .la files

diff --git a/debian/backports/ubuntu14.04/debian/control b/debian/backports/ubuntu14.04/debian/control
index 23a1ae826db7e5dd88d58a9995751a978d4ea771..c05cdd04f86b4fa5974554da6b358368a44a067f 100644 (file)
--- a/debian/backports/ubuntu14.04/debian/control
+++ b/debian/backports/ubuntu14.04/debian/control
@@ -39,7 +39,7 @@ Section: net
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: frr
-Description: Documentation files for FRR
+Description: documentation files for FRR
  This package includes info files for frr, a free software which manages
  TCP/IP based routing protocols.  It supports BGP4, BGP4+, OSPFv2, OSPFv3,
  IS-IS, RIPv1, RIPv2, RIPng, PIM and LDP as well as the IPv6 versions of these.

diff --git a/debian/backports/ubuntu14.04/debian/rules b/debian/backports/ubuntu14.04/debian/rules
index cf63076015d01c59d930be55e0de77401ee2449f..84d4b177c8e1e5b6f395898e62aa593f3185caab 100644 (file)
--- a/debian/backports/ubuntu14.04/debian/rules
+++ b/debian/backports/ubuntu14.04/debian/rules
@@ -23,7 +23,7 @@ endif
        dh $@ --with=autoreconf --parallel --dbg-package=frr-dbg --list-missing
 
 override_dh_auto_configure:
-       # FRR needs /proc to check some BSD vs Linux specific stuff.
+       # Frr needs /proc to check some BSD vs Linux specific stuff.
        # Else it fails with an obscure error message pointing out that
        # IPCTL_FORWARDING is an undefined symbol which is not very helpful.
        @if ! [ -d /proc/1 ]; then \
@@ -51,11 +51,11 @@ override_dh_auto_configure:
                --enable-gcc-rdynamic \
                --with-libpam \
                --enable-systemd=no \
-               --disable-rr-semantics \
                --enable-poll=yes \
                --enable-cumulus=yes \
                --enable-pimd=no \
-               --enable-dependency-tracking; \
+               --enable-dependency-tracking \
+               --disable-rr-semantics; \
        fi
 
 override_dh_auto_build:
@@ -84,7 +84,7 @@ override_dh_auto_install:
        mkdir -p debian/tmp/etc/frr/
        perl -pi -e 's#^!log file #!log file /var/log/frr/#' debian/tmp/usr/share/doc/frr/examples/*sample*
 
-       # installing the FRR specific SNMP MIB
+       # installing the Frr specific SNMP MIB
        install -D -m 644 ./zebra/GNOME-PRODUCT-ZEBRA-MIB debian/tmp/usr/share/snmp/mibs/GNOME-PRODUCT-ZEBRA-MIB
 
        # cleaning .la files