libxdamage: Changes to 'refs/tags/libxdamage-1_1.1.4-1'

2013-06-24 Thread Julien Cristau
Tag 'libxdamage-1_1.1.4-1' created by Julien Cristau jcris...@debian.org at 
2013-06-24 08:29 +

Tagging upload of libxdamage 1:1.1.4-1 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRyANRAAoJEDEBgAUJBeQMCRoQAIF2WaUiNcTjnhUEc8w6btAn
5KQtdqgrxG+U3XiL6UW3/x1kgcCjDny5YdYT9bOEVGW/9dbCYJZsnWyJvGKxB/pV
FF0/6TnDx1VT3Z26qrMYnuPWLQ8L59qUsQjdq3mjSaQ84QvaH2KsGj4kQJsCdSYz
by72vMicXYoDp1YQ0eU21tVAn+WTjsWjWJYeg5fCKzPQ5meEHpcOr23DvLwC4Ruy
TQp3muTuVXfhJ7+r3N6kQUZpGsm1IDN5mcJ9ov3nuj5jwuKgzHj2tlRU0U947PGq
z0kaoFoIP35TZDWh1b83BowLaIegxNBrItf3OGHqHD/cg904BY/EWkLy8f8u8KOg
u31t11FXuiTr6m0pI08DHUm/Wm5LxbsAui+Ja/kRGBmuj9pqsIE8UGOcwtZKYQX0
M88Qj1fTwTo6IeoVRA5Pd8Os6iJh4zZwWQ08lgurxgmwqP/3B7R5vQY4ZZXSRP1r
3oTUW5/u1H4RNhzpJ99BlAspLE3PXMYiS50dGmTDCMOU+dQl603C2+8pHlWsEa6d
4CLPhA7Fxg+F9YmPJQ7h1lz/d+9MlFg8VkzvCwy6mQOP89u3p5TYdz/0n7qPDUR/
OAmXGCBVEnvIKgV17iSfPIWCPUoSJ8hVwBJgaDns5BRVSPv5yOd/WXn5V7Djl6rN
BSYOGWG9fZszCte8o3Nr
=k7wZ
-END PGP SIGNATURE-

Changes since libxdamage-1_1.1.3-2:
Alan Coopersmith (2):
  Strip trailing whitespace
  libXdamage 1.1.4

Fernando Carrijo (1):
  Purge macros NEED_EVENTS and NEED_REPLIES

Gaetan Nadon (3):
  config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
  config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
  config: comment, minor upgrade, quote and layout configure.ac

Julien Cristau (9):
  Merge tag 'libXdamage-1.1.4' into debian-unstable
  Bump changelogs
  Bump debhelper compat level to 7.
  Use dpkg-buildflags.
  Disable silent rules.
  Replace dh_clean -k with dh_prep.
  Fix build/patch rules dependency
  Add build-{arch,indep} rules (same as build).
  Upload to unstable

---
 ChangeLog|   68 +++
 Makefile.am  |6 +-
 configure.ac |   97 +++
 debian/changelog |   11 
 debian/compat|2 
 debian/control   |2 
 debian/rules |   29 ---
 include/X11/extensions/Xdamage.h |2 
 src/Makefile.am  |2 
 src/Xdamage.c|   28 +--
 src/xdamageint.h |2 
 11 files changed, 161 insertions(+), 88 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ur2aj-0004de...@vasks.debian.org



libxdamage: Changes to 'upstream-unstable'

2013-06-24 Thread Julien Cristau
 Makefile.am  |6 +-
 configure.ac |   97 +++
 include/X11/extensions/Xdamage.h |2 
 src/Makefile.am  |2 
 src/Xdamage.c|   28 +--
 src/xdamageint.h |2 
 6 files changed, 67 insertions(+), 70 deletions(-)

New commits:
commit 0c7f26ab7fb41873c2e68d8b136ef098ed663aff
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date:   Wed Jan 2 21:45:11 2013 -0800

libXdamage 1.1.4

Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com

diff --git a/configure.ac b/configure.ac
index c274016..efe40ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PREREQ([2.60])
 # digit in the version number to track changes which don't affect the
 # protocol, so Xdamage version l.n.m corresponds to protocol version l.n
 #
-AC_INIT(libXdamage, [1.1.3],
+AC_INIT(libXdamage, [1.1.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXdamage])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])

commit 665c80d7af5fc7a73b76e0ddaee3536b37b029e9
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date:   Fri Sep 16 22:16:01 2011 -0700

Strip trailing whitespace

Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w  git diff -b show no diffs from this change

Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com

diff --git a/Makefile.am b/Makefile.am
index 0e317a5..b107025 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-# 
+#
 #  Copyright © 2003 Keith Packard, Noah Levitt
-# 
+#
 #  Permission to use, copy, modify, distribute, and sell this software and its
 #  documentation for any purpose is hereby granted without fee, provided that
 #  the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
 #  specific, written prior permission.  Keith Packard makes no
 #  representations about the suitability of this software for any purpose.  It
 #  is provided as is without express or implied warranty.
-# 
+#
 #  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 #  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 #  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/include/X11/extensions/Xdamage.h b/include/X11/extensions/Xdamage.h
index 5ecf035..b3a5a06 100644
--- a/include/X11/extensions/Xdamage.h
+++ b/include/X11/extensions/Xdamage.h
@@ -62,7 +62,7 @@ void
 XDamageDestroy (Display *dpy, Damage damage);
 
 void
