From f991ec7d6679fb6ce6c65f18246c0d46a08bf635 Mon Sep 17 00:00:00 2001
From: rbalocca <rbalocca@vyatta.com>
Date: Thu, 6 Mar 2008 12:55:26 -0800
Subject: Fix problems with upgrading (and also fix lintian errors)

---
 debian/control | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'debian/control')

diff --git a/debian/control b/debian/control
index c317ca4..960e9a5 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,10 @@ Depends: bash (>= 3.1),
  bsdutils,
  vyatta-op,
  vyatta-config-migrate, 
- dhcp3-client | vyatta-dhcp3-client
+ dhcp3-client | vyatta-dhcp3-client,
+ bsdutils (>=1:2.13),
+ libc6 (>= 2.7-6)
+Replaces: vyatta-cfg-firewall
 Suggests: util-linux (>= 2.13-5),
  net-tools,
  ethtool,
-- 
cgit v1.2.3


From ed83fedcee73473b038cabc1ebc172f085169bd5 Mon Sep 17 00:00:00 2001
From: rbalocca <rbalocca@vyatta.com>
Date: Thu, 6 Mar 2008 12:57:41 -0800
Subject: Remove a dependency listed twice

---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

(limited to 'debian/control')

diff --git a/debian/control b/debian/control
index 960e9a5..c359bcd 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Depends: bash (>= 3.1),
  procps (>= 1:3.2.7-3),
  vyatta-quagga | quagga,
  coreutils (>= 5.97-5.3),
- bsdutils,
  vyatta-op,
  vyatta-config-migrate, 
  dhcp3-client | vyatta-dhcp3-client,
-- 
cgit v1.2.3


From 23104e6a58525f2dbd41152bf22615bb8d257278 Mon Sep 17 00:00:00 2001
From: rbalocca <rbalocca@vyatta.com>
Date: Fri, 21 Mar 2008 16:38:29 -0700
Subject: Fix debian dependencies

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'debian/control')

diff --git a/debian/control b/debian/control
index c359bcd..ddad8da 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,13 @@ Standards-Version: 3.7.2
 
 Package: vyatta-cfg
 Architecture: any
-Depends: bash (>= 3.1),
- sed (>= 4.1.5),
+Depends: sed (>= 4.1.5),
  perl (>= 5.8.8),
  procps (>= 1:3.2.7-3),
  vyatta-quagga | quagga,
  coreutils (>= 5.97-5.3),
  vyatta-op,
+ vyatta-bash,
  vyatta-config-migrate, 
  dhcp3-client | vyatta-dhcp3-client,
  bsdutils (>=1:2.13),
-- 
cgit v1.2.3


From dedc3083522c70de84db4d2e7bef21998debd18f Mon Sep 17 00:00:00 2001
From: rbalocca <rbalocca@vyatta.com>
Date: Mon, 24 Mar 2008 18:14:04 -0700
Subject: Set dependencies on either bash or vyatta-bash

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'debian/control')

diff --git a/debian/control b/debian/control
index ddad8da..308105a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,10 +10,10 @@ Architecture: any
 Depends: sed (>= 4.1.5),
  perl (>= 5.8.8),
  procps (>= 1:3.2.7-3),
- vyatta-quagga | quagga,
  coreutils (>= 5.97-5.3),
+ vyatta-bash | bash (>= 3.1),
+ vyatta-quagga | quagga,
  vyatta-op,
- vyatta-bash,
  vyatta-config-migrate, 
  dhcp3-client | vyatta-dhcp3-client,
  bsdutils (>=1:2.13),
-- 
cgit v1.2.3


From 35642e2e10aff32335690a5af2710bbb9ec3ea13 Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Tue, 1 Apr 2008 12:37:35 -0700
Subject: fix for bug 2689: sort tag nodes appropriately

---
 debian/control                | 4 +++-
 scripts/VyattaConfigOutput.pm | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'debian/control')

diff --git a/debian/control b/debian/control
index 308105a..2fdbcfe 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,9 @@ Depends: sed (>= 4.1.5),
  vyatta-config-migrate, 
  dhcp3-client | vyatta-dhcp3-client,
  bsdutils (>=1:2.13),
- libc6 (>= 2.7-6)
+ libc6 (>= 2.7-6),
+ libsort-versions-perl,
+ vlan
 Replaces: vyatta-cfg-firewall
 Suggests: util-linux (>= 2.13-5),
  net-tools,
diff --git a/scripts/VyattaConfigOutput.pm b/scripts/VyattaConfigOutput.pm
index b7c5499..2766b64 100755
--- a/scripts/VyattaConfigOutput.pm
+++ b/scripts/VyattaConfigOutput.pm
@@ -32,6 +32,7 @@ package VyattaConfigOutput;
 use strict;
 use lib '/opt/vyatta/share/perl5/';
 use VyattaConfig;
+use Sort::Versions;
 
 # whether to show default values
 my $show_all = 0;
@@ -190,6 +191,7 @@ sub displayDeletedOrigChildren {
                     $dont_show_as_deleted);
     } elsif (scalar($#cnames) >= 0) {
       if ($is_tag) {
+        @cnames = sort versioncmp @cnames;
         foreach my $cname (@cnames) {
           if ($cname eq 'node.val') {
             # should not happen
@@ -244,6 +246,7 @@ sub displayChildren {
       displayValues([ @cur_path, $child ], $prefix, $child);
     } elsif (scalar($#cnames) >= 0) {
       if ($is_tag) {
+        @cnames = sort versioncmp @cnames;
         foreach my $cname (@cnames) {
           if ($cname eq 'node.val') {
             # should not happen
-- 
cgit v1.2.3