summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Winter <mwinter@opensourcerouting.org>2017-06-09 15:30:21 -0700
committerMartin Winter <mwinter@opensourcerouting.org>2017-10-10 07:52:47 -0700
commitc56e5380175546cb2098e31b983aa55d7e647c2c (patch)
treed562e37e565ccd4210068cf2e710ab9ece67d2d3
parent56f9b733a0e1f6906b5fda7fef42c1a975ffc6cf (diff)
debianpkg: Fix Date format in changelog and version numbering to make sure custom build is newer
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
-rw-r--r--debianpkg/backports/debian8/versionext2
-rw-r--r--debianpkg/backports/ubuntu12.04/versionext2
-rw-r--r--debianpkg/backports/ubuntu14.04/versionext2
-rw-r--r--debianpkg/backports/ubuntu16.04/versionext2
-rw-r--r--debianpkg/changelog9
5 files changed, 9 insertions, 8 deletions
diff --git a/debianpkg/backports/debian8/versionext b/debianpkg/backports/debian8/versionext
index cf418ffabf..4824521f8c 100644
--- a/debianpkg/backports/debian8/versionext
+++ b/debianpkg/backports/debian8/versionext
@@ -1 +1 @@
--0~debian8+1
+-1~debian8+1
diff --git a/debianpkg/backports/ubuntu12.04/versionext b/debianpkg/backports/ubuntu12.04/versionext
index 0a8f3c956e..159e2e4160 100644
--- a/debianpkg/backports/ubuntu12.04/versionext
+++ b/debianpkg/backports/ubuntu12.04/versionext
@@ -1 +1 @@
--0~ubuntu12.04+1
+-1~ubuntu12.04+1
diff --git a/debianpkg/backports/ubuntu14.04/versionext b/debianpkg/backports/ubuntu14.04/versionext
index 5ebeee771d..c5be0650af 100644
--- a/debianpkg/backports/ubuntu14.04/versionext
+++ b/debianpkg/backports/ubuntu14.04/versionext
@@ -1 +1 @@
--0~ubuntu14.04+1
+-1~ubuntu14.04+1
diff --git a/debianpkg/backports/ubuntu16.04/versionext b/debianpkg/backports/ubuntu16.04/versionext
index 56339e8367..dc33d97a12 100644
--- a/debianpkg/backports/ubuntu16.04/versionext
+++ b/debianpkg/backports/ubuntu16.04/versionext
@@ -1 +1 @@
--0~ubuntu16.04+1
+-1~ubuntu16.04+1
diff --git a/debianpkg/changelog b/debianpkg/changelog
index fe4ee6b334..60696dc151 100644
--- a/debianpkg/changelog
+++ b/debianpkg/changelog
@@ -1,4 +1,5 @@
-frr (3.0) Released; urgency=medium
+<<<<<<< HEAD
+frr (3.0-0) Released; urgency=medium
* New Enabled: BGP Shutdown Message
* New Enabled: BGP Large Community
@@ -17,13 +18,13 @@ frr (3.0) Released; urgency=medium
* New Enabled: NHRP RFC 2332
* New Enabled: Label Manager
- -- frr <frr@lists.nox.tf> Wed, 5 Apr 2017 22:23:42 -0500
+ -- FRRouting-Dev <dev@lists.frrouting.org> Wed, 05 Apr 2017 22:23:42 -0500
-frr (2.1) Released; urgency=medium
+frr (2.0-0) Released; urgency=medium
* Switchover to FRR
- -- frr <frr@lists.nox.tf> Mon, 23 Jan 2017 16:30:22 -0400
+ -- FRRouting-Dev <dev@lists.frrouting.org> Mon, 23 Jan 2017 16:30:22 -0400
quagga (0.99.24+cl3u5) RELEASED; urgency=medium