diff options
Diffstat (limited to 'debianpkg')
| -rw-r--r-- | debianpkg/changelog.in (renamed from debianpkg/changelog) | 6 | ||||
| -rwxr-xr-x | debianpkg/rules | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/debianpkg/changelog b/debianpkg/changelog.in index d86a1a761..4002f7e14 100644 --- a/debianpkg/changelog +++ b/debianpkg/changelog.in @@ -1,10 +1,10 @@ -frr (3.1-dev) Released; urgency=medium +frr (@VERSION@) RELEASED; urgency=medium * New Enabled: PIM draft Unnumbered -- FRRouting-Dev <dev@lists.frrouting.org> Wed, 18 Oct 2017 17:01:42 -0700 -frr (3.0-0) Released; urgency=medium +frr (3.0-0) RELEASED; urgency=medium * New Enabled: BGP Shutdown Message * New Enabled: BGP Large Community @@ -25,7 +25,7 @@ frr (3.0-0) Released; urgency=medium -- FRRouting-Dev <dev@lists.frrouting.org> Wed, 05 Apr 2017 22:23:42 -0500 -frr (2.0-0) Released; urgency=medium +frr (2.0-0) RELEASED; urgency=medium * Switchover to FRR diff --git a/debianpkg/rules b/debianpkg/rules index 3d84a37d3..75d4cb14b 100755 --- a/debianpkg/rules +++ b/debianpkg/rules @@ -197,11 +197,10 @@ override_dh_systemd_enable: # backports SRCPKG = frr KNOWN_BACKPORTS = debian8 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 < debian/changelog | \ sed -rn 's/^Version: ?//p') +ORIG_VERSION := $(DEBIAN_VERSION) -include debian/backports/rules ifneq ($(TARBALLDIR),) |