debian/changelog | 9 +++++++--
debian/compat | 2 +-
debian/control | 6 +++++-
debian/libxp-dev.install | 6 +++---
debian/libxp6.install | 2 +-
debian/rules | 2 ++
6 files changed, 19 insertions(+), 8 deletions(-)
New commits:
commit 0559c9c554f28861290197c851a2c9de7f351b44
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Sat Oct 22 13:03:32 2011 -0700
releasing version 1:1.0.1-2
diff --git a/debian/changelog b/debian/changelog
index cc8b39c..cab0c1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxp (1:1.0.1-2) UNRELEASED; urgency=low
+libxp (1:1.0.1-2) unstable; urgency=low
[ Julien Cristau ]
* Drop Pre-Depends on x11-common, only needed for upgrades from the
@@ -8,7 +8,7 @@ libxp (1:1.0.1-2) UNRELEASED; urgency=low
* Build for multiarch; thanks to Julian Taylor for the patch.
Closes: #639679.
- -- Julien Cristau <jcris...@debian.org> Thu, 28 Apr 2011 14:16:56 +0200
+ -- Steve Langasek <vor...@debian.org> Sat, 22 Oct 2011 13:03:28 -0700
libxp (1:1.0.1-1) unstable; urgency=low
commit dd2ac4cd5056993c9e1c8c247f7a5d9805dc1328
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Sat Oct 22 13:03:19 2011 -0700
libxp-dev is also m-a: same
diff --git a/debian/control b/debian/control
index 3b5d8f9..150710b 100644
--- a/debian/control
+++ b/debian/control
@@ -65,6 +65,7 @@ Description: X Printing Extension (Xprint) client library
(unstripped)
Package: libxp-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends:
${misc:Depends},
libxp6 (= ${binary:Version}),
commit 3358d3afc5f77713d9b72310682fbc73c15b6ffa
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Sat Oct 22 12:56:40 2011 -0700
Build for multiarch; thanks to Julian Taylor for the patch. Closes: #639679.
diff --git a/debian/changelog b/debian/changelog
index d409627..cc8b39c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
libxp (1:1.0.1-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Drop Pre-Depends on x11-common, only needed for upgrades from the
monolith.
+ [ Steve Langasek ]
+ * Build for multiarch; thanks to Julian Taylor for the patch.
+ Closes: #639679.
+
-- Julien Cristau <jcris...@debian.org> Thu, 28 Apr 2011 14:16:56 +0200
libxp (1:1.0.1-1) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 20639f3..3b5d8f9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Drew Parsons <dpars...@debian.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends:
- debhelper (>= 5),
+ debhelper (>= 8.1.3~),
quilt,
pkg-config,
libx11-dev (>= 1:0.99.2),
@@ -20,6 +20,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxp.git
Package: libxp6
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -37,6 +39,7 @@ Package: libxp6-dbg
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends:
libxp6 (= ${binary:Version}),
${shlibs:Depends},
diff --git a/debian/libxp-dev.install b/debian/libxp-dev.install
index 44154d1..b137291 100644
--- a/debian/libxp-dev.install
+++ b/debian/libxp-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libXp.a
-usr/lib/libXp.so
-usr/lib/pkgconfig/xp.pc
+usr/lib/*/libXp.a
+usr/lib/*/libXp.so
+usr/lib/*/pkgconfig/xp.pc
diff --git a/debian/libxp6.install b/debian/libxp6.install
index 857cbee..49e5519 100644
--- a/debian/libxp6.install
+++ b/debian/libxp6.install
@@ -1 +1 @@
-usr/lib/libXp.so.6*
+usr/lib/*/libXp.so.6*
diff --git a/debian/rules b/debian/rules
index 317b73e..8e2fe33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -41,6 +42,7 @@ build-stamp:
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
CFLAGS="$(CFLAGS)"
$(MAKE) -C build
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rhhqr-0001ie...@vasks.debian.org
