r19168 - in /desktop/unstable/system-tools-backends/debian: changelog patches/01_debian_4.0.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Mar 21 15:04:13 UTC 2009
Author: joss
Date: Sat Mar 21 15:04:13 2009
New Revision: 19168
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19168
Log:
* 01_debian_4.0.patch: update for the new string in
/etc/debian_version. Closes: #519773.
+ Make it also understand 6.0 in preparation for squeeze.
Modified:
desktop/unstable/system-tools-backends/debian/changelog
desktop/unstable/system-tools-backends/debian/patches/01_debian_4.0.patch
Modified: desktop/unstable/system-tools-backends/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/changelog?rev=19168&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/changelog (original)
+++ desktop/unstable/system-tools-backends/debian/changelog Sat Mar 21 15:04:13 2009
@@ -1,4 +1,4 @@
-system-tools-backends (2.6.0-5) UNRELEASED; urgency=low
+system-tools-backends (2.6.0-5) unstable; urgency=low
[ Michael Biebl ]
* debian/control{.in}
@@ -9,8 +9,11 @@
[ Josselin Mouette ]
* Remove dependency on adduser. Closes: #519366.
-
- -- Michael Biebl <biebl at debian.org> Thu, 12 Mar 2009 01:35:47 +0100
+ * 01_debian_4.0.patch: update for the new string in
+ /etc/debian_version. Closes: #519773.
+ + Make it also understand 6.0 in preparation for squeeze.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 21 Mar 2009 16:03:05 +0100
system-tools-backends (2.6.0-4) unstable; urgency=low
Modified: desktop/unstable/system-tools-backends/debian/patches/01_debian_4.0.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/patches/01_debian_4.0.patch?rev=19168&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/patches/01_debian_4.0.patch (original)
+++ desktop/unstable/system-tools-backends/debian/patches/01_debian_4.0.patch Sat Mar 21 15:04:13 2009
@@ -1,19 +1,20 @@
Index: system-tools-backends-2.6.0/Init/Services.pm
===================================================================
--- system-tools-backends-2.6.0.orig/Init/Services.pm 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends-2.6.0/Init/Services.pm 2008-07-24 10:53:47.811102928 +0200
-@@ -46,6 +46,10 @@
++++ system-tools-backends-2.6.0/Init/Services.pm 2009-03-21 16:00:25.151963480 +0100
+@@ -46,6 +46,11 @@ sub get_runlevels
"mandrake-9.0" => "redhat-6.2",
"conectiva-9" => "redhat-6.2",
"debian-3.0" => "redhat-6.2",
+ "debian-3.1" => "redhat-6.2",
+ "debian-4.0" => "redhat-6.2",
+ "debian-5.0" => "redhat-6.2",
++ "debian-6.0" => "redhat-6.2",
+ "debian-testing" => "redhat-6.2",
"ubuntu-7.04" => "redhat-6.2",
"suse-9.0" => "redhat-6.2",
"pld-1.0" => "redhat-6.2",
-@@ -103,6 +107,11 @@
+@@ -103,6 +108,11 @@ 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"],
@@ -28,14 +29,15 @@
Index: system-tools-backends-2.6.0/Network/Hosts.pm
===================================================================
--- system-tools-backends-2.6.0.orig/Network/Hosts.pm 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends-2.6.0/Network/Hosts.pm 2008-07-24 10:54:05.303343213 +0200
-@@ -46,6 +46,10 @@
++++ system-tools-backends-2.6.0/Network/Hosts.pm 2009-03-21 16:00:36.305473563 +0100
+@@ -46,6 +46,11 @@ sub get_fqdn_dist
"yoper-2.2" => "redhat-6.2",
"conectiva-9" => "redhat-6.2",
"debian-3.0" => "debian-2.2",
+ "debian-3.1" => "debian-2.2",
+ "debian-4.0" => "debian-2.2",
+ "debian-5.0" => "debian-2.2",
++ "debian-6.0" => "debian-2.2",
+ "debian-testing" => "debian-2.2",
"ubuntu-7.04" => "debian-2.2",
"suse-9.0" => "suse-9.0",
@@ -43,8 +45,8 @@
Index: system-tools-backends-2.6.0/Network/Ifaces.pm
===================================================================
--- system-tools-backends-2.6.0.orig/Network/Ifaces.pm 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends-2.6.0/Network/Ifaces.pm 2008-07-24 10:54:37.903320235 +0200
-@@ -1993,6 +1993,10 @@
++++ system-tools-backends-2.6.0/Network/Ifaces.pm 2009-03-21 15:57:33.255962941 +0100
+@@ -1993,6 +1993,10 @@ sub get_interface_dist
"yoper-2.2" => "redhat-6.2",
"conectiva-9" => "conectiva-9",
"debian-3.0" => "debian-3.0",
@@ -58,14 +60,15 @@
Index: system-tools-backends-2.6.0/Shares/SMB.pm
===================================================================
--- system-tools-backends-2.6.0.orig/Shares/SMB.pm 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends-2.6.0/Shares/SMB.pm 2008-07-24 10:55:10.727108663 +0200
-@@ -137,6 +137,10 @@
++++ system-tools-backends-2.6.0/Shares/SMB.pm 2009-03-21 16:00:47.273474734 +0100
+@@ -137,6 +137,11 @@ sub get_distro_smb_file
"redhat-8.0" => "debian-3.0",
"mandrake-9.0" => "debian-3.0",
"debian-3.0" => "debian-3.0",
+ "debian-3.1" => "debian-3.0",
+ "debian-4.0" => "debian-3.0",
+ "debian-5.0" => "debian-3.0",
++ "debian-6.0" => "debian-3.0",
+ "debian-testing" => "debian-3.0",
"ubuntu-7.04" => "debian-3.0",
"suse-9.0" => "debian-3.0",
@@ -73,14 +76,15 @@
Index: system-tools-backends-2.6.0/Time/NTP.pm
===================================================================
--- system-tools-backends-2.6.0.orig/Time/NTP.pm 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends-2.6.0/Time/NTP.pm 2008-07-24 10:55:39.011105094 +0200
-@@ -35,6 +35,10 @@
++++ system-tools-backends-2.6.0/Time/NTP.pm 2009-03-21 16:01:00.441476673 +0100
+@@ -35,6 +35,11 @@ sub get_config_file ()
"redhat-8.0" => "redhat-6.2",
"mandrake-9.0" => "redhat-6.2",
"debian-3.0" => "redhat-6.2",
+ "debian-3.1" => "redhat-6.2",
+ "debian-4.0" => "redhat-6.2",
+ "debian-5.0" => "redhat-6.2",
++ "debian-6.0" => "redhat-6.2",
+ "debian-testing" => "redhat-6.2",
"ubuntu-7.04" => "redhat-6.2",
"suse-9.0" => "redhat-6.2",
@@ -88,14 +92,15 @@
Index: system-tools-backends-2.6.0/Time/TimeDate.pm
===================================================================
--- system-tools-backends-2.6.0.orig/Time/TimeDate.pm 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends-2.6.0/Time/TimeDate.pm 2008-07-24 10:56:01.159797036 +0200
-@@ -166,6 +166,10 @@
++++ system-tools-backends-2.6.0/Time/TimeDate.pm 2009-03-21 16:01:13.761478097 +0100
+@@ -166,6 +166,11 @@ sub get_dist
"redhat-8.0" => "redhat-6.2",
"mandrake-9.0" => "redhat-6.2",
"debian-3.0" => "debian-3.0",
+ "debian-3.1" => "debian-3.0",
+ "debian-4.0" => "debian-3.0",
+ "debian-5.0" => "debian-3.0",
++ "debian-6.0" => "debian-3.0",
+ "debian-testing" => "debian-3.0",
"ubuntu-7.04" => "debian-3.0",
"suse-9.0" => "redhat-6.2",
@@ -103,14 +108,15 @@
Index: system-tools-backends-2.6.0/Users/Users.pm
===================================================================
--- system-tools-backends-2.6.0.orig/Users/Users.pm 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends-2.6.0/Users/Users.pm 2008-07-24 10:56:20.967146992 +0200
-@@ -237,6 +237,10 @@
++++ system-tools-backends-2.6.0/Users/Users.pm 2009-03-21 16:01:31.315966237 +0100
+@@ -237,6 +237,11 @@ my $logindefs_dist_map = {
'pld-1.0' => $rh_logindefs_defaults,
'fedora-1' => $rh_logindefs_defaults,
'debian-3.0' => $rh_logindefs_defaults,
+ 'debian-3.1' => $rh_logindefs_defaults,
+ 'debian-4.0' => $rh_logindefs_defaults,
+ 'debian-5.0' => $rh_logindefs_defaults,
++ 'debian-6.0' => $rh_logindefs_defaults,
+ 'debian-testing' => $rh_logindefs_defaults,
'vine-3.0' => $rh_logindefs_defaults,
'gentoo' => $gentoo_logindefs_defaults,
@@ -118,23 +124,24 @@
Index: system-tools-backends-2.6.0/Utils/Platform.pm
===================================================================
--- system-tools-backends-2.6.0.orig/Utils/Platform.pm 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends-2.6.0/Utils/Platform.pm 2008-07-24 10:52:19.311513035 +0200
-@@ -34,6 +34,9 @@
++++ system-tools-backends-2.6.0/Utils/Platform.pm 2009-03-21 15:59:52.001467537 +0100
+@@ -34,6 +34,10 @@ use Utils::Replace;
my $PLATFORM_INFO = {
"debian-3.0" => [ "Debian GNU/Linux", "3.0", "Woody" ],
"debian-3.1" => [ "Debian GNU/Linux", "3.1", "Sarge" ],
+ "debian-4.0" => [ "Debian GNU/Linux", "4.0", "Etch" ],
+ "debian-5.0" => [ "Debian GNU/Linux", "5.0", "Lenny" ],
-+ "debian-testing" => [ "Debian GNU/Linux", "testing/unstable", "Lenny/Sid" ],
++ "debian-6.0" => [ "Debian GNU/Linux", "6.0", "Squeeze" ],
++ "debian-testing" => [ "Debian GNU/Linux", "testing/unstable", "Squeeze/Sid" ],
"ubuntu-5.04" => [ "Ubuntu Linux", "5.04", "Hoary" ],
"ubuntu-5.10" => [ "Ubuntu Linux", "5.10", "Breezy" ],
"ubuntu-6.06" => [ "Ubuntu Linux", "6.06", "Dapper" ],
-@@ -366,7 +369,7 @@
+@@ -366,7 +370,7 @@ sub guess
my %platform_checks = (
"Linux" => [[ \&check_lsb ],
- [ \&check_distro_file, "/etc/debian_version", "debian", "(.*)", { "testing/unstable" => "sarge" } ],
-+ [ \&check_distro_file, "/etc/debian_version", "debian", "(.*)", { "testing/unstable" => "sarge", "lenny/sid" => "testing" } ],
++ [ \&check_distro_file, "/etc/debian_version", "debian", "(.*)", { "testing/unstable" => "sarge", "lenny/sid" => "testing", "squeeze/sid" => "testing" } ],
[ \&check_distro_file, "/etc/SuSE-release", "suse", "VERSION\\s*=\\s*(\\S+)" ],
[ \&check_distro_file, "/etc/blackPanther-release", "blackpanther", "^Linux Black Panther release (\\S+)" ],
[ \&check_distro_file, "/etc/blackPanther-release", "blackpanther", "^Black Panther ( L|l)inux release ([\\d\\.]+)" ],
More information about the pkg-gnome-commits
mailing list