libxv: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/control | 6 +++++-
debian/libxv-dev.install | 6 +++---
debian/libxv1.install | 2 +-
debian/rules | 3 +++
5 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit cf89dc7ca027c3407c6805f2e8a2421df6414ecc
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Thu Aug 11 10:45:48 2011 -0700
releasing version 2:1.0.6-2
diff --git a/debian/changelog b/debian/changelog
index 927cc13..152c748 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libxv (2:1.0.6-2) UNRELEASED; urgency=low
+libxv (2:1.0.6-2) oneiric; urgency=low
* Build for multiarch.
- -- Steve Langasek <vorlon@debian.org> Thu, 11 Aug 2011 17:41:14 +0000
+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 11 Aug 2011 10:45:44 -0700
libxv (2:1.0.6-1) unstable; urgency=low
commit b051fa4e235604eca4cc71c25e383e29adc84def
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Thu Aug 11 10:44:39 2011 -0700
Build for multiarch.
diff --git a/debian/changelog b/debian/changelog
index df93231..927cc13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxv (2:1.0.6-2) UNRELEASED; urgency=low
+
+ * Build for multiarch.
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 11 Aug 2011 17:41:14 +0000
+
libxv (2:1.0.6-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 87ebbf5..d4f2110 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Cyril Brulebois <kibi@debian.org>
Standards-Version: 3.8.3
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.3),
libx11-dev (>= 1:0.99.2),
libxext-dev (>= 1:0.99.1),
x11proto-video-dev,
@@ -20,7 +20,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxv.git
Package: libxv1
Section: libs
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Description: X11 Video extension library
libXv provides an X Window System client interface to the XVideo
extension to the X protocol.
@@ -38,6 +40,7 @@ Description: X11 Video extension library
Package: libxv1-dbg
Section: debug
Architecture: any
+Multi-Arch: same
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libxv1 (= ${binary:Version})
Description: X11 Video extension library (debug package)
@@ -60,6 +63,7 @@ Description: X11 Video extension library (debug package)
Package: libxv-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}, libxv1 (= ${binary:Version}), libx11-dev, libxext-dev, x11proto-video-dev
Conflicts: x11proto-video-dev (<< 2.2+cvs.20050712-1)
Replaces: x11proto-video-dev (<< 2.2+cvs.20050712-1)
diff --git a/debian/libxv-dev.install b/debian/libxv-dev.install
index b3be4e0..21e1fd4 100644
--- a/debian/libxv-dev.install
+++ b/debian/libxv-dev.install
@@ -1,5 +1,5 @@
usr/share/man/*
usr/include/X11/*
-usr/lib/libXv.a
-usr/lib/libXv.so
-usr/lib/pkgconfig/xv.pc
+usr/lib/*/libXv.a
+usr/lib/*/libXv.so
+usr/lib/*/pkgconfig/xv.pc
diff --git a/debian/libxv1.install b/debian/libxv1.install
index d65b929..eb1dc20 100644
--- a/debian/libxv1.install
+++ b/debian/libxv1.install
@@ -1 +1 @@
-usr/lib/libXv.so.1*
+usr/lib/*/libXv.so.1*
diff --git a/debian/rules b/debian/rules
index bd0de0b..c74677d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,8 @@
# set this to the name of the main shlib's binary package
PACKAGE = libxv1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
@@ -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)
Reply to: