Package: xaw3d
Version: 1.5+E-18
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
Hi Francesco,
Please find attached a patch to xaw3d to transition it to use the multiarch
library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>. This patch is being
applied in Ubuntu precise.
Since xaw3dg is included in ia32-libs, converting this package for multiarch
is a prerequisite for getting rid of ia32-libs.
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.
Ubuntu Developer http://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/compat'
--- debian/compat 2010-04-26 17:47:03 +0000
+++ debian/compat 2011-10-22 03:25:26 +0000
@@ -1 +1 @@
-7
+9
=== modified file 'debian/control'
--- debian/control 2010-04-26 17:47:03 +0000
+++ debian/control 2011-10-22 04:22:18 +0000
@@ -2,12 +2,14 @@
Section: x11
Priority: optional
Maintainer: Francesco Paolo Lovergine <fran...@debian.org>
-Build-Depends: debhelper (>= 7), xutils-dev (>= 1:1.0.2-3), libx11-dev,
libxmu-dev, libxpm-dev, libxt-dev, x11proto-core-dev, x11proto-xext-dev,
+Build-Depends: debhelper (>= 8.1.3~), xutils-dev (>= 1:1.0.2-3), libx11-dev,
libxmu-dev, libxpm-dev, libxt-dev, x11proto-core-dev, x11proto-xext-dev,
bison, flex-old|flex (>= 2.5.31-16), dpatch
Standards-Version: 3.8.4
Package: xaw3dg
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: axe (<< 6.1.2-2), xaw3d (<= 1.3-6), xfig (<< 1:3.2.4-rel-9), gv (<<
1:3.5.8-30.1)
Description: Xaw3d widget set
@@ -21,6 +24,7 @@
Package: xaw3dg-dev
Section: devel
Architecture: any
+Multi-Arch: same
Depends: xaw3dg (=${binary:Version}), xutils-dev, libx11-dev, libxmu-dev,
libxpm-dev, libxt-dev, x11proto-core-dev, x11proto-xext-dev, ${misc:Depends}
Conflicts: xaw3d-dev
Replaces: xaw3dg (<< 1.5+E-16)
=== modified file 'debian/rules'
--- debian/rules 2010-04-26 17:47:03 +0000
+++ debian/rules 2011-10-22 04:25:32 +0000
@@ -5,6 +5,8 @@
#export DH_VERBOSE = 1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
include /usr/share/dpatch/dpatch.make
ifneq (,$(findstring $(ARCH), $(COMPATARCHS)))
@@ -41,7 +43,9 @@
dh_testroot
dh_prep
$(MAKE) -C $(SOURCE) install \
- DESTDIR=$(CURDIR)/debian/tmp INCDIR=/usr/include
+ DESTDIR=$(CURDIR)/debian/tmp INCDIR=/usr/include \
+ SHLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ USRLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
binary: binary-indep binary-arch
=== modified file 'debian/xaw3dg-dev.install'
--- debian/xaw3dg-dev.install 2008-07-25 09:47:14 +0000
+++ debian/xaw3dg-dev.install 2011-10-22 03:30:18 +0000
@@ -1,3 +1,3 @@
-usr/include/* usr/include
-usr/lib/*.a usr/lib
-usr/lib/*.so usr/lib
+usr/include/*
+usr/lib/*/*.a
+usr/lib/*/*.so
=== modified file 'debian/xaw3dg.install'
--- debian/xaw3dg.install 2008-07-25 09:47:14 +0000
+++ debian/xaw3dg.install 2011-10-22 03:30:06 +0000
@@ -1 +1 @@
-usr/lib/*.so.* usr/lib
+usr/lib/*/*.so.*
