diffstat of debian/ for libxvmc_1.0.9-1 libxvmc_1.0.9-1ubuntu1 debian/patches/01_support_alternatives.patch | 11 +++ debian/patches/series | 1 libxvmc-1.0.9/debian/changelog | 90 +++++++++++++++++++++++++++ libxvmc-1.0.9/debian/control | 3 libxvmc-1.0.9/debian/libxvmc1.install | 2 libxvmc-1.0.9/debian/rules | 7 +- 6 files changed, 109 insertions(+), 5 deletions(-) diff -u libxvmc-1.0.9/debian/changelog libxvmc-1.0.9/debian/changelog --- libxvmc-1.0.9/debian/changelog +++ libxvmc-1.0.9/debian/changelog @@ -1,3 +1,15 @@ +libxvmc (2:1.0.9-1ubuntu1) wily; urgency=medium + + * Merge with Debian, remaining Ubuntu changes: + * debian/patches/01_support_alternatives.patch: + * debian/libxvmc1.install: + * debian/rules: + - Put XvMCConfig in usr/lib/xvmcconfig-standard. + - Make the library look for /lib/XvMCConfig (which will be + the link that alternatives will set). + + -- Robert Ancell Tue, 14 Jul 2015 10:50:44 +1200 + libxvmc (2:1.0.9-1) unstable; urgency=medium * New upstream release. @@ -6,6 +18,17 @@ -- Julien Cristau Thu, 30 Apr 2015 22:54:07 +0200 +libxvmc (2:1.0.8-2ubuntu1) utopic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/01_support_alternatives.patch, + debian/libxvmc1.install, debian/rules: + + Put XvMCConfig in usr/lib/xvmcconfig-standard. + + Make the library look for /lib/XvMCConfig (which will be + the link that alternatives will set). + + -- Artur Rona Thu, 07 Aug 2014 00:04:27 +0200 + libxvmc (2:1.0.8-2) unstable; urgency=low * Link libXvMCW.so against -ldl (closes: #610592) @@ -13,6 +36,21 @@ -- Julien Cristau Sat, 12 Jul 2014 17:58:58 +0200 +libxvmc (2:1.0.8-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. (LP: #1247502) Remaining changes: + - debian/patches/01_support_alternatives.patch, + debian/libxvmc1.install, debian/rules: + + Put XvMCConfig in usr/lib/xvmcconfig-standard. + + Make the library look for /lib/XvMCConfig (which will be + the link that alternatives will set). + * Drop debian/patches/ld.gold.diff: not need anymore. + * Drop debian/patches/CVE* patches, both are fixed upstream. + * Re-apply mistakenly dropped delta in latest merge: + - debian/libxvmc1.install, debian/rules + + -- Artur Rona Sun, 03 Nov 2013 01:40:21 +0100 + libxvmc (2:1.0.8-1) unstable; urgency=low * New upstream release @@ -34,6 +72,33 @@ -- Emilio Pozuelo Monfort Sun, 09 Jun 2013 02:32:16 +0200 +libxvmc (2:1.0.7-1ubuntu2) saucy; urgency=low + + * SECURITY UPDATE: denial of service and possible code execution via + incorrect memory size calculations + - debian/patches/CVE-2013-1990.patch: fix multiple integer overflows. + - CVE-2013-1990 + * SECURITY UPDATE: denial of service and possible code execution via + incorrect length and bounds checking + - debian/patches/CVE-2013-1999.patch: properly handle lengths in + src/XvMC.c. + - CVE-2013-1999 + + -- Marc Deslauriers Wed, 05 Jun 2013 15:38:21 -0400 + +libxvmc (2:1.0.7-1ubuntu1) quantal; 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). + - debian/patches/ld.gold.diff: + Resolve unresolved symbols in shared library + * refresh patches. + + -- Timo Aaltonen Wed, 15 Aug 2012 12:34:57 +0300 + libxvmc (2:1.0.7-1) unstable; urgency=low [ Robert Hooker ] @@ -50,6 +115,22 @@ -- Julien Cristau Tue, 24 Apr 2012 22:46:56 +0200 +libxvmc (2:1.0.6-1ubuntu2) natty; urgency=low + + * Resolve unresolved symbols in shared library. + + -- Matthias Klose 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 Thu, 20 Jan 2011 08:57:30 +0100 + libxvmc (2:1.0.6-1) unstable; urgency=low * New upstream release. @@ -59,6 +140,15 @@ -- Cyril Brulebois 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 Fri, 08 Jan 2010 20:13:26 +0100 + libxvmc (2:1.0.5-1) unstable; urgency=low [ Timo Aaltonen ] diff -u libxvmc-1.0.9/debian/control libxvmc-1.0.9/debian/control --- libxvmc-1.0.9/debian/control +++ libxvmc-1.0.9/debian/control @@ -1,7 +1,8 @@ Source: libxvmc Section: x11 Priority: optional -Maintainer: Debian X Strike Force +Maintainer: Ubuntu X-SWAT +XSBC-Original-Maintainer: Debian X Strike Force Uploaders: Drew Parsons , Build-Depends: diff -u libxvmc-1.0.9/debian/libxvmc1.install libxvmc-1.0.9/debian/libxvmc1.install --- libxvmc-1.0.9/debian/libxvmc1.install +++ libxvmc-1.0.9/debian/libxvmc1.install @@ -3 +3 @@ -etc/X11/XvMCConfig +usr/lib/xvmcconfig-standard/XvMCConfig diff -u libxvmc-1.0.9/debian/rules libxvmc-1.0.9/debian/rules --- libxvmc-1.0.9/debian/rules +++ libxvmc-1.0.9/debian/rules @@ -28,6 +28,7 @@ confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) endif +standard-configdir := /usr/lib/xvmcconfig-standard build: patch build-stamp build-stamp: @@ -37,7 +38,7 @@ cd build && \ ../configure --prefix=/usr \ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ - --sysconfdir=/etc --mandir=\$${prefix}/share/man \ + --sysconfdir=/usr/lib --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ --disable-silent-rules \ $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure) @@ -64,8 +65,8 @@ dh_installdirs cd build && $(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 --- libxvmc-1.0.9.orig/debian/patches/01_support_alternatives.patch +++ libxvmc-1.0.9/debian/patches/01_support_alternatives.patch @@ -0,0 +1,11 @@ +--- a/wrapper/Makefile.am ++++ b/wrapper/Makefile.am +@@ -3,7 +3,7 @@ + AM_CPPFLAGS = \ + -I$(top_srcdir)/include \ + $(MALLOC_ZERO_CFLAGS) \ +- -DXVMC_CONFIGDIR=$(sysconfdir)/X11 \ ++ -DXVMC_CONFIGDIR=$(sysconfdir) \ + -DXVMC_SOVERSION=\".1.0\" \ + -DXV_SOVERSION=\".1.0\" + --- libxvmc-1.0.9.orig/debian/patches/series +++ libxvmc-1.0.9/debian/patches/series @@ -0,0 +1 @@ +01_support_alternatives.patch