r18154 - in /desktop/experimental/system-tools-backends/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Jan 4 11:27:27 UTC 2009
Author: joss
Date: Sun Jan 4 11:27:27 2009
New Revision: 18154
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18154
Log:
* Build-depend on libpolkit-dbus-dev for PolicyKit support.
* Make other build-dependencies up-to-date.
* Break gnome-system-tools < 2.22.1-1.
* 03_default_permissions.patch: removed, useless with PolicyKit.
* Install the policy.
* Remove the init script, the dispatcher is correctly started on
demand in the PolicyKit-enabled code path. Closes: #423903.
* Remove the init script and symbolic links in the preinst.
* system-tools-backends.1: fix typo. Closes: #482198.
* system-tools-backends.postinst: removed, we don’t need stb-admin
anymore and we don’t need to reload dbus to make it start the
daemon.
* Don’t pass --with-stb-group to the configure flags.
Removed:
desktop/experimental/system-tools-backends/debian/patches/03_default_permissions.patch
desktop/experimental/system-tools-backends/debian/system-tools-backends.init
desktop/experimental/system-tools-backends/debian/system-tools-backends.postinst
Modified:
desktop/experimental/system-tools-backends/debian/changelog
desktop/experimental/system-tools-backends/debian/control
desktop/experimental/system-tools-backends/debian/control.in
desktop/experimental/system-tools-backends/debian/patches/series
desktop/experimental/system-tools-backends/debian/rules
desktop/experimental/system-tools-backends/debian/system-tools-backends.1
desktop/experimental/system-tools-backends/debian/system-tools-backends.install
desktop/experimental/system-tools-backends/debian/system-tools-backends.preinst
Modified: desktop/experimental/system-tools-backends/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/system-tools-backends/debian/changelog?rev=18154&op=diff
==============================================================================
--- desktop/experimental/system-tools-backends/debian/changelog (original)
+++ desktop/experimental/system-tools-backends/debian/changelog Sun Jan 4 11:27:27 2009
@@ -1,9 +1,25 @@
-system-tools-backends (2.6.0-3) UNRELEASED; urgency=low
-
+system-tools-backends (2.6.0-3) experimental; urgency=low
+
+ [ Loic Minier ]
* Don't rm_conffile /etc/dbus-1/event.d/70system-tools-backends during first
configuration.
- -- Loic Minier <lool at dooz.org> Fri, 28 Nov 2008 20:29:44 +0100
+ [ Josselin Mouette ]
+ * Build-depend on libpolkit-dbus-dev for PolicyKit support.
+ * Make other build-dependencies up-to-date.
+ * Break gnome-system-tools < 2.22.1-1.
+ * 03_default_permissions.patch: removed, useless with PolicyKit.
+ * Install the policy.
+ * Remove the init script, the dispatcher is correctly started on
+ demand in the PolicyKit-enabled code path. Closes: #423903.
+ * Remove the init script and symbolic links in the preinst.
+ * system-tools-backends.1: fix typo. Closes: #482198.
+ * system-tools-backends.postinst: removed, we don’t need stb-admin
+ anymore and we don’t need to reload dbus to make it start the
+ daemon.
+ * Don’t pass --with-stb-group to the configure flags.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 04 Jan 2009 11:50:44 +0100
system-tools-backends (2.6.0-2) unstable; urgency=medium
Modified: desktop/experimental/system-tools-backends/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/system-tools-backends/debian/control?rev=18154&op=diff
==============================================================================
--- desktop/experimental/system-tools-backends/debian/control (original)
+++ desktop/experimental/system-tools-backends/debian/control Sun Jan 4 11:27:27 2009
@@ -2,18 +2,17 @@
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>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Otavio Salvador <otavio at debian.org>, Niv Sardi <xaiki at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.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,
libnet-dbus-perl,
- libdbus-1-dev (>= 0.35),
- libdbus-glib-1-dev,
- libglib2.0-dev
+ libdbus-1-dev (>= 1.1.2),
+ libdbus-glib-1-dev (>= 0.74),
+ libpolkit-dbus-dev (>= 0.5),
+ libglib2.0-dev (>= 2.15.2)
Package: system-tools-backends
Architecture: any
@@ -23,6 +22,7 @@
adduser
Replaces: gnome-system-tools (<< 1.1)
Conflicts: gnome-system-tools (<< 2.18), liboobs-1-3
+Breaks: gnome-system-tools (<< 2.22.1-1)
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/experimental/system-tools-backends/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/system-tools-backends/debian/control.in?rev=18154&op=diff
==============================================================================
--- desktop/experimental/system-tools-backends/debian/control.in (original)
+++ desktop/experimental/system-tools-backends/debian/control.in Sun Jan 4 11:27:27 2009
@@ -8,12 +8,11 @@
cdbs,
quilt,
gnome-pkg-tools (>= 0.10),
- libxml-parser-perl,
- intltool,
libnet-dbus-perl,
- libdbus-1-dev (>= 0.35),
- libdbus-glib-1-dev,
- libglib2.0-dev
+ libdbus-1-dev (>= 1.1.2),
+ libdbus-glib-1-dev (>= 0.74),
+ libpolkit-dbus-dev (>= 0.5),
+ libglib2.0-dev (>= 2.15.2)
Package: system-tools-backends
Architecture: any
@@ -23,6 +22,7 @@
adduser
Replaces: gnome-system-tools (<< 1.1)
Conflicts: gnome-system-tools (<< 2.18), liboobs-1-3
+Breaks: gnome-system-tools (<< 2.22.1-1)
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/experimental/system-tools-backends/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/system-tools-backends/debian/patches/series?rev=18154&op=diff
==============================================================================
--- desktop/experimental/system-tools-backends/debian/patches/series (original)
+++ desktop/experimental/system-tools-backends/debian/patches/series Sun Jan 4 11:27:27 2009
@@ -1,6 +1,5 @@
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/experimental/system-tools-backends/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/system-tools-backends/debian/rules?rev=18154&op=diff
==============================================================================
--- desktop/experimental/system-tools-backends/debian/rules (original)
+++ desktop/experimental/system-tools-backends/debian/rules Sun Jan 4 11:27:27 2009
@@ -8,7 +8,4 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_CONFIGURE_EXTRA_FLAGS += --datadir=/usr/share/ \
- --with-net-dbus=/usr/lib/perl5 \
- --with-stb-group=stb-admin
-
-DEB_DH_INSTALLINIT_ARGS := -- start 30 2 3 4 5 . stop 30 0 1 6 .
+ --with-net-dbus=/usr/lib/perl5
Modified: desktop/experimental/system-tools-backends/debian/system-tools-backends.1
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/system-tools-backends/debian/system-tools-backends.1?rev=18154&op=diff
==============================================================================
--- desktop/experimental/system-tools-backends/debian/system-tools-backends.1 (original)
+++ desktop/experimental/system-tools-backends/debian/system-tools-backends.1 Sun Jan 4 11:27:27 2009
@@ -24,7 +24,7 @@
to all platforms to modify or read the system configuration in a
distro independent fashion.
.P
-This program is a lightwight DBus message dispatcher. It does not take
+This program is a lightweight DBus message dispatcher. It does not take
any options.
.SH AUTHORS
.B system-tools-backends
Modified: desktop/experimental/system-tools-backends/debian/system-tools-backends.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/system-tools-backends/debian/system-tools-backends.install?rev=18154&op=diff
==============================================================================
--- desktop/experimental/system-tools-backends/debian/system-tools-backends.install (original)
+++ desktop/experimental/system-tools-backends/debian/system-tools-backends.install Sun Jan 4 11:27:27 2009
@@ -2,3 +2,4 @@
debian/tmp/usr/share/system-tools-backends-2.0
debian/tmp/usr/share/dbus-1/system-services
debian/tmp/etc/dbus-1/system.d
+debian/tmp/usr/share/PolicyKit
Modified: desktop/experimental/system-tools-backends/debian/system-tools-backends.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/system-tools-backends/debian/system-tools-backends.preinst?rev=18154&op=diff
==============================================================================
--- desktop/experimental/system-tools-backends/debian/system-tools-backends.preinst (original)
+++ desktop/experimental/system-tools-backends/debian/system-tools-backends.preinst Sun Jan 4 11:27:27 2009
@@ -29,6 +29,10 @@
/etc/dbus-1/event.d/70system-tools-backends stop || true
rm_conffile system-tools-backends "/etc/dbus-1/event.d/70system-tools-backends"
fi
+ if dpkg --compare-versions "$2" lt-nl 2.6.0-3; then
+ rm_conffile system-tools-backends "/etc/init.d/system-tools-backends"
+ update-rc.d system-tools-backends remove
+ fi
;;
esac
More information about the pkg-gnome-commits
mailing list