debian: fix dpkg tool invocations to work on Ubuntu 12.04

dpkg-parsechangelog and dpkg-source were both using flags
not yet available in the versions available on 12.04.

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

diff --git a/debian/backports/rules b/debian/backports/rules
index 3b8699754f0210d2ec0a4e3999cd44424572dfaa..a5b8991d135760f08cc2fe721d1814c9f9e53e5f 100644 (file)
--- a/debian/backports/rules
+++ b/debian/backports/rules
@@ -76,7 +76,7 @@ $(TARBALLDIR)/$(SRCPKG)_$$(DEBIAN_VERSION_$(1)).dsc:
                -c$$(CONTROL_$(1)) \
                --format='3.0 (custom)' \
                --target-format='$$(SOURCEFORMAT_$(1))' \
-               --build . $$^
+               -b . $$^
 
 ifeq ($$(SOURCEFORMAT_$(1)),3.0 (quilt))
 # this target depends on the orig.tar.gz file, for which there is no target in

diff --git a/debian/rules b/debian/rules
index 8a13b1bceaca3e474a4f47ac9c9150885f5d2190..3b6b9d86e2ec164ba69f6f78995b843430649722 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -106,13 +106,14 @@ KNOWN_BACKPORTS = ubuntu12.04 ubuntu14.04 ubuntu16.04
 ORIG_VERSION := $(shell dh_testdir && grep -E < configure.ac '^AC_INIT\(.*\)' \
                | cut -d, -f2 | xargs echo)
 DEBIAN_VERSION := $(shell dh_testdir && \
-               dpkg-parsechangelog -c1 -Sversion < debian/changelog)
+               dpkg-parsechangelog -c1 < debian/changelog | \
+               sed -rn 's/^Version: ?//p')
 -include debian/backports/rules
 
 ifneq ($(TARBALLDIR),)
 # better error message on missing .orig.tar.gz
 $(TARBALLDIR)/$(SRCPKG)_$(ORIG_VERSION).orig.tar.gz:
-       @ echo "\`$(TARBALLDIR)/$(SRCPKG)_$(ORIG_VERSION).orig.tar.gz'" not
+       @ echo "\`$(TARBALLDIR)/$(SRCPKG)_$(ORIG_VERSION).orig.tar.gz'" not \
                found and not generated by debian/rules. Provided you have the \
                necessary packages installed, you can generate it yourself via \
                "\"./bootstrap.sh && ./configure && make dist\"" \

diff --git a/debian/rules.orig b/debian/rules.orig
index 42c0d5f63a904c6c6a0bcdce8439388a0ce1409f..98bf6222b85b99e266676e89b4bd0bf2867127d6 100755 (executable)
--- a/debian/rules.orig
+++ b/debian/rules.orig
@@ -96,3 +96,22 @@ override_dh_systemd_start:
 override_dh_systemd_enable:
        dh_systemd_enable frr.service
 
+# backports
+SRCPKG = frr
+KNOWN_BACKPORTS = ubuntu12.04 ubuntu14.04 ubuntu16.04
+ORIG_VERSION := $(shell dh_testdir && grep -E < configure.ac '^AC_INIT\(.*\)' \
+               | cut -d, -f2 | xargs echo)
+DEBIAN_VERSION := $(shell dh_testdir && \
+               dpkg-parsechangelog -c1 -Sversion < debian/changelog)
+-include debian/backports/rules
+
+ifneq ($(TARBALLDIR),)
+# better error message on missing .orig.tar.gz
+$(TARBALLDIR)/$(SRCPKG)_$(ORIG_VERSION).orig.tar.gz:
+       @ echo "\`$(TARBALLDIR)/$(SRCPKG)_$(ORIG_VERSION).orig.tar.gz'" not
+               found and not generated by debian/rules. Provided you have the \
+               necessary packages installed, you can generate it yourself via \
+               "\"./bootstrap.sh && ./configure && make dist\"" \
+               and renaming the resulting file.
+       exit 1
+endif # def TARBALLDIR