Bug#687373: pre-approve unblock: libxvmc/1.0.7-1.1

[Andreas Beckmann <debian@abeckmann.de>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear release managers,

please approve the upload of a NMU of libxvmc that converts the package
to multiarch for inclusion in wheezy, fixing #640499. Of course the
maintainers are welcome to do such an upload themselves.

The patch has been around for a year, has gotten more testing recently
and Ralf Jung has confirmed that it is OK to have shared conffiles in
M-A: same packages.

I consider adding multiarch support to libxvmc1 as important, as
this is currently a regression from squeeze: users of the non-free
Nvidia drivers on amd64 are unable to get OpenGL acceleration in 32-bit
applications. Most often this is observed in 32-bit wine, which seems to
be a frequent use case considering the number of bug reports and
commenters:
  #676723: libgl1-nvidia-glx:i386: Please downgrad libxvmc dependency to
  Recommends,
  #685054: breaks wine (32-bit) OpenGL support on amd64,
  #686033: libgl1-nvidia-glx: 304.37-1 libgl1-nvidia-glx:i386 removes
  libgl1-nvidia-glx (amd64) and Nvidia driver

Also, without libxvmc1:i386 we can't give working instructions for
replacing the obsolete *nvidia*-ia32 packages (which need to become
transitional due to the phasing out of the monolithic ia32-libs) by
their multiarchified variants.

If I get an OK that a package with the attached nmudiff 
  5 files changed, 20 insertions(+), 7 deletions(-)
is fine for wheezy, I'll go looking for a sponsor (unless the
maintainers object).


Andreas

unblock libxvmc/1.0.7-1.1

diffstat for libxvmc_1.0.7-1 libxvmc_1.0.7-1.1

 changelog           |    7 +++++++
 control             |    3 +++
 libxvmc-dev.install |   10 +++++-----
 libxvmc1.install    |    4 ++--
 rules               |    3 +++
 5 files changed, 20 insertions(+), 7 deletions(-)

diff -u libxvmc-1.0.7/debian/rules libxvmc-1.0.7/debian/rules
--- libxvmc-1.0.7/debian/rules
+++ libxvmc-1.0.7/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 @@
 	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)" 
diff -u libxvmc-1.0.7/debian/control libxvmc-1.0.7/debian/control
--- libxvmc-1.0.7/debian/control
+++ libxvmc-1.0.7/debian/control
@@ -21,6 +21,8 @@
 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 @@
 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 -u libxvmc-1.0.7/debian/libxvmc-dev.install libxvmc-1.0.7/debian/libxvmc-dev.install
--- libxvmc-1.0.7/debian/libxvmc-dev.install
+++ libxvmc-1.0.7/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 -u libxvmc-1.0.7/debian/libxvmc1.install libxvmc-1.0.7/debian/libxvmc1.install
--- libxvmc-1.0.7/debian/libxvmc1.install
+++ libxvmc-1.0.7/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 -u libxvmc-1.0.7/debian/changelog libxvmc-1.0.7/debian/changelog
--- libxvmc-1.0.7/debian/changelog
+++ libxvmc-1.0.7/debian/changelog
@@ -1,3 +1,10 @@
+libxvmc (2:1.0.7-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Build for multiarch.  (Closes: #640499)
+
+ -- Andreas Beckmann <debian@abeckmann.de>  Wed, 12 Sep 2012 05:16:31 +0200
+
 libxvmc (2:1.0.7-1) unstable; urgency=low
 
   [ Robert Hooker ]