debian/changelog | 7 +++++-- debian/control | 6 ++++++ debian/libxpm-dev.install | 6 +++--- debian/libxpm4.install | 2 +- debian/rules | 3 +++ 5 files changed, 18 insertions(+), 6 deletions(-)
New commits: commit 61af59d1243f79069a0d9bb34550d4ea0d6ea611 Author: Steve Langasek <[email protected]> Date: Fri Oct 21 15:24:49 2011 -0700 releasing version 1:3.5.9-2 diff --git a/debian/changelog b/debian/changelog index 772af4f..e42ddf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxpm (1:3.5.9-2) UNRELEASED; urgency=low +libxpm (1:3.5.9-2) unstable; urgency=low [ Cyril Brulebois ] * Build xpm.pdf from xpm.PS.gz, and use debian/libxpm-dev.docs to @@ -16,7 +16,7 @@ libxpm (1:3.5.9-2) UNRELEASED; urgency=low [ Steve Langasek ] * Build for multiarch. - -- Cyril Brulebois <[email protected]> Sat, 15 Jan 2011 00:34:23 +0100 + -- Steve Langasek <[email protected]> Fri, 21 Oct 2011 15:24:28 -0700 libxpm (1:3.5.9-1) unstable; urgency=low commit f9f8e9b80a01ec9a373089a88da820c49a08bf4e Author: Steve Langasek <[email protected]> Date: Fri Oct 21 15:24:25 2011 -0700 Build for multiarch. diff --git a/debian/changelog b/debian/changelog index da08c6d..772af4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,9 @@ libxpm (1:3.5.9-2) UNRELEASED; urgency=low monolith. * Drop Replaces on xbase-clients 6.8.x. + [ Steve Langasek ] + * Build for multiarch. + -- Cyril Brulebois <[email protected]> Sat, 15 Jan 2011 00:34:23 +0100 libxpm (1:3.5.9-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 6b2a9d2..4d63906 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force <[email protected]> Uploaders: Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 5.0.0), + dpkg-dev (>= 1.16.0), automake, libtool, xutils-dev (>= 1:7.5+4), @@ -21,6 +22,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxpm.git Package: libxpm4 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: X11 pixmap library libXpm provides support and common operation for the XPM pixmap format, which @@ -36,6 +39,7 @@ Description: X11 pixmap library Package: libxpm4-dbg Section: debug Architecture: any +Multi-Arch: same Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, libxpm4 (= ${binary:Version}) Description: X11 pixmap library (debug package) @@ -55,6 +59,7 @@ Description: X11 pixmap library (debug package) Package: libxpm-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libxpm4 (= ${binary:Version}), libx11-dev, x11proto-core-dev Description: X11 pixmap library (development headers) libXpm provides support and common operation for the XPM pixmap format, which @@ -72,6 +77,7 @@ Description: X11 pixmap library (development headers) Package: xpmutils Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: X11 pixmap utilities This package provides two tools, cxpm and sxpm. diff --git a/debian/libxpm-dev.install b/debian/libxpm-dev.install index 59333aa..e0fa6df 100644 --- a/debian/libxpm-dev.install +++ b/debian/libxpm-dev.install @@ -1,4 +1,4 @@ usr/include/X11/* -usr/lib/libXpm.a -usr/lib/libXpm.so -usr/lib/pkgconfig/xpm.pc +usr/lib/*/libXpm.a +usr/lib/*/libXpm.so +usr/lib/*/pkgconfig/xpm.pc diff --git a/debian/libxpm4.install b/debian/libxpm4.install index 84b8f2d..3f3a108 100644 --- a/debian/libxpm4.install +++ b/debian/libxpm4.install @@ -1 +1 @@ -usr/lib/libXpm.so.4* +usr/lib/*/libXpm.so.4* diff --git a/debian/rules b/debian/rules index f049670..e3cca37 100755 --- a/debian/rules +++ b/debian/rules @@ -26,6 +26,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: mkdir -p build cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" cd build && $(MAKE) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
