libxaw: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/control | 4 ++++
debian/libxaw7-dev.install | 7 ++++---
debian/libxaw7-dev.links | 1 -
debian/libxaw7.install | 4 ++--
debian/rules | 6 +++++-
6 files changed, 21 insertions(+), 7 deletions(-)
New commits:
commit 53bf737798981afca7e0d7627712097babae6906
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Fri Oct 21 14:12:35 2011 -0700
releasing version 2:1.0.9-3
diff --git a/debian/changelog b/debian/changelog
index 6b7c340..d4fe706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libxaw (2:1.0.9-3) UNRELEASED; urgency=low
+libxaw (2:1.0.9-3) unstable; urgency=low
* Build for multiarch.
- -- Steve Langasek <vorlon@debian.org> Fri, 21 Oct 2011 12:59:22 -0700
+ -- Steve Langasek <vorlon@debian.org> Fri, 21 Oct 2011 14:12:23 -0700
libxaw (2:1.0.9-2) unstable; urgency=low
commit 212842361fa684087d3ef802ae6c7f1540e1e05b
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Fri Oct 21 13:33:53 2011 -0700
Build for multiarch.
diff --git a/debian/changelog b/debian/changelog
index 5700edf..6b7c340 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxaw (2:1.0.9-3) UNRELEASED; urgency=low
+
+ * Build for multiarch.
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 21 Oct 2011 12:59:22 -0700
+
libxaw (2:1.0.9-2) unstable; urgency=low
* Bump Standards-Version to 3.9.1.
diff --git a/debian/control b/debian/control
index e294909..281c45b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders:
Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5),
+ dpkg-dev (>= 1.16.0),
libx11-dev (>= 1:0.99.2),
x11proto-core-dev (>= 7.0.1),
libxt-dev (>= 1:0.99.1),
@@ -29,6 +30,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxaw.git
Package: libxaw7
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -48,6 +51,7 @@ Description: X11 Athena Widget library
Package: libxaw7-dbg
Section: debug
Architecture: any
+Multi-Arch: same
Priority: extra
Depends:
${shlibs:Depends},
diff --git a/debian/libxaw7-dev.install b/debian/libxaw7-dev.install
index d4e30ed..95eea7f 100644
--- a/debian/libxaw7-dev.install
+++ b/debian/libxaw7-dev.install
@@ -1,6 +1,7 @@
-usr/lib/libXaw7.a
-usr/lib/libXaw7.so
-usr/lib/pkgconfig/xaw7.pc
+usr/lib/*/libXaw7.a
+usr/lib/*/libXaw7.so
+usr/lib/*/libXaw.so
+usr/lib/*/pkgconfig/xaw7.pc
usr/include/X11/*
usr/share/man/man3/*
usr/share/doc/libXaw/* usr/share/doc/libxaw7-dev
diff --git a/debian/libxaw7-dev.links b/debian/libxaw7-dev.links
deleted file mode 100644
index 6917ddf..0000000
--- a/debian/libxaw7-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libXaw7.so usr/lib/libXaw.so
diff --git a/debian/libxaw7.install b/debian/libxaw7.install
index fd8df61..4337035 100644
--- a/debian/libxaw7.install
+++ b/debian/libxaw7.install
@@ -1,2 +1,2 @@
-usr/lib/libXaw7.so.7*
-usr/lib/libXaw.so.7
+usr/lib/*/libXaw7.so.7*
+usr/lib/*/libXaw.so.7
diff --git a/debian/rules b/debian/rules
index 3051e27..38ae1b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,8 @@ endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
else
@@ -36,6 +38,7 @@ build/config.status: configure
mkdir -p build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--infodir=\$${prefix}/share/info $(confflags) \
--disable-xaw6 \
--with-xmlto --without-fop \
@@ -73,7 +76,8 @@ install: build
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
find debian/tmp/usr/share/doc/libXaw -name '*.xml' -delete
- rm -f debian/tmp/usr/lib/libXaw.so
+ rm -f debian/tmp/usr/lib/*/libXaw.so
+ ln -s libXaw7.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXaw.so
# Build architecture-dependent files here.
binary-arch: build install
Reply to: