r14590 - in /desktop/unstable/system-tools-backends/debian: changelog control control.in patches/02ubuntu_chmod_network_interfaces_when_using_key.patch rules system-tools-backends.init system-tools-backends.init.dbus system-tools-backends.preinst

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Feb 16 00:00:38 UTC 2008 

Author: joss
Date: Sat Feb 16 00:00:38 2008
New Revision: 14590

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14590
Log:
* New upstream release. Closes: #453633.
* 02ubuntu_chmod_network_interfaces_when_using_key.patch: updated from
  Ubuntu.
* Define PIDDIR in the init script. Closes: #455600.
* Entirely remove the old dbus script.
* Standards version is 3.7.3.
* Don’t stop the init script in the S runlevel.
* Handle gracefully the case where the daemon fails to stop in the 
  preinst.

Removed:
    desktop/unstable/system-tools-backends/debian/system-tools-backends.init.dbus
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/02ubuntu_chmod_network_interfaces_when_using_key.patch
    desktop/unstable/system-tools-backends/debian/rules
    desktop/unstable/system-tools-backends/debian/system-tools-backends.init
    desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst

Modified: desktop/unstable/system-tools-backends/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/changelog?rev=14590&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/changelog (original)
+++ desktop/unstable/system-tools-backends/debian/changelog Sat Feb 16 00:00:38 2008
@@ -1,7 +1,6 @@
-system-tools-backends (2.2.1-6) UNRELEASED; urgency=low
+system-tools-backends (2.4.2-1) unstable; urgency=low
 
   [ Kilian Krause ]
-  * NOT RELEASED YET
   * Add get-orig-source target.
   * Fix preinst maintainer script. Add rm_conffile function from
     http://wiki.debian.org/DpkgConffileHandling. Actually this should be done
@@ -14,7 +13,18 @@
   * Make system-tools-backends-dev arch: all as the /usr/lib/pkgconfig file is
     actually arch independent (and should be moved to /usr/share).
 
- -- Sven Arvidsson <sa at whiz.se>  Thu, 27 Sep 2007 18:03:36 +0200
+  [ Josselin Mouette ]
+  * New upstream release. Closes: #453633.
+  * 02ubuntu_chmod_network_interfaces_when_using_key.patch: updated from
+    Ubuntu.
+  * Define PIDDIR in the init script. Closes: #455600.
+  * Entirely remove the old dbus script.
+  * Standards version is 3.7.3.
+  * Don’t stop the init script in the S runlevel.
+  * Handle gracefully the case where the daemon fails to stop in the 
+    preinst.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 16 Feb 2008 00:36:20 +0100
 
 system-tools-backends (2.2.1-5) 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=14590&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/control (original)
+++ desktop/unstable/system-tools-backends/debian/control Sat Feb 16 00:00:38 2008
@@ -3,7 +3,7 @@
 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.2
+Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 5),
                cdbs,
                gnome-pkg-tools (>= 0.10),

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=14590&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/control.in (original)
+++ desktop/unstable/system-tools-backends/debian/control.in Sat Feb 16 00:00:38 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
 Uploaders: @GNOME_TEAM@, Niv Sardi <xaiki at debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 5),
                cdbs,
                gnome-pkg-tools (>= 0.10),

Modified: desktop/unstable/system-tools-backends/debian/patches/02ubuntu_chmod_network_interfaces_when_using_key.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/patches/02ubuntu_chmod_network_interfaces_when_using_key.patch?rev=14590&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/patches/02ubuntu_chmod_network_interfaces_when_using_key.patch (original)
+++ desktop/unstable/system-tools-backends/debian/patches/02ubuntu_chmod_network_interfaces_when_using_key.patch Sat Feb 16 00:00:38 2008
@@ -1,7 +1,7 @@
-diff -Nur system-tools-backends-1.9.7/Network/Ifaces.pm system-tools-backends-1.9.7.new/Network/Ifaces.pm
---- system-tools-backends-1.9.7/Network/Ifaces.pm	2006-10-06 00:16:51.000000000 +0200
-+++ system-tools-backends-1.9.7.new/Network/Ifaces.pm	2006-10-11 23:29:38.000000000 +0200
-@@ -693,6 +693,17 @@
+diff -Nur system-tools-backends-2.3.0/Network/Ifaces.pm system-tools-backends-2.3.0.new/Network/Ifaces.pm
+--- system-tools-backends-2.3.0/Network/Ifaces.pm	2007-07-10 17:54:00.000000000 +0100
++++ system-tools-backends-2.3.0.new/Network/Ifaces.pm	2007-07-10 17:56:17.000000000 +0100
+@@ -793,6 +793,17 @@
    return (&get_debian_auto_by_stanza ($file, $iface) ne undef)? 1 : 0;
  }
  
