r32667 - /desktop/unstable/gconf/debian/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu Feb 23 20:56:45 UTC 2012 

Author: joss
Date: Thu Feb 23 20:56:44 2012
New Revision: 32667

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32667
Log:
* Convert to Multi-Arch.
  + gconf2, gconf2-common, gconf-defaults-service are M-A: foreign.
  + Move the daemon to a multiarch path.
  + Tighten dependencies.
  + Move the sanity-check binary to gconf2.
  + Move the daemon and the activation file to gconf-service, a new 
    MA: foreign package.
  + Add appropriate Breaks/Replaces for the activation file.
  + Rename libgconf2-4 to libgconf-2-4, make it MA: same.
  + Make the shlibs add both libgconf-2-4 and gconf-service.
  + Make libgconf2-4 a dummy MA: same package depending on both too.
  + gconf-gsettings-backend is MA: same.
* Move the API documentation to libgconf2-doc.
* Get rid of the symlink for documentation.
* Remove unused gnome-version.mk.

Added:
    desktop/unstable/gconf/debian/gconf-service.install
    desktop/unstable/gconf/debian/libgconf-2-4.install
      - copied, changed from r32662, desktop/unstable/gconf/debian/libgconf2-4.install
    desktop/unstable/gconf/debian/libgconf2-doc.examples
      - copied unchanged from r32662, desktop/unstable/gconf/debian/libgconf2-dev.examples
    desktop/unstable/gconf/debian/libgconf2-doc.install
Removed:
    desktop/unstable/gconf/debian/libgconf2-4.install
    desktop/unstable/gconf/debian/libgconf2-dev.examples
    desktop/unstable/gconf/debian/libgconf2-dev.links
    desktop/unstable/gconf/debian/libgconf2-dev.postinst
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/gconf-gsettings-backend.install
    desktop/unstable/gconf/debian/gconf2-common.install
    desktop/unstable/gconf/debian/gir1.2-gconf-2.0.install
    desktop/unstable/gconf/debian/libgconf2-dev.install
    desktop/unstable/gconf/debian/rules

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=32667&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Thu Feb 23 20:56:44 2012
@@ -1,4 +1,4 @@
-gconf (3.2.3-2) UNRELEASED; urgency=low
+gconf (3.2.3-2) unstable; urgency=low
 
   [ Michael Biebl ]
   * debian/libgconf2-dev.install:
@@ -18,7 +18,24 @@
     a GConf 2.32 → GConf 3.2 upgrade, due to the ORBit → D-Bus
     transition (closes: #648673).
 
- -- Jordi Mallach <jordi at debian.org>  Thu, 23 Feb 2012 18:07:18 +0100
+  [ Josselin Mouette ]
+  * Convert to Multi-Arch.
+    + gconf2, gconf2-common, gconf-defaults-service are M-A: foreign.
+    + Move the daemon to a multiarch path.
+    + Tighten dependencies.
+    + Move the sanity-check binary to gconf2.
+    + Move the daemon and the activation file to gconf-service, a new 
+      MA: foreign package.
+    + Add appropriate Breaks/Replaces for the activation file.
+    + Rename libgconf2-4 to libgconf-2-4, make it MA: same.
+    + Make the shlibs add both libgconf-2-4 and gconf-service.
+    + Make libgconf2-4 a dummy MA: same package depending on both too.
+    + gconf-gsettings-backend is MA: same.
+  * Move the API documentation to libgconf2-doc.
+  * Get rid of the symlink for documentation.
+  * Remove unused gnome-version.mk.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 23 Feb 2012 21:56:45 +0100
 
 gconf (3.2.3-1) unstable; urgency=low
 

Modified: desktop/unstable/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control?rev=32667&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control [utf-8] (original)
+++ desktop/unstable/gconf/debian/control [utf-8] Thu Feb 23 20:56:44 2012
@@ -7,7 +7,7 @@
 Section: libs
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Jordi Mallach <jordi at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 8),
                cdbs (>= 0.4.90),
                gnome-pkg-tools (>= 0.14),
@@ -35,14 +35,13 @@
 
 Package: gconf2
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gconf2-common (>= ${gnome:Version}),
-         gconf2-common (<< ${gnome:NextVersion}),
+Multi-Arch: foreign
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gconf-service (= ${binary:Version}),
          psmisc,
          dbus-x11,
          ${python:Depends}
