r31352 - in /desktop/experimental/d-conf/debian: changelog control control.in dconf-gsettings-backend.install dconf-service.install libdconf-dbus-1-0.install libdconf-dbus-1-dev.install libdconf-dev.install libdconf0.install rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Nov 13 14:39:48 UTC 2011
Author: joss
Date: Sun Nov 13 14:39:47 2011
New Revision: 31352
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31352
Log:
* Tighten dependency on libdconf0.
* Pass multiarch path to the gio modules dir.
* Break glib < 2.30 because of the multiarch path.
* Support multiarch:
+ Split the service in dconf-service (multi-arch: foreign).
+ Keep only the gio module in dconf-gsettings-backend (m-a: same).
+ Move libraries to the multiarch path.
+ Make them pre-depend on multiarch-support.
* -dev recommends -doc.
* Use the occasion to rename /usr/lib/d-conf to /u/l/dconf.
Added:
desktop/experimental/d-conf/debian/dconf-service.install
- copied, changed from r31339, desktop/experimental/d-conf/debian/dconf-gsettings-backend.install
Modified:
desktop/experimental/d-conf/debian/changelog
desktop/experimental/d-conf/debian/control
desktop/experimental/d-conf/debian/control.in
desktop/experimental/d-conf/debian/dconf-gsettings-backend.install
desktop/experimental/d-conf/debian/libdconf-dbus-1-0.install
desktop/experimental/d-conf/debian/libdconf-dbus-1-dev.install
desktop/experimental/d-conf/debian/libdconf-dev.install
desktop/experimental/d-conf/debian/libdconf0.install
desktop/experimental/d-conf/debian/rules
Modified: desktop/experimental/d-conf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/changelog?rev=31352&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/changelog [utf-8] (original)
+++ desktop/experimental/d-conf/debian/changelog [utf-8] Sun Nov 13 14:39:47 2011
@@ -1,3 +1,18 @@
+d-conf (0.10.0-2) experimental; urgency=low
+
+ * Tighten dependency on libdconf0.
+ * Pass multiarch path to the gio modules dir.
+ * Break glib < 2.30 because of the multiarch path.
+ * Support multiarch:
+ + Split the service in dconf-service (multi-arch: foreign).
+ + Keep only the gio module in dconf-gsettings-backend (m-a: same).
+ + Move libraries to the multiarch path.
+ + Make them pre-depend on multiarch-support.
+ * -dev recommends -doc.
+ * Use the occasion to rename /usr/lib/d-conf to /u/l/dconf.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 13 Nov 2011 14:58:03 +0100
+
d-conf (0.10.0-1) experimental; urgency=low
[ Laurent Bigonville ]
Modified: desktop/experimental/d-conf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/control?rev=31352&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/control [utf-8] (original)
+++ desktop/experimental/d-conf/debian/control [utf-8] Sun Nov 13 14:39:47 2011
@@ -25,8 +25,10 @@
Package: libdconf0
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends}
+Pre-Depends: multiarch-support
Breaks: dconf-gsettings-backend (<< 0.10.0)
Description: simple configuration storage system - runtime library
DConf is a low-level key/value database designed for storing desktop
@@ -39,7 +41,8 @@
Architecture: any
Depends: ${misc:Depends},
libdconf0 (= ${binary:Version}),
- libglib2.0-dev (>= 2.25.10)
+ libglib2.0-dev (>= 2.25.7)
+Recommends: libdconf-doc
Description: simple configuration storage system - development files
DConf is a low-level key/value database designed for storing desktop
environment settings.
@@ -50,6 +53,7 @@
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
libdconf0 (= ${binary:Version})
Description: simple configuration storage system - debugging symbols
@@ -60,9 +64,11 @@
Package: libdconf-dbus-1-0
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends},
libdconf0 (= ${binary:Version})
+Pre-Depends: multiarch-support
Description: simple configuration storage system - D-Bus library
DConf is a low-level key/value database designed for storing desktop
environment settings.
@@ -74,7 +80,7 @@
Architecture: any
Depends: ${misc:Depends},
libdconf-dbus-1-0 (= ${binary:Version}),
- libglib2.0-dev (>= 2.25.10),
+ libglib2.0-dev,
libdbus-1-dev
Description: simple configuration storage system - D-Bus development files
DConf is a low-level key/value database designed for storing desktop
@@ -86,6 +92,7 @@
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
libdconf-dbus-1-0 (= ${binary:Version})
Description: simple configuration storage system - D-Bus debug symbols
@@ -119,9 +126,15 @@
Package: dconf-gsettings-backend
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
+ dconf-service (>= ${source:Version}),
+ dconf-service (<< ${source:Version}.1~),
+ libdconf0 (= ${binary:Version})
Replaces: libdconf0 (<< 0.7.3-2)
+Breaks: libglib2.0-0 (<< 2.30),
+ libdconf0 (<< 0.7.3-2)
Provides: gsettings-backend
Description: simple configuration storage system - GSettings back-end
DConf is a low-level key/value database designed for storing desktop
@@ -130,3 +143,22 @@
This package contains a back-end for GSettings. It is needed by
applications accessing settings through GSettings to set custom values
and listen for changes.
+
+Package: dconf-service
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libdconf0 (= ${binary:Version})
+Recommends: dconf-gsettings-backend
+Breaks: libdconf0 (<< 0.7.3-2),
+ dconf-gsettings-backend (<< 0.10.0-2)
+Replaces: libdconf0 (<< 0.7.3-2),
+ dconf-gsettings-backend (<< 0.10.0-2)
+Description: simple configuration storage system - D-Bus service
+ DConf is a low-level key/value database designed for storing desktop
+ environment settings.
+ .
+ This package contains the DConf service, which applications talk to
+ using D-Bus in order to obtain their settings. It is mostly used by the
+ GSettings backend.
Modified: desktop/experimental/d-conf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/control.in?rev=31352&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/control.in [utf-8] (original)
+++ desktop/experimental/d-conf/debian/control.in [utf-8] Sun Nov 13 14:39:47 2011
@@ -20,8 +20,10 @@
Package: libdconf0
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends}
+Pre-Depends: multiarch-support
Breaks: dconf-gsettings-backend (<< 0.10.0)
Description: simple configuration storage system - runtime library
DConf is a low-level key/value database designed for storing desktop
@@ -34,7 +36,8 @@
Architecture: any
Depends: ${misc:Depends},
libdconf0 (= ${binary:Version}),
- libglib2.0-dev (>= 2.25.10)
+ libglib2.0-dev (>= 2.25.7)
+Recommends: libdconf-doc
Description: simple configuration storage system - development files
DConf is a low-level key/value database designed for storing desktop
environment settings.
@@ -45,6 +48,7 @@
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
libdconf0 (= ${binary:Version})
Description: simple configuration storage system - debugging symbols
@@ -55,9 +59,11 @@
Package: libdconf-dbus-1-0
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends},
libdconf0 (= ${binary:Version})
+Pre-Depends: multiarch-support
Description: simple configuration storage system - D-Bus library
DConf is a low-level key/value database designed for storing desktop
environment settings.
@@ -69,7 +75,7 @@
Architecture: any
Depends: ${misc:Depends},
libdconf-dbus-1-0 (= ${binary:Version}),
- libglib2.0-dev (>= 2.25.10),
+ libglib2.0-dev,
libdbus-1-dev
Description: simple configuration storage system - D-Bus development files
DConf is a low-level key/value database designed for storing desktop
@@ -81,6 +87,7 @@
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
libdconf-dbus-1-0 (= ${binary:Version})
Description: simple configuration storage system - D-Bus debug symbols
@@ -114,9 +121,15 @@
Package: dconf-gsettings-backend
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
+ dconf-service (>= ${source:Version}),
+ dconf-service (<< ${source:Version}.1~),
+ libdconf0 (= ${binary:Version})
Replaces: libdconf0 (<< 0.7.3-2)
+Breaks: libglib2.0-0 (<< 2.30),
+ libdconf0 (<< 0.7.3-2)
Provides: gsettings-backend
Description: simple configuration storage system - GSettings back-end
DConf is a low-level key/value database designed for storing desktop
@@ -125,3 +138,22 @@
This package contains a back-end for GSettings. It is needed by
applications accessing settings through GSettings to set custom values
and listen for changes.
+
+Package: dconf-service
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libdconf0 (= ${binary:Version})
+Recommends: dconf-gsettings-backend
+Breaks: libdconf0 (<< 0.7.3-2),
+ dconf-gsettings-backend (<< 0.10.0-2)
+Replaces: libdconf0 (<< 0.7.3-2),
+ dconf-gsettings-backend (<< 0.10.0-2)
+Description: simple configuration storage system - D-Bus service
+ DConf is a low-level key/value database designed for storing desktop
+ environment settings.
+ .
+ This package contains the DConf service, which applications talk to
+ using D-Bus in order to obtain their settings. It is mostly used by the
+ GSettings backend.
Modified: desktop/experimental/d-conf/debian/dconf-gsettings-backend.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/dconf-gsettings-backend.install?rev=31352&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/dconf-gsettings-backend.install [utf-8] (original)
+++ desktop/experimental/d-conf/debian/dconf-gsettings-backend.install [utf-8] Sun Nov 13 14:39:47 2011
@@ -1,3 +1,1 @@
-usr/lib/d-conf
-usr/lib/gio
-usr/share/dbus-1
+usr/lib/*/gio
Copied: desktop/experimental/d-conf/debian/dconf-service.install (from r31339, desktop/experimental/d-conf/debian/dconf-gsettings-backend.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/dconf-service.install?rev=31352&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/dconf-gsettings-backend.install [utf-8] (original)
+++ desktop/experimental/d-conf/debian/dconf-service.install [utf-8] Sun Nov 13 14:39:47 2011
@@ -1,3 +1,2 @@
-usr/lib/d-conf
-usr/lib/gio
+usr/lib/dconf
usr/share/dbus-1
Modified: desktop/experimental/d-conf/debian/libdconf-dbus-1-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/libdconf-dbus-1-0.install?rev=31352&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/libdconf-dbus-1-0.install [utf-8] (original)
+++ desktop/experimental/d-conf/debian/libdconf-dbus-1-0.install [utf-8] Sun Nov 13 14:39:47 2011
@@ -1,1 +1,1 @@
-usr/lib/libdconf-dbus-1.so.*
+usr/lib/*/libdconf-dbus-1.so.*
Modified: desktop/experimental/d-conf/debian/libdconf-dbus-1-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/libdconf-dbus-1-dev.install?rev=31352&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/libdconf-dbus-1-dev.install [utf-8] (original)
+++ desktop/experimental/d-conf/debian/libdconf-dbus-1-dev.install [utf-8] Sun Nov 13 14:39:47 2011
@@ -1,3 +1,3 @@
-usr/lib/pkgconfig/dconf-dbus-1.pc
-usr/lib/libdconf-dbus-1.so
+usr/lib/*/pkgconfig/dconf-dbus-1.pc
+usr/lib/*/libdconf-dbus-1.so
usr/include/dconf-dbus-1
Modified: desktop/experimental/d-conf/debian/libdconf-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/libdconf-dev.install?rev=31352&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/libdconf-dev.install [utf-8] (original)
+++ desktop/experimental/d-conf/debian/libdconf-dev.install [utf-8] Sun Nov 13 14:39:47 2011
@@ -1,4 +1,4 @@
-usr/lib/pkgconfig/dconf.pc
-usr/lib/libdconf.so
+usr/lib/*/pkgconfig/dconf.pc
+usr/lib/*/libdconf.so
usr/include/dconf
usr/share/vala/vapi/dconf.*
Modified: desktop/experimental/d-conf/debian/libdconf0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/libdconf0.install?rev=31352&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/libdconf0.install [utf-8] (original)
+++ desktop/experimental/d-conf/debian/libdconf0.install [utf-8] Sun Nov 13 14:39:47 2011
@@ -1,1 +1,1 @@
-usr/lib/libdconf.so.*
+usr/lib/*/libdconf.so.*
Modified: desktop/experimental/d-conf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/rules?rev=31352&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/rules [utf-8] (original)
+++ desktop/experimental/d-conf/debian/rules [utf-8] Sun Nov 13 14:39:47 2011
@@ -7,7 +7,11 @@
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE=dconf
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
+ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ --libexecdir=/usr/lib/dconf \
+ --with-gio-modules-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/gio/modules
+
DEB_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4
DEB_DBG_PACKAGE_libdconf0 := libdconf-dbg
More information about the pkg-gnome-commits
mailing list