-XDamageSubtract (Display *dpy, Damage damage, 
+XDamageSubtract (Display *dpy, Damage damage,
 XserverRegion repair, XserverRegion parts);
 
 void
diff --git a/src/Makefile.am b/src/Makefile.am
index 787fc04..0027895 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,4 +12,4 @@ INCLUDES = -I$(top_srcdir)/include/X11/extensions
 libXdamage_la_LDFLAGS = -version-number 1:1:0 -no-undefined
 
 libXdamageincludedir = $(includedir)/X11/extensions
-libXdamageinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xdamage.h 
+libXdamageinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xdamage.h
diff --git a/src/Xdamage.c b/src/Xdamage.c
index 3a368d2..dc0044d 100644
--- a/src/Xdamage.c
+++ b/src/Xdamage.c
@@ -32,7 +32,7 @@ const char XDamageExtensionName[] = DAMAGE_NAME;
 
 static int
 XDamageCloseDisplay (Display *dpy, XExtCodes *codes);
-
+
 static Bool
 XDamageWireToEvent(Display *dpy, XEvent *event, xEvent *wire);
 
@@ -58,13 +58,13 @@ XDamageExtAddDisplay (XDamageExtInfo*extinfo,
 info-codes = XInitExtension (dpy, ext_name);
 
 /*
- * if the server has the extension, then we can initialize the 
+ * if the server has the extension, then we can initialize the
  * appropriate function vectors
  */
 if (info-codes) {
xDamageQueryVersionReplyrep;
xDamageQueryVersionReq  *req;
-XESetCloseDisplay (dpy, info-codes-extension, 
+XESetCloseDisplay (dpy, info-codes-extension,
XDamageCloseDisplay);
for (ev = info-codes-first_event;
 ev  info-codes-first_event + XDamageNumberEvents;
@@ -82,7 +82,7 @@ XDamageExtAddDisplay (XDamageExtInfo  *extinfo,
req-damageReqType = X_DamageQueryVersion;
req-majorVersion = DAMAGE_MAJOR;
req-minorVersion = DAMAGE_MINOR;
-   if (!_XReply (dpy, (xReply *) rep, 0, xTrue)) 
+   if (!_XReply (dpy, (xReply *) rep, 0, xTrue))
{
UnlockDisplay (dpy);
SyncHandle ();
@@ -124,7 +124,7 @@ XDamageExtAddDisplay (XDamageExtInfo*extinfo,
  * XDamageExtRemoveDisplay - remove the indicated display from the
  * extension object. (Replaces XextRemoveDisplay.)
  */
-static int 
+static int
 XDamageExtRemoveDisplay (XDamageExtInfo *extinfo, Display *dpy)
 {
 XDamageExtDisplayInfo *info, *prev;
@@ -165,7 +165,7 @@ 

libxdamage: Changes to 'debian-unstable'

2013-06-24 Thread Julien Cristau
 ChangeLog|   68 +++
 Makefile.am  |6 +-
 configure.ac |   97 +++
 debian/changelog |   11 
 debian/compat|2 
 debian/control   |2 
 debian/rules |   29 ---
 include/X11/extensions/Xdamage.h |2 
 src/Makefile.am  |2 
 src/Xdamage.c|   28 +--
 src/xdamageint.h |2 
 11 files changed, 161 insertions(+), 88 deletions(-)

New commits:
commit 8b5ab8dec8bbe62ebf681fa343f9fb0c13f68deb
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 24 10:18:37 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index ec06fe8..dd4e17c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxdamage (1:1.1.4-1) UNRELEASED; urgency=low
+libxdamage (1:1.1.4-1) unstable; urgency=low
 
   * New upstream release.
   * Bump debhelper compat level to 7.
@@ -7,7 +7,7 @@ libxdamage (1:1.1.4-1) UNRELEASED; urgency=low
   * Replace dh_clean -k with dh_prep.
   * Add build-{arch,indep} rules (same as build).
 
- -- Julien Cristau jcris...@debian.org  Mon, 24 Jun 2013 09:55:23 +0200
+ -- Julien Cristau jcris...@debian.org  Mon, 24 Jun 2013 10:18:30 +0200
 
 libxdamage (1:1.1.3-2) unstable; urgency=low
 

commit 89494d8a41cb0891998ce21b1b6afb412c318c90
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 24 10:12:38 2013 +0200

Add build-{arch,indep} rules (same as build).

diff --git a/debian/changelog b/debian/changelog
index e9b2b21..ec06fe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxdamage (1:1.1.4-1) UNRELEASED; urgency=low
   * Use dpkg-buildflags.
   * Disable silent rules.
   * Replace dh_clean -k with dh_prep.
+  * Add build-{arch,indep} rules (same as build).
 
  -- Julien Cristau jcris...@debian.org  Mon, 24 Jun 2013 09:55:23 +0200
 
diff --git a/debian/rules b/debian/rules
index 587b8cc..17e8285 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,8 @@ else
 endif
 confflags += $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags 
--export=configure)
 
-
+build-arch: build
+build-indep: build
 build: build-stamp
 build-stamp: $(STAMP_DIR)/patch
dh_testdir
@@ -88,3 +89,4 @@ binary-indep: build install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build-indep build-arch

commit 0f191d5f3938ce99fbdf38064936169b32a5b183
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 24 10:10:59 2013 +0200

Fix build/patch rules dependency

diff --git a/debian/rules b/debian/rules
index 31652d6..587b8cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,8 @@ endif
 confflags += $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags 
--export=configure)
 
 
-build: patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
mkdir -p build
@@ -47,7 +47,6 @@ clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -63,14 +62,12 @@ install: build
dh_testroot
dh_prep
dh_installdirs
-
cd build  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
 binary-arch: build install
dh_testdir
dh_testroot
-
dh_installdocs
dh_install --list-missing --exclude=libXdamage.la
dh_installchangelogs

commit 1b9573772b9e7516005900dea5bcc33f0e28bc91
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 24 10:07:54 2013 +0200

Replace dh_clean -k with dh_prep.

diff --git a/debian/changelog b/debian/changelog
index 86813cb..e9b2b21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxdamage (1:1.1.4-1) UNRELEASED; urgency=low
   * Bump debhelper compat level to 7.
   * Use dpkg-buildflags.
   * Disable silent rules.
+  * Replace dh_clean -k with dh_prep.
 
  -- Julien Cristau jcris...@debian.org  Mon, 24 Jun 2013 09:55:23 +0200
 
diff --git a/debian/rules b/debian/rules
index 05d9e75..31652d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,7 @@ clean: xsfclean
 install: build
dh_testdir
dh_testroot
-   dh_clean -k
+   dh_prep
dh_installdirs
 
cd build  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install

commit 7ac02516a3bfd186943ccb83454c1933e4622bb1
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 24 10:00:21 2013 +0200

Disable silent rules.

diff --git a/debian/changelog b/debian/changelog
index f29ebfa..86813cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxdamage (1:1.1.4-1) UNRELEASED; urgency=low
   * New upstream release.
   * 

Processing of libxdamage_1.1.4-1_amd64.changes

2013-06-24 Thread Debian FTP Masters
libxdamage_1.1.4-1_amd64.changes uploaded successfully to localhost
along with the files:
  libxdamage_1.1.4-1.dsc
  libxdamage_1.1.4.orig.tar.gz
  libxdamage_1.1.4-1.diff.gz
  libxdamage1_1.1.4-1_amd64.deb
  libxdamage1-dbg_1.1.4-1_amd64.deb
  libxdamage-dev_1.1.4-1_amd64.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ur2gl-00086y...@franck.debian.org



libxdamage_1.1.4-1_amd64.changes ACCEPTED into unstable

2013-06-24 Thread Debian FTP Masters
Mapping sid to unstable.

Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.8
Date: Mon, 24 Jun 2013 10:18:30 +0200
Source: libxdamage
Binary: libxdamage1 libxdamage1-dbg libxdamage-dev
Architecture: source amd64
Version: 1:1.1.4-1
Distribution: sid
Urgency: low
Maintainer: Debian X Strike Force debian-x@lists.debian.org
Changed-By: Julien Cristau jcris...@debian.org
Description: 
 libxdamage-dev - X11 damaged region extension library (development headers)
 libxdamage1 - X11 damaged region extension library
 libxdamage1-dbg - X11 damaged region extension library (debug package)
Changes: 
 libxdamage (1:1.1.4-1) unstable; urgency=low
 .
   * New upstream release.
   * Bump debhelper compat level to 7.
   * Use dpkg-buildflags.
   * Disable silent rules.
   * Replace dh_clean -k with dh_prep.
   * Add build-{arch,indep} rules (same as build).
Checksums-Sha1: 
 03777a55dd4ec2454605ac46816884ef0ee8c07a 2121 libxdamage_1.1.4-1.dsc
 f357e25af6fe05ae76af2acf2250969652f3a1b0 339060 libxdamage_1.1.4.orig.tar.gz
 946252ca57d8c0c314e0cbe7822572fc7cfdc73e 14923 libxdamage_1.1.4-1.diff.gz
 a7c1df0c7a52b47e9d42a783349675dad6c7079c 15144 libxdamage1_1.1.4-1_amd64.deb
 c70f0b0329fb2759a9735bfaa7d861e8e16066c4 30784 
libxdamage1-dbg_1.1.4-1_amd64.deb
 d463360c907aab9b93840f2a57253cc534afb841 14790 libxdamage-dev_1.1.4-1_amd64.deb
Checksums-Sha256: 
 f496e669484840d4db1a0f66fafc6ca7aa3cc55c912be29bf5c134dc62e336ec 2121 
libxdamage_1.1.4-1.dsc
 4bb3e9d917f5f593df2277d452926ee6ad96de7b7cd1017cbcf4579fe5d3442b 339060 
libxdamage_1.1.4.orig.tar.gz
 a3dbe5b9d4d0ea74b0ebe892a062049ddf5fb4cc6cd298634b9468a72b8244ed 14923 
libxdamage_1.1.4-1.diff.gz
 b0f6cf61b289d44d2232a6d4a9a59622a1f5984c4bee6df712001b0512ab5241 15144 
libxdamage1_1.1.4-1_amd64.deb
 49bd36083c9ee7fbd7d3655abd47fce0d7c68e2981cc6fa6b79887edeacc1001 30784 
libxdamage1-dbg_1.1.4-1_amd64.deb
 fa4fe1875fd7d4cd8a2becca121e73e567ee096a12860d91f076efe58b700b31 14790 
libxdamage-dev_1.1.4-1_amd64.deb
Files: 
 b66fbfa3305bf67f25cd71333f430c03 2121 x11 optional libxdamage_1.1.4-1.dsc
 95867778da012623815214769007c0d7 339060 x11 optional 
libxdamage_1.1.4.orig.tar.gz
 96476236e766f86d0224b12bbbdfcbc5 14923 x11 optional libxdamage_1.1.4-1.diff.gz
 6c722ad6aae4b1d86550ce905bc1f46f 15144 libs optional 
libxdamage1_1.1.4-1_amd64.deb
 ec3c88bffd876fef7a40c4b267e6aeb8 30784 debug extra 
libxdamage1-dbg_1.1.4-1_amd64.deb
 c55065fd37bf82c8e6a0f99a11c0818e 14790 libdevel optional 
libxdamage-dev_1.1.4-1_amd64.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBAgAGBQJRyANPAAoJEDEBgAUJBeQM5zUQAORECf5jDrhTicldP5+EPtmc
YrCH/8AKQRGBqTQlhFF6lsbUNiQCbR0SRbuL0q7cSEKVrJLN3LBdmwV0muTO/jih
l8Iy9kwzgDIi8yODTvq2BlAZQpLy997e0G7HtG/QWyg2g+0m3ZprF6hrtr/LF5wr
Gl3oYXR370n5V5h36AkeNEw6UPoT1zj/M8P9qbAdWI3CxwBlv5tiSrCmsqZcdaEE
w1u5Fkw+Ga8X093fyc6DnSiob96mZt3dZdvcNuvGPf6hl1UXvxWdfGkW8SMaEaZo
LF1MSxkeCOTfshSDMxZH2Yl53gRSbM2isMmXPodrB0yvWk03CYgpJALLM8Tva0RI
wxIIUKPT09EAmuf7UdPATyd9q59V52IadJfoVTOgxUf2SAM49G2rssPwKIXmbZpC
4QK8I1HmB9rfwKKkIsgL0q8X7/qy4GAH45NTTs38ZlFIFkmy8TGtJXckNcWByxxg
R+U38lBxhU0Om+42pG7ZW/yRjOsV2fETG9/CqnI9jdFfZDHqIOmry84wRqbaVVw0
NbtrqwUCDVbX7yvB7SMkNcTPdTx6+j9UObRAmPUlLNFpA0WtKBYUVFHEp1X0ZG1r
zbCX7wTBGklPeuK5Xtnbck33rC0dWIgmk8fokb4SfgBB/PSASt79aWsLqlRIzN3i
4zHgr0qoAgm9LdgD4V9S
=2OfW
-END PGP SIGNATURE-


Thank you for your contribution to Debian.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ur2w7-0006gh...@franck.debian.org



mesa: Changes to 'ubuntu'

2013-06-24 Thread Maarten Lankhorst
 debian/changelog  |   27 ++
 debian/patches/CVE-2013-1872.patch|   78 
 debian/patches/CVE-2013-1993.patch|   45 
 debian/patches/add-more-reserved-hsw-ids.diff |  231 +
 debian/patches/add-vlv-ids.diff   |   97 ++
 debian/patches/fix-hsw-gt3-names.diff |  238 ++
 debian/patches/fix-missing-gt3-id.diff|   26 ++
 debian/patches/series |8 
 8 files changed, 750 insertions(+)

New commits:
commit 08a8f98cd6cc962586b029c157e9f674c23c3f4d
Author: Marc Deslauriers marc.deslauri...@ubuntu.com
Date:   Mon Jun 24 13:38:28 2013 +0200

SECURITY UPDATE: denial of service and possible code execution via 
out-of-bands access.

diff --git a/debian/changelog b/debian/changelog
index 11fd70a..41f14dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+mesa (9.1.3-0ubuntu4) saucy; urgency=low
+
+  * SECURITY UPDATE: denial of service and possible code execution via
+out-of-bands access
+- debian/patches/CVE-2013-1872.patch: check for out-of-bounds reads in
+  src/mesa/drivers/dri/i965/brw_fs.cpp,
+  src/mesa/drivers/dri/i965/brw_fs.h,
+  src/mesa/drivers/dri/i965/brw_fs_visitor.cpp.
+- CVE-2013-1872
+  * SECURITY UPDATE: denial of service and possible code execution via
+integer overflows
+- debian/patches/CVE-2013-1993.patch: check lengths in
+  src/glx/XF86dri.c.
+- CVE-2013-1993
+
+ -- Marc Deslauriers marc.deslauri...@ubuntu.com  Wed, 19 Jun 2013 09:33:40 
-0400
+
 mesa (9.1.3-0ubuntu3) saucy; urgency=low
 
   * Added patches to add/fix Haswell pci-id's (LP: #1175533)
diff --git a/debian/patches/CVE-2013-1872.patch 
b/debian/patches/CVE-2013-1872.patch
new file mode 100644
index 000..530b851
--- /dev/null
+++ b/debian/patches/CVE-2013-1872.patch
@@ -0,0 +1,78 @@
+Description: fix denial of service and possible code execution via
+ out-of-bands access
+Origin: backport, 
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0677ea063cd96adefe87c1fb01ef7c66d905535b
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59429
+
+Index: mesa-9.1.3/src/mesa/drivers/dri/i965/brw_fs.cpp
+===
+--- mesa-9.1.3.orig/src/mesa/drivers/dri/i965/brw_fs.cpp   2013-06-18 
13:53:12.200524978 -0400
 mesa-9.1.3/src/mesa/drivers/dri/i965/brw_fs.cpp2013-06-18 
13:53:12.196524978 -0400
+@@ -786,6 +786,7 @@
+  import_uniforms_callback,
+  variable_ht);
+this-params_remap = v-params_remap;
++   this-nr_params_remap = v-nr_params_remap;
+ }
+ 
+ /* Our support for uniforms is piggy-backed on the struct
+@@ -1458,6 +1459,7 @@
+ {
+if (dispatch_width == 8) {
+   this-params_remap = ralloc_array(mem_ctx, int, c-prog_data.nr_params);
++  this-nr_params_remap = c-prog_data.nr_params;
+ 
+   for (unsigned int i = 0; i  c-prog_data.nr_params; i++)
+this-params_remap[i] = -1;
+@@ -1472,7 +1474,14 @@
+   if (inst-src[i].file != UNIFORM)
+  continue;
+ 
+-  assert(constant_nr  (int)c-prog_data.nr_params);
++  /* Section 5.11 of the OpenGL 4.3 spec says:
++   *
++   * Out-of-bounds reads return undefined values, which include
++   * values from other variables of the active program or zero.
++   */
++  if (constant_nr  0 || constant_nr = (int)c-prog_data.nr_params) {
++ constant_nr = 0;
++  }
+ 
+   /* For now, set this to non-negative.  We'll give it the
+* actual new number in a moment, in order to keep the
+@@ -1520,6 +1529,10 @@
+if (inst-src[i].file != UNIFORM)
+   continue;
+ 
++   /* as above alias to 0 */
++   if (constant_nr  0 || constant_nr = (int)this-nr_params_remap) {
++  constant_nr = 0;
++   }
+assert(this-params_remap[constant_nr] != -1);
+inst-src[i].reg = this-params_remap[constant_nr];
+inst-src[i].reg_offset = 0;
+Index: mesa-9.1.3/src/mesa/drivers/dri/i965/brw_fs.h
+===
+--- mesa-9.1.3.orig/src/mesa/drivers/dri/i965/brw_fs.h 2013-06-18 
13:53:12.200524978 -0400
 mesa-9.1.3/src/mesa/drivers/dri/i965/brw_fs.h  2013-06-18 
13:53:12.196524978 -0400
+@@ -431,6 +431,7 @@
+ * uniform index.
+ */
+int *params_remap;
++   int nr_params_remap;
+ 
+struct hash_table *variable_ht;
+fs_reg frag_depth;
+Index: mesa-9.1.3/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+===
+--- mesa-9.1.3.orig/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp   
2013-06-18 13:53:12.200524978 -0400
 mesa-9.1.3/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp2013-06-18 
13:53:12.196524978 -0400
+@@ -2273,6 +2273,9 @@
+this-virtual_grf_use = NULL;
+  

mesa: Changes to 'ubuntu-quantal'

2013-06-24 Thread Maarten Lankhorst
 debian/changelog  |   28 +++
 debian/patches/CVE-2013-1872.patch|   78 
 debian/patches/CVE-2013-1993.patch|   45 
 debian/patches/add-more-reserved-hsw-ids.diff |  231 +
 debian/patches/add-vlv-ids.diff   |   97 ++
 debian/patches/fix-hsw-crw-ids.diff   |   68 +++
 debian/patches/fix-hsw-gt3-names.diff |  238 ++
 debian/patches/fix-missing-gt3-id.diff|   26 ++
 debian/patches/series |9 
 9 files changed, 820 insertions(+)

New commits:
commit 32a9843ff033cc3d4c9b4c7c64fab5e5065acd90
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Jun 24 13:45:35 2013 +0200

release to quantal-proposed

diff --git a/debian/changelog b/debian/changelog
index f091c87..a379833 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (9.0.3-0ubuntu0.3) UNRELEASED; urgency=low
+mesa (9.0.3-0ubuntu0.3) quantal-proposed; urgency=low
 
   * Added patches to add/fix Haswell pci-id's (LP: #1175533)
 - fix-hsw-crw-ids.diff
@@ -7,7 +7,7 @@ mesa (9.0.3-0ubuntu0.3) UNRELEASED; urgency=low
 - fix-missing-gt3-id.diff
 - add-more-reserved-hsw-ids.diff
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 19 Jun 2013 
13:33:09 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 24 Jun 2013 
13:45:19 +0200
 
 mesa (9.0.3-0ubuntu0.2) quantal-security; urgency=low
 

commit 09475beaacc68db521464de13e419197fc74ec87
Author: Marc Deslauriers marc.deslauri...@ubuntu.com
Date:   Mon Jun 24 13:38:28 2013 +0200

SECURITY UPDATE: denial of service and possible code execution via 
out-of-bands access.

diff --git a/debian/changelog b/debian/changelog
index 3f5a2d4..f091c87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (9.0.3-0ubuntu0.2) UNRELEASED; urgency=low
+mesa (9.0.3-0ubuntu0.3) UNRELEASED; urgency=low
 
   * Added patches to add/fix Haswell pci-id's (LP: #1175533)
 - fix-hsw-crw-ids.diff
@@ -9,6 +9,23 @@ mesa (9.0.3-0ubuntu0.2) UNRELEASED; urgency=low
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 19 Jun 2013 
13:33:09 +0200
 
+mesa (9.0.3-0ubuntu0.2) quantal-security; urgency=low
+
+  * SECURITY UPDATE: denial of service and possible code execution via
+out-of-bands access
+- debian/patches/CVE-2013-1872.patch: check for out-of-bounds reads in
+  src/mesa/drivers/dri/i965/brw_fs.cpp,
+  src/mesa/drivers/dri/i965/brw_fs.h,
+  src/mesa/drivers/dri/i965/brw_fs_visitor.cpp.
+- CVE-2013-1872
+  * SECURITY UPDATE: denial of service and possible code execution via
+integer overflows
+- debian/patches/CVE-2013-1993.patch: check lengths in
+  src/glx/XF86dri.c.
+- CVE-2013-1993
+
+ -- Marc Deslauriers marc.deslauri...@ubuntu.com  Tue, 18 Jun 2013 14:05:02 
-0400
+
 mesa (9.0.3-0ubuntu0.1) quantal-proposed; urgency=low
 
   * New upstream release. (LP: #1134466)
diff --git a/debian/git-cleanup.sh b/debian/git-cleanup.sh
old mode 100755
new mode 100644
diff --git a/debian/patches/CVE-2013-1872.patch 
b/debian/patches/CVE-2013-1872.patch
new file mode 100644
index 000..d0a39e8
--- /dev/null
+++ b/debian/patches/CVE-2013-1872.patch
@@ -0,0 +1,78 @@
+Description: fix denial of service and possible code execution via
+ out-of-bands access
+Origin: backport, 
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0677ea063cd96adefe87c1fb01ef7c66d905535b
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59429
+
+Index: mesa-9.0.3/src/mesa/drivers/dri/i965/brw_fs.cpp
+===
+--- mesa-9.0.3.orig/src/mesa/drivers/dri/i965/brw_fs.cpp   2013-06-18 
14:02:34.944519611 -0400
 mesa-9.0.3/src/mesa/drivers/dri/i965/brw_fs.cpp2013-06-18 
14:02:34.936519611 -0400
+@@ -496,6 +496,7 @@
+  import_uniforms_callback,
+  variable_ht);
+this-params_remap = v-params_remap;
++   this-nr_params_remap = v-nr_params_remap;
+ }
+ 
+ /* Our support for uniforms is piggy-backed on the struct
+@@ -1110,6 +,7 @@
+ {
+if (c-dispatch_width == 8) {
+   this-params_remap = ralloc_array(mem_ctx, int, c-prog_data.nr_params);
++  this-nr_params_remap = c-prog_data.nr_params;
+ 
+   for (unsigned int i = 0; i  c-prog_data.nr_params; i++)
+this-params_remap[i] = -1;
+@@ -1124,7 +1126,14 @@
+   if (inst-src[i].file != UNIFORM)
+  continue;
+ 
+-  assert(constant_nr  (int)c-prog_data.nr_params);
++  /* Section 5.11 of the OpenGL 4.3 spec says:
++   *
++   * Out-of-bounds reads return undefined values, which include
++   * values from other variables of the active program or zero.
++   */
++  if (constant_nr  0 || constant_nr = (int)c-prog_data.nr_params) {
++ constant_nr = 0;
++  }
+ 
+   /* 

mesa: Changes to 'ubuntu-raring'

2013-06-24 Thread Maarten Lankhorst
 debian/changelog  |   27 ++
 debian/patches/CVE-2013-1872.patch|   78 
 debian/patches/CVE-2013-1993.patch|   45 
 debian/patches/add-more-reserved-hsw-ids.diff |  231 +
 debian/patches/add-vlv-ids.diff   |   97 ++
 debian/patches/fix-hsw-gt3-names.diff |  238 ++
 debian/patches/fix-missing-gt3-id.diff|   26 ++
 debian/patches/series |8 
 8 files changed, 750 insertions(+)

New commits:
commit dc4f9c5700dcbb74b3c9d0eec89778b0527f1909
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Jun 24 13:45:07 2013 +0200

release to raring-proposed

diff --git a/debian/changelog b/debian/changelog
index 95390d6..711cbd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (9.1.3-0ubuntu0.4) UNRELEASED; urgency=low
+mesa (9.1.3-0ubuntu0.4) raring-proposed; urgency=low
 
   * Added patches to add/fix Haswell pci-id's (LP: #1175533)
 - add-vlv-ids.diff
@@ -6,7 +6,7 @@ mesa (9.1.3-0ubuntu0.4) UNRELEASED; urgency=low
 - fix-missing-gt3-id.diff
 - add-more-reserved-hsw-ids.diff
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 19 Jun 2013 
13:33:09 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 24 Jun 2013 
13:44:48 +0200
 
 mesa (9.1.3-0ubuntu0.3) raring-security; urgency=low
 

commit fe32c1a36b4be05aa688c009282960ae747d18a8
Author: Marc Deslauriers marc.deslauri...@ubuntu.com
Date:   Mon Jun 24 13:38:28 2013 +0200

SECURITY UPDATE: denial of service and possible code execution via 
out-of-bands access.

diff --git a/debian/changelog b/debian/changelog
index f1d598d..95390d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (9.1.3-0ubuntu0.3) UNRELEASED; urgency=low
+mesa (9.1.3-0ubuntu0.4) UNRELEASED; urgency=low
 
   * Added patches to add/fix Haswell pci-id's (LP: #1175533)
 - add-vlv-ids.diff
@@ -8,6 +8,23 @@ mesa (9.1.3-0ubuntu0.3) UNRELEASED; urgency=low
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 19 Jun 2013 
13:33:09 +0200
 
+mesa (9.1.3-0ubuntu0.3) raring-security; urgency=low
+
+  * SECURITY UPDATE: denial of service and possible code execution via
+out-of-bands access
+- debian/patches/CVE-2013-1872.patch: check for out-of-bounds reads in
+  src/mesa/drivers/dri/i965/brw_fs.cpp,
+  src/mesa/drivers/dri/i965/brw_fs.h,
+  src/mesa/drivers/dri/i965/brw_fs_visitor.cpp.
+- CVE-2013-1872
+  * SECURITY UPDATE: denial of service and possible code execution via
+integer overflows
+- debian/patches/CVE-2013-1993.patch: check lengths in
+  src/glx/XF86dri.c.
+- CVE-2013-1993
+
+ -- Marc Deslauriers marc.deslauri...@ubuntu.com  Tue, 18 Jun 2013 14:00:15 
-0400
+
 mesa (9.1.3-0ubuntu0.2) raring-proposed; urgency=low
 
   * Add back a patch that reverts a change which made blur slow on i915,
diff --git a/debian/git-cleanup.sh b/debian/git-cleanup.sh
old mode 100755
new mode 100644
diff --git a/debian/patches/CVE-2013-1872.patch 
b/debian/patches/CVE-2013-1872.patch
new file mode 100644
index 000..530b851
--- /dev/null
+++ b/debian/patches/CVE-2013-1872.patch
@@ -0,0 +1,78 @@
+Description: fix denial of service and possible code execution via
+ out-of-bands access
+Origin: backport, 
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0677ea063cd96adefe87c1fb01ef7c66d905535b
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59429
+
+Index: mesa-9.1.3/src/mesa/drivers/dri/i965/brw_fs.cpp
+===
+--- mesa-9.1.3.orig/src/mesa/drivers/dri/i965/brw_fs.cpp   2013-06-18 
13:53:12.200524978 -0400
 mesa-9.1.3/src/mesa/drivers/dri/i965/brw_fs.cpp2013-06-18 
13:53:12.196524978 -0400
+@@ -786,6 +786,7 @@
+  import_uniforms_callback,
+  variable_ht);
+this-params_remap = v-params_remap;
++   this-nr_params_remap = v-nr_params_remap;
+ }
+ 
+ /* Our support for uniforms is piggy-backed on the struct
+@@ -1458,6 +1459,7 @@
+ {
+if (dispatch_width == 8) {
+   this-params_remap = ralloc_array(mem_ctx, int, c-prog_data.nr_params);
++  this-nr_params_remap = c-prog_data.nr_params;
+ 
+   for (unsigned int i = 0; i  c-prog_data.nr_params; i++)
+this-params_remap[i] = -1;
+@@ -1472,7 +1474,14 @@
+   if (inst-src[i].file != UNIFORM)
+  continue;
+ 
+-  assert(constant_nr  (int)c-prog_data.nr_params);
++  /* Section 5.11 of the OpenGL 4.3 spec says:
++   *
++   * Out-of-bounds reads return undefined values, which include
++   * values from other variables of the active program or zero.
++   */
++  if (constant_nr  0 || constant_nr = (int)c-prog_data.nr_params) {
++ constant_nr = 0;
++  }
+ 
+   /* For now, set this to non-negative.  We'll give 

weston: Changes to 'upstream-unstable'

2013-06-24 Thread Sven Joachim
Rebased ref, commits from common ancestor:
commit b22b21f13f379e3de7d82ea45a4a69d085dc8ede
Author: Kristian Høgsberg k...@bitplanet.net
Date:   Fri Jun 7 01:52:08 2013 -0400

configure.ac: Bump version to 1.1.1

diff --git a/configure.ac b/configure.ac
index ed6d2ee..06d0b4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([weston_major_version], [1])
 m4_define([weston_minor_version], [1])
-m4_define([weston_micro_version], [0])
+m4_define([weston_micro_version], [1])
 m4_define([weston_version],
   [weston_major_version.weston_minor_version.weston_micro_version])
 

commit 747d4ee17e573766a0b46b60db9b2477b9286d27
Author: Sinclair Yeh sinclair@intel.com
Date:   Thu Jun 6 16:41:30 2013 -0700

Avoid unnecessarily re-allocating texture buffer when the size hasn't 
changed.

v4:
Incorporated krh and anderco's comments.  Now adding newly allocated
buffer's dimensions to texture_damage

v3:
* Removed unnecessary parentheses
* Added check for switching from EGL image to SHM buffer
* Moved shader assignment out of IF condition

v2:
Fixed the wrong comparison

v1:
Depending on specific DRI driver implementation, glTexImage2D() with data
set to NULL may or may not re-allocate the texture buffer each time it is
called.  Unintended consequences happen if later glTexSubImage2D() is called
to only update a sub-region of the texture buffer.

I've explored moving glTexImage2D() from gl_renderer_attach() and simply
mark the texture dirty, but the current implemention seems cleaner because
I won't have to worry about calling ensure_textures() and re-assigning
gs-shader unnecessarily.

diff --git a/src/gl-renderer.c b/src/gl-renderer.c
index ea6631f..f6c7194 100644
--- a/src/gl-renderer.c
+++ b/src/gl-renderer.c
@@ -66,6 +66,7 @@ struct gl_surface_state {
int num_images;
 
struct weston_buffer_reference buffer_ref;
+   int height;
int pitch; /* in pixels */
 };
 
@@ -1192,14 +1193,28 @@ gl_renderer_attach(struct weston_surface *es, struct 
wl_buffer *buffer)
}
 
if (wl_buffer_is_shm(buffer)) {
-   gs-pitch = wl_shm_buffer_get_stride(buffer) / 4;
-   gs-target = GL_TEXTURE_2D;
+   /* Only allocate a texture if it doesn't match existing one.
+* If gs-num_images is not 0, then a switch from DRM allocated
+* buffer to a SHM buffer is happening, and we need to allocate
+* a new texture buffer. */
+   if (wl_shm_buffer_get_stride(buffer) / 4 != gs-pitch ||
+   wl_shm_buffer_get_height(buffer) != gs-height ||
+   gs-num_images  0) {
+   gs-pitch = wl_shm_buffer_get_stride(buffer) / 4;
+   gs-height = wl_shm_buffer_get_height(buffer);
+   gs-target = GL_TEXTURE_2D;
+
+   ensure_textures(gs, 1);
+   glBindTexture(GL_TEXTURE_2D, gs-textures[0]);
+   glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
+gs-pitch, buffer-height, 0,
+GL_BGRA_EXT, GL_UNSIGNED_BYTE, NULL);
+   pixman_region32_union_rect(gs-texture_damage,
+  gs-texture_damage,
+  0, 0,
+  gs-pitch, gs-height);
+   }
 
-   ensure_textures(gs, 1);
-   glBindTexture(GL_TEXTURE_2D, gs-textures[0]);
-   glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
-gs-pitch, buffer-height, 0,
-GL_BGRA_EXT, GL_UNSIGNED_BYTE, NULL);
if (wl_shm_buffer_get_format(buffer) == WL_SHM_FORMAT_XRGB)
gs-shader = gr-texture_shader_rgbx;
else
@@ -1258,6 +1273,7 @@ gl_renderer_attach(struct weston_surface *es, struct 
wl_buffer *buffer)
}
 