-Recommends: libgtk-3-0
 Suggests: gconf-defaults-service
 Description: GNOME configuration database system (support tools)
  GConf is a configuration database system for storing application
@@ -54,8 +53,28 @@
  This package contains the command line tools: gconftool and
  gconf-merge-tree.
 
+Package: gconf-service
+Architecture: any
+Multi-Arch: foreign
+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)
+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 contains the D-Bus enabled daemon that is used internally 
+ by the GConf library to access configuration data.
+
 Package: gconf2-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          dbus,
          ucf
@@ -70,10 +89,10 @@
 
 Package: gconf-defaults-service
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gconf2-common (>= ${gnome:Version}),
-         gconf2-common (<< ${gnome:NextVersion})
+Multi-Arch: foreign
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gconf2-common (= ${source:Version})
 Conflicts: libgconf2-4 (<< 2.24.0-3), gconf2-common (<< 2.24.0-3)
 Breaks: gconf-editor (<< 2.28)
 Replaces: gconf2-common (<< 2.24.0-3)
@@ -87,12 +106,15 @@
  This package contains the PolicyKit service that allows users to edit the
  system-wide defaults from a user session.
 
-Package: libgconf2-4
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gconf2-common (>= ${gnome:Version}),
-         gconf2-common (<< ${gnome:NextVersion})
+Package: libgconf-2-4
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gconf2-common (= ${source:Version})
+Breaks: libgconf2-4 (<< 3.2.3-2)
+Recommends: gconf-service
 Conflicts: libbonobo2-0 (<< 2.24)
 Description: GNOME configuration database system (shared libraries)
  GConf is a configuration database system for storing application
@@ -101,17 +123,36 @@
  running applications. It is written for the GNOME desktop but doesn't
  require it.
  .
- This package contains the shared libraries and the GConf daemon.
+ This package contains the shared libraries.
+
+Package: libgconf2-4
+Section: oldlibs
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgconf-2-4 (= ${binary:Version}),
+         gconf-service
+Description: GNOME configuration database system (dummy package)
+ 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 is here to ensure smooth upgrades. It can be removed when 
+ you see fit.
 
 Package: libgconf2-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libgconf2-4 (= ${binary:Version}),
+         libgconf-2-4 (= ${binary:Version}),
          gir1.2-gconf-2.0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.25.9),
          libdbus-1-dev (>= 1.0.0),
          gconf2 (= ${binary:Version})
+Recommends: libgconf2-doc
 Replaces: gir-repository-dev (<< 0.6.5-7)
 Description: GNOME configuration database system (development)
  GConf is a configuration database system for storing application
@@ -120,8 +161,23 @@
  running applications. It is written for the GNOME desktop but doesn't
  require it.
  .
- This package contains the static libraries, header files and
- documentation needed to build applications using GConf. 
+ This package contains the static libraries and header files needed to 
+ build applications using GConf. 
+
+Package: libgconf2-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Conflicts: libgconf2-dev (<< 3.2.3-2)
+Description: GNOME configuration database system (API reference)
+ 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 contains the API reference for the GConf library.
 
 Package: gir1.2-gconf-2.0
 Section: introspection
@@ -142,12 +198,12 @@
 
 Package: gconf-gsettings-backend
 Architecture: any
+Multi-Arch: same
 Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gconf2-common (>= ${gnome:Version}),
-         gconf2-common (<< ${gnome:NextVersion}),
-         libgconf2-4 (= ${binary:Version})
+         libgconf-2-4 (= ${binary:Version}),
+         gconf-service
 Breaks: libgconf2-4 (<< 3.2)
 Replaces: libgconf2-4 (<< 3.2)
 Provides: gsettings-backend

Modified: desktop/unstable/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control.in?rev=32667&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control.in [utf-8] (original)
+++ desktop/unstable/gconf/debian/control.in [utf-8] Thu Feb 23 20:56:44 2012
@@ -30,14 +30,13 @@
 
 Package: gconf2
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gconf2-common (>= ${gnome:Version}),
-         gconf2-common (<< ${gnome:NextVersion}),
+Multi-Arch: foreign
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gconf-service (= ${binary:Version}),
          psmisc,
          dbus-x11,
          ${python:Depends}
-Recommends: libgtk-3-0
 Suggests: gconf-defaults-service
 Description: GNOME configuration database system (support tools)
  GConf is a configuration database system for storing application
