debian/changelog | 10 ++++++++++ debian/control | 7 +++++-- debian/libxvmc-dev.install | 10 +++++----- debian/libxvmc1.install | 4 ++-- debian/rules | 3 +++ 5 files changed, 25 insertions(+), 9 deletions(-)
New commits: commit 101f96101b4860b0465ccf1d7f32e777b9decc22 Author: Emilio Pozuelo Monfort <poch...@gmail.com> Date: Sun Jun 9 02:32:21 2013 +0200 Release to unstable diff --git a/debian/changelog b/debian/changelog index fd6c321..3f2d548 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -libxvmc (2:1.0.7-2) UNRELEASED; urgency=low +libxvmc (2:1.0.7-2) unstable; urgency=low + + * Team upload. * Switch to Multi-Arch. Thanks Andreas Beckmann for the patch. Closes: #640499. * Bump Standards-Version to 3.9.4. No changes needed. - -- Emilio Pozuelo Monfort <po...@debian.org> Sun, 09 Jun 2013 02:15:37 +0200 + -- Emilio Pozuelo Monfort <po...@debian.org> Sun, 09 Jun 2013 02:32:16 +0200 libxvmc (2:1.0.7-1) unstable; urgency=low commit 08df3a471a7221b491682a0a3d8f0c5a67dd4faf Author: Emilio Pozuelo Monfort <poch...@gmail.com> Date: Sun Jun 9 02:28:17 2013 +0200 Bump Standards-Version diff --git a/debian/changelog b/debian/changelog index a9ce623..fd6c321 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libxvmc (2:1.0.7-2) UNRELEASED; urgency=low * Switch to Multi-Arch. Thanks Andreas Beckmann for the patch. Closes: #640499. + * Bump Standards-Version to 3.9.4. No changes needed. -- Emilio Pozuelo Monfort <po...@debian.org> Sun, 09 Jun 2013 02:15:37 +0200 diff --git a/debian/control b/debian/control index 1f2b92f..073a082 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: quilt, automake, libtool -Standards-Version: 3.8.3 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxvmc Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxvmc.git commit 993ef4648e81423845baa99f6dca52352e2db35b Author: Emilio Pozuelo Monfort <poch...@gmail.com> Date: Sun Jun 9 02:16:30 2013 +0200 Switch to Multi-Arch diff --git a/debian/changelog b/debian/changelog index 0fc7ff0..a9ce623 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libxvmc (2:1.0.7-2) UNRELEASED; urgency=low + + * Switch to Multi-Arch. Thanks Andreas Beckmann for the patch. + Closes: #640499. + + -- Emilio Pozuelo Monfort <po...@debian.org> Sun, 09 Jun 2013 02:15:37 +0200 + libxvmc (2:1.0.7-1) unstable; urgency=low [ Robert Hooker ] diff --git a/debian/control b/debian/control index 1a0cb2f..1f2b92f 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.0.0), + debhelper (>= 8.1.3), libx11-dev (>= 1:0.99.2), libxext-dev (>= 1:0.99.1), x11proto-video-dev, @@ -21,6 +21,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxvmc.git Package: libxvmc1 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common Description: X11 Video extension library libXvMC provides an X Window System client interface to the @@ -63,6 +65,7 @@ Description: X11 Video extension library (debug package) Package: libxvmc-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libxvmc1 (= ${binary:Version}), libx11-dev (>= 2:1.0.0-1), libxext-dev (>= 1:1.0.0-2), x11proto-video-dev, libxv-dev Conflicts: x11proto-video-dev (<< 2.2+cvs.20050712-1) Replaces: x11proto-video-dev (<< 2.2+cvs.20050712-1) diff --git a/debian/libxvmc-dev.install b/debian/libxvmc-dev.install index a8b1a8f..ce042b1 100644 --- a/debian/libxvmc-dev.install +++ b/debian/libxvmc-dev.install @@ -1,7 +1,7 @@ usr/include/X11/* -usr/lib/libXvMC.a -usr/lib/libXvMC.so -usr/lib/libXvMCW.a -usr/lib/libXvMCW.so -usr/lib/pkgconfig/xvmc.pc +usr/lib/*/libXvMC.a +usr/lib/*/libXvMC.so +usr/lib/*/libXvMCW.a +usr/lib/*/libXvMCW.so +usr/lib/*/pkgconfig/xvmc.pc usr/share/doc/libXvMC/* usr/share/doc/libxvmc-dev diff --git a/debian/libxvmc1.install b/debian/libxvmc1.install index fe81455..71856ed 100644 --- a/debian/libxvmc1.install +++ b/debian/libxvmc1.install @@ -1,3 +1,3 @@ -usr/lib/libXvMC.so.1* -usr/lib/libXvMCW.so.1* +usr/lib/*/libXvMC.so.1* +usr/lib/*/libXvMCW.so.1* etc/X11/XvMCConfig diff --git a/debian/rules b/debian/rules index 7d7f962..4f04ac4 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,8 @@ # set this to the name of the main shlib's binary package PACKAGE = libxvmc1 +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 \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --sysconfdir=/etc --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" -- 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/e1ultcm-0005f0...@vasks.debian.org