r16632 - in /desktop/unstable/system-tools-backends/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu Jul 24 08:58:24 UTC 2008
Author: joss
Date: Thu Jul 24 08:58:24 2008
New Revision: 16632
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16632
Log:
* Switch to quilt for patch management; build-depend on quilt.
* 01_debian_4.0.patch: also support Debian 5.0 as lenny.
* system-tools-backends.init: don't fail when STB is already running,
which can happen when dbus was upgraded in the same run and started
daemons using it. Closes: #469414.
* Urgency medium for RC bug fix.
Added:
desktop/unstable/system-tools-backends/debian/patches/series
Modified:
desktop/unstable/system-tools-backends/debian/changelog
desktop/unstable/system-tools-backends/debian/control
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/03_default_permissions.patch
desktop/unstable/system-tools-backends/debian/patches/04_correct_perl_command.patch
desktop/unstable/system-tools-backends/debian/patches/60_fix-permissions-of-pid-file.patch
desktop/unstable/system-tools-backends/debian/rules
desktop/unstable/system-tools-backends/debian/system-tools-backends.init
Modified: desktop/unstable/system-tools-backends/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/changelog?rev=16632&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/changelog (original)
+++ desktop/unstable/system-tools-backends/debian/changelog Thu Jul 24 08:58:24 2008
@@ -1,4 +1,4 @@
-system-tools-backends (2.6.0-2) UNRELEASED; urgency=low
+system-tools-backends (2.6.0-2) unstable; urgency=medium
[ Emilio Pozuelo Monfort ]
* debian/patches/04_correct_perl_command.patch:
@@ -10,11 +10,17 @@
- Updated Standards-Version to 3.8.0, no changes needed.
[ Josselin Mouette ]
+ * Switch to quilt for patch management; build-depend on quilt.
* 07_dont_symlink_localtime.patch: patch from Ubuntu to support /etc
being on a partition separate from /usr. Thanks Steve Langasek and
James Westby. Closes: #488792.
-
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com> Tue, 08 Jul 2008 20:34:57 +0200
+ * 01_debian_4.0.patch: also support Debian 5.0 as lenny.
+ * system-tools-backends.init: don't fail when STB is already running,
+ which can happen when dbus was upgraded in the same run and started
+ daemons using it. Closes: #469414.
+ * Urgency medium for RC bug fix.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 24 Jul 2008 10:58:16 +0200
system-tools-backends (2.6.0-1) unstable; urgency=low
Modified: desktop/unstable/system-tools-backends/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/control?rev=16632&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/control (original)
+++ desktop/unstable/system-tools-backends/debian/control Thu Jul 24 08:58:24 2008
@@ -2,10 +2,11 @@
Section: admin
Priority: optional
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Otavio Salvador <otavio at debian.org>, Niv Sardi <xaiki at debian.org>
-Standards-Version: 3.7.3
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at ubuntu.com>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Otavio Salvador <otavio at debian.org>, Niv Sardi <xaiki at debian.org>
+Standards-Version: 3.8.0
Build-Depends: debhelper (>= 5),
cdbs,
+ quilt,
gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
intltool,
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=16632&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/control.in (original)
+++ desktop/unstable/system-tools-backends/debian/control.in Thu Jul 24 08:58:24 2008
@@ -6,6 +6,7 @@
Standards-Version: 3.8.0
Build-Depends: debhelper (>= 5),
cdbs,
+ quilt,
gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
intltool,
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=16632&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 Thu Jul 24 08:58:24 2008
@@ -1,120 +1,135 @@
-diff --git a/system-tools-backends-2.2.0/Init/Services.pm b/system-tools-backends-2.2.0/Init/Services.pm
-index a8649b2..a9f723e 100644
-diff -Nur system-tools-backends-2.2.0/Init/Services.pm system-tools-backends-2.2.0.new/Init/Services.pm
---- system-tools-backends-2.2.0/Init/Services.pm 2007-03-27 20:22:13.000000000 +0200
-+++ system-tools-backends-2.2.0.new/Init/Services.pm 2007-04-07 09:29:44.000000000 +0200
-@@ -45,6 +45,9 @@
+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 @@
"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-testing" => "redhat-6.2",
"ubuntu-7.04" => "redhat-6.2",
"suse-9.0" => "redhat-6.2",
"pld-1.0" => "redhat-6.2",
-@@ -101,6 +104,10 @@
+@@ -103,6 +107,11 @@
"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"],
+ "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-5.0" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+ "debian-testing" => ["$gst_prefix/etc", "$gst_prefix/etc/init.d", "../init.d"],
+
"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"],
-diff -Nur system-tools-backends-2.2.0/Network/Hosts.pm system-tools-backends-2.2.0.new/Network/Hosts.pm
---- system-tools-backends-2.2.0/Network/Hosts.pm 2007-03-27 20:22:13.000000000 +0200
-+++ system-tools-backends-2.2.0.new/Network/Hosts.pm 2007-04-07 09:29:44.000000000 +0200
-@@ -46,6 +46,9 @@
+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 @@
"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-testing" => "debian-2.2",
"ubuntu-7.04" => "debian-2.2",
"suse-9.0" => "suse-9.0",
"pld-1.0" => "redhat-6.2",
-diff -Nur system-tools-backends-2.2.0/Network/Ifaces.pm system-tools-backends-2.2.0.new/Network/Ifaces.pm
---- system-tools-backends-2.2.0/Network/Ifaces.pm 2007-03-27 20:22:13.000000000 +0200
-+++ system-tools-backends-2.2.0.new/Network/Ifaces.pm 2007-04-07 09:29:44.000000000 +0200
-@@ -1992,6 +1992,9 @@
+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 @@
"yoper-2.2" => "redhat-6.2",
"conectiva-9" => "conectiva-9",
"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-testing" => "debian-3.0",
"ubuntu-7.04" => "debian-3.0",
"suse-9.0" => "suse-9.0",
"pld-1.0" => "pld-1.0",
-diff -Nur system-tools-backends-2.2.0/Shares/SMB.pm system-tools-backends-2.2.0.new/Shares/SMB.pm
---- system-tools-backends-2.2.0/Shares/SMB.pm 2007-03-27 20:22:13.000000000 +0200
-+++ system-tools-backends-2.2.0.new/Shares/SMB.pm 2007-04-07 09:29:44.000000000 +0200
-@@ -137,6 +137,9 @@
+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 @@
"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-testing" => "debian-3.0",
"ubuntu-7.04" => "debian-3.0",
"suse-9.0" => "debian-3.0",
"slackware-9.1.0" => "debian-3.0",
-diff -Nur system-tools-backends-2.2.0/Time/NTP.pm system-tools-backends-2.2.0.new/Time/NTP.pm
---- system-tools-backends-2.2.0/Time/NTP.pm 2007-03-27 20:22:13.000000000 +0200
-+++ system-tools-backends-2.2.0.new/Time/NTP.pm 2007-04-07 09:29:44.000000000 +0200
-@@ -35,6 +35,9 @@
+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 @@
"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-testing" => "redhat-6.2",
"ubuntu-7.04" => "redhat-6.2",
"suse-9.0" => "redhat-6.2",
"slackware-9.1.0" => "redhat-6.2",
-diff -Nur system-tools-backends-2.2.0/Time/TimeDate.pm system-tools-backends-2.2.0.new/Time/TimeDate.pm
---- system-tools-backends-2.2.0/Time/TimeDate.pm 2007-03-27 20:22:13.000000000 +0200
-+++ system-tools-backends-2.2.0.new/Time/TimeDate.pm 2007-04-07 09:29:44.000000000 +0200
-@@ -166,6 +166,9 @@
+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 @@
"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-testing" => "debian-3.0",
"ubuntu-7.04" => "debian-3.0",
"suse-9.0" => "redhat-6.2",
"slackware-9.1.0" => "redhat-6.2",
-diff -Nur system-tools-backends-2.2.0/Users/Users.pm system-tools-backends-2.2.0.new/Users/Users.pm
---- system-tools-backends-2.2.0/Users/Users.pm 2007-03-27 20:22:13.000000000 +0200
-+++ system-tools-backends-2.2.0.new/Users/Users.pm 2007-04-07 09:29:44.000000000 +0200
-@@ -237,6 +237,9 @@
+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 @@
'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-testing' => $rh_logindefs_defaults,
'vine-3.0' => $rh_logindefs_defaults,
'gentoo' => $gentoo_logindefs_defaults,
'archlinux' => $gentoo_logindefs_defaults,
-diff -Nur system-tools-backends-2.2.0/Utils/Platform.pm system-tools-backends-2.2.0.new/Utils/Platform.pm
---- system-tools-backends-2.2.0/Utils/Platform.pm 2007-03-27 20:22:13.000000000 +0200
-+++ system-tools-backends-2.2.0.new/Utils/Platform.pm 2007-04-07 09:30:22.000000000 +0200
-@@ -34,6 +34,8 @@
+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 @@
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" ],
"ubuntu-5.04" => [ "Ubuntu Linux", "5.04", "Hoary" ],
"ubuntu-5.10" => [ "Ubuntu Linux", "5.10", "Breezy" ],
"ubuntu-6.06" => [ "Ubuntu Linux", "6.06", "Dapper" ],
-@@ -356,7 +358,7 @@
+@@ -366,7 +369,7 @@
my %platform_checks = (
"Linux" => [[ \&check_lsb ],
Modified: desktop/unstable/system-tools-backends/debian/patches/03_default_permissions.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/patches/03_default_permissions.patch?rev=16632&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/patches/03_default_permissions.patch (original)
+++ desktop/unstable/system-tools-backends/debian/patches/03_default_permissions.patch Thu Jul 24 08:58:24 2008
@@ -1,5 +1,5 @@
---- system-tools-backends.conf.orig 2008-05-28 13:20:52.246850438 +0200
-+++ system-tools-backends.conf 2008-05-28 13:24:07.867969323 +0200
+--- a/system-tools-backends.conf.orig 2008-05-28 13:20:52.246850438 +0200
++++ b/system-tools-backends.conf 2008-05-28 13:24:07.867969323 +0200
@@ -25,9 +25,7 @@
<!-- configuration modules can't be accessed directly... -->
<deny send_interface="org.freedesktop.SystemToolsBackends"/>
Modified: desktop/unstable/system-tools-backends/debian/patches/04_correct_perl_command.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/patches/04_correct_perl_command.patch?rev=16632&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/patches/04_correct_perl_command.patch (original)
+++ desktop/unstable/system-tools-backends/debian/patches/04_correct_perl_command.patch Thu Jul 24 08:58:24 2008
@@ -1,72 +1,80 @@
-diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/SystemToolsBackends.pl.in system-tools-backends-2.6.0.new/SystemToolsBackends.pl.in
---- system-tools-backends-2.6.0/SystemToolsBackends.pl.in 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends-2.6.0.new/SystemToolsBackends.pl.in 2008-03-13 18:55:25.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
- # Loader for the system tools backends.
-diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/Backend.pm system-tools-backends-2.6.0.new/Utils/Backend.pm
---- system-tools-backends-2.6.0/Utils/Backend.pm 2007-12-12 01:31:03.000000000 +0100
-+++ system-tools-backends-2.6.0.new/Utils/Backend.pm 2008-03-13 18:55:55.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
- # Common stuff for the ximian-setup-tools backends.
-diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/File.pm system-tools-backends-2.6.0.new/Utils/File.pm
---- system-tools-backends-2.6.0/Utils/File.pm 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends-2.6.0.new/Utils/File.pm 2008-03-13 18:55:51.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
- # Functions for file manipulation. Find, open, read, write, backup, etc.
-diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/Parse.pm system-tools-backends-2.6.0.new/Utils/Parse.pm
---- system-tools-backends-2.6.0/Utils/Parse.pm 2008-03-09 14:21:45.000000000 +0100
-+++ system-tools-backends-2.6.0.new/Utils/Parse.pm 2008-03-13 18:55:47.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
- # parse.pl: Common parsing stuff for the ximian-setup-tools backends.
-diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/Platform.pm system-tools-backends-2.6.0.new/Utils/Platform.pm
---- system-tools-backends-2.6.0/Utils/Platform.pm 2008-03-13 18:55:25.000000000 +0100
-+++ system-tools-backends-2.6.0.new/Utils/Platform.pm 2008-03-13 18:55:44.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
- # Determine the platform we're running on.
-diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/Report.pm system-tools-backends-2.6.0.new/Utils/Report.pm
---- system-tools-backends-2.6.0/Utils/Report.pm 2007-12-12 01:31:03.000000000 +0100
-+++ system-tools-backends-2.6.0.new/Utils/Report.pm 2008-03-13 18:55:40.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
- # /* Functions for on-the-fly commentary on a tool's work. */
-diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/Util.pm system-tools-backends-2.6.0.new/Utils/Util.pm
---- system-tools-backends-2.6.0/Utils/Util.pm 2007-10-09 00:18:53.000000000 +0200
-+++ system-tools-backends-2.6.0.new/Utils/Util.pm 2008-03-13 18:55:37.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
- # Utility functions.
-diff -Nur -x '*.orig' -x '*~' system-tools-backends-2.6.0/Utils/XML.pm system-tools-backends-2.6.0.new/Utils/XML.pm
---- system-tools-backends-2.6.0/Utils/XML.pm 2007-10-09 00:18:53.000000000 +0200
-+++ system-tools-backends-2.6.0.new/Utils/XML.pm 2008-03-13 18:55:34.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
- # XML printing, scanning and parsing.
+Index: system-tools-backends-2.6.0/SystemToolsBackends.pl.in
+===================================================================
+--- system-tools-backends-2.6.0.orig/SystemToolsBackends.pl.in 2008-03-09 14:21:45.000000000 +0100
++++ system-tools-backends-2.6.0/SystemToolsBackends.pl.in 2008-07-24 10:56:44.155104889 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+ # Loader for the system tools backends.
+Index: system-tools-backends-2.6.0/Utils/Backend.pm
+===================================================================
+--- system-tools-backends-2.6.0.orig/Utils/Backend.pm 2007-12-12 01:31:03.000000000 +0100
++++ system-tools-backends-2.6.0/Utils/Backend.pm 2008-07-24 10:56:44.155104889 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+ # Common stuff for the ximian-setup-tools backends.
+Index: system-tools-backends-2.6.0/Utils/File.pm
+===================================================================
+--- system-tools-backends-2.6.0.orig/Utils/File.pm 2008-03-09 14:21:45.000000000 +0100
++++ system-tools-backends-2.6.0/Utils/File.pm 2008-07-24 10:56:44.155104889 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+ # Functions for file manipulation. Find, open, read, write, backup, etc.
+Index: system-tools-backends-2.6.0/Utils/Parse.pm
+===================================================================
+--- system-tools-backends-2.6.0.orig/Utils/Parse.pm 2008-03-09 14:21:45.000000000 +0100
++++ system-tools-backends-2.6.0/Utils/Parse.pm 2008-07-24 10:56:44.155104889 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+ # parse.pl: Common parsing stuff for the ximian-setup-tools backends.
+Index: system-tools-backends-2.6.0/Utils/Platform.pm
+===================================================================
+--- system-tools-backends-2.6.0.orig/Utils/Platform.pm 2008-07-24 10:52:19.311513035 +0200
++++ system-tools-backends-2.6.0/Utils/Platform.pm 2008-07-24 10:56:44.155104889 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+ # Determine the platform we're running on.
+Index: system-tools-backends-2.6.0/Utils/Report.pm
+===================================================================
+--- system-tools-backends-2.6.0.orig/Utils/Report.pm 2007-12-12 01:31:03.000000000 +0100
++++ system-tools-backends-2.6.0/Utils/Report.pm 2008-07-24 10:56:44.159105677 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+ # /* Functions for on-the-fly commentary on a tool's work. */
+Index: system-tools-backends-2.6.0/Utils/Util.pm
+===================================================================
+--- system-tools-backends-2.6.0.orig/Utils/Util.pm 2007-10-09 00:18:53.000000000 +0200
++++ system-tools-backends-2.6.0/Utils/Util.pm 2008-07-24 10:56:44.159105677 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+ # Utility functions.
+Index: system-tools-backends-2.6.0/Utils/XML.pm
+===================================================================
+--- system-tools-backends-2.6.0.orig/Utils/XML.pm 2007-10-09 00:18:53.000000000 +0200
++++ system-tools-backends-2.6.0/Utils/XML.pm 2008-07-24 10:56:44.159105677 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+ # XML printing, scanning and parsing.
Modified: desktop/unstable/system-tools-backends/debian/patches/60_fix-permissions-of-pid-file.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/patches/60_fix-permissions-of-pid-file.patch?rev=16632&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/patches/60_fix-permissions-of-pid-file.patch (original)
+++ desktop/unstable/system-tools-backends/debian/patches/60_fix-permissions-of-pid-file.patch Thu Jul 24 08:58:24 2008
@@ -1,5 +1,5 @@
---- dispatcher/main.c.orig 2008-05-28 12:55:44.774846523 +0200
-+++ dispatcher/main.c 2008-05-28 12:56:18.211757081 +0200
+--- a/dispatcher/main.c.orig 2008-05-28 12:55:44.774846523 +0200
++++ b/dispatcher/main.c 2008-05-28 12:56:18.211757081 +0200
@@ -47,7 +47,7 @@
setsid ();
Added: 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=16632&op=file
==============================================================================
--- desktop/unstable/system-tools-backends/debian/patches/series (added)
+++ desktop/unstable/system-tools-backends/debian/patches/series Thu Jul 24 08:58:24 2008
@@ -1,0 +1,6 @@
+01_debian_4.0.patch
+02ubuntu_chmod_network_interfaces_when_using_key.patch
+03_default_permissions.patch
+04_correct_perl_command.patch
+07_dont_symlink_localtime.patch
+60_fix-permissions-of-pid-file.patch
Modified: desktop/unstable/system-tools-backends/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/rules?rev=16632&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/rules (original)
+++ desktop/unstable/system-tools-backends/debian/rules Thu Jul 24 08:58:24 2008
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
Modified: desktop/unstable/system-tools-backends/debian/system-tools-backends.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/system-tools-backends.init?rev=16632&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.init (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.init Thu Jul 24 08:58:24 2008
@@ -41,9 +41,14 @@
if [ ! -d $PIDDIR ]; then
mkdir -p $PIDDIR
fi
- log_daemon_msg "Starting $DESC" "$NAME"
- start-stop-daemon --start --startas $DAEMON --quiet --pidfile $PIDFILE
- log_end_msg $?
+ if [ -f $PIDFILE ] && [ "$(readlink /proc/$(cat $PIDFILE)/exe)" = $DAEMON ]; then
+ log_begin_msg "$DESC already running"
+ log_end_msg 0
+ else
+ log_daemon_msg "Starting $DESC" "$NAME"
+ start-stop-daemon --start --startas $DAEMON --quiet --pidfile $PIDFILE
+ log_end_msg $?
+ fi
}
do_stop() {
More information about the pkg-gnome-commits
mailing list