tags 646194 + pending
thanks
Dear maintainer,
I've prepared an NMU for xaw3d (versioned as 1.5+E-18.2) (as discussed
with you on IRC) for the multiarch support issue.
Regards.
--
Mark Hymers <mhy at debian dot org>
"I told you I was ill"
The epitaph of Spike Milligan (1918-2002)
diff -u xaw3d-1.5+E/debian/changelog xaw3d-1.5+E/debian/changelog
--- xaw3d-1.5+E/debian/changelog
+++ xaw3d-1.5+E/debian/changelog
@@ -1,3 +1,10 @@
+xaw3d (1.5+E-18.2) unstable; urgency=low
+
+ * Non-maintainer upload with permission of Francesco Paolo Lovergine.
+ * Apply Multi-Arch patch. Closes: #646194.
+
+ -- Mark Hymers <[email protected]> Mon, 14 May 2012 21:54:41 +0000
+
xaw3d (1.5+E-18.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u xaw3d-1.5+E/debian/rules xaw3d-1.5+E/debian/rules
--- xaw3d-1.5+E/debian/rules
+++ xaw3d-1.5+E/debian/rules
@@ -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
diff -u xaw3d-1.5+E/debian/control xaw3d-1.5+E/debian/control
--- xaw3d-1.5+E/debian/control
+++ xaw3d-1.5+E/debian/control
@@ -2,12 +2,14 @@
Section: x11
Priority: optional
Maintainer: Francesco Paolo Lovergine <[email protected]>
-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: multiarch-support
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 +23,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)
diff -u xaw3d-1.5+E/debian/xaw3dg-dev.install xaw3d-1.5+E/debian/xaw3dg-dev.install
--- xaw3d-1.5+E/debian/xaw3dg-dev.install
+++ xaw3d-1.5+E/debian/xaw3dg-dev.install
@@ -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
diff -u xaw3d-1.5+E/debian/compat xaw3d-1.5+E/debian/compat
--- xaw3d-1.5+E/debian/compat
+++ xaw3d-1.5+E/debian/compat
@@ -1 +1 @@
-7
+9
diff -u xaw3d-1.5+E/debian/xaw3dg.install xaw3d-1.5+E/debian/xaw3dg.install
--- xaw3d-1.5+E/debian/xaw3dg.install
+++ xaw3d-1.5+E/debian/xaw3dg.install
@@ -1 +1 @@
-usr/lib/*.so.* usr/lib
+usr/lib/*/*.so.*
only in patch2:
unchanged:
--- xaw3d-1.5+E.orig/source/format
+++ xaw3d-1.5+E/source/format
@@ -0,0 +1 @@
+1.0