@@ -19,11 +19,11 @@
  sub set_debian_auto
  {
    my ($file, $iface, $value) = @_;
-@@ -3098,6 +3109,7 @@
-       [ "netmask",            \&Utils::Replace::set_interfaces_option_str, [INTERFACES, IFACE], "netmask" ],
-       [ "gateway",            \&Utils::Replace::set_interfaces_option_str, [INTERFACES, IFACE], "gateway" ],
-       [ "essid",              \&Utils::Replace::set_interfaces_option_str, [INTERFACES, IFACE], "wireless-essid" ],
+@@ -3087,6 +3098,7 @@
+       [ "network",            \&Utils::Replace::set_sh,      IFCFG, NETWORK ],
+       [ "gateway",            \&Utils::Replace::set_sh,      IFCFG, GATEWAY ],
+       [ "essid",              \&Utils::Replace::set_sh,      IFCFG, WIRELESS_ESSID ],
 +      [ "key",                \&set_network_config_permission, "%key%"],
-       [ "key",                \&Utils::Replace::set_interfaces_option_str, [INTERFACES, IFACE], "wireless-key"   ],
-       [ "key_type",           \&set_wep_key_full, [ \&Utils::Replace::set_interfaces_option_str, INTERFACES, IFACE, "wireless-key", "%key%" ]],
-       # ugly hack for deleting undesired options (due to syntax duality)
+       [ "key",                \&Utils::Replace::set_sh,      IFCFG, WIRELESS_KEY   ],
+       [ "key_type",           \&set_wep_key_full, [ \&Utils::Replace::set_sh, IFCFG, WIRELESS_KEY, "%key%" ]],
+       [ "update_dns",         \&Utils::Replace::set_sh_bool, IFCFG, PEERDNS ],

Modified: desktop/unstable/system-tools-backends/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/rules?rev=14590&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/rules (original)
+++ desktop/unstable/system-tools-backends/debian/rules Sat Feb 16 00:00:38 2008
@@ -34,11 +34,6 @@
 	# generate POT file for translators
 	cd po ; intltool-update --verbose -p
 
-binary-install/system-tools-backends::
-	mkdir -p debian/system-tools-backends/etc/dbus-1/event.d
-	install -m 755 debian/system-tools-backends.init.dbus   \
-		debian/system-tools-backends/etc/dbus-1/event.d/70system-tools-backends
-
 clean::
 	# GNOME Team 'uploaders.mk' should not override this behavior, here is a workaround :
 	sed -i "s/@cdbs@/$(CDBS_BUILD_DEPENDS)/g" debian/control

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=14590&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.init (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.init Sat Feb 16 00:00:38 2008
@@ -6,7 +6,7 @@
 # Should-Start:	     $syslog
 # Should-Stop:       $syslog
 # Default-Start:     2 3 4 5
-# Default-Stop:      S 0 1 6
+# Default-Stop:      0 1 6
 # Short-Description: Gnome System Tools Backends
 # Description:       The Gnome System Tools Backends daemon handles root-needed
 #                    operations to configure your machine with the Gnome System
@@ -26,7 +26,8 @@
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/system-tools-backends
-PIDFILE=/var/run/system-tools-backends.pid
+PIDDIR=/var/run
+PIDFILE=$PIDDIR/system-tools-backends.pid
 NAME=system-tools-backends
 DESC="System Tools Backends"
 

Modified: desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst?rev=14590&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst Sat Feb 16 00:00:38 2008
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 # stop backend here when upgrading from a version that didn't handle
 # it correctly yet in the prerm
@@ -25,7 +26,7 @@
     install|upgrade)
 	if dpkg --compare-versions "$2" lt 2.2.1-5; then
 	    test -x /etc/dbus-1/event.d/70system-tools-backends && \
-		/etc/dbus-1/event.d/70system-tools-backends stop
+		/etc/dbus-1/event.d/70system-tools-backends stop || true
 	    rm_conffile "/etc/dbus-1/event.d/70system-tools-backends"
 	fi
 	;;

More information about the pkg-gnome-commits mailing list