r21767 - in /desktop/unstable/gconf/debian: changelog control control.in gconf-defaults-service.install patches/01_defaults_path.patch
lethalman-guest at users.alioth.debian.org
lethalman-guest at users.alioth.debian.org
Sun Oct 4 11:07:52 UTC 2009
Author: lethalman-guest
Date: Sun Oct 4 11:07:52 2009
New Revision: 21767
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21767
Log:
* New upstream release.
* debian/control.in:
- Update Standards-Version to 3.8.3, no additional changes needed.
- Remove libpolkit-dbus-dev and add libpolkit-gobject-1-dev
build-depends.
- Remove policykit from Build-Depends and from gconf-defaults-service.
Closes: #549518.
- Add misc:Depends to libgconf2-4, gconf2, libgconf2-dev and
gconf-defaults-service.
- Add Vcs-* fields.
* debian/gconf-defaults-service.install:
- Share dir changed from PolicyKit to polkit-1.
* debian/patches/01_defaults_path.patch:
- Update to apply cleanly.
Modified:
desktop/unstable/gconf/debian/changelog
desktop/unstable/gconf/debian/control
desktop/unstable/gconf/debian/control.in
desktop/unstable/gconf/debian/gconf-defaults-service.install
desktop/unstable/gconf/debian/patches/01_defaults_path.patch
Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=21767&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Sun Oct 4 11:07:52 2009
@@ -1,4 +1,4 @@
-gconf (2.26.2-4) UNRELEASED; urgency=low
+gconf (2.28.0-1) UNRELEASED; urgency=low
[ Loïc Minier ]
* gconf2.postinst: don't test for install as this isn't used for postinsts;
@@ -8,7 +8,23 @@
* debian/patches/70_relibtoolize.patch:
- Removed, not needed anymore since upstream uses a recent libtool.
- -- Loïc Minier <lool at dooz.org> Mon, 21 Sep 2009 15:33:02 +0200
+ [ Luca Bruno ]
+ * New upstream release.
+ * debian/control.in:
+ - Update Standards-Version to 3.8.3, no additional changes needed.
+ - Remove libpolkit-dbus-dev and add libpolkit-gobject-1-dev
+ build-depends.
+ - Remove policykit from Build-Depends and from gconf-defaults-service.
+ Closes: #549518.
+ - Add misc:Depends to libgconf2-4, gconf2, libgconf2-dev and
+ gconf-defaults-service.
+ - Add Vcs-* fields.
+ * debian/gconf-defaults-service.install:
+ - Share dir changed from PolicyKit to polkit-1.
+ * debian/patches/01_defaults_path.patch:
+ - Update to apply cleanly.
+
+ -- Luca Bruno <lethalman88 at gmail.com> Fri, 25 Sep 2009 15:17:19 +0200
gconf (2.26.2-3) unstable; urgency=low
Modified: desktop/unstable/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control?rev=21767&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control [utf-8] (original)
+++ desktop/unstable/gconf/debian/control [utf-8] Sun Oct 4 11:07:52 2009
@@ -2,9 +2,10 @@
Section: libs
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
+ quilt,
gnome-pkg-tools (>= 0.10),
dpkg-dev (>= 1.13.19),
gtk-doc-tools (>= 1.0),
@@ -14,8 +15,7 @@
libdbus-glib-1-dev (>= 0.74),
libxml2-dev,
libgtk2.0-dev,
- libpolkit-dbus-dev,
- policykit,
+ libpolkit-gobject-1-dev,
libldap2-dev,
intltool (>= 0.35.0),
libxml-parser-perl,
@@ -24,7 +24,7 @@
python-support (>= 0.5.3),
autotools-dev,
libglib2.0-doc
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
Homepage: http://projects.gnome.org/gconf/
Package: gconf2
@@ -67,8 +67,7 @@
Architecture: any
Depends: ${shlibs:Depends},
gconf2-common (>= ${gnome:Version}),
- gconf2-common (<< ${gnome:NextVersion}),
- policykit
+ gconf2-common (<< ${gnome:NextVersion})
Conflicts: libgconf2-4 (<< 2.24.0-3), gconf2-common (<< 2.24.0-3)
Replaces: gconf2-common (<< 2.24.0-3)
Description: GNOME configuration database system (system defaults service)
Modified: desktop/unstable/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control.in?rev=21767&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control.in [utf-8] (original)
+++ desktop/unstable/gconf/debian/control.in [utf-8] Sun Oct 4 11:07:52 2009
@@ -15,8 +15,7 @@
libdbus-glib-1-dev (>= 0.74),
libxml2-dev,
libgtk2.0-dev,
- libpolkit-dbus-dev,
- policykit,
+ libpolkit-gobject-1-dev,
libldap2-dev,
intltool (>= 0.35.0),
libxml-parser-perl,
@@ -25,12 +24,15 @@
python-support (>= 0.5.3),
autotools-dev,
libglib2.0-doc
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
Homepage: http://projects.gnome.org/gconf/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gconf
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gconf
Package: gconf2
Architecture: any
Depends: ${shlibs:Depends},
+ ${misc:Depends},
gconf2-common (>= ${gnome:Version}),
gconf2-common (<< ${gnome:NextVersion}),
psmisc,
@@ -67,9 +69,9 @@
Package: gconf-defaults-service
Architecture: any
Depends: ${shlibs:Depends},
+ ${misc:Depends},
gconf2-common (>= ${gnome:Version}),
- gconf2-common (<< ${gnome:NextVersion}),
- policykit
+ gconf2-common (<< ${gnome:NextVersion})
Conflicts: libgconf2-4 (<< 2.24.0-3), gconf2-common (<< 2.24.0-3)
Replaces: gconf2-common (<< 2.24.0-3)
Description: GNOME configuration database system (system defaults service)
@@ -85,6 +87,7 @@
Package: libgconf2-4
Architecture: any
Depends: ${shlibs:Depends},
+ ${misc:Depends},
gconf2-common (>= ${gnome:Version}),
gconf2-common (<< ${gnome:NextVersion})
Conflicts: libbonobo2-0 (<< 2.24)
@@ -100,7 +103,8 @@
Package: libgconf2-dev
Section: libdevel
Architecture: any
-Depends: libgconf2-4 (= ${binary:Version}),
+Depends: ${misc:Depends},
+ libgconf2-4 (= ${binary:Version}),
libglib2.0-dev (>= 2.14.0),
liborbit2-dev (>= 1:2.10.2-1.1),
libdbus-1-dev (>= 1.0.0),
Modified: desktop/unstable/gconf/debian/gconf-defaults-service.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf-defaults-service.install?rev=21767&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/gconf-defaults-service.install [utf-8] (original)
+++ desktop/unstable/gconf/debian/gconf-defaults-service.install [utf-8] Sun Oct 4 11:07:52 2009
@@ -1,4 +1,4 @@
debian/tmp/etc/dbus-1
-debian/tmp/usr/share/PolicyKit
+debian/tmp/usr/share/polkit-1
debian/tmp/usr/share/dbus-1/system-services
debian/tmp/usr/lib/libgconf2-4/gconf-defaults-mechanism
Modified: desktop/unstable/gconf/debian/patches/01_defaults_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/01_defaults_path.patch?rev=21767&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/patches/01_defaults_path.patch [utf-8] (original)
+++ desktop/unstable/gconf/debian/patches/01_defaults_path.patch [utf-8] Sun Oct 4 11:07:52 2009
@@ -1,21 +1,19 @@
-Index: GConf-2.26.2/defaults/gconf-defaults.c
-===================================================================
---- GConf-2.26.2.orig/defaults/gconf-defaults.c 2009-05-31 01:34:03.455659987 +0200
-+++ GConf-2.26.2/defaults/gconf-defaults.c 2009-05-31 01:34:36.507163240 +0200
-@@ -507,7 +507,7 @@ do_copy (GConfDefaults *mechani
+diff -urN GConf-2.28.0.orig/defaults/gconf-defaults.c GConf-2.28.0/defaults/gconf-defaults.c
+--- GConf-2.28.0.orig/defaults/gconf-defaults.c 2009-08-19 17:35:32.000000000 +0200
++++ GConf-2.28.0/defaults/gconf-defaults.c 2009-10-04 12:17:01.000000000 +0200
+@@ -810,7 +810,7 @@
else {
- annotation_key = "org.gnome.gconf.defaults.set-system.prefix";
- default_action = "org.gnome.gconf.defaults.set-system";
-- dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.system";
-+ dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.defaults";
+ adata->annotation_key = "org.gnome.gconf.defaults.set-system.prefix";
+ adata->default_action = "org.gnome.gconf.defaults.set-system";
+- cdata->dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.system";
++ cdata->dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.defaults";
}
- for (i = 0; includes[i]; i++) {
-Index: GConf-2.26.2/gconf/gconfd.c
-===================================================================
---- GConf-2.26.2.orig/gconf/gconfd.c 2009-05-31 01:34:43.255158102 +0200
-+++ GConf-2.26.2/gconf/gconfd.c 2009-05-31 01:35:09.147174042 +0200
-@@ -655,7 +655,7 @@ system_bus_message_handler (DBusConnecti
+ polkit_authority_enumerate_actions (mechanism->priv->auth,
+diff -urN GConf-2.28.0.orig/gconf/gconfd.c GConf-2.28.0/gconf/gconfd.c
+--- GConf-2.28.0.orig/gconf/gconfd.c 2009-08-19 17:35:32.000000000 +0200
++++ GConf-2.28.0/gconf/gconfd.c 2009-10-04 12:16:44.000000000 +0200
+@@ -655,7 +655,7 @@
gconf_log (GCL_DEBUG, "System defaults changed. Notifying.");
More information about the pkg-gnome-commits
mailing list