Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeadmin

4 files changed, 102 insertions, 3 deletions

diff --git a/knetworkconf/backends/network-conf.in b/knetworkconf/backends/network-conf.in
index 6dba52f..ce9d169 100755
--- a/knetworkconf/backends/network-conf.in
+++ b/knetworkconf/backends/network-conf.in
@@ -70,8 +70,8 @@ $version = "@VERSION@";
               "mandriva-2006.1", "mandriva-2007.0", "mandriva-2007.1",
               "yoper-2.2",
               "blackpanther-4.0",
-              "debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-5.0", "debian-testing",
-              "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10", "ubuntu-8.04", "ubuntu-8.10", "ubuntu-9.04", "ubuntu-9.10", "ubuntu-10.04", "ubuntu-10.10",
+              "debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-5.0", "debian-6.0", "debian-7.0", "debian-testing",
+              "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10", "ubuntu-8.04", "ubuntu-8.10", "ubuntu-9.04", "ubuntu-9.10", "ubuntu-10.04", "ubuntu-10.10", "ubuntu-11.04", "ubuntu-11.10", "ubuntu-12.04", "ubuntu-12.10", "ubuntu-13.04",
               "suse-7.0", "suse-9.0", "suse-9.1",
               "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", "fedora-15", "fedora-16", "fedora-17",
               "pld-1.0", "pld-1.1", "pld-1.99",
diff --git a/knetworkconf/backends/network.pl.in b/knetworkconf/backends/network.pl.in
index 91270bb..608346c 100644
--- a/knetworkconf/backends/network.pl.in
+++ b/knetworkconf/backends/network.pl.in
@@ -500,6 +500,8 @@ sub gst_network_get_broadcast_ping_cmd
        "debian-3.1"   => "debian-2.2",
        "debian-4.0"   => "debian-2.2",
        "debian-5.0"   => "debian-2.2",
+       "debian-6.0"   => "debian-2.2",
+       "debian-7.0"   => "debian-2.2",
        "debian-testing" => "debian-2.2",
        "ubuntu-5.04"  => "debian-2.2",
        "ubuntu-5.10"  => "debian-2.2",
@@ -511,8 +513,13 @@ sub gst_network_get_broadcast_ping_cmd
        "ubuntu-8.10"  => "debian-2.2",
        "ubuntu-9.04"  => "debian-2.2",
        "ubuntu-9.10"  => "debian-2.2",
+       "ubuntu-10.04"  => "debian-2.2",
        "ubuntu-10.10"  => "debian-2.2",
-       "ubuntu-10.10"  => "debian-2.2",
+       "ubuntu-11.04"  => "debian-2.2",
+       "ubuntu-11.10"  => "debian-2.2",
+       "ubuntu-12.04"  => "debian-2.2",
+       "ubuntu-12.10"  => "debian-2.2",
+       "ubuntu-13.04"  => "debian-2.2",
        "mandrake-7.1" => "debian-2.2",
        "mandrake-7.2" => "debian-2.2",
        "mandrake-9.0" => "debian-2.2",
@@ -1847,6 +1854,8 @@ sub gst_network_get_file
           "debian-3.1"   => \&gst_network_deb22_get_file,
           "debian-4.0"   => \&gst_network_deb22_get_file,
           "debian-5.0"   => \&gst_network_deb22_get_file,
+          "debian-6.0"   => \&gst_network_deb22_get_file,
+          "debian-7.0"   => \&gst_network_deb22_get_file,
           "debian-testing" => \&gst_network_deb22_get_file,
           "ubuntu-5.04"  => \&gst_network_deb22_get_file,
           "ubuntu-5.10"  => \&gst_network_deb22_get_file,
@@ -1860,6 +1869,11 @@ sub gst_network_get_file
           "ubuntu-9.10"  => \&gst_network_deb22_get_file,
           "ubuntu-10.04"  => \&gst_network_deb22_get_file,
           "ubuntu-10.10"  => \&gst_network_deb22_get_file,
+          "ubuntu-11.04"  => \&gst_network_deb22_get_file,
+          "ubuntu-11.10"  => \&gst_network_deb22_get_file,
+          "ubuntu-12.04"  => \&gst_network_deb22_get_file,
+          "ubuntu-12.10"  => \&gst_network_deb22_get_file,
+          "ubuntu-13.04"  => \&gst_network_deb22_get_file,
           "suse-7.0"     => \&gst_network_suse70_get_file,
           "suse-9.0"     => \&gst_network_deb22_get_file,
           "suse-9.1"     => \&gst_network_deb22_get_file,
