[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#654252: marked as done (please add multi-arch support for libxfont)

Your message dated Mon, 12 Aug 2013 16:33:10 +0000
with message-id <E1V8v3O-0006AV-NM@franck.debian.org>
and subject line Bug#654252: fixed in libxfont 1:1.4.6-1
has caused the Debian Bug report #654252,
regarding please add multi-arch support for libxfont
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
654252: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654252
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: libxfont
Version: 1:1.4.4-1
Severity: normal
User: multiarch-devel@lists.alioth.debian.org
Usertags: multiarch
Tags: patch

Hi,

Another rather straightforward multiarch conversion. 

Riku

>From 22386f6b4aef96c04bef653c878a2966b2fe64ea Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voipio@linaro.org>
Date: Mon, 2 Jan 2012 16:49:24 +0200
Subject: [PATCH] Convert to Multi-Arch

This patch converts libxfont to multiarch
---
 debian/control                |    5 ++++-
 debian/libxfont-dev.install   |    6 +++---
 debian/libxfont1-udeb.install |    2 +-
 debian/libxfont1.install      |    2 +-
 debian/rules                  |    2 ++
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 4b5fd8e..4d01073 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
 Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 8.1.3),
  dh-autoreconf,
  quilt,
  pkg-config,
@@ -27,6 +27,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xprint (<< 2:1.6.0-1)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: X11 font rasterisation library
  libXfont provides various services for X servers, most notably font
  selection and rasterisation (through external libraries).
@@ -67,6 +69,7 @@ Package: libxfont-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxfont1 (= ${binary:Version}), libx11-dev, x11proto-core-dev, x11proto-fonts-dev, libfreetype6-dev, libfontenc-dev (>= 1:1.0.1-1)
+Multi-Arch: same
 Description: X11 font rasterisation library (development headers)
  libXfont provides various services for X servers, most notably font
  selection and rasterisation (through external libraries).
diff --git a/debian/libxfont-dev.install b/debian/libxfont-dev.install
index edf16a3..75740c9 100644
--- a/debian/libxfont-dev.install
+++ b/debian/libxfont-dev.install
@@ -1,7 +1,7 @@
 usr/include/X11/*
-usr/lib/libXfont.a
-usr/lib/libXfont.so
-usr/lib/pkgconfig/xfont.pc
+usr/lib/*/libXfont.a
+usr/lib/*/libXfont.so
+usr/lib/*/pkgconfig/xfont.pc
 
 # Extra doc, under noinst_* in doc/Makefile.am:
 ../../build-main/doc/*.html usr/share/doc/libxfont-dev/
diff --git a/debian/libxfont1-udeb.install b/debian/libxfont1-udeb.install
index e73e376..02a72ba 100644
--- a/debian/libxfont1-udeb.install
+++ b/debian/libxfont1-udeb.install
@@ -1,2 +1,2 @@
-usr/lib/libXfont.so.1*
+usr/lib/*/libXfont.so.1*
 
