[Pkg-kde-commits] rev 2451 - trunk/packages/kdeadmin/debian/patches
Josh Metzler
jdmetz-guest at costa.debian.org
Wed Nov 30 17:00:24 UTC 2005
Author: jdmetz-guest
Date: 2005-11-30 17:00:23 +0000 (Wed, 30 Nov 2005)
New Revision: 2451
Added:
trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch_r484389.diff
Log:
kdeadmin branch pull.
Added: trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch_r484389.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch_r484389.diff 2005-11-30 16:55:20 UTC (rev 2450)
+++ trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch_r484389.diff 2005-11-30 17:00:23 UTC (rev 2451)
@@ -0,0 +1,178 @@
+#DPATCHLEVEL=0
+--- knetworkconf/knetworkconf/knetworkconf.cpp (.../tags/KDE/3.5.0/kdeadmin) (revision 484389)
++++ knetworkconf/knetworkconf/knetworkconf.cpp (.../branches/KDE/3.5/kdeadmin) (revision 484389)
+@@ -21,6 +21,7 @@
+
+ KNetworkConf::KNetworkConf(QWidget *parent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(parent, name)
+ {
++ netInfo = 0L;
+ makeButtonsResizeable();
+ config = new KNetworkConfigParser();
+ klvCardList->setAllColumnsShowFocus(true);
+@@ -990,6 +991,8 @@
+
+ void KNetworkConf::createProfileSlot()
+ {
++ if (!netInfo)
++ return;
+ bool ok;
+ QString newProfileName = KInputDialog::getText(i18n("Create New Network Profile"),
+ i18n("Name of new profile:"),
+--- knetworkconf/backends/service.pl.in (.../tags/KDE/3.5.0/kdeadmin) (revision 484389)
++++ knetworkconf/backends/service.pl.in (.../branches/KDE/3.5/kdeadmin) (revision 484389)
+@@ -67,7 +67,9 @@
+ "mandrake-9.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "mandrake-10.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "mandrake-10.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+-
++ "mandrake-10.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
++ "mandriva-2006.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
++
+ "blackpanther-4.0" => ["$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"],
+@@ -134,6 +136,8 @@
+ "mandrake-9.2" => [3, 5],
+ "mandrake-10.0" => [3, 5],
+ "mandrake-10.1" => [3, 5],
++ "mandrake-10.2" => [3, 5],
++ "mandriva-2006.0" => [3, 5],
+
+ "blackpanther-4.0" => [3, 5],
+
+@@ -201,6 +205,8 @@
+ "mandrake-9.2" => "redhat-5.2",
+ "mandrake-10.0" => "redhat-5.2",
+ "mandrake-10.1" => "redhat-5.2",
++ "mandrake-10.2" => "redhat-5.2",
++ "mandriva-2006.0" => "redhat-5.2",
+
+ "blackpanther-4.0" => "redhat-5.2",
+
+--- knetworkconf/backends/network-conf.in (.../tags/KDE/3.5.0/kdeadmin) (revision 484389)
++++ knetworkconf/backends/network-conf.in (.../branches/KDE/3.5/kdeadmin) (revision 484389)
+@@ -65,7 +65,7 @@
+ "redhat-7.2", "redhat-8.0", "redhat-9",
+ "openna-1.0",
+ "mandrake-7.1", "mandrake-7.2", "mandrake-9.0", "mandrake-9.1", "mandrake-9.2",
+- "mandrake-10.0", "mandrake-10.1",
++ "mandrake-10.0", "mandrake-10.1", "mandrake-10.2", "mandriva-2006.0",
+ "blackpanther-4.0",
+ "debian-2.2", "debian-3.0", "debian-sarge",
+ "ubuntu-5.04", "ubuntu-5.10",
+--- knetworkconf/backends/platform.pl.in (.../tags/KDE/3.5.0/kdeadmin) (revision 484389)
++++ knetworkconf/backends/platform.pl.in (.../branches/KDE/3.5/kdeadmin) (revision 484389)
+@@ -61,7 +61,9 @@
+ "mandrake-9.1" => "Linux Mandrake 9.1 Bamboo",
+ "mandrake-9.2" => "Linux Mandrake 9.2 FiveStar",
+ "mandrake-10.0" => "Linux Mandrake 10.0",
+- "mandrake-10.1" => "Linux Mandrake 10.1",
++ "mandrake-10.1" => "Mandrake 10.1",
++ "mandrake-10.2" => "Mandrake Linux Limited Edition 2005",
++ "mandriva-2006.0" => "Mandriva Linux 2006.0",
+ "blackpanther-4.0" => "Black Panther OS 4.0",
+ "conectiva-9" => "Conectiva Linux 9",
+ "conectiva-10" => "Conectiva Linux 10",
+@@ -200,6 +202,28 @@
+ return -1;
+ }
+
++sub check_mandriva
++{
++ open MANDRIVA, "$gst_prefix/etc/mandriva-release" or return -1;
++ while (<MANDRIVA>)
++ {
++ $ver = $_;
++ chomp ($ver);
++ if ($ver =~ /^Linux Mandriva release (\S+)/)
++ {
++ close MANDRIVA;
++ return "mandriva-$1";
++ }
++ elsif ($ver =~ /^Mandriva( L|l)inux release ([\d\.]+)/i)
++ {
++ close MANDRIVA;
++ return "mandriva-$2";
++ }
++ }
++ close MANDRIVA;
++ return -1;
++}
++
+ sub check_mandrake
+ {
+ open MANDRAKE, "$gst_prefix/etc/mandrake-release" or return -1;
+@@ -519,7 +543,7 @@
+ my %check = (
+ # Red Hat check must run after Vine, Mandrake and Fedora, and Mandrake after BlackPanther
+ "Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_blackpanther, \&check_vine,
+- \&check_fedora, \&check_yoper, \&check_mandrake, \&check_conectiva, \&check_linuxppc, \&check_redhat, \&check_openna,
++ \&check_fedora, \&check_yoper, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_redhat, \&check_openna,
+ \&check_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_specifix, \&check_archlinux, \&check_ark ],
+ "FreeBSD" => [ \&check_freebsd ],
+ "SunOS" => [ \&check_solaris ]
+--- knetworkconf/backends/network.pl.in (.../tags/KDE/3.5.0/kdeadmin) (revision 484389)
++++ knetworkconf/backends/network.pl.in (.../branches/KDE/3.5/kdeadmin) (revision 484389)
+@@ -501,6 +501,8 @@
+ "mandrake-9.2" => "debian-2.2",
+ "mandrake-10.0" => "debian-2.2",
+ "mandrake-10.1" => "redhat-6.2",
++ "mandrake-10.2" => "redhat-6.2",
++ "mandriva-2006.0" => "redhat-6.2",
+ "blackpanther-4.0" => "debian-2.2",
+ "suse-7.0" => "debian-2.2",
+ "suse-9.0" => "redhat-6.2",
+@@ -1781,6 +1783,8 @@
+ "mandrake-9.2" => \&gst_network_rh62_get_file,
+ "mandrake-10.0" => \&gst_network_rh62_get_file,
+ "mandrake-10.1" => \&gst_network_rh62_get_file,
++ "mandrake-10.2" => \&gst_network_rh62_get_file,
++ "mandriva-2006.0" => \&gst_network_rh62_get_file,
+ "blackpanther-4.0" => \&gst_network_rh62_get_file,
+ "conectiva-9" => \&gst_network_rh62_get_file,
+ "conectiva-10" => \&gst_network_rh62_get_file,
+@@ -3887,6 +3891,8 @@
+ "mandrake-9.2" => "lo",
+ "mandrake-10.0" => "lo",
+ "mandrake-10.1" => "lo",
++ "mandrake-10.2" => "lo",
++ "mandriva-2006.0" => "lo",
+ "blackpanther-4.0" => "lo",
+ "conectiva-9" => "lo",
+ "conectiva-10" => "lo",
+@@ -4019,6 +4025,8 @@
+ "mandrake-9.2" => "redhat-7.0",
+ "mandrake-10.0" => "redhat-7.0",
+ "mandrake-10.1" => "redhat-7.0",
++ "mandrake-10.2" => "redhat-7.0",
++ "mandriva-2006.0" => "redhat-7.0",
+ "blackpanther-4.0" => "redhat-7.0",
+ "conectiva-9" => "redhat-7.0",
+ "conectiva-10" => "redhat-7.0",
+@@ -4502,6 +4510,8 @@
+ "mandrake-9.2" => "mandrake-9.0",
+ "mandrake-10.0" => "mandrake-9.0",
+ "mandrake-10.1" => "mandrake-9.0",
++ "mandrake-10.2" => "mandrake-9.0",
++ "mandriva-2006.0" => "mandrake-9.0",
+ "blackpanther-4.0" => "mandrake-9.0",
+ "conectiva-9" => "conectiva-9",
+ "conectiva-10" => "conectiva-9",
+@@ -5380,6 +5390,8 @@
+ "mandrake-9.2" => "redhat-7.0",
+ "mandrake-10.0" => "redhat-7.0",
+ "mandrake-10.1" => "redhat-7.0",
++ "mandrake-10.2" => "redhat-7.0",
++ "mandriva-2006.0" => "redhat-7.0",
+ "blackpanther-4.0" => "redhat-7.0",
+ "conectiva-9" => "redhat-7.0",
+ "conectiva-10" => "redhat-7.0",
+@@ -5813,6 +5825,8 @@
+ "mandrake-9.2" => "mandrake-9.0",
+ "mandrake-10.0" => "mandrake-9.0",
+ "mandrake-10.1" => "mandrake-9.0",
++ "mandrake-10.2" => "mandrake-9.0",
++ "mandriva-2006.0" => "mandrake-9.0",
+ "blackpanther-4.0" => "mandrake-9.0",
+ "conectiva-9" => "conectiva-9",
+ "conectiva-10" => "conectiva-9",
More information about the pkg-kde-commits
mailing list