diff -pruN 2:1.0.6-1/debian/changelog 2:1.0.6-1ubuntu2/debian/changelog
--- 2:1.0.6-1/debian/changelog	2011-01-20 10:57:12.000000000 +0000
+++ 2:1.0.6-1ubuntu2/debian/changelog	2011-01-20 10:54:58.000000000 +0000
@@ -1,3 +1,19 @@
+libxvmc (2:1.0.6-1ubuntu2) natty; urgency=low
+
+  * Resolve unresolved symbols in shared library.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 20 Jan 2011 09:27:36 +0100
+
+libxvmc (2:1.0.6-1ubuntu1) natty; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - debian/patches/01_support_alternatives.patch:
+      - Put XvMCConfig in usr/lib/xvmcconfig-standard.
+      - Make the library look for /lib/XvMCConfig (which will be the
+        link that alternatives will set).
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 20 Jan 2011 08:57:30 +0100
+
 libxvmc (2:1.0.6-1) unstable; urgency=low
 
   * New upstream release.
@@ -7,6 +23,15 @@ libxvmc (2:1.0.6-1) unstable; urgency=lo
 
  -- Cyril Brulebois <kibi@debian.org>  Mon, 08 Nov 2010 00:29:28 +0100
 
+libxvmc (2:1.0.5-1ubuntu1) lucid; urgency=low
+
+  * debian/patches/01_support_alternatives.patch:
+    - Put XvMCConfig in usr/lib/xvmcconfig-standard.
+    - Make the library look for /lib/XvMCConfig (which will be the
+      link that alternatives will set).
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Fri, 08 Jan 2010 20:13:26 +0100
+
 libxvmc (2:1.0.5-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff -pruN 2:1.0.6-1/debian/libxvmc1.install 2:1.0.6-1ubuntu2/debian/libxvmc1.install
--- 2:1.0.6-1/debian/libxvmc1.install	2011-01-20 10:57:12.000000000 +0000
+++ 2:1.0.6-1ubuntu2/debian/libxvmc1.install	2011-01-20 10:54:58.000000000 +0000
@@ -1,3 +1,3 @@
 usr/lib/libXvMC.so.1*
 usr/lib/libXvMCW.so.1*
-etc/X11/XvMCConfig
+usr/lib/xvmcconfig-standard/XvMCConfig
diff -pruN 2:1.0.6-1/debian/patches/01_support_alternatives.patch 2:1.0.6-1ubuntu2/debian/patches/01_support_alternatives.patch
--- 2:1.0.6-1/debian/patches/01_support_alternatives.patch	1970-01-01 01:00:00.000000000 +0100
+++ 2:1.0.6-1ubuntu2/debian/patches/01_support_alternatives.patch	2011-01-20 10:54:58.000000000 +0000
@@ -0,0 +1,13 @@
+Index: libxvmc-1.0.5/src/Makefile.am
+===================================================================
+--- libxvmc-1.0.5.orig/src/Makefile.am	2010-01-06 16:12:58.184669594 +0100
++++ libxvmc-1.0.5/src/Makefile.am	2010-01-06 16:13:22.457132534 +0100
+@@ -16,7 +16,7 @@
+ libXvMCW_la_LIBADD = @XVMC_LIBS@
+ libXvMCW_la_CFLAGS =				\
+ 	$(AM_CFLAGS)				\
+-	-DXVMC_CONFIGDIR=$(sysconfdir)/X11		\
++	-DXVMC_CONFIGDIR=$(sysconfdir)		\
+ 	-DXVMC_SOVERSION=\".1.0\"		\
+ 	-DXV_SOVERSION=\".1.0\"
+ 
diff -pruN 2:1.0.6-1/debian/patches/ld.gold.diff 2:1.0.6-1ubuntu2/debian/patches/ld.gold.diff
--- 2:1.0.6-1/debian/patches/ld.gold.diff	1970-01-01 01:00:00.000000000 +0100
+++ 2:1.0.6-1ubuntu2/debian/patches/ld.gold.diff	2011-01-20 10:54:58.000000000 +0000
@@ -0,0 +1,13 @@
+Index: libxvmc-1.0.6/src/Makefile.am
+===================================================================
+--- libxvmc-1.0.6.orig/src/Makefile.am	2011-01-20 08:26:19.078234331 +0000
++++ libxvmc-1.0.6/src/Makefile.am	2011-01-20 08:27:26.518228985 +0000
+@@ -13,7 +13,7 @@
+ libXvMC_la_LIBADD = @XVMC_LIBS@
+ libXvMC_la_CFLAGS = $(AM_CFLAGS)
+ 
+-libXvMCW_la_LIBADD = @XVMC_LIBS@
++libXvMCW_la_LIBADD = @XVMC_LIBS@ -ldl
+ libXvMCW_la_CFLAGS =				\
+ 	$(AM_CFLAGS)				\
+ 	-DXVMC_CONFIGDIR=$(sysconfdir)		\
diff -pruN 2:1.0.6-1/debian/patches/series 2:1.0.6-1ubuntu2/debian/patches/series
--- 2:1.0.6-1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ 2:1.0.6-1ubuntu2/debian/patches/series	2011-01-20 10:54:58.000000000 +0000
@@ -0,0 +1,2 @@
+01_support_alternatives.patch
+ld.gold.diff
diff -pruN 2:1.0.6-1/debian/rules 2:1.0.6-1ubuntu2/debian/rules
--- 2:1.0.6-1/debian/rules	2011-01-20 10:57:12.000000000 +0000
+++ 2:1.0.6-1ubuntu2/debian/rules	2011-01-20 10:54:58.000000000 +0000
@@ -32,6 +32,7 @@ else
 	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
+standard-configdir := /usr/lib/xvmcconfig-standard
 
 build: patch build-stamp
 build-stamp:
@@ -40,7 +41,7 @@ build-stamp:
 	mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
 	cd obj-$(DEB_BUILD_GNU_TYPE) && \
 	../configure --prefix=/usr \
-	             --sysconfdir=/etc --mandir=\$${prefix}/share/man \
+	             --sysconfdir=/usr/lib --mandir=\$${prefix}/share/man \
 	             --infodir=\$${prefix}/share/info $(confflags) \
 	             CFLAGS="$(CFLAGS)" 
 	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
@@ -69,8 +70,8 @@ install: build
 	dh_installdirs
 
 	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	mkdir -p $(CURDIR)/debian/tmp/etc/X11
-	cp debian/local/XvMCConfig $(CURDIR)/debian/tmp/etc/X11
+	mkdir -p $(CURDIR)/debian/tmp$(standard-configdir)
+	cp debian/local/XvMCConfig $(CURDIR)/debian/tmp$(standard-configdir)
 
 # Build architecture-dependent files here.
 binary-arch: build install