@@ -3999,6 +4013,8 @@ sub gst_network_ensure_loopback_interface
           "debian-3.1"   => "lo",
           "debian-4.0"   => "lo",
           "debian-5.0"   => "lo",
+          "debian-6.0"   => "lo",
+          "debian-7.0"   => "lo",
           "debian-testing" => "lo",
           "ubuntu-5.04"  => "lo",
           "ubuntu-5.10"  => "lo",
@@ -4012,6 +4028,11 @@ sub gst_network_ensure_loopback_interface
           "ubuntu-9.10"  => "lo",
           "ubuntu-10.04"  => "lo",
           "ubuntu-10.10"  => "lo",
+          "ubuntu-11.04"  => "lo",
+          "ubuntu-11.10"  => "lo",
+          "ubuntu-12.04"  => "lo",
+          "ubuntu-12.10"  => "lo",
+          "ubuntu-13.04"  => "lo",
           "suse-7.0"     => "",
           "suse-9.0"     => "",
           "suse-9.1"     => "",
@@ -4195,6 +4216,8 @@ sub gst_network_get_parse_table
           "debian-3.1"   => "debian-2.2",
           "debian-4.0"   => "debian-2.2",
           "debian-5.0"   => "debian-2.2",
+          "debian-6.0"   => "debian-2.2",
+          "debian-7.0"   => "debian-2.2",
           "debian-testing" => "debian-2.2",
           "ubuntu-5.04"  => "debian-2.2",
           "ubuntu-5.10"  => "debian-2.2",
@@ -4208,6 +4231,11 @@ sub gst_network_get_parse_table
           "ubuntu-9.10"  => "debian-2.2",
           "ubuntu-10.04"  => "debian-2.2",
           "ubuntu-10.10"  => "debian-2.2",
+          "ubuntu-11.04"  => "debian-2.2",
+          "ubuntu-11.10"  => "debian-2.2",
+          "ubuntu-12.04"  => "debian-2.2",
+          "ubuntu-12.10"  => "debian-2.2",
+          "ubuntu-13.04"  => "debian-2.2",
           "suse-7.0"     => "suse-7.0",
           "suse-9.0"     => "suse-9.0",
           "suse-9.1"     => "suse-9.0",
@@ -4637,6 +4665,8 @@ sub gst_network_get_interface_parse_table
           "debian-3.1"   => "debian-3.0",
           "debian-4.0"   => "debian-3.0",
           "debian-5.0"   => "debian-3.0",
+          "debian-6.0"   => "debian-3.0",
+          "debian-7.0"   => "debian-3.0",
           "debian-testing" => "debian-3.0",
           "ubuntu-5.04"  => "debian-3.0",
           "ubuntu-5.10"  => "debian-3.0",
@@ -4650,6 +4680,11 @@ sub gst_network_get_interface_parse_table
           "ubuntu-9.10"  => "debian-3.0",
           "ubuntu-10.04"  => "debian-3.0",
           "ubuntu-10.10"  => "debian-3.0",
+          "ubuntu-11.04"  => "debian-3.0",
+          "ubuntu-11.10"  => "debian-3.0",
+          "ubuntu-12.04"  => "debian-3.0",
+          "ubuntu-12.10"  => "debian-3.0",
+          "ubuntu-13.04"  => "debian-3.0",
           "suse-7.0"     => "suse-7.0",
           "suse-9.0"     => "suse-9.0",
           "suse-9.1"     => "suse-9.0",
@@ -5503,6 +5538,8 @@ sub gst_network_get_replace_table
           "debian-3.1"   => "debian-2.2",
           "debian-4.0"   => "debian-2.2",
           "debian-5.0"   => "debian-2.2",
+          "debian-6.0"   => "debian-2.2",
+          "debian-7.0"   => "debian-2.2",
           "debian-testing" => "debian-2.2",
           "ubuntu-5.04"  => "debian-2.2",
           "ubuntu-5.10"  => "debian-2.2",
@@ -5516,6 +5553,11 @@ sub gst_network_get_replace_table
           "ubuntu-9.10"  => "debian-2.2",
           "ubuntu-10.04"  => "debian-2.2",
           "ubuntu-10.10"  => "debian-2.2",