gs-pitch = buffer-width;
+   gs-height = wl_shm_buffer_get_height(buffer);
} else {
weston_log(unhandled buffer type!\n);
weston_buffer_reference(gs-buffer_ref, NULL);

commit 7583aff275ccbe0c4d6bb37ec9343773d119e18a
Author: Ander Conselvan de Oliveira ander.conselvan.de.olive...@intel.com
Date:   Tue Jun 4 16:24:05 2013 +0300

compositor-drm: Force DPMS state to ON after drmModeSetCrtc()

The kernel is supposed to set this when drmModeSetCrtc() is called but
at least the i915 driver wouldn't do that in all cases. A fix for this
should be released with kernel 3.10, but we work around the issue in
older kernels by always forcing DPMS to ON when doing a mode set.

https://bugs.freedesktop.org/show_bug.cgi?id=64873

diff --git a/src/compositor-drm.c 

weston: Changes to 'debian-unstable'

2013-06-24 Thread Sven Joachim
 .gitignore|3 
 Makefile.am   |5 
 clients/.gitignore|5 
 clients/Makefile.am   |   32 
 clients/calibrator.c  |  260 
 clients/clickdot.c|2 
 clients/cliptest.c|2 
 clients/desktop-shell.c   |9 
 clients/dnd.c |2 
 clients/editor.c  |  852 ++--
 clients/eventdemo.c   |6 
 clients/flower.c  |   11 
 clients/gears.c   |2 
 clients/image.c   |3 
 clients/keyboard.c|  367 +-
 clients/resizor.c |2 
 clients/screenshot.c  |9 
 clients/simple-egl.c  |   25 
 clients/simple-shm.c  |  119 +-
 clients/simple-touch.c|8 
 clients/smoke.c   |2 
 clients/tablet-shell.c|5 
 clients/terminal.c|6 
 clients/transformed.c |  299 +
 clients/view.c|5 
 clients/weston-info.c |8 
 clients/weston-simple-im.c|  514 +
 clients/window.c  | 1338 +
 clients/window.h  |   46 
 clients/wscreensaver.c|6 
 configure.ac  |  142 ++
 debian/changelog  |7 
 debian/rules  |2 
 debian/weston.install |6 
 man/.gitignore|1 
 man/Makefile.am   |1 
 man/weston.ini.man|   10 
 man/weston.man|8 
 protocol/desktop-shell.xml|   18 
 protocol/input-method.xml |   93 +
 protocol/text-cursor-position.xml |   11 
 protocol/text.xml |  167 ++-
 shared/config-parser.h|   10 
 shared/image-loader.c |1 
 shared/matrix.c   |  271 +
 shared/matrix.h   |   82 +
 shared/option-parser.c|5 
 src/.gitignore|1 
 src/Makefile.am   |  133 ++
 src/android-framebuffer.cpp   |   93 -
 src/android-framebuffer.h |   54 -
 src/animation.c   |  290 +
 src/bindings.c|  292 +
 src/compositor-android.c  |  510 -
 src/compositor-drm.c  | 1357 -
 src/compositor-fbdev.c|  927 +
 src/compositor-headless.c |  212 +++
 src/compositor-rdp.c  | 1039 +++
 src/compositor-rpi.c  | 1575 +
 src/compositor-wayland.c  |  327 ++
 src/compositor-x11.c  |  517 +++--
 src/compositor.c  | 1044 +--
 src/compositor.h  |  246 ++--
 src/evdev-touchpad.c  |   19 
 src/evdev.c   |   55 -
 src/evdev.h   |6 
 src/gl-renderer.c | 2016 ++
 src/gl-renderer.h |  106 +
 src/gles2-renderer.c  | 1307 
 src/libbacklight.c|9 
 src/matrix.c  |  250 
 src/matrix.h  |   64 -
 src/noop-renderer.c   |   98 +
 src/pixman-renderer.c |  605 +++
 src/pixman-renderer.h |   35 
 src/rpi-bcm-stubs.h   |  267 +
 src/screenshooter.c   |   48 
 src/shell.c   |  950 +
 src/tablet-shell.c|   15 
 src/text-backend.c|  478 -
 src/udev-seat.c   |  298 +
 src/udev-seat.h   |   45 
 src/util.c|  521 -
 src/version.h.in  |   31 
 src/weston-egl-ext.h  |4 
 src/weston-launch.c   |   43 
 src/weston.pc.in  |   11 
 src/xwayland/Makefile.am  |2 
 src/xwayland/launcher.c   |  106 +
 src/xwayland/selection.c  |2 
 src/xwayland/window-manager.c |  283 -
 src/xwayland/xwayland.h   |   12 
 src/zoom.c|3 
 tests/.gitignore  |1 
 tests/Makefile.am |   28 
 tests/event-test.c|   69 +
 tests/matrix-test.c   |2 
 tests/setbacklight.c  |2 
 tests/surface-global-test.c   |3 
 tests/surface-test.c  |3 
 tests/text-test.c |   67 -
 tests/weston-test-client-helper.c |   73 -
 tests/weston-test-client-helper.h |9 
 tests/weston-test.c   |   27 
 tests/weston-tests-env|6 
 tests/xwayland-test.c |  142 ++
 weston.ini|   58 +
 107 files changed, 15856 

weston: Changes to 'debian-unstable'

2013-06-24 Thread Sven Joachim
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 60ae0e03fc731bd51ab489c0f5c886010eedce74
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Jun 24 20:33:56 2013 +0200

Add some bug closures to debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 65c0207..cd595a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 weston (1.1.1-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
-  * New upstream release.
+  * New upstream release (Closes: #675138, #699045).
   * Add a watch file.
   * control: Add missing build-depends: libmtdev-dev, libxcursor-dev,
 libpam0g-dev, libvpx-dev.
@@ -13,7 +13,7 @@ weston (1.1.1-1) UNRELEASED; urgency=low
   * control: Bump build-depends on mesa derived components to 9.0~.
   * control, compat: Switch to debhelper 9.
   * control: Bump policy to 3.9.4, no changes.
-  * control: Added homepage.
+  * control: Added homepage (Closes: #687571).
   * Add README.source.
   * patches/series: Add a placeholder file.
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1urbh9-0001c1...@vasks.debian.org



Bug#677657: libxfixes-dev should be marked as Multi-Arch: same

2013-06-24 Thread Nicolas Le Cam
Package: libxfixes-dev
Version: 1:5.0-4+deb7u1
Tags: patch
Followup-For: Bug #677657

Dear Maintainer,

The following patch marks libxfixes-dev Multi-Arch: same.

As specified in the previous message,
every shared files are identical across architectures so nothing else is needed
to make it multiarch cross-installable.

Nicolas Le Cam

diff -ru a/debian/control b/debian/control
--- a/debian/control2012-11-24 18:14:24.772037794 +0100
+++ b/debian/control2012-11-24 19:00:38.289223801 +0100
@@ -78,6 +78,7 @@
  libxfixes3 (= ${binary:Version}),
  libx11-dev,
  x11proto-fixes-dev (= 1:5.0-1),
+Multi-Arch: same
 Description: X11 miscellaneous 'fixes' extension library (development headers)
  libXfixes provides an X Window System client interface to the 'XFIXES'
  extension to the X protocol.


-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (900, 'testing'), (800, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.9-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libxfixes-dev depends on:
ii  libx11-dev  2:1.5.0-1+deb7u1
ii  libxfixes3  1:5.0-4+deb7u1
ii  x11proto-fixes-dev  1:5.0-2

libxfixes-dev recommends no packages.

libxfixes-dev suggests no packages.

-- no debconf information


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/20130624224742.5119.8610.reportbug@hinata.GreedIsland