kdereview/knetworkconf

[Jonathan Riddell]

Excellent, thanks.

Jonathan Riddell

On Sun, Mar 20, 2005 at 07:44:10AM +0100, Juan Luis Baptiste wrote:
> CVS commit by jbaptiste: 
> 
> FEATURE: Added support for kubuntu 5.04 (Hoary)
> 
> 
>   M +1 -0      backends/network-conf.in   1.13
>   M +7 -0      backends/network.pl.in   1.19
>   M +1 -1      backends/platform.pl.in   1.15
>   M +10 -2     backends/service.pl.in   1.11
>   M +6 -0      knetworkconf/knetworkconfigparser.cpp   1.56
> 
> 
> --- kdereview/knetworkconf/backends/network-conf.in  #1.12:1.13
> @@ -69,4 +69,5 @@
>                "blackpanther-4.0",
>                "debian-2.2", "debian-3.0", "debian-sarge",
> +              "ubuntu-5.04",
>                "suse-7.0", "suse-9.0", "suse-9.1",
>                "turbolinux-7.0", "fedora-1", "fedora-2", "specifix",
> 
> --- kdereview/knetworkconf/backends/network.pl.in  #1.18:1.19
> @@ -471,4 +471,5 @@
>         "debian-3.0"   => "debian-2.2",
>         "debian-sarge" => "debian-2.2",
> +       "ubuntu-5.04" => "debian-2.2",       
>         "mandrake-7.1" => "debian-2.2",
>         "mandrake-7.2" => "debian-2.2",
> @@ -1757,4 +1758,5 @@
>      "debian-3.0"   => \&gst_network_deb22_get_file,
>      "debian-sarge" => \&gst_network_deb22_get_file,
> +    "ubuntu-5.04" => \&gst_network_deb22_get_file,    
>      "suse-7.0"     => \&gst_network_suse70_get_file,
>      "suse-9.0"     => \&gst_network_deb22_get_file,
> @@ -3818,4 +3820,5 @@
>      "debian-3.0"   => "lo",
>      "debian-sarge" => "lo",
> +    "ubuntu-5.04" => "lo",    
>      "suse-7.0"     => "",
>      "suse-9.0"     => "",
> @@ -3942,4 +3945,5 @@
>      "debian-3.0"   => "debian-2.2",
>      "debian-sarge" => "debian-2.2",
> +    "ubuntu-5.04" => "debian-2.2",
>      "suse-7.0"     => "suse-7.0",
>      "suse-9.0"     => "suse-9.0",
> @@ -4349,4 +4353,5 @@
>      "debian-3.0"   => "debian-3.0",
>      "debian-sarge" => "debian-3.0",
> +    "ubuntu-5.04" => "debian-3.0",
>      "suse-7.0"     => "suse-7.0",
>      "suse-9.0"     => "suse-9.0",
> @@ -5163,4 +5168,5 @@
>      "debian-3.0" => "debian-2.2",
>      "debian-sarge" => "debian-2.2",
> +    "ubuntu-5.04" => "debian-2.2",
>      "suse-7.0"     => "suse-7.0",
>      "suse-9.0"     => "suse-9.0",
> @@ -5556,4 +5562,5 @@
>      "debian-3.0"   => "debian-3.0",
>      "debian-sarge" => "debian-3.0",
> +    "ubuntu-5.04" => "debian-3.0",
>      "suse-7.0"     => "suse-7.0",
>      "suse-9.0"     => "suse-9.0",
> 
> --- kdereview/knetworkconf/backends/platform.pl.in  #1.14:1.15
> @@ -41,5 +41,5 @@
>    "debian-2.2"      => "Debian GNU/Linux 2.2 Potato",
>    "debian-3.0"      => "Debian GNU/Linux 3.0 Woody",
> -  "debian-sarge"    => "Debian GNU/Linux Sarge",
> +  "ubuntu-5.04"    => "Ubuntu GNU/Linux Hoary",  
>    "redhat-5.2"      => "Red Hat Linux 5.2 Apollo",
>    "redhat-6.0"      => "Red Hat Linux 6.0 Hedwig",
> 
> --- kdereview/knetworkconf/backends/service.pl.in  #1.10:1.11
> @@ -78,4 +78,6 @@
>         "debian-sarge" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
>  
> +       "ubuntu-5.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", "../"],
> @@ -138,4 +140,6 @@
>         "debian-sarge"   => [2, 3],
>  
> +       "ubuntu-5.04"   => [2, 3],       
> +       
>         "suse-7.0"       => [3, 5],
>         "suse-9.0"       => [3, 5],
> @@ -196,5 +200,7 @@
>       "debian-3.0"     => "debian-2.2",
>       "debian-sarge"   => "debian-2.2",
> -     
> +
> +     "ubuntu-5.04"   => "debian-2.2",     
> +          
>       "suse-7.0"       => "redhat-5.2",
>       "suse-9.0"       => "redhat-5.2",
> @@ -1574,5 +1580,7 @@
>         "debian-3.0"   => \&gst_service_debian_get_status,
>         "debian-sarge" => \&gst_service_debian_get_status,
> -       
> +
> +       "ubuntu-5.04" => \&gst_service_debian_get_status,
> +              
>         "redhat-5.2"   => \&gst_service_redhat_get_status,
>         "redhat-6.0"   => \&gst_service_redhat_get_status,
> 
> --- kdereview/knetworkconf/knetworkconf/knetworkconfigparser.cpp  #1.55:1.56
> @@ -953,4 +953,10 @@ void KNetworkConfigParser::showSupported
>        dialog->klbDistroList->insertItem(distroImg, name);
>      }    
> +    else if (key.contains("ubuntu"))
> +    {
> +      QPixmap distroImg(locate("data","knetworkconf/pixmaps/kubuntu.png"));
> +      dialog->klbDistroList->insertItem(distroImg, name);
> +    }    
> +    
>    } 
>    
> 
>