+          "ubuntu-11.04"  => "debian-2.2",
+          "ubuntu-11.10"  => "debian-2.2",
+          "ubuntu-12.04"  => "debian-2.2",
+          "ubuntu-12.10"  => "debian-2.2",
+          "ubuntu-13.04"  => "debian-2.2",
           "suse-7.0"     => "suse-7.0",
           "suse-9.0"     => "suse-9.0",
           "suse-9.1"     => "suse-9.0",
@@ -5937,6 +5979,8 @@ sub gst_network_get_interface_replace_table
           "debian-3.1"   => "debian-3.0",
           "debian-4.0"   => "debian-3.0",
           "debian-5.0"   => "debian-3.0",
+          "debian-6.0"   => "debian-3.0",
+          "debian-7.0"   => "debian-3.0",
           "debian-testing" => "debian-3.0",
           "ubuntu-5.04"  => "debian-3.0",
           "ubuntu-5.10"  => "debian-3.0",
@@ -5950,6 +5994,11 @@ sub gst_network_get_interface_replace_table
           "ubuntu-9.10"  => "debian-3.0",
           "ubuntu-10.04"  => "debian-3.0",
           "ubuntu-10.10"  => "debian-3.0",
+          "ubuntu-11.04"  => "debian-3.0",
+          "ubuntu-11.10"  => "debian-3.0",
+          "ubuntu-12.04"  => "debian-3.0",
+          "ubuntu-12.10"  => "debian-3.0",
+          "ubuntu-13.04"  => "debian-3.0",
           "suse-7.0"     => "suse-7.0",
           "suse-9.0"     => "suse-9.0",
           "suse-9.1"     => "suse-9.0",
