← Back to branch summary

~ubuntu-branches/ubuntu/hardy/kdeadmin/hardy-backports

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_01_ubuntu_version.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2006-07-25 10:12:17 UTC
  • mfrom: (1.2.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725101217-96zqqeyi89kl8hxb
Tags: 4:3.5.4-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_01_ubuntu_version.diff
1
 
--- kdeadmin-3.5.2/knetworkconf/backends/network-conf.in        2006-01-19 16:20:15.000000000 +0000
2
 
+++ kdeadmin-3.5.2/knetworkconf/backends/network-conf.in        2006-03-31 00:37:09.000000000 +0100
3
 
@@ -69,7 +69,7 @@
4
 
               "yoper-2.2",
5
 
               "blackpanther-4.0",
6
 
               "debian-2.2", "debian-3.0", "debian-sarge",
7
 
-              "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.04",
8
 
+              "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06",
9
 
               "suse-7.0", "suse-9.0", "suse-9.1",
10
 
               "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "rpath",
11
 
               "pld-1.0", "pld-1.1", "pld-1.99",
12
 
--- kdeadmin-3.5.2/knetworkconf/backends/network.pl.in  2006-01-19 16:20:15.000000000 +0000
13
 
+++ kdeadmin-3.5.2/knetworkconf/backends/network.pl.in  2006-03-31 00:36:13.000000000 +0100
14
 
@@ -498,7 +498,7 @@
15
 
        "debian-sarge" => "debian-2.2",
16
 
        "ubuntu-5.04"  => "debian-2.2",
17
 
        "ubuntu-5.10"  => "debian-2.2",
18
 
-       "ubuntu-6.04"  => "debian-2.2",
19
 
+       "ubuntu-6.06"  => "debian-2.2",
20
 
        "mandrake-7.1" => "debian-2.2",
21
 
        "mandrake-7.2" => "debian-2.2",
22
 
        "mandrake-9.0" => "debian-2.2",
23
 
@@ -1815,7 +1815,7 @@
24
 
           "debian-sarge" => \&gst_network_deb22_get_file,
25
 
           "ubuntu-5.04" => \&gst_network_deb22_get_file,    
26
 
           "ubuntu-5.10" => \&gst_network_deb22_get_file,    
27
 
-          "ubuntu-6.04" => \&gst_network_deb22_get_file,    
28
 
+          "ubuntu-6.06" => \&gst_network_deb22_get_file,    
29
 
           "suse-7.0"     => \&gst_network_suse70_get_file,
30
 
           "suse-9.0"     => \&gst_network_deb22_get_file,
31
 
           "suse-9.1"     => \&gst_network_deb22_get_file,
32
 
@@ -3935,7 +3935,7 @@
33
 
           "debian-sarge" => "lo",
34
 
           "ubuntu-5.04" => "lo",    
35
 
           "ubuntu-5.10" => "lo",    
36
 
-          "ubuntu-6.04" => "lo",    
37
 
+          "ubuntu-6.06" => "lo",    
38
 
           "suse-7.0"     => "",
39
 
           "suse-9.0"     => "",
40
 
           "suse-9.1"     => "",
41
 
@@ -4100,7 +4100,7 @@
42
 
           "debian-sarge" => "debian-2.2",
43
 
           "ubuntu-5.04" => "debian-2.2",
44
 
           "ubuntu-5.10" => "debian-2.2",
45
 
-          "ubuntu-6.04" => "debian-2.2",
46
 
+          "ubuntu-6.06" => "debian-2.2",
47
 
           "suse-7.0"     => "suse-7.0",
48
 
           "suse-9.0"     => "suse-9.0",
49
 
           "suse-9.1"     => "suse-9.0",
50
 
@@ -4521,7 +4521,7 @@
51
 
           "debian-sarge" => "debian-3.0",
52
 
           "ubuntu-5.04" => "debian-3.0",
53
 
           "ubuntu-5.10" => "debian-3.0",
54
 
-          "ubuntu-6.04" => "debian-3.0",
55
 
+          "ubuntu-6.06" => "debian-3.0",
56
 
           "suse-7.0"     => "suse-7.0",
57
 
           "suse-9.0"     => "suse-9.0",
58
 
           "suse-9.1"     => "suse-9.0",
59
 
@@ -5359,7 +5359,7 @@
60
 
           "debian-sarge" => "debian-2.2",
61
 
           "ubuntu-5.04" => "debian-2.2",
62
 
           "ubuntu-5.10" => "debian-2.2",
63
 
-          "ubuntu-6.04" => "debian-2.2",
64
 
+          "ubuntu-6.06" => "debian-2.2",
65
 
           "suse-7.0"     => "suse-7.0",
66
 
           "suse-9.0"     => "suse-9.0",
67
 
           "suse-9.1"     => "suse-9.0",
68
 
@@ -5765,7 +5765,7 @@
69
 
           "debian-sarge" => "debian-3.0",
70
 
           "ubuntu-5.04" => "debian-3.0",
71
 
           "ubuntu-5.10" => "debian-3.0",
72
 
-          "ubuntu-6.04" => "debian-3.0",
73
 
+          "ubuntu-6.06" => "debian-3.0",
74
 
           "suse-7.0"     => "suse-7.0",
75
 
           "suse-9.0"     => "suse-9.0",
76
 
           "suse-9.1"     => "suse-9.0",
77
 
--- kdeadmin-3.5.2/knetworkconf/backends/platform.pl.in 2006-01-19 16:20:15.000000000 +0000
78
 
+++ kdeadmin-3.5.2/knetworkconf/backends/platform.pl.in 2006-03-31 00:36:24.000000000 +0100
79
 
@@ -43,7 +43,7 @@
80
 
   "debian-sarge"    => "Debian GNU/Linux Sarge",
81
 
   "ubuntu-5.04"     => "Ubuntu GNU/Linux Hoary",
82
 
   "ubuntu-5.10"     => "Ubuntu GNU/Linux Breezy",
83
 
-  "ubuntu-6.04"     => "Ubuntu GNU/Linux Dapper",
84
 
+  "ubuntu-6.06"     => "Ubuntu GNU/Linux Dapper",
85
 
   "redhat-5.2"      => "Red Hat Linux 5.2 Apollo",
86
 
   "redhat-6.0"      => "Red Hat Linux 6.0 Hedwig",
87
 
   "redhat-6.1"      => "Red Hat Linux 6.1 Cartman",
88
 
--- kdeadmin-3.5.2/knetworkconf/backends/service.pl.in  2006-01-19 16:20:15.000000000 +0000
89
 
+++ kdeadmin-3.5.2/knetworkconf/backends/service.pl.in  2006-03-31 00:36:45.000000000 +0100
90
 
@@ -83,7 +83,7 @@
91
 
        "debian-sarge" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
92
 
        "ubuntu-5.04"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
93
 
        "ubuntu-5.10"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
94
 
-       "ubuntu-6.04"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
95
 
+       "ubuntu-6.06"  => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
96
 
        
97
 
        "suse-7.0"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d", "../"],
98
 
        "suse-9.0"     => ["$gst_prefix/etc/init.d", "$gst_prefix/etc/init.d", "../"],