2007-01-04 Carlos Garnacho <carlosg@gnome.org>

        * */*.pm: Add support for Ubuntu Feisty, separated from the rest of
        the debian based ones, because there are supposed to be important
        changes.
        * Network/Ifaces.pm (get_available_configuration_methods): add ipv4ll
        support for Ubuntu Feisty.
        * Utils/Platform.pm (init): do not use cache at the moment, might
        give incorrect results if the underlying system requires different
        treatment, and as it's called just one in all s-t-b app lifecicle,
        there shouldn't be any noticeable performance decrease.

8 files changed, 28 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5bce879..5379980 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2007-01-04  Carlos Garnacho  <carlosg@gnome.org>
 
+	* */*.pm: Add support for Ubuntu Feisty, separated from the rest of
+	the debian based ones, because there are supposed to be important
+	changes.
+	* Network/Ifaces.pm (get_available_configuration_methods): add ipv4ll
+	support for Ubuntu Feisty.
+	* Utils/Platform.pm (init): do not use cache at the moment, might
+	give incorrect results if the underlying system requires different
+	treatment, and as it's called just one in all s-t-b app lifecicle,
+	there shouldn't be any noticeable performance decrease.
+
+2007-01-04  Carlos Garnacho  <carlosg@gnome.org>
+
 	* configure.in: bump revision number.
 
 2007-01-04  Carlos Garnacho  <carlosg@gnome.org>
diff --git a/Init/Services.pm b/Init/Services.pm
index b905a4d..a8649b2 100644
--- a/Init/Services.pm
+++ b/Init/Services.pm
@@ -45,6 +45,7 @@ sub get_runlevels
      "mandrake-9.0"     => "redhat-6.2",
      "conectiva-9"      => "redhat-6.2",
      "debian-3.0"       => "redhat-6.2",
+     "ubuntu-7.04"      => "redhat-6.2",
      "suse-9.0"         => "redhat-6.2",
      "pld-1.0"          => "redhat-6.2",
      "vine-3.0"         => "redhat-6.2",
@@ -100,6 +101,7 @@ sub get_sysv_paths
      "yoper-2.2"      => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
      "conectiva-9"    => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
      "debian-3.0"     => ["$gst_prefix/etc",      "$gst_prefix/etc/init.d",      "../init.d"],
+     "ubuntu-7.04"    => ["$gst_prefix/etc",      "$gst_prefix/etc/init.d",      "../init.d"],
      "suse-9.0"       => ["$gst_prefix/etc/init.d", "$gst_prefix/etc/init.d",    "../"],
      "pld-1.0"        => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
      "vine-3.0"       => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
diff --git a/Network/Hosts.pm b/Network/Hosts.pm
index 25fae76..60c69b2 100644
--- a/Network/Hosts.pm
+++ b/Network/Hosts.pm
@@ -46,6 +46,7 @@ sub get_fqdn_dist
     "yoper-2.2"       => "redhat-6.2",
     "conectiva-9"     => "redhat-6.2", 
     "debian-3.0"      => "debian-2.2",
+    "ubuntu-7.04"     => "debian-2.2",
     "suse-9.0"        => "suse-9.0",
     "pld-1.0"         => "redhat-6.2",
     "vine-3.0"        => "redhat-6.2",
diff --git a/Network/Ifaces.pm b/Network/Ifaces.pm
index c629e9c..9ac0d4e 100644
--- a/Network/Ifaces.pm
+++ b/Network/Ifaces.pm
@@ -1989,6 +1989,7 @@ sub get_interface_dist
     "yoper-2.2"       => "redhat-6.2",
     "conectiva-9"     => "conectiva-9",
     "debian-3.0"      => "debian-3.0",
+    "ubuntu-7.04"     => "debian-3.0",
     "suse-9.0"        => "suse-9.0",
     "pld-1.0"         => "pld-1.0",
     "vine-3.0"        => "vine-3.0",
@@ -3617,6 +3618,7 @@ sub get_available_configuration_methods
   my $dist = $Utils::Backend::tool{"platform"};
   my $default = [ "static", "dhcp" ];
   my %dist_map = (
+    "ubuntu-7.04"  =>  "ipv4ll",
   );
 
   push @$default, @{$dist_map{$dist}};
diff --git a/Shares/SMB.pm b/Shares/SMB.pm
index 5abe981..a555276 100644
--- a/Shares/SMB.pm
+++ b/Shares/SMB.pm
@@ -137,6 +137,7 @@ sub get_distro_smb_file
    "redhat-8.0"      => "debian-3.0",
    "mandrake-9.0"    => "debian-3.0",
    "debian-3.0"      => "debian-3.0",
+   "ubuntu-7.04"     => "debian-3.0",
    "suse-9.0"        => "debian-3.0",
    "slackware-9.1.0" => "debian-3.0",
    "gentoo"          => "debian-3.0",
diff --git a/Time/NTP.pm b/Time/NTP.pm
index 21acc2b..91802f1 100644
--- a/Time/NTP.pm
+++ b/Time/NTP.pm
@@ -35,6 +35,7 @@ sub get_config_file ()
     "redhat-8.0"      => "redhat-6.2",
     "mandrake-9.0"    => "redhat-6.2",
     "debian-3.0"      => "redhat-6.2",
+    "ubuntu-7.04"     => "redhat-6.2",
     "suse-9.0"        => "redhat-6.2",
     "slackware-9.1.0" => "redhat-6.2",
     "gentoo"          => "redhat-6.2",
diff --git a/Time/TimeDate.pm b/Time/TimeDate.pm
index 415f342..65e0952 100644
--- a/Time/TimeDate.pm
+++ b/Time/TimeDate.pm
@@ -166,6 +166,7 @@ sub get_dist
    "redhat-8.0"      => "redhat-6.2",
    "mandrake-9.0"    => "redhat-6.2",
    "debian-3.0"      => "debian-3.0",
+   "ubuntu-7.04"     => "debian-3.0",
    "suse-9.0"        => "redhat-6.2",
    "slackware-9.1.0" => "redhat-6.2",
    "gentoo"          => "redhat-6.2",
diff --git a/Utils/Platform.pm b/Utils/Platform.pm
index 989fb19..fe58417 100644
--- a/Utils/Platform.pm
+++ b/Utils/Platform.pm
@@ -38,6 +38,7 @@ my $PLATFORM_INFO = {
   "ubuntu-5.10"     => [ "Ubuntu Linux", "5.10", "Breezy" ],
   "ubuntu-6.06"     => [ "Ubuntu Linux", "6.06", "Dapper" ],
   "ubuntu-6.10"     => [ "Ubuntu Linux", "6.10", "Edgy" ],
+  "ubuntu-7.04"     => [ "Ubuntu Linux", "7.04", "Feisty" ],
   "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" ],
@@ -430,11 +431,15 @@ sub init
 {
   &get_system ();
 
-  if (!&get_cached_platform ())
-  {
+  # FIXME: need to figure out whether the underlying platform has
+  # been updated or changed, until now it's safer to ignore the cache,
+  # this function is called just once in all the executable lifecicle,
+  # so I don't expect any noticeable performance decrease.
+  #if (!&get_cached_platform ())
+  #{
     &guess ($self) if !$Utils::Backend::tool{"platform"};
     &cache_platform ();
-  }
+  #}
 }
 
 1;