diff options
| -rw-r--r-- | debian/backports/rules | 2 | ||||
| -rwxr-xr-x | debian/rules | 5 | ||||
| -rwxr-xr-x | debian/rules.orig | 19 |
3 files changed, 23 insertions, 3 deletions
diff --git a/debian/backports/rules b/debian/backports/rules index 3b8699754..a5b8991d1 100644 --- 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 8a13b1bce..3b6b9d86e 100755 --- 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 42c0d5f63..98bf6222b 100755 --- 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 |