diff --git a/knetworkconf/backends/platform.pl.in b/knetworkconf/backends/platform.pl.in
index 2d0534a..ad6a38d 100644
--- a/knetworkconf/backends/platform.pl.in
+++ b/knetworkconf/backends/platform.pl.in
@@ -61,6 +61,8 @@ $PLATFORM_INFO = {
   "ubuntu-11.04"     => "Kubuntu 11.04, Natty Narwhal",
   "ubuntu-11.10"     => "Kubuntu 11.10, Oneiric Ocelot",
   "ubuntu-12.04"     => "Kubuntu 12.04, Precise Pangolin",
+  "ubuntu-12.10"     => "Kubuntu 12.10, Quantal Quetzal",
+  "ubuntu-13.04"     => "Kubuntu 13.04, Raring Ringtail",
   "redhat-5.2"      => "Red Hat Linux 5.2 Apollo",
   "redhat-6.0"      => "Red Hat Linux 6.0 Hedwig",
   "redhat-6.1"      => "Red Hat Linux 6.1 Cartman",
diff --git a/knetworkconf/backends/service.pl.in b/knetworkconf/backends/service.pl.in
index 08caca7..1e4d9af 100644
--- a/knetworkconf/backends/service.pl.in
+++ b/knetworkconf/backends/service.pl.in
@@ -87,6 +87,8 @@ sub gst_service_sysv_get_paths
        "debian-3.1"   => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
        "debian-4.0"   => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
        "debian-5.0"   => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "debian-6.0"   => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "debian-7.0"   => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
        "debian-testing" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
        "ubuntu-5.04"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
        "ubuntu-5.10"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
@@ -95,6 +97,16 @@ sub gst_service_sysv_get_paths
        "ubuntu-7.04"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
        "ubuntu-7.10"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
        "ubuntu-8.04"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "ubuntu-8.10"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "ubuntu-9.04"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "ubuntu-9.10"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "ubuntu-10.04"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "ubuntu-10.10"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "ubuntu-11.04"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "ubuntu-11.10"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "ubuntu-12.04"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "ubuntu-12.10"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+       "ubuntu-13.04"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
        
        "suse-7.0"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d", "../"],
        "suse-9.0"     => ["$gst_prefix/etc/init.d", "$gst_prefix/etc/init.d", "../"],
@@ -174,6 +186,8 @@ sub gst_service_sysv_get_runlevels
        "debian-3.1"     => [2, 3],
        "debian-4.0"     => [2, 3],
        "debian-5.0"     => [2, 3],
+       "debian-6.0"     => [2, 3],
+       "debian-7.0"     => [2, 3],
        "debian-testing" => [2, 3],
        "ubuntu-5.04"    => [2, 3],
        "ubuntu-5.10"    => [2, 3],
@@ -182,6 +196,16 @@ sub gst_service_sysv_get_runlevels
        "ubuntu-7.04"    => [2, 3],
        "ubuntu-7.10"    => [2, 3],
        "ubuntu-8.04"    => [2, 3],
+       "ubuntu-8.10"    => [2, 3],
+       "ubuntu-9.04"    => [2, 3],
+       "ubuntu-9.10"    => [2, 3],
+       "ubuntu-10.04"    => [2, 3],
+       "ubuntu-10.10"    => [2, 3],
+       "ubuntu-11.04"    => [2, 3],
+       "ubuntu-11.10"    => [2, 3],
+       "ubuntu-12.04"    => [2, 3],
+       "ubuntu-12.10"    => [2, 3],
+       "ubuntu-13.04"    => [2, 3],
        
        "suse-7.0"       => [3, 5],
        "suse-9.0"       => [3, 5],
@@ -260,6 +284,8 @@ sub gst_service_get_runlevel_roles
      "debian-3.1"     => "debian-2.2",
      "debian-4.0"     => "debian-2.2",
      "debian-5.0"     => "debian-2.2",
+     "debian-6.0"     => "debian-2.2",
+     "debian-7.0"     => "debian-2.2",
      "debian-testing" => "debian-2.2",
      "ubuntu-5.04"    => "debian-2.2",
      "ubuntu-5.10"    => "debian-2.2",
@@ -268,6 +294,16 @@ sub gst_service_get_runlevel_roles
      "ubuntu-7.04"    => "debian-2.2",
      "ubuntu-7.10"    => "debian-2.2",
      "ubuntu-8.04"    => "debian-2.2",
+     "ubuntu-8.10"    => "debian-2.2",
+     "ubuntu-9.04"    => "debian-2.2",
+     "ubuntu-9.10"    => "debian-2.2",
+     "ubuntu-10.04"    => "debian-2.2",
+     "ubuntu-10.10"    => "debian-2.2",
+     "ubuntu-11.04"    => "debian-2.2",
+     "ubuntu-11.10"    => "debian-2.2",
+     "ubuntu-12.04"    => "debian-2.2",
+     "ubuntu-12.10"    => "debian-2.2",
+     "ubuntu-13.04"    => "debian-2.2",
           
      "suse-7.0"       => "redhat-5.2",
      "suse-9.0"       => "redhat-5.2",
@@ -1754,6 +1790,8 @@ sub gst_service_get_status
        "debian-3.1"   => \&gst_service_debian_get_status,
        "debian-4.0"   => \&gst_service_debian_get_status,
        "debian-5.0"   => \&gst_service_debian_get_status,
+       "debian-6.0"   => \&gst_service_debian_get_status,
+       "debian-7.0"   => \&gst_service_debian_get_status,
        "debian-testing" => \&gst_service_debian_get_status,
        "ubuntu-5.04"  => \&gst_service_debian_get_status,
        "ubuntu-5.10"  => \&gst_service_debian_get_status,
@@ -1762,6 +1800,16 @@ sub gst_service_get_status
        "ubuntu-7.04"  => \&gst_service_debian_get_status,
        "ubuntu-7.10"  => \&gst_service_debian_get_status,
        "ubuntu-8.04"  => \&gst_service_debian_get_status,
+       "ubuntu-8.10"  => \&gst_service_debian_get_status,
+       "ubuntu-9.04"  => \&gst_service_debian_get_status,
+       "ubuntu-9.10"  => \&gst_service_debian_get_status,
+       "ubuntu-10.04"  => \&gst_service_debian_get_status,
+       "ubuntu-10.10"  => \&gst_service_debian_get_status,
+       "ubuntu-11.04"  => \&gst_service_debian_get_status,
+       "ubuntu-11.10"  => \&gst_service_debian_get_status,
+       "ubuntu-12.04"  => \&gst_service_debian_get_status,
+       "ubuntu-12.10"  => \&gst_service_debian_get_status,
+       "ubuntu-13.04"  => \&gst_service_debian_get_status,
               
        "redhat-5.2"   => \&gst_service_redhat_get_status,
        "redhat-6.0"   => \&gst_service_redhat_get_status,