@@ -49,8 +48,28 @@
  This package contains the command line tools: gconftool and
  gconf-merge-tree.
 
+Package: gconf-service
+Architecture: any
+Multi-Arch: foreign
+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)
+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 contains the D-Bus enabled daemon that is used internally 
+ by the GConf library to access configuration data.
+
 Package: gconf2-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
          dbus,
          ucf
@@ -65,10 +84,10 @@
 
 Package: gconf-defaults-service
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gconf2-common (>= ${gnome:Version}),
-         gconf2-common (<< ${gnome:NextVersion})
+Multi-Arch: foreign
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gconf2-common (= ${source:Version})
 Conflicts: libgconf2-4 (<< 2.24.0-3), gconf2-common (<< 2.24.0-3)
 Breaks: gconf-editor (<< 2.28)
 Replaces: gconf2-common (<< 2.24.0-3)
@@ -82,12 +101,15 @@
  This package contains the PolicyKit service that allows users to edit the
  system-wide defaults from a user session.
 
-Package: libgconf2-4
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gconf2-common (>= ${gnome:Version}),
-         gconf2-common (<< ${gnome:NextVersion})
+Package: libgconf-2-4
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gconf2-common (= ${source:Version})
+Breaks: libgconf2-4 (<< 3.2.3-2)
+Recommends: gconf-service
 Conflicts: libbonobo2-0 (<< 2.24)
 Description: GNOME configuration database system (shared libraries)
  GConf is a configuration database system for storing application
@@ -96,17 +118,36 @@
  running applications. It is written for the GNOME desktop but doesn't
  require it.
  .
- This package contains the shared libraries and the GConf daemon.
+ This package contains the shared libraries.
+
+Package: libgconf2-4
+Section: oldlibs
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgconf-2-4 (= ${binary:Version}),
+         gconf-service
+Description: GNOME configuration database system (dummy package)
+ 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 is here to ensure smooth upgrades. It can be removed when 
+ you see fit.
 
 Package: libgconf2-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libgconf2-4 (= ${binary:Version}),
+         libgconf-2-4 (= ${binary:Version}),
          gir1.2-gconf-2.0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.25.9),
          libdbus-1-dev (>= 1.0.0),
          gconf2 (= ${binary:Version})
+Recommends: libgconf2-doc
 Replaces: gir-repository-dev (<< 0.6.5-7)
 Description: GNOME configuration database system (development)
  GConf is a configuration database system for storing application
@@ -115,8 +156,23 @@
  running applications. It is written for the GNOME desktop but doesn't
  require it.
  .
- This package contains the static libraries, header files and
- documentation needed to build applications using GConf. 
+ This package contains the static libraries and header files needed to 
+ build applications using GConf. 
+
+Package: libgconf2-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Conflicts: libgconf2-dev (<< 3.2.3-2)
+Description: GNOME configuration database system (API reference)
+ 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 contains the API reference for the GConf library.
 
 Package: gir1.2-gconf-2.0
 Section: introspection
@@ -137,12 +193,12 @@
 
 Package: gconf-gsettings-backend
 Architecture: any
+Multi-Arch: same
 Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gconf2-common (>= ${gnome:Version}),
-         gconf2-common (<< ${gnome:NextVersion}),
-         libgconf2-4 (= ${binary:Version})
+         libgconf-2-4 (= ${binary:Version}),
+         gconf-service
 Breaks: libgconf2-4 (<< 3.2)
 Replaces: libgconf2-4 (<< 3.2)
 Provides: gsettings-backend

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=32667&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/gconf-defaults-service.install [utf-8] (original)
+++ desktop/unstable/gconf/debian/gconf-defaults-service.install [utf-8] Thu Feb 23 20:56:44 2012
@@ -1,4 +1,4 @@
 etc/dbus-1
 usr/share/polkit-1
 usr/share/dbus-1/system-services
