diff -Nru gconf-3.2.5/debian/changelog gconf-3.2.5/debian/changelog --- gconf-3.2.5/debian/changelog 2012-03-12 09:43:18.000000000 +0000 +++ gconf-3.2.5/debian/changelog 2012-03-23 21:44:06.000000000 +0000 @@ -1,3 +1,13 @@ +gconf (3.2.5-0ubuntu2) precise; urgency=low + + * Split gconf-service further into gconf-service and gconf-service-backend, + one package being Multi-Arch: foreign and the other Multi-Arch: none, so + that we correctly handle the fact that gconf2 needs backend modules of + the same arch whereas other reverse-dependencies just need a working + daemon. LP: #962854. + + -- Steve Langasek Fri, 23 Mar 2012 14:43:19 -0700 + gconf (3.2.5-0ubuntu1) precise; urgency=low * New upstream version diff -Nru gconf-3.2.5/debian/control gconf-3.2.5/debian/control --- gconf-3.2.5/debian/control 2012-03-12 09:43:20.000000000 +0000 +++ gconf-3.2.5/debian/control 2012-03-23 21:44:08.000000000 +0000 @@ -41,7 +41,7 @@ Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, - gconf-service (= ${binary:Version}), + gconf-service-backend (= ${binary:Version}), psmisc, dbus-x11, ${python:Depends} @@ -59,12 +59,27 @@ Package: gconf-service Architecture: any Multi-Arch: foreign +Depends: gconf-service-backend (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Description: GNOME configuration database system (D-Bus service) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package provides the D-Bus enabled daemon that is used internally + by the GConf library to access configuration data. + +Package: gconf-service-backend +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgconf-2-4 (= ${binary:Version}), gconf2-common (= ${source:Version}) Breaks: gconf2-common (<< 3.2.3-2) -Replaces: gconf2-common (<< 3.2.3-2) +Replaces: gconf2-common (<< 3.2.3-2), gconf-service (<< 3.2.5-0ubuntu2) Description: GNOME configuration database system (D-Bus service) GConf is a configuration database system for storing application preferences. It supports default or mandatory settings set by the @@ -73,7 +88,9 @@ require it. . This package contains the D-Bus enabled daemon that is used internally - by the GConf library to access configuration data. + by the GConf library to access configuration data. It is an internal + implementation of gconf used to work around multiarch-related upgrade + problems, and will eventually be merged back into gconf-service. Package: gconf2-common Architecture: all diff -Nru gconf-3.2.5/debian/control.in gconf-3.2.5/debian/control.in --- gconf-3.2.5/debian/control.in 2012-03-12 09:43:18.000000000 +0000 +++ gconf-3.2.5/debian/control.in 2012-03-23 21:44:06.000000000 +0000 @@ -36,7 +36,7 @@ Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, - gconf-service (= ${binary:Version}), + gconf-service-backend (= ${binary:Version}), psmisc, dbus-x11, ${python:Depends} @@ -54,12 +54,27 @@ Package: gconf-service Architecture: any Multi-Arch: foreign +Depends: gconf-service-backend (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Description: GNOME configuration database system (D-Bus service) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package provides the D-Bus enabled daemon that is used internally + by the GConf library to access configuration data. + +Package: gconf-service-backend +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgconf-2-4 (= ${binary:Version}), gconf2-common (= ${source:Version}) Breaks: gconf2-common (<< 3.2.3-2) -Replaces: gconf2-common (<< 3.2.3-2) +Replaces: gconf2-common (<< 3.2.3-2), gconf-service (<< 3.2.5-0ubuntu2) Description: GNOME configuration database system (D-Bus service) GConf is a configuration database system for storing application preferences. It supports default or mandatory settings set by the @@ -68,7 +83,9 @@ require it. . This package contains the D-Bus enabled daemon that is used internally - by the GConf library to access configuration data. + by the GConf library to access configuration data. It is an internal + implementation of gconf used to work around multiarch-related upgrade + problems, and will eventually be merged back into gconf-service. Package: gconf2-common Architecture: all diff -Nru gconf-3.2.5/debian/gconf-service-backend.install gconf-3.2.5/debian/gconf-service-backend.install --- gconf-3.2.5/debian/gconf-service-backend.install 1970-01-01 00:00:00.000000000 +0000 +++ gconf-3.2.5/debian/gconf-service-backend.install 2012-03-23 21:44:06.000000000 +0000 @@ -0,0 +1,3 @@ +usr/lib/*/gconf/gconfd-2 +usr/lib/*/gconf/2/*.so +usr/share/dbus-1/services diff -Nru gconf-3.2.5/debian/gconf-service.install gconf-3.2.5/debian/gconf-service.install --- gconf-3.2.5/debian/gconf-service.install 2012-03-12 09:43:18.000000000 +0000 +++ gconf-3.2.5/debian/gconf-service.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/lib/*/gconf/gconfd-2 -usr/lib/*/gconf/2/*.so -usr/share/dbus-1/services diff -Nru gconf-3.2.5/debian/rules gconf-3.2.5/debian/rules --- gconf-3.2.5/debian/rules 2012-03-12 09:43:18.000000000 +0000 +++ gconf-3.2.5/debian/rules 2012-03-23 21:44:06.000000000 +0000 @@ -31,7 +31,7 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_gconf-service += -Xbackend +DEB_DH_MAKESHLIBS_ARGS_gconf-service-backend += -Xbackend DEB_DH_MAKESHLIBS_ARGS_libgconf-2-4 += -V"libgconf-2-4 (>= 2.31.1), gconf-service" DEB_COMPRESS_EXCLUDE += usr/share/doc/gconf2/html