debianpkg: Fix Date format in changelog and version numbering to make sure custom...

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

diff --git a/debianpkg/backports/debian8/versionext b/debianpkg/backports/debian8/versionext
index cf418ffabfc9cb50e924fd122ae9bccd5911488e..4824521f8c83ac6a3ef02f0eba4f0d08e23d075f 100644 (file)
--- 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 0a8f3c956e2d6739d206c0f3df8adbd24c4d85b2..159e2e4160cdd652e07f5940510c2c8c4a9f9c7e 100644 (file)
--- 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 5ebeee771d6e012c9401ab2041abf9f4c501dfe0..c5be0650af187fe1533cc8bbf27fd20b798b8ec8 100644 (file)
--- 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 56339e8367979004e2830a89d69632b2a1f69b6e..dc33d97a12338a6bbaa1cb68608c3e2bc458c17c 100644 (file)
--- 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 fe4ee6b33445e038939f84305db5b0fbbb5123df..60696dc15161d02dff758057adb76afdbbd8aa7b 100644 (file)
--- 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