-usr/lib/libgconf2-4/gconf-defaults-mechanism
+usr/lib/*/gconf/gconf-defaults-mechanism

Modified: desktop/unstable/gconf/debian/gconf-gsettings-backend.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf-gsettings-backend.install?rev=32667&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/gconf-gsettings-backend.install [utf-8] (original)
+++ desktop/unstable/gconf/debian/gconf-gsettings-backend.install [utf-8] Thu Feb 23 20:56:44 2012
@@ -1,1 +1,1 @@
-usr/lib/gio/modules/*.so
+usr/lib/*/gio/modules/*.so

Added: desktop/unstable/gconf/debian/gconf-service.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf-service.install?rev=32667&op=file
==============================================================================
--- desktop/unstable/gconf/debian/gconf-service.install (added)
+++ desktop/unstable/gconf/debian/gconf-service.install [utf-8] Thu Feb 23 20:56:44 2012
@@ -1,0 +1,3 @@
+usr/lib/*/gconf/gconfd-2
+usr/lib/*/gconf/2/*.so
+usr/share/dbus-1/services

Modified: desktop/unstable/gconf/debian/gconf2-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf2-common.install?rev=32667&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/gconf2-common.install [utf-8] (original)
+++ desktop/unstable/gconf/debian/gconf2-common.install [utf-8] Thu Feb 23 20:56:44 2012
@@ -2,5 +2,4 @@
 etc/gconf/2/evoldap.conf
 usr/share/locale
 usr/share/sgml
-usr/share/dbus-1/services
 usr/share/GConf/schema/evoldap.schema usr/share/doc/gconf2-common/

Modified: desktop/unstable/gconf/debian/gir1.2-gconf-2.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gir1.2-gconf-2.0.install?rev=32667&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/gir1.2-gconf-2.0.install [utf-8] (original)
+++ desktop/unstable/gconf/debian/gir1.2-gconf-2.0.install [utf-8] Thu Feb 23 20:56:44 2012
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0 usr/lib

Copied: desktop/unstable/gconf/debian/libgconf-2-4.install (from r32662, desktop/unstable/gconf/debian/libgconf2-4.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/libgconf-2-4.install?rev=32667&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/libgconf2-4.install [utf-8] (original)
+++ desktop/unstable/gconf/debian/libgconf-2-4.install [utf-8] Thu Feb 23 20:56:44 2012
@@ -1,4 +1,1 @@
-usr/lib/*.so.*
-usr/lib/libgconf2-4/gconfd-2
-usr/lib/libgconf2-4/gconf-sanity-check-2
-usr/lib/libgconf2-4/2/*.so
+usr/lib/*/*.so.*

Modified: desktop/unstable/gconf/debian/libgconf2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/libgconf2-dev.install?rev=32667&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/libgconf2-dev.install [utf-8] (original)
+++ desktop/unstable/gconf/debian/libgconf2-dev.install [utf-8] Thu Feb 23 20:56:44 2012
@@ -1,7 +1,6 @@
 usr/include
-usr/lib/*.so
-usr/lib/*.a
+usr/lib/*/*.so
+usr/lib/*/*.a
 usr/share/aclocal
 usr/share/gir-1.0
-usr/lib/pkgconfig
-usr/share/gtk-doc/html/gconf/* usr/share/doc/gconf2/html/
+usr/lib/*/pkgconfig

Added: desktop/unstable/gconf/debian/libgconf2-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/libgconf2-doc.install?rev=32667&op=file
==============================================================================
--- desktop/unstable/gconf/debian/libgconf2-doc.install (added)
+++ desktop/unstable/gconf/debian/libgconf2-doc.install [utf-8] Thu Feb 23 20:56:44 2012
@@ -1,0 +1,1 @@
+usr/share/gtk-doc/html/gconf

Modified: desktop/unstable/gconf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/rules?rev=32667&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/rules [utf-8] (original)
+++ desktop/unstable/gconf/debian/rules [utf-8] Thu Feb 23 20:56:44 2012
@@ -4,7 +4,6 @@
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_MODULE := GConf
@@ -22,16 +21,17 @@
 DEB_INSTALL_DOCS_gconf2 += doc/FAQ.txt NEWS README TODO
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
-                             --libexecdir=/usr/lib/libgconf2-4 \
+                             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+                             --libexecdir=\$${libdir}/gconf \
                              --with-gtk=3.0 \
                              --disable-orbit
 
-DEB_MAKE_INVOKE += pkglibdir=/usr/lib/libgconf2-4
+DEB_MAKE_INVOKE += pkglibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gconf
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libgconf2-4 += -Xbackend -V"libgconf2-4 (>= 2.31.1)"
-DEB_DH_SHLIBDEPS_ARGS += -Xgconf-sanity-check
+DEB_DH_MAKESHLIBS_ARGS_gconf-service += -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

More information about the pkg-gnome-commits mailing list