r21750 - in /desktop/unstable/system-tools-backends/debian: ./ maintfiles/ patches/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Fri Oct 2 15:56:17 UTC 2009
Author: pochu
Date: Fri Oct 2 15:56:17 2009
New Revision: 21750
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21750
Log:
* New upstream release.
- debian/control.in:
+ Break gnome-system-tools << 2.28 because of the PolicyKit 1 migration.
+ Build depend on intltool.
+ Build depend on libpolkit-gobject-1-dev rather than
libpolkit-dbus-dev for PolicyKit 1 support.
- debian/patches/05_cve_2008_4311.patch,
debian/patches/07_dont_symlink_localtime.patch,
debian/patches/60_fix-permissions-of-pid-file.patch:
+ Removed, applied upstream.
- debian/patches/01_debian_4.0.patch:
+ Refreshed.
- debian/system-tools-backends.install:
+ system-tools-backends is now in /usr/sbin.
+ Update the location of the policykit stuff.
* Use viewsvn in Vcs-Browser.
Removed:
desktop/unstable/system-tools-backends/debian/maintfiles/
desktop/unstable/system-tools-backends/debian/patches/05_cve_2008_4311.patch
desktop/unstable/system-tools-backends/debian/patches/07_dont_symlink_localtime.patch
desktop/unstable/system-tools-backends/debian/patches/60_fix-permissions-of-pid-file.patch
Modified:
desktop/unstable/system-tools-backends/debian/changelog
desktop/unstable/system-tools-backends/debian/control.in
desktop/unstable/system-tools-backends/debian/patches/01_debian_4.0.patch
desktop/unstable/system-tools-backends/debian/patches/series
desktop/unstable/system-tools-backends/debian/system-tools-backends.install
Modified: desktop/unstable/system-tools-backends/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/changelog?rev=21750&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/changelog [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/changelog [utf-8] Fri Oct 2 15:56:17 2009
@@ -1,7 +1,26 @@
-system-tools-backends (2.6.0-7) UNRELEASED; urgency=low
-
+system-tools-backends (2.8.1-1) UNRELEASED; urgency=low
+
+ [ Josselin Mouette ]
* 09_check_etc_timezone.patch: patch from Ubuntu. Use /etc/timezone to
obtain time zone. Closes: #526940.
+
+ [ Emilio Pozuelo Monfort ]
+ * New upstream release.
+ - debian/control.in:
+ + Break gnome-system-tools << 2.28 because of the PolicyKit 1 migration.
+ + Build depend on intltool.
+ + Build depend on libpolkit-gobject-1-dev rather than
+ libpolkit-dbus-dev for PolicyKit 1 support.
+ - debian/patches/05_cve_2008_4311.patch,
+ debian/patches/07_dont_symlink_localtime.patch,
+ debian/patches/60_fix-permissions-of-pid-file.patch:
+ + Removed, applied upstream.
+ - debian/patches/01_debian_4.0.patch:
+ + Refreshed.
+ - debian/system-tools-backends.install:
+ + system-tools-backends is now in /usr/sbin.
+ + Update the location of the policykit stuff.
+ * Use viewsvn in Vcs-Browser.
-- Josselin Mouette <joss at debian.org> Mon, 04 May 2009 17:58:31 +0200
Modified: desktop/unstable/system-tools-backends/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/control.in?rev=21750&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/control.in [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/control.in [utf-8] Fri Oct 2 15:56:17 2009
@@ -8,13 +8,14 @@
cdbs,
quilt,
gnome-pkg-tools (>= 0.10),
+ intltool (>= 0.40),
libnet-dbus-perl,
libdbus-1-dev (>= 1.1.2),
libdbus-glib-1-dev (>= 0.74),
- libpolkit-dbus-dev (>= 0.5),
+ libpolkit-gobject-1-dev (>= 0.92),
libglib2.0-dev (>= 2.15.2)
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/system-tools-backends
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/system-tools-backends
Homepage: http://system-tools-backends.freedesktop.org/
Package: system-tools-backends
@@ -25,7 +26,7 @@
dbus (>= 1.1.2)
Replaces: gnome-system-tools (<< 1.1)
Conflicts: gnome-system-tools (<< 2.18), liboobs-1-3
-Breaks: gnome-system-tools (<< 2.22.1-1)
+Breaks: gnome-system-tools (<< 2.28.0)
Description: System Tools to manage computer configuration -- scripts
The System Tools Backends are a set of cross-platform scripts
for Linux and other Unix systems. The backends provide a standard
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=21750&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/patches/01_debian_4.0.patch [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/patches/01_debian_4.0.patch [utf-8] Fri Oct 2 15:56:17 2009
@@ -1,8 +1,6 @@
-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 2009-04-14 21:20:22.611206337 +0200
-@@ -45,7 +45,7 @@ sub get_runlevels
+--- a/Init/Services.pm
++++ b/Init/Services.pm
+@@ -45,7 +45,7 @@
"redhat-8.0" => "redhat-6.2",
"mandrake-9.0" => "redhat-6.2",
"conectiva-9" => "redhat-6.2",
@@ -11,7 +9,7 @@
"ubuntu-7.04" => "redhat-6.2",
"suse-9.0" => "redhat-6.2",
"pld-1.0" => "redhat-6.2",
-@@ -102,7 +102,7 @@ sub get_sysv_paths
+@@ -102,7 +102,7 @@
"mandrake-9.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"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"],
@@ -20,11 +18,9 @@
"ubuntu-7.04" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
"suse-9.0" => ["$gst_prefix/etc/init.d", "$gst_prefix/etc/init.d", "../"],
"pld-1.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-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 2009-04-14 21:21:03.614707407 +0200
-@@ -45,8 +45,6 @@ sub get_fqdn_dist
+--- a/Network/Hosts.pm
++++ b/Network/Hosts.pm
+@@ -45,8 +45,6 @@
"mandrake-9.0" => "redhat-6.2",
"yoper-2.2" => "redhat-6.2",
"conectiva-9" => "redhat-6.2",
@@ -33,7 +29,7 @@
"suse-9.0" => "suse-9.0",
"pld-1.0" => "redhat-6.2",
"vine-3.0" => "redhat-6.2",
-@@ -95,7 +93,7 @@ sub get_fqdn_parse_table
+@@ -95,7 +93,7 @@
]
},
@@ -42,7 +38,7 @@
{
fn =>
{
-@@ -215,7 +213,7 @@ sub get_fqdn_replace_table
+@@ -215,7 +213,7 @@
]
},
@@ -51,11 +47,9 @@
{
fn =>
{
-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 2009-04-14 21:21:57.895197455 +0200
-@@ -1992,8 +1992,6 @@ sub get_interface_dist
+--- a/Network/Ifaces.pm
++++ b/Network/Ifaces.pm
+@@ -1992,8 +1992,6 @@
"mandrake-9.0" => "mandrake-9.0",
"yoper-2.2" => "redhat-6.2",
"conectiva-9" => "conectiva-9",
@@ -64,7 +58,7 @@
"suse-9.0" => "suse-9.0",
"pld-1.0" => "pld-1.0",
"vine-3.0" => "vine-3.0",
-@@ -2394,7 +2392,7 @@ sub get_interface_parse_table
+@@ -2394,7 +2392,7 @@
]
},
@@ -73,7 +67,7 @@
{
fn =>
{
-@@ -3118,7 +3116,7 @@ sub get_interface_replace_table
+@@ -3118,7 +3116,7 @@
]
},
@@ -82,7 +76,7 @@
{
iface_set => \&activate_interface,
iface_delete => \&delete_debian_interface,
-@@ -3675,8 +3673,7 @@ sub get_available_encryptions
+@@ -3675,8 +3673,7 @@
my $dist = $Utils::Backend::tool{"platform"};
my $default = [ "wep-hex", "wep-ascii" ];
my %dist_map = (
@@ -92,11 +86,9 @@
);
push @$default, @{$dist_map{$dist}};
-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 2009-04-14 21:22:42.343198882 +0200
-@@ -130,27 +130,26 @@ sub get_distro_smb_file
+--- a/Shares/SMB.pm
++++ b/Shares/SMB.pm
+@@ -130,27 +130,26 @@
my %dist_map =
(
"redhat-6.2" => "redhat-6.2",
@@ -137,11 +129,9 @@
"pld-1.0" => "/etc/smb/smb.conf",
"freebsd-5" => "/usr/local/etc/smb.conf",
);
-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 2009-04-14 21:22:59.190707150 +0200
-@@ -34,7 +34,7 @@ sub get_config_file ()
+--- a/Time/NTP.pm
++++ b/Time/NTP.pm
+@@ -34,7 +34,7 @@
"redhat-7.3" => "redhat-6.2",
"redhat-8.0" => "redhat-6.2",
"mandrake-9.0" => "redhat-6.2",
@@ -150,42 +140,69 @@
"ubuntu-7.04" => "redhat-6.2",
"suse-9.0" => "redhat-6.2",
"slackware-9.1.0" => "redhat-6.2",
-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 2009-04-14 21:23:25.367205634 +0200
-@@ -165,8 +165,6 @@ sub get_dist
+--- a/Time/TimeDate.pm
++++ b/Time/TimeDate.pm
+@@ -165,9 +165,6 @@
"redhat-7.3" => "redhat-6.2",
"redhat-8.0" => "redhat-6.2",
"mandrake-9.0" => "redhat-6.2",
-- "debian-3.0" => "debian-3.0",
-- "ubuntu-7.04" => "debian-3.0",
+- "debian-4.0" => "debian-4.0",
+- "debian-testing" => "debian-4.0",
+- "ubuntu-7.04" => "debian-4.0",
"suse-9.0" => "redhat-6.2",
"slackware-9.1.0" => "redhat-6.2",
"gentoo" => "redhat-6.2",
-@@ -198,7 +196,7 @@ sub conf_get_parse_table
+@@ -199,21 +196,7 @@
]
},
- "debian-3.0" =>
+- {
+- fn =>
+- {
+- ZONEINFO => "/usr/share/zoneinfo",
+- LOCAL_TIME => "/etc/localtime"
+- },
+- table =>
+- [
+- [ "local_time", \&get_utc_time ],
+- [ "timezone", \&get_timezone, [LOCAL_TIME, ZONEINFO] ],
+- ]
+- },
+-
+- "debian-4.0" =>
+ "debian" =>
{
fn =>
{
-@@ -267,7 +265,7 @@ sub conf_get_replace_table
+@@ -281,23 +264,7 @@
]
},
- "debian-3.0" =>
+- {
+- fn =>
+- {
+- ZONEINFO => "/usr/share/zoneinfo",
+- LOCAL_TIME => "/etc/localtime",
+- TIMEZONE => "/etc/timezone"
+- },
+- table =>
+- [
+- [ "timezone", \&set_timezone, [LOCAL_TIME, ZONEINFO] ],
+- [ "timezone", \&Utils::Replace::set_first_line, TIMEZONE ],
+- [ "local_time", \&set_utc_time ],
+- ]
+- },
+-
+- "debian-4.0" =>
+ "debian" =>
{
fn =>
{
-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 2009-04-14 21:23:40.491202895 +0200
-@@ -236,7 +236,7 @@ my $logindefs_dist_map = {
+--- a/Users/Users.pm
++++ b/Users/Users.pm
+@@ -236,7 +236,7 @@
'mandrake-9.0' => $rh_logindefs_defaults,
'pld-1.0' => $rh_logindefs_defaults,
'fedora-1' => $rh_logindefs_defaults,
@@ -194,11 +211,9 @@
'vine-3.0' => $rh_logindefs_defaults,
'gentoo' => $gentoo_logindefs_defaults,
'archlinux' => $gentoo_logindefs_defaults,
-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 2009-04-14 21:24:34.738703678 +0200
-@@ -32,8 +32,7 @@ use Utils::Replace;
+--- a/Utils/Platform.pm
++++ b/Utils/Platform.pm
+@@ -32,8 +32,7 @@
# --- System guessing --- #
my $PLATFORM_INFO = {
@@ -208,7 +223,7 @@
"ubuntu-5.04" => [ "Ubuntu Linux", "5.04", "Hoary" ],
"ubuntu-5.10" => [ "Ubuntu Linux", "5.10", "Breezy" ],
"ubuntu-6.06" => [ "Ubuntu Linux", "6.06", "Dapper" ],
-@@ -116,7 +115,6 @@ sub ensure_distro_map
+@@ -116,7 +115,6 @@
(
"blackpanther-4.0" => "mandrake-9.0",
"conectiva-10" => "conectiva-9",
@@ -216,7 +231,7 @@
"mandrake-7.1" => "redhat-6.2",
"mandrake-7.2" => "redhat-6.2",
"mandrake-9.1" => "mandrake-9.0",
-@@ -147,16 +145,9 @@ sub ensure_distro_map
+@@ -147,16 +145,9 @@
"slackware-12.0.0" => "slackware-9.1.0",
"bluewhite64-12.0.0" => "slackware-9.1.0",
"suse-9.1" => "suse-9.0",
@@ -233,7 +248,7 @@
);
return $metamap{$distro} if ($metamap{$distro});
-@@ -366,7 +357,7 @@ sub guess
+@@ -366,7 +357,7 @@
my %platform_checks = (
"Linux" => [[ \&check_lsb ],
Modified: desktop/unstable/system-tools-backends/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/patches/series?rev=21750&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/patches/series [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/patches/series [utf-8] Fri Oct 2 15:56:17 2009
@@ -1,8 +1,5 @@
01_debian_4.0.patch
02ubuntu_chmod_network_interfaces_when_using_key.patch
04_correct_perl_command.patch
-05_cve_2008_4311.patch
-07_dont_symlink_localtime.patch
08_use_md5.patch
09_check_etc_timezone.patch
-60_fix-permissions-of-pid-file.patch
Modified: desktop/unstable/system-tools-backends/debian/system-tools-backends.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/system-tools-backends.install?rev=21750&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.install [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.install [utf-8] Fri Oct 2 15:56:17 2009
@@ -1,5 +1,6 @@
-debian/tmp/usr/bin/system-tools-backends
+debian/tmp/usr/sbin/system-tools-backends
debian/tmp/usr/share/system-tools-backends-2.0
debian/tmp/usr/share/dbus-1/system-services
+debian/tmp/usr/share/polkit-1
+debian/tmp/usr/share/locale
debian/tmp/etc/dbus-1/system.d
-debian/tmp/usr/share/PolicyKit
More information about the pkg-gnome-commits
mailing list