Package: exo
Version: 0.6.2-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
Hi folks,
In order to help make Linaro ALIP cross-buildable in a multiarch context,
I've begun looking at converting some of the XFCE libraries to multiarch.
I've tested that the contents of the packages all appear to be correct, but
have not checked it out from a runtime POV. If the patch checks out on your
end, I'd be grateful if you would apply it to the Debian package.
Thanks for considering the patch.
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
vor...@debian.org http://www.debian.org/
diff -Nru exo-0.6.2/debian/compat exo-0.6.2/debian/compat
--- exo-0.6.2/debian/compat 2011-03-30 16:08:38.000000000 +0000
+++ exo-0.6.2/debian/compat 2011-07-02 18:54:59.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru exo-0.6.2/debian/control exo-0.6.2/debian/control
--- exo-0.6.2/debian/control 2011-04-19 14:02:00.000000000 +0000
+++ exo-0.6.2/debian/control 2011-07-02 18:54:59.000000000 +0000
@@ -4,7 +4,7 @@
Maintainer: Debian Xfce Maintainers <pkg-xfce-de...@lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <cor...@debian.org>,
Lionel Le Folgoc <mrpo...@gmail.com>
-Build-Depends: debhelper (>= 7.2.7), libxfce4util-dev (>= 4.8.0),
+Build-Depends: debhelper (>= 8.1.3), libxfce4util-dev (>= 4.8.0),
libxfce4ui-1-dev (>= 4.8.0), liburi-perl, chrpath, intltool,
hardening-includes, libglib2.0-dev (>= 2.27)
Standards-Version: 3.9.2
@@ -15,6 +15,7 @@
Package: libexo-1-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: libexo-1-0 (= ${binary:Version}), libxfce4util-dev (>= 4.8.0),
${misc:Depends}, libgtk2.0-dev
Description: Development files for libexo
@@ -26,6 +27,8 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libexo-common
Recommends: liburi-perl
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: Library with extensions for Xfce
libexo is a library for Xfce that contains a bunch of additional widgets and
a framework for editable toolbars (an improved version of the framework
@@ -57,6 +60,7 @@
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}, libexo-1-0 (= ${binary:Version})
Description: debugging informations for libexo
This package contains the debugging symbols for libexo, additional library
@@ -79,6 +83,7 @@
Section: libs
Priority: extra
Architecture: all
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libexo-0.3-0 (<< 0.3.104-3)
Description: libexo common files
diff -Nru exo-0.6.2/debian/libexo-1-0.install exo-0.6.2/debian/libexo-1-0.install
--- exo-0.6.2/debian/libexo-1-0.install 2011-03-30 16:08:38.000000000 +0000
+++ exo-0.6.2/debian/libexo-1-0.install 2011-07-02 18:54:59.000000000 +0000
@@ -1,4 +1,5 @@
-usr/lib/xfce4/exo-1/*
-usr/lib/lib*.so.*
+usr/lib/*/xfce4/exo-1/exo-helper-1
+usr/lib/*/xfce4/exo-1/exo-compose-mail-1 usr/lib/xfce4/exo-1
+usr/lib/*/lib*.so.*
usr/share/locale/*/*/*.mo
usr/share/pixmaps
diff -Nru exo-0.6.2/debian/libexo-1-dev.install exo-0.6.2/debian/libexo-1-dev.install
--- exo-0.6.2/debian/libexo-1-dev.install 2011-03-30 16:08:38.000000000 +0000
+++ exo-0.6.2/debian/libexo-1-dev.install 2011-07-02 18:54:59.000000000 +0000
@@ -1,5 +1,5 @@
usr/include/*
-usr/lib/pkgconfig/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
usr/share/gtk-doc/html/exo-1/*
diff -Nru exo-0.6.2/debian/rules exo-0.6.2/debian/rules
--- exo-0.6.2/debian/rules 2011-03-30 16:08:38.000000000 +0000
+++ exo-0.6.2/debian/rules 2011-07-02 18:54:59.000000000 +0000
@@ -9,6 +9,8 @@
export CFLAGS LDFLAGS
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
EXO_LIBNAME=1
EXO_SOVERSION=0
EXO_SONAME=libexo-$(EXO_LIBNAME)-$(EXO_SOVERSION)
@@ -21,8 +23,8 @@
override_dh_install:
# delete the unneeded .a and .la files
- rm -f debian/tmp/usr/lib/libexo-$(EXO_LIBNAME).la
- rm -f debian/tmp/usr/lib/gio/modules/libexo-module-$(EXO_LIBNAME).la
+ rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libexo-$(EXO_LIBNAME).la
+ rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gio/modules/libexo-module-$(EXO_LIBNAME).la
# Debianise
sed -i -e 's/^WebBrowser=.*/WebBrowser=debian-sensible-browser/' \
@@ -32,8 +34,8 @@
chrpath -d -k debian/tmp/usr/bin/exo-csource \
debian/tmp/usr/bin/exo-desktop-item-edit \
debian/tmp/usr/bin/exo-open \
- debian/tmp/usr/lib/xfce4/exo-$(EXO_LIBNAME)/exo-helper-$(EXO_LIBNAME) \
- debian/tmp/usr/lib/libexo-$(EXO_LIBNAME).so.*
+ debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/exo-$(EXO_LIBNAME)/exo-helper-$(EXO_LIBNAME) \
+ debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libexo-$(EXO_LIBNAME).so.*
# Create a muttng helper from the mutt one
sed -e 's/utt/uttng/;s/Icon=muttng/Icon=mutt/' \