diff --git a/debian/libxfont1.install b/debian/libxfont1.install
index e73e376..02a72ba 100644
--- a/debian/libxfont1.install
+++ b/debian/libxfont1.install
@@ -1,2 +1,2 @@
-usr/lib/libXfont.so.1*
+usr/lib/*/libXfont.so.1*
 
diff --git a/debian/rules b/debian/rules
index 11814cc..65116cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ CFLAGS   = $(shell dpkg-buildflags --get CFLAGS)
 CFLAGS  += -Wall
 CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
 LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CONFFLAGS += \
 	--enable-fc \
@@ -15,6 +16,7 @@ CONFFLAGS += \
 	--enable-bdfformat \
 	--enable-devel-docs \
 	--without-fop \
+	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	CFLAGS="$(CFLAGS)" \
 	CPPFLAGS="$(CPPFLAGS)" \
 	LDFLAGS="$(LDFLAGS)"
-- 
1.7.5.4

--- End Message ---
--- Begin Message --- 
Source: libxfont
Source-Version: 1:1.4.6-1

We believe that the bug you reported is fixed in the latest version of
libxfont, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 654252@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Julien Cristau <jcristau@debian.org> (supplier of updated libxfont package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Mon, 12 Aug 2013 18:28:57 +0200
Source: libxfont
Binary: libxfont1 libxfont1-udeb libxfont1-dbg libxfont-dev
Architecture: source amd64
Version: 1:1.4.6-1
Distribution: sid
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Julien Cristau <jcristau@debian.org>
Description: 
 libxfont-dev - X11 font rasterisation library (development headers)
 libxfont1  - X11 font rasterisation library
 libxfont1-dbg - X11 font rasterisation library (debug package)
 libxfont1-udeb - X11 font rasterisation library (udeb)
Closes: 654252
Changes: 
 libxfont (1:1.4.6-1) unstable; urgency=low
 .
   * New upstream release.
   * Build for multiarch (closes: #654252).  Patch by Riku Voipio, thanks!
   * Disable silent build rules.
Checksums-Sha1: 
 ef0af01cfbea3ade4fada104a358e360b97105c0 2241 libxfont_1.4.6-1.dsc
 18817b799bc9d7b8176ee0d661bc828174e1e4a1 618599 libxfont_1.4.6.orig.tar.gz
 1ebd82e4545c8739f682a9023f8ce15c4d775660 9463 libxfont_1.4.6-1.diff.gz
 938c9f9d9c95b21e22c8bc25da3f85b6fcf5d25a 143944 libxfont1_1.4.6-1_amd64.deb
 ad04c675645b87c525de21780b94ecb01f042c43 109844 libxfont1-udeb_1.4.6-1_amd64.udeb
 c206859163f61405f986d88b56aa1e76ad4aaadd 294592 libxfont1-dbg_1.4.6-1_amd64.deb
 38558b1c654ffe0e1baccf348f5fa5167d4743fc 178674 libxfont-dev_1.4.6-1_amd64.deb
Checksums-Sha256: 
 a36d88fcece3392cfe3f3cf2a61300ba0c20b8a93f96569834a28ccf36ccb4ad 2241 libxfont_1.4.6-1.dsc
 a0db35727dc52bf930834aac470933c8905c58d902591e23a3cb0133f22e1375 618599 libxfont_1.4.6.orig.tar.gz
 05c3eeeab951f74a637c2765aa064745fca5733a7e31e8cd304e833a02feba1e 9463 libxfont_1.4.6-1.diff.gz
 a4aed7d80831a9c54b6eafebe4936e97021d75105492918d3d764d6791d99e8f 143944 libxfont1_1.4.6-1_amd64.deb
 94c441835bcfa24e31161f0de7940bab1907ac2e5769f12ccf70c5e39ecd97bf 109844 libxfont1-udeb_1.4.6-1_amd64.udeb
 ec7eecbf0b527e4040c6db47ead8b46baad611332a61b9ad18bef8db76925f23 294592 libxfont1-dbg_1.4.6-1_amd64.deb
 ebade8a30a170cf947f54819a3072acc7e5317af6bdb03fcd10d2e801af25039 178674 libxfont-dev_1.4.6-1_amd64.deb
Files: 
 17c3c62be7d56c3a7d0ca58a686bd256 2241 x11 optional libxfont_1.4.6-1.dsc
 f8d1007df1ee14f3ab5d5b13f11aa7f4 618599 x11 optional libxfont_1.4.6.orig.tar.gz
 aa71c0eddc3f677d5bfd45a99419e6e2 9463 x11 optional libxfont_1.4.6-1.diff.gz
 7de19810ac07c1f72946539bb1cd6aac 143944 libs optional libxfont1_1.4.6-1_amd64.deb
 b400fabf704a99435c1f0f23b7701a23 109844 debian-installer optional libxfont1-udeb_1.4.6-1_amd64.udeb
 eb5f282b2437bc58a8ed81f7ef0b2feb 294592 debug extra libxfont1-dbg_1.4.6-1_amd64.deb
 4dbc76120096ca636a3a8f282a12be14 178674 libdevel optional libxfont-dev_1.4.6-1_amd64.deb
Package-Type: udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAEBAgAGBQJSCQ3dAAoJEDEBgAUJBeQMvbMP/1iXzYa+61/95niYozoxlE81
7nXlqC7y+BxNU4SLqFnruMqoQJSxb4uMhZjx4nr0GuGIY6NnpSYP+6ciaDQ/R/tR
IggmBRMGemlyR553vB64sUMXcN8oJxoJTL7+UD7ZaQWz2WFjpeaiLSaxK2TWqNHf
GkXlVYCr1UwJxnVXUW32OhOxemN8aXmnujzy7izxCZxFnkuGHkimIE54gCMmP4wh
e2c17UEFIUAuKJYq8LRGVPLr028MwCyuZ8niNbqMN+mcK9gvfSiZ5QHUwWyzzkYS
piKF7gPsDjPBZEmzzk+a7kbf+sDFNf5oKMBfLDgkEqbTt+yfQzNLN3joQPep6T1i
S0PLV2uAnb/ZEbM+7h7iF7a9ZBM+0b2zfQ+XrexCUIZy23dg9v1qAd70j2FMIKGw
R7fUzDtSZ6lX1sde2DFG4MMpvGTgf4y/NJ9dl7/TS2RhTA3wrbBaAYvUrVDVgSoS
AS4PhQjuo7N1nA3BRwpPBjFbF3AlaQGG7tQeAD9TwLbaBZy++treZck+xfYmMS2T
hgyMgwanUzVu+oDZF2la6LzvGhUNrPoWmRtEE7Sg+Dlgay/WEj4i2OqxjRIakefe
MPOcJDndkK7mW5yuLKYO0d6+44XA4z7aUElwd+pWrfn4oc27HZGdx2g2kJeeJ47W
5wm+gG2FZAQL6d8Fs3+k
=sdRG
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: