Bug#640499: libxvmc: please add multiarch support [PATCH]
tags 640499 + patch
thanks
Attached you can find a patch which moves the conffile into a separate
package.
However, it seems the conffile problem is already in the archive: For example,
libmap-modules is MA: same and has a conffile, showing the same problems as
this package with just the path by Andreas Beckmann. So, maybe this is
actually a bug in dpkg.
Kind regards,
Ralf
diff --git a/debian/changelog b/debian/changelog
index 0fc7ff0..4b2bac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libxvmc (2:1.0.7-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Support for multiarch (patch by Andreas Beckmann).
+ * Bump debhelper dependency for ${misc:Pre-Depends}.
+ * Split config file into separate package.
+
+ -- Ralf Jung <post@ralfj.de> Sun, 12 Aug 2012 22:45:20 +0200
+
libxvmc (2:1.0.7-1) unstable; urgency=low
[ Robert Hooker ]
diff --git a/debian/control b/debian/control
index 1a0cb2f..f14bae7 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 <dparsons@debian.org>, Cyril Brulebois <kibi@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,7 +21,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxvmc.git
Package: libxvmc1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxvmc-common (= ${source:Version})
Description: X11 Video extension library
libXvMC provides an X Window System client interface to the
XVideo-MotionCompensation extension to the X protocol.
@@ -37,6 +39,32 @@ Description: X11 Video extension library
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libXvMC
+Package: libxvmc-common
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Recommends: libxvmc1
+Replaces: libxvmc1 (<< 2:1.0.7-1.1)
+Breaks: libxvmc1 (<< 2:1.0.7-1.1)
+Description: X11 Video extension library (architecture-independent files)
+ libXvMC provides an X Window System client interface to the
+ XVideo-MotionCompensation extension to the X protocol.
+ .
+ The XVideo-MotionCompensation extension allows for further accelerated drawing
+ of videos. Video data may be sent at earlier stages of the decoding pipeline
+ than raw YUV data. At the moment, driver support for XvMC is poor to
+ non-existent.
+ .
+ This package contains the configuration file necessary for libxvmc1 to operate
+ properly.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ .
+ This module can be found at
+ git://anongit.freedesktop.org/git/xorg/lib/libXvMC
+
Package: libxvmc1-dbg
Section: debug
Architecture: any
@@ -63,6 +91,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-common.install b/debian/libxvmc-common.install
new file mode 100644
index 0000000..eed3638
--- /dev/null
+++ b/debian/libxvmc-common.install
@@ -0,0 +1 @@
+etc/X11/XvMCConfig
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..66e57d8 100644
--- a/debian/libxvmc1.install
+++ b/debian/libxvmc1.install
@@ -1,3 +1,2 @@
-usr/lib/libXvMC.so.1*
-usr/lib/libXvMCW.so.1*
-etc/X11/XvMCConfig
+usr/lib/*/libXvMC.so.1*
+usr/lib/*/libXvMCW.so.1*
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)"
Reply to: