r10783 - in /desktop/unstable/system-tools-backends/debian:
changelog
control control.in copyright rules system-tools-backends.init.dbus
system-tools-backends.postinst system-tools-backends.postrm
system-tools-backends.preinst
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Sun May 6 07:43:55 UTC 2007
Author: lool
Date: Sun May 6 07:43:52 2007
New Revision: 10783
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10783
Log:
* Re-add ubuntu version specific in preinst. :)
* Wrap build-deps and deps.
* Fix bashism in maintainer script.
* Cleanups.
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/copyright
desktop/unstable/system-tools-backends/debian/rules
desktop/unstable/system-tools-backends/debian/system-tools-backends.init.dbus
desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst
desktop/unstable/system-tools-backends/debian/system-tools-backends.postrm
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=10783&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/changelog (original)
+++ desktop/unstable/system-tools-backends/debian/changelog Sun May 6 07:43:52 2007
@@ -1,3 +1,12 @@
+system-tools-backends (2.2.1-3) UNRELEASED; urgency=low
+
+ * Re-add ubuntu version specific in preinst. :)
+ * Wrap build-deps and deps.
+ * Fix bashism in maintainer script.
+ * Cleanups.
+
+ -- Loic Minier <lool at dooz.org> Sun, 06 May 2007 09:42:59 +0200
+
system-tools-backends (2.2.1-2) unstable; urgency=low
* Upload to Unstable, remove check-dist.mk.
Modified: desktop/unstable/system-tools-backends/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/control?rev=10783&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/control (original)
+++ desktop/unstable/system-tools-backends/debian/control Sun May 6 07:43:52 2007
@@ -4,11 +4,20 @@
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>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), cdbs, gnome-pkg-tools (>= 0.10), libxml-parser-perl, intltool, libnet-dbus-perl, libdbus-1-dev (>= 0.35), libdbus-glib-1-dev, libglib2.0-dev
+Build-Depends: debhelper (>= 5),
+ cdbs,
+ gnome-pkg-tools (>= 0.10),
+ libxml-parser-perl,
+ intltool,
+ libnet-dbus-perl,
+ libdbus-1-dev (>= 0.35),
+ libdbus-glib-1-dev,
+ libglib2.0-dev
Package: system-tools-backends
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Replaces: gnome-system-tools (<< 1.1)
Conflicts: gnome-system-tools (<< 2.18)
Description: System Tools to manage computer configuration -- scripts
@@ -22,7 +31,8 @@
Package: system-tools-backends-dev
Architecture: any
Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Replaces: gnome-system-tools (<< 1.1)
Description: System Tools to manage computer configuration -- development files
The System Tools Backends are a set of cross-platform scripts
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=10783&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/control.in (original)
+++ desktop/unstable/system-tools-backends/debian/control.in Sun May 6 07:43:52 2007
@@ -4,11 +4,20 @@
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
Uploaders: @GNOME_TEAM@
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), cdbs, gnome-pkg-tools (>= 0.10), libxml-parser-perl, intltool, libnet-dbus-perl, libdbus-1-dev (>= 0.35), libdbus-glib-1-dev, libglib2.0-dev
+Build-Depends: debhelper (>= 5),
+ cdbs,
+ gnome-pkg-tools (>= 0.10),
+ libxml-parser-perl,
+ intltool,
+ libnet-dbus-perl,
+ libdbus-1-dev (>= 0.35),
+ libdbus-glib-1-dev,
+ libglib2.0-dev
Package: system-tools-backends
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Replaces: gnome-system-tools (<< 1.1)
Conflicts: gnome-system-tools (<< 2.18)
Description: System Tools to manage computer configuration -- scripts
@@ -22,7 +31,8 @@
Package: system-tools-backends-dev
Architecture: any
Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Replaces: gnome-system-tools (<< 1.1)
Description: System Tools to manage computer configuration -- development files
The System Tools Backends are a set of cross-platform scripts
Modified: desktop/unstable/system-tools-backends/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/copyright?rev=10783&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/copyright (original)
+++ desktop/unstable/system-tools-backends/debian/copyright Sun May 6 07:43:52 2007
@@ -1,7 +1,8 @@
This package was debianized by Marc Dequènes (Duck) <Duck at DuckCorp.org> on
Fri, 15 Apr 2005 02:54:06 +0200.
-It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/
+It was downloaded from:
+ http://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/
Copyright Holders: the full list is in:
/usr/share/doc/system-tools-backends/AUTHORS
Modified: desktop/unstable/system-tools-backends/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/rules?rev=10783&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/rules (original)
+++ desktop/unstable/system-tools-backends/debian/rules Sun May 6 07:43:52 2007
@@ -21,9 +21,9 @@
# so you don't need to include those too.
include /usr/share/cdbs/1/class/gnome.mk
-DEB_BUILDDIR = $(CURDIR)/debian/build
+DEB_BUILDDIR := $(CURDIR)/debian/build
-DEB_CONFIGURE_EXTRA_FLAGS := --datadir=/usr/share/ --with-net-dbus=/usr/lib/perl
+DEB_CONFIGURE_EXTRA_FLAGS += --datadir=/usr/share/ --with-net-dbus=/usr/lib/perl
5 --with-stb-group=root
Modified: desktop/unstable/system-tools-backends/debian/system-tools-backends.init.dbus
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/system-tools-backends.init.dbus?rev=10783&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.init.dbus (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.init.dbus Sun May 6 07:43:52 2007
@@ -1,13 +1,13 @@
#! /bin/sh
#
# system-tools-backends
-# dbus init script
+# dbus init script
#
-# (Stolen from the hal package)
-# Written by Martin Waitz based on skeleton code
-# written by Miquel van Smoorenburg <miquels at cistron.nl>.
-# Modified for Debian
-# by Ian Murdock <imurdock at gnu.ai.mit.edu>.
+# (Stolen from the hal package)
+# Written by Martin Waitz based on skeleton code
+# written by Miquel van Smoorenburg <miquels at cistron.nl>.
+# Modified for Debian
+# by Ian Murdock <imurdock at gnu.ai.mit.edu>.
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
@@ -23,55 +23,55 @@
set -e
do_start() {
- 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 [ ! -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 $?
}
do_stop() {
- log_daemon_msg "Stopping $DESC" "$NAME"
- start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE --startas $DAEMON
- log_end_msg $?
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE --startas $DAEMON
+ log_end_msg $?
}
case "$1" in
start)
do_start
- ;;
+ ;;
stop)
do_stop
- ;;
+ ;;
#reload)
- #
- # If the daemon can reload its config files on the fly
- # for example by sending it SIGHUP, do it here.
- #
- # If the daemon responds to changes in its config file
- # directly anyway, make this a do-nothing entry.
- #
- # echo "Reloading $DESC configuration files."
- # start-stop-daemon --stop --signal 1 --quiet --pidfile \
- # /var/run/$NAME.pid --exec $DAEMON
+ #
+ # If the daemon can reload its config files on the fly
+ # for example by sending it SIGHUP, do it here.
+ #
+ # If the daemon responds to changes in its config file
+ # directly anyway, make this a do-nothing entry.
+ #
+ # echo "Reloading $DESC configuration files."
+ # start-stop-daemon --stop --signal 1 --quiet --pidfile \
+ # /var/run/$NAME.pid --exec $DAEMON
#;;
restart|force-reload)
- #
- # If the "reload" option is implemented, move the "force-reload"
- # option to the "reload" entry above. If not, "force-reload" is
- # just the same as "restart".
- #
+ #
+ # If the "reload" option is implemented, move the "force-reload"
+ # option to the "reload" entry above. If not, "force-reload" is
+ # just the same as "restart".
+ #
do_stop
- sleep 5
+ sleep 5
do_start
- ;;
+ ;;
*)
- N=/etc/init.d/$NAME
- # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
- log_success_msg "Usage: $N {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
+ N=/etc/init.d/$NAME
+ # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+ log_success_msg "Usage: $N {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
esac
exit 0
Modified: desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst?rev=10783&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.postinst Sun May 6 07:43:52 2007
@@ -25,14 +25,14 @@
case "$1" in
configure)
- if ! getent group stb-admin > /dev/null; then
- addgroup --quiet --system stb-admin
- fi
+ if ! getent group stb-admin > /dev/null; then
+ addgroup --quiet --system stb-admin
+ fi
# only start system-tools-backends if it is not already running
if [ ! -e /var/run/system-tools-backends.pid ] || ! ps --no-headers -p $(cat /var/run/system-tools-backends.pid) > /dev/null 2>&1; then
if [ -x /etc/init.d/dbus ]; then
invoke-rc.d dbus force-reload || true
- if [ ! -e /var/run/system-tools-backends.pid ] || ! ps --no-headers -p $(< /var/run/system-tools-backends.pid) > /dev/null 2>&1; then
+ if [ ! -e /var/run/system-tools-backends.pid ] || ! ps --no-headers -p $(cat /var/run/system-tools-backends.pid) > /dev/null 2>&1; then
/etc/dbus-1/event.d/70system-tools-backends start || true
fi
fi
@@ -50,5 +50,3 @@
# generated by other debhelper scripts.
#DEBHELPER#
-
-exit 0
Modified: desktop/unstable/system-tools-backends/debian/system-tools-backends.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/system-tools-backends.postrm?rev=10783&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.postrm (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.postrm Sun May 6 07:43:52 2007
@@ -10,5 +10,3 @@
fi
#DEBHELPER#
-
-exit 0
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=10783&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst Sun May 6 07:43:52 2007
@@ -2,7 +2,7 @@
# stop backend here when upgrading from a version that didn't handle
# it correctly yet in the prerm
-if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl 2.1.0; then
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl 2.1.0-0ubuntu2; then
/etc/dbus-1/event.d/70system-tools-backends stop || true
fi
More information about the pkg-gnome-commits
mailing list