Bug#387047: knetworkconf: please support debian etch 4.0 and debian unstable/experimental
Package: knetworkconf
Version: 4:3.5.4-1
Severity: important
Tags: patch
Currently debian etch does not support debian etch - and unfortunately
debian testing/unstable is called debian sarge.
This patch fixes it.
Thank you
/Sune
diff -u kdeadmin-3.5.4/debian/changelog kdeadmin-3.5.4/debian/changelog
--- kdeadmin-3.5.4/debian/changelog
+++ kdeadmin-3.5.4/debian/changelog
@@ -1,3 +1,10 @@
+kdeadmin (4:3.5.4-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Makes knetworkconf work with etch
+
+ -- Sune Vuorela <pusling@pusling-main> Fri, 8 Sep 2006 16:04:41 +0200
+
kdeadmin (4:3.5.4-1) unstable; urgency=low
* New upstream release.
only in patch2:
unchanged:
--- kdeadmin-3.5.4.orig/knetworkconf/backends/service.pl.in
+++ kdeadmin-3.5.4/knetworkconf/backends/service.pl.in
@@ -80,7 +80,9 @@
"debian-2.2" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
"debian-3.0" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
- "debian-sarge" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+ "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-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"],
"ubuntu-6.06" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
@@ -151,7 +153,9 @@
"debian-2.2" => [2, 3],
"debian-3.0" => [2, 3],
- "debian-sarge" => [2, 3],
+ "debian-3.1" => [2, 3],
+ "debian-4.0" => [2, 3],
+ "debian-testing" => [2, 3],
"ubuntu-5.04" => [2, 3],
"ubuntu-5.10" => [2, 3],
"ubuntu-6.04" => [2, 3],
@@ -221,7 +225,9 @@
"debian-2.2" => "debian-2.2",
"debian-3.0" => "debian-2.2",
- "debian-sarge" => "debian-2.2",
+ "debian-3.1" => "debian-2.2",
+ "debian-4.0" => "debian-2.2",
+ "debian-testing" => "debian-2.2",
"ubuntu-5.04" => "debian-2.2",
"ubuntu-5.10" => "debian-2.2",
"ubuntu-6.04" => "debian-2.2",
@@ -1696,7 +1702,9 @@
(
"debian-2.2" => \&gst_service_debian_get_status,
"debian-3.0" => \&gst_service_debian_get_status,
- "debian-sarge" => \&gst_service_debian_get_status,
+ "debian-3.1" => \&gst_service_debian_get_status,
+ "debian-4.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,
"ubuntu-6.04" => \&gst_service_debian_get_status,
only in patch2:
unchanged:
--- kdeadmin-3.5.4.orig/knetworkconf/backends/network-conf.in
+++ kdeadmin-3.5.4/knetworkconf/backends/network-conf.in
@@ -68,7 +68,7 @@
"mandrake-10.0", "mandrake-10.1","mandrake-10.2", "mandriva-2006.0", "mandriva-2006.1",
"yoper-2.2",
"blackpanther-4.0",
- "debian-2.2", "debian-3.0", "debian-sarge",
+ "debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-testing",
"ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06",
"suse-7.0", "suse-9.0", "suse-9.1",
"turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath",
only in patch2:
unchanged:
--- kdeadmin-3.5.4.orig/knetworkconf/backends/platform.pl.in
+++ kdeadmin-3.5.4/knetworkconf/backends/platform.pl.in
@@ -40,7 +40,9 @@
$PLATFORM_INFO = {
"debian-2.2" => "Debian GNU/Linux 2.2 Potato",
"debian-3.0" => "Debian GNU/Linux 3.0 Woody",
- "debian-sarge" => "Debian GNU/Linux Sarge",
+ "debian-3.1" => "Debian GNU/Linux 3.1 Sarge",
+ "debian-4.0" => "Debian GNU/Linux 4.0 Etch",
+ "debian-testing" => "Debian GNU/Linux Testing/Unstable/Experimental",
"ubuntu-5.04" => "Ubuntu GNU/Linux Hoary",
"ubuntu-5.10" => "Ubuntu GNU/Linux Breezy",
"ubuntu-6.06" => "Ubuntu GNU/Linux Dapper",
@@ -128,8 +130,8 @@
{
my ($ver, $i);
my %vermap =
- ("testing/unstable" => "sarge",
- "3.1" => "sarge");
+ ("testing/unstable" => "testing",
+ "unstable/experimental" => "testing");
open DEBIAN, "$gst_prefix/etc/debian_version" or return -1;
chomp ($ver = <DEBIAN>);
only in patch2:
unchanged:
--- kdeadmin-3.5.4.orig/knetworkconf/backends/network.pl.in
+++ kdeadmin-3.5.4/knetworkconf/backends/network.pl.in
@@ -495,7 +495,9 @@
"openna-1.0" => "redhat-6.2",
"debian-2.2" => "debian-2.2",
"debian-3.0" => "debian-2.2",
- "debian-sarge" => "debian-2.2",
+ "debian-3.1" => "debian-2.2",
+ "debian-4.0" => "debian-2.2",
+ "debian-testing" => "debian-2.2",
"ubuntu-5.04" => "debian-2.2",
"ubuntu-5.10" => "debian-2.2",
"ubuntu-6.06" => "debian-2.2",
@@ -1813,7 +1815,9 @@
"conectiva-10" => \&gst_network_rh62_get_file,
"debian-2.2" => \&gst_network_deb22_get_file,
"debian-3.0" => \&gst_network_deb22_get_file,
- "debian-sarge" => \&gst_network_deb22_get_file,
+ "debian-3.1" => \&gst_network_deb22_get_file,
+ "debian-4.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,
"ubuntu-6.06" => \&gst_network_deb22_get_file,
@@ -3934,7 +3938,9 @@
"conectiva-10" => "lo",
"debian-2.2" => "lo",
"debian-3.0" => "lo",
- "debian-sarge" => "lo",
+ "debian-3.1" => "lo",
+ "debian-4.0" => "lo",
+ "debian-testing" => "lo",
"ubuntu-5.04" => "lo",
"ubuntu-5.10" => "lo",
"ubuntu-6.06" => "lo",
@@ -4100,7 +4106,9 @@
"conectiva-10" => "redhat-7.0",
"debian-2.2" => "debian-2.2",
"debian-3.0" => "debian-2.2",
- "debian-sarge" => "debian-2.2",
+ "debian-3.1" => "debian-2.2",
+ "debian-4.0" => "debian-2.2",
+ "debian-testing" => "debian-2.2",
"ubuntu-5.04" => "debian-2.2",
"ubuntu-5.10" => "debian-2.2",
"ubuntu-6.06" => "debian-2.2",
@@ -4522,7 +4530,9 @@
"conectiva-10" => "conectiva-9",
"debian-2.2" => "debian-2.2",
"debian-3.0" => "debian-3.0",
- "debian-sarge" => "debian-3.0",
+ "debian-3.1" => "debian-3.0",
+ "debian-4.0" => "debian-3.0",
+ "debian-testing" => "debian-3.0",
"ubuntu-5.04" => "debian-3.0",
"ubuntu-5.10" => "debian-3.0",
"ubuntu-6.06" => "debian-3.0",
@@ -5361,7 +5371,9 @@
"conectiva-10" => "redhat-7.0",
"debian-2.2" => "debian-2.2",
"debian-3.0" => "debian-2.2",
- "debian-sarge" => "debian-2.2",
+ "debian-3.1" => "debian-2.2",
+ "debian-4.0" => "debian-2.2",
+ "debian-testing" => "debian-2.2",
"ubuntu-5.04" => "debian-2.2",
"ubuntu-5.10" => "debian-2.2",
"ubuntu-6.06" => "debian-2.2",
@@ -5768,7 +5780,9 @@
"conectiva-10" => "conectiva-9",
"debian-2.2" => "debian-2.2",
"debian-3.0" => "debian-3.0",
- "debian-sarge" => "debian-3.0",
+ "debian-3.1" => "debian-3.0",
+ "debian-4.0" => "debian-3.0",
+ "debian-testing" => "debian-3.0",
"ubuntu-5.04" => "debian-3.0",
"ubuntu-5.10" => "debian-3.0",
"ubuntu-6.06" => "debian-3.0",
-- System Information:
Debian Release: unstable/experimental
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (200, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/dash
Kernel: Linux 2.6.16-1-k7
Locale: LANG=en_GB, LC_CTYPE=en_GB (charmap=ISO-8859-1)
Versions of packages knetworkconf depends on:
ii kdelibs4c2a 4:3.5.4-3 core libraries and binaries for al
ii libc6 2.3.6.ds1-4 GNU C Library: Shared libraries
ii libgcc1 1:4.1.1-13 GCC support library
ii libstdc++6 4.1.1-13 The GNU Standard C++ Library v3
knetworkconf recommends no packages.
-- debconf-show failed
Reply to: