diff -ruN debian/debian/changelog ubuntu/debian/changelog --- debian/debian/changelog 2014-01-04 16:54:48.666734832 +0400 +++ ubuntu/debian/changelog 2014-01-04 16:58:45.835080846 +0400 @@ -1,3 +1,11 @@ +libxcb (1.10-1ubuntu1) trusty; urgency=low + + * Merge with Debian unstable, remaining changes: + - Add a simple autopkgtest. + - Build-depend on python:any rather than python. + + -- Dmitry Shachnev Sat, 04 Jan 2014 16:57:54 +0400 + libxcb (1.10-1) unstable; urgency=low * New upstream release. @@ -19,6 +27,14 @@ -- Julien Cristau Sun, 22 Dec 2013 18:41:14 +0100 +libxcb (1.9.1-3.1ubuntu1) trusty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a simple autopkgtest. + - Build-depend on python:any rather than python. + + -- Colin Watson Tue, 03 Dec 2013 15:28:44 +0000 + libxcb (1.9.1-3.1) unstable; urgency=low * Non-maintainer upload. @@ -32,6 +48,14 @@ -- gregor herrmann Sun, 24 Nov 2013 02:51:08 +0100 +libxcb (1.9.1-3ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add a simple autopkgtest. + - Build-depend on python:any rather than python. + + -- Colin Watson Fri, 13 Sep 2013 11:59:14 +0100 + libxcb (1.9.1-3) unstable; urgency=low * Revert #711599 workaround now that check is fixed. @@ -62,6 +86,28 @@ -- Julien Cristau Sun, 09 Jun 2013 20:52:53 +0200 +libxcb (1.8.1-2ubuntu3) saucy; urgency=low + + * SECURITY UPDATE: denial of service and possible code execution via + incorrect memory size calculations + - 1b33867fa996034deb50819ae54640be501f8d20 + - CVE-2013-2064 + * tests/Makefile.am: Fix FTBFS with newer automake. + + -- Marc Deslauriers Wed, 05 Jun 2013 15:31:31 -0400 + +libxcb (1.8.1-2ubuntu2) raring; urgency=low + + * Build-depend on python:any (LP: #1129376) + + -- Wookey Mon, 18 Feb 2013 17:36:26 +0000 + +libxcb (1.8.1-2ubuntu1) raring; urgency=low + + * Add simple autopkgtest to the package. + + -- Vibhav Pant Tue, 12 Feb 2013 15:55:01 +0100 + libxcb (1.8.1-2) unstable; urgency=low * Cherry-pick from upstream 1.9: diff -ruN debian/debian/control ubuntu/debian/control --- debian/debian/control 2014-01-04 16:54:48.670734555 +0400 +++ ubuntu/debian/control 2014-01-04 16:57:47.128487181 +0400 @@ -16,7 +16,7 @@ python-xcbgen (>= 1.10), libtool, automake, - python, + python:any, dctrl-tools Build-Depends-Indep: # libxcb-doc diff -ruN debian/debian/tests/build ubuntu/debian/tests/build --- debian/debian/tests/build 1970-01-01 03:00:00.000000000 +0300 +++ ubuntu/debian/tests/build 2014-01-04 16:55:56.209773906 +0400 @@ -0,0 +1,34 @@ +#!/bin/sh +# autopkgtest check: Build and run a program against libxcb,to verify that the +# headers and pkg-config file are installed correctly +# (C) 2013 Canonical Ltd. +# Author: Vibhav Pant + +set -e + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +cat < libxcb_test.c +#include +#include +#include + +int main(void) +{ + xcb_connection_t *c; + + c = xcb_connect(NULL, NULL); + assert(xcb_connection_has_error(c) == 0); + xcb_disconnect(c); + + printf("Test completed successfully\n"); + return 0; +} +EOF + +gcc -o libxcb_test libxcb_test.c `pkg-config --cflags --libs xcb` -Wall -Werror +echo "build: OK" +[ -x libxcb_test ] +xvfb-run ./libxcb_test +echo "run: OK" diff -ruN debian/debian/tests/control ubuntu/debian/tests/control --- debian/debian/tests/control 1970-01-01 03:00:00.000000000 +0300 +++ ubuntu/debian/tests/control 2014-01-04 16:55:56.213773600 +0400 @@ -0,0 +1,2 @@ +Tests: build +Depends: libxcb1-dev, build-essential, pkg-config, xvfb