Hi,
Attached is my full multiarch conversion. I didn't add any libconf2-4 -> gconf2
dependency what was discussed on the previous mail. I don't see why it would any
more neccesary in multiarch scenario than in regular scenario. Furthermore, we
don't usually do any library -> server dependencies (see dbus, mysql and so on).
A recommends at most would be warranted.
These patches were done to allow cross compile packages the build-depend
directly on libgconf2-dev or inderectly to libconf2-4.
The org.gnome.GConf.service file was moved from gconf2-common to gconf2, since
the
contents of the file are not arch-independent. Other than that, quite
straightforward
conversion. But also not really tested in non-crosscompiling scenarios.
Riku
diff -Nru gconf-3.2.3/debian/changelog gconf-3.2.3/debian/changelog
--- gconf-3.2.3/debian/changelog 2011-11-12 15:17:54.000000000 +0200
+++ gconf-3.2.3/debian/changelog 2011-12-23 15:08:14.000000000 +0200
@@ -1,3 +1,9 @@
+gconf (3.2.3-2) unstable; urgency=low
+
+ * Convert to multiarch
+
+ -- Riku Voipio <riku.voi...@linaro.org> Fri, 23 Dec 2011 15:07:53 +0200
+
gconf (3.2.3-1) unstable; urgency=low
[ Jeremy Bicha ]
diff -Nru gconf-3.2.3/debian/control.in gconf-3.2.3/debian/control.in
--- gconf-3.2.3/debian/control.in 2011-10-30 11:20:12.000000000 +0200
+++ gconf-3.2.3/debian/control.in 2011-12-23 15:07:41.000000000 +0200
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Josselin Mouette <j...@debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
- cdbs (>= 0.4.41),
+Build-Depends: debhelper (>= 8.1.3),
+ cdbs (>= 0.4.93),
gnome-pkg-tools (>= 0.14),
gtk-doc-tools (>= 1.0),
libglib2.0-dev (>= 2.25.9),
@@ -41,6 +41,8 @@
Recommends: libgtk-3-0
Suggests: gconf-defaults-service
Conflicts: libgconf2-4 (<< 2.12.0-2)
+Replaces: gconf2-common (<< 3.2.3-2)
+Multi-Arch: foreign
Description: GNOME configuration database system (support tools)
GConf is a configuration database system for storing application
preferences. It supports default or mandatory settings set by the
@@ -57,6 +59,7 @@
dbus,
ucf
Replaces: gconf2 (<< 2.12.0-2)
+Multi-Arch: foreign
Description: GNOME configuration database system (common files)
GConf is a configuration database system for storing application
preferences. It supports default or mandatory settings set by the
@@ -75,6 +78,7 @@
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)
+Multi-Arch: foreign
Description: GNOME configuration database system (system defaults service)
GConf is a configuration database system for storing application
preferences. It supports default or mandatory settings set by the
@@ -92,6 +96,8 @@
gconf2-common (>= ${gnome:Version}),
gconf2-common (<< ${gnome:NextVersion})
Conflicts: libbonobo2-0 (<< 2.24)
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: GNOME configuration database system (shared libraries)
GConf is a configuration database system for storing application
preferences. It supports default or mandatory settings set by the
@@ -112,6 +118,7 @@
gconf2 (= ${binary:Version})
Replaces: gconf2 (<< 2.12.0-2),
gir-repository-dev (<< 0.6.5-7)
+Multi-Arch: same
Description: GNOME configuration database system (development)
GConf is a configuration database system for storing application
preferences. It supports default or mandatory settings set by the
diff -Nru gconf-3.2.3/debian/gconf2-common.install gconf-3.2.3/debian/gconf2-common.install
--- gconf-3.2.3/debian/gconf2-common.install 2011-06-03 22:53:50.000000000 +0300
+++ gconf-3.2.3/debian/gconf2-common.install 2011-12-23 15:00:48.000000000 +0200
@@ -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/
diff -Nru gconf-3.2.3/debian/gconf2.install gconf-3.2.3/debian/gconf2.install
--- gconf-3.2.3/debian/gconf2.install 2011-06-03 22:53:50.000000000 +0300
+++ gconf-3.2.3/debian/gconf2.install 2011-12-23 15:00:51.000000000 +0200
@@ -3,3 +3,4 @@
usr/bin
usr/share/man
etc/xdg/autostart
+usr/share/dbus-1/services
diff -Nru gconf-3.2.3/debian/gconf-defaults-service.install gconf-3.2.3/debian/gconf-defaults-service.install
--- gconf-3.2.3/debian/gconf-defaults-service.install 2011-06-03 22:53:50.000000000 +0300
+++ gconf-3.2.3/debian/gconf-defaults-service.install 2011-12-23 14:55:40.000000000 +0200
@@ -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/*/libgconf2-4/gconf-defaults-mechanism
diff -Nru gconf-3.2.3/debian/gconf-gsettings-backend.install gconf-3.2.3/debian/gconf-gsettings-backend.install
--- gconf-3.2.3/debian/gconf-gsettings-backend.install 2011-10-30 11:20:12.000000000 +0200
+++ gconf-3.2.3/debian/gconf-gsettings-backend.install 2011-12-23 15:17:16.000000000 +0200
@@ -1 +1 @@
-usr/lib/gio/modules/*.so
+usr/lib/*/gio/modules/*.so
diff -Nru gconf-3.2.3/debian/gir1.2-gconf-2.0.install gconf-3.2.3/debian/gir1.2-gconf-2.0.install
--- gconf-3.2.3/debian/gir1.2-gconf-2.0.install 2011-06-03 22:53:50.000000000 +0300
+++ gconf-3.2.3/debian/gir1.2-gconf-2.0.install 2011-12-23 14:56:46.000000000 +0200
@@ -1 +1 @@
-usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0
diff -Nru gconf-3.2.3/debian/libgconf2-4.install gconf-3.2.3/debian/libgconf2-4.install
--- gconf-3.2.3/debian/libgconf2-4.install 2011-10-30 11:20:12.000000000 +0200
+++ gconf-3.2.3/debian/libgconf2-4.install 2011-12-23 14:56:58.000000000 +0200
@@ -1,4 +1,4 @@
-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.*
+usr/lib/*/libgconf2-4/gconfd-2
+usr/lib/*/libgconf2-4/gconf-sanity-check-2
+usr/lib/*/libgconf2-4/2/*.so
diff -Nru gconf-3.2.3/debian/libgconf2-dev.install gconf-3.2.3/debian/libgconf2-dev.install
--- gconf-3.2.3/debian/libgconf2-dev.install 2011-06-03 22:53:50.000000000 +0300
+++ gconf-3.2.3/debian/libgconf2-dev.install 2011-12-23 14:57:19.000000000 +0200
@@ -1,8 +1,8 @@
usr/include
-usr/lib/*.so
-usr/lib/*.a
-usr/lib/*.la
+usr/lib/*/*.so
+usr/lib/*/*.a
+usr/lib/*/*.la
usr/share/aclocal
usr/share/gir-1.0
-usr/lib/pkgconfig
+usr/lib/*/pkgconfig
usr/share/gtk-doc/html/gconf/* usr/share/doc/gconf2/html/
diff -Nru gconf-3.2.3/debian/rules gconf-3.2.3/debian/rules
--- gconf-3.2.3/debian/rules 2011-10-27 05:38:21.000000000 +0300
+++ gconf-3.2.3/debian/rules 2011-12-23 14:53:33.000000000 +0200
@@ -21,9 +21,9 @@
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
DEB_INSTALL_DOCS_gconf2 += doc/FAQ.txt NEWS README TODO
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libexecdir=/usr/lib/libgconf2-4 \
- --with-gtk=3.0 --disable-orbit
-DEB_MAKE_INVOKE += pkglibdir=/usr/lib/libgconf2-4
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/libgconf2-4 \
+ --with-gtk=3.0 --disable-orbit --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+DEB_MAKE_INVOKE += pkglibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/libgconf2-4
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
