[Pkg-xfce-commits] r5846 - desktop/trunk/exo/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-07-02 20:41:21 +0000 (Sat, 02 Jul 2011)
New Revision: 5846

Modified:
   desktop/trunk/exo/debian/changelog
   desktop/trunk/exo/debian/compat
   desktop/trunk/exo/debian/control
   desktop/trunk/exo/debian/libexo-1-0.install
   desktop/trunk/exo/debian/libexo-1-dev.install
   desktop/trunk/exo/debian/rules
Log:
Include patch from Steve Langasek to make exo multi-arch ready, thanks to
him!                                                        closes: #632486

Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog	2011-06-30 22:53:35 UTC (rev 5845)
+++ desktop/trunk/exo/debian/changelog	2011-07-02 20:41:21 UTC (rev 5846)
@@ -1,3 +1,10 @@
+exo (0.6.2-2) UNRELEASED; urgency=low
+
+  * Include patch from Steve Langasek to make exo multi-arch ready, thanks to
+    him!                                                        closes: #632486
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Jul 2011 21:57:18 +0200
+
 exo (0.6.2-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/trunk/exo/debian/compat
===================================================================
--- desktop/trunk/exo/debian/compat	2011-06-30 22:53:35 UTC (rev 5845)
+++ desktop/trunk/exo/debian/compat	2011-07-02 20:41:21 UTC (rev 5846)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control	2011-06-30 22:53:35 UTC (rev 5845)
+++ desktop/trunk/exo/debian/control	2011-07-02 20:41:21 UTC (rev 5846)
@@ -4,7 +4,7 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
  Lionel Le Folgoc <mrpouit at 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

Modified: desktop/trunk/exo/debian/libexo-1-0.install
===================================================================
--- desktop/trunk/exo/debian/libexo-1-0.install	2011-06-30 22:53:35 UTC (rev 5845)
+++ desktop/trunk/exo/debian/libexo-1-0.install	2011-07-02 20:41:21 UTC (rev 5846)
@@ -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

Modified: desktop/trunk/exo/debian/libexo-1-dev.install
===================================================================
--- desktop/trunk/exo/debian/libexo-1-dev.install	2011-06-30 22:53:35 UTC (rev 5845)
+++ desktop/trunk/exo/debian/libexo-1-dev.install	2011-07-02 20:41:21 UTC (rev 5846)
@@ -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/*

Modified: desktop/trunk/exo/debian/rules
===================================================================
--- desktop/trunk/exo/debian/rules	2011-06-30 22:53:35 UTC (rev 5845)
+++ desktop/trunk/exo/debian/rules	2011-07-02 20:41:21 UTC (rev 5846)
@@ -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/' \