libxmu: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/control | 10 ++++++++++
debian/libxmu-dev.install | 6 +++---
debian/libxmu6.install | 2 +-
debian/libxmuu-dev.install | 6 +++---
debian/libxmuu1.install | 2 +-
debian/rules | 3 +++
7 files changed, 27 insertions(+), 8 deletions(-)
New commits:
commit a1686975725d48db6118cf75a58aea0b6f25a7a5
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Fri Oct 21 14:48:02 2011 -0700
releasing version 2:1.1.0-3
diff --git a/debian/changelog b/debian/changelog
index 29e43f8..b533395 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libxmu (2:1.1.0-3) UNRELEASED; urgency=low
+libxmu (2:1.1.0-3) unstable; urgency=low
* Build for multiarch.
- -- Steve Langasek <vorlon@debian.org> Fri, 21 Oct 2011 14:27:02 -0700
+ -- Steve Langasek <vorlon@debian.org> Fri, 21 Oct 2011 14:47:59 -0700
libxmu (2:1.1.0-2) unstable; urgency=low
commit ac8beb9ce0ba2d1c60201bfee7c2b5fd895dc3bc
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Fri Oct 21 14:47:39 2011 -0700
Build for multiarch.
diff --git a/debian/changelog b/debian/changelog
index 32e870e..29e43f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxmu (2:1.1.0-3) UNRELEASED; urgency=low
+
+ * Build for multiarch.
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 21 Oct 2011 14:27:02 -0700
+
libxmu (2:1.1.0-2) unstable; urgency=low
[ Christopher James Halse Rogers ]
diff --git a/debian/control b/debian/control
index 82b1f01..4c145c8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
+ dpkg-dev (>= 1.16.0),
libx11-dev (>= 1:0.99.2),
libxt-dev (>= 1:0.99.1),
libxext-dev (>= 1:0.99.1),
@@ -22,6 +23,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxmu.git
Package: libxmu6
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: X11 miscellaneous utility library
libXmu provides a set of miscellaneous utility convenience functions for X
@@ -37,6 +40,7 @@ Description: X11 miscellaneous utility library
Package: libxmu6-dbg
Section: debug
Architecture: any
+Multi-Arch: same
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libxmu6 (= ${binary:Version})
Description: X11 miscellaneous utility library (debug package)
@@ -56,6 +60,7 @@ Description: X11 miscellaneous utility library (debug package)
Package: libxmu-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}, libxext-dev, libxt-dev, libxmu6 (= ${binary:Version}), libxmu-headers (= ${source:Version})
Description: X11 miscellaneous utility library (development headers)
libXmu provides a set of miscellaneous utility convenience functions for X
@@ -74,6 +79,8 @@ Description: X11 miscellaneous utility library (development headers)
Package: libxmuu1
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: X11 miscellaneous micro-utility library
libXmuu provides a set of miscellaneous utility convenience functions for X
@@ -89,6 +96,7 @@ Description: X11 miscellaneous micro-utility library
Package: libxmuu1-dbg
Section: debug
Architecture: any
+Multi-Arch: same
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libxmuu1 (= ${binary:Version})
Description: X11 miscellaneous micro-utility library (debug package)
@@ -108,6 +116,7 @@ Description: X11 miscellaneous micro-utility library (debug package)
Package: libxmuu-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}, libxmuu1 (= ${binary:Version}), libxmu-headers (= ${source:Version})
Description: X11 miscellaneous micro-utility library (development headers)
libXmuu provides a set of miscellaneous utility convenience functions for X
@@ -126,6 +135,7 @@ Description: X11 miscellaneous micro-utility library (development headers)
Package: libxmu-headers
Section: libdevel
Architecture: all
+Multi-Arch: foreign
Depends: libx11-dev, x11proto-core-dev
Description: X11 miscellaneous utility library headers
libXmu and libXmuu are miscellaneous utility libraries for X library
diff --git a/debian/libxmu-dev.install b/debian/libxmu-dev.install
index 2f5f5b2..613e605 100644
--- a/debian/libxmu-dev.install
+++ b/debian/libxmu-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libXmu.a
-usr/lib/libXmu.so
-usr/lib/pkgconfig/xmu.pc
+usr/lib/*/libXmu.a
+usr/lib/*/libXmu.so
+usr/lib/*/pkgconfig/xmu.pc
diff --git a/debian/libxmu6.install b/debian/libxmu6.install
index 8bb0da2..9e56527 100644
--- a/debian/libxmu6.install
+++ b/debian/libxmu6.install
@@ -1 +1 @@
-usr/lib/libXmu.so.6*
+usr/lib/*/libXmu.so.6*
diff --git a/debian/libxmuu-dev.install b/debian/libxmuu-dev.install
index 61b0f62..66d145f 100644
--- a/debian/libxmuu-dev.install
+++ b/debian/libxmuu-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libXmuu.a
-usr/lib/libXmuu.so
-usr/lib/pkgconfig/xmuu.pc
+usr/lib/*/libXmuu.a
+usr/lib/*/libXmuu.so
+usr/lib/*/pkgconfig/xmuu.pc
diff --git a/debian/libxmuu1.install b/debian/libxmuu1.install
index 4ccea84..d33b6a3 100644
--- a/debian/libxmuu1.install
+++ b/debian/libxmuu1.install
@@ -1 +1 @@
-usr/lib/libXmuu.so.1*
+usr/lib/*/libXmuu.so.1*
diff --git a/debian/rules b/debian/rules
index faf789d..8294e9b 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
@@ -40,6 +42,7 @@ build-stamp: configure
mkdir -p build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--infodir=\$${prefix}/share/info $(confflags) \
--docdir=\$${prefix}/share/doc/libxmu-headers \
--with-xmlto --without-fop \
Reply to: