Bug#531726: compiz-core: libcore.so missing

2011-12-15 Thread tom schorpp
Package: compiz-core
Version: 0.8.4-4
Severity: normal

$ compiz --debug --display :0.0 --replace
compiz (core) - Debug: Could not stat() file 
/home/schorpp/.compiz/plugins/libcore.so : No such file or directory
compiz (core) - Debug: Could not stat() file /usr/lib/compiz/libcore.so : No 
such file or directory
compiz (core) - Debug: Could not stat() file 
/home/schorpp/.compiz/plugins/libcore.so : No such file or directory
compiz (core) - Debug: Could not stat() file /usr/lib/compiz/libcore.so : No 
such file or directory
XIO:  fatal IO error 11 (Resource temporarily unavailable) on X server :0.0
  after 175 requests (172 known processed) with 2 events remaining.

y
tom


-- System Information:
Debian Release: 6.0.3
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'lucid-security')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-bpo.2-amd64 (SMP w/1 CPU core)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages compiz-core depends on:
ii  libc6  2.11.2-10 Embedded GNU C Library: Shared lib
ii  libgl1-mesa-glx [l 7.7.1-5   A free implementation of the OpenG
ii  libice62:1.0.6-2 X11 Inter-Client Exchange library
ii  libsm6 2:1.1.1-1 X11 Session Management library
ii  libstartup-notific 0.10-1library for program launch feedbac
ii  libx11-6   2:1.3.3-4 X11 client-side library
ii  libxcomposite1 1:0.4.2-1 X11 Composite extension library
ii  libxcursor11:1.1.10-2X cursor management library
ii  libxdamage11:1.1.3-1 X11 damaged region extension libra
ii  libxext6   2:1.1.2-1 X11 miscellaneous extension librar
ii  libxfixes3 1:4.0.5-1 X11 miscellaneous 'fixes' extensio
ii  libxinerama1   2:1.1-3   X11 Xinerama extension library
ii  libxml22.7.8.dfsg-2+squeeze1 GNOME XML library
ii  libxrandr2 2:1.3.0-3 X11 RandR extension library
ii  libxslt1.1 1.1.26-6  XSLT 1.0 processing library - runt
ii  mesa-utils 7.7.1-5   Miscellaneous Mesa GL utilities

Versions of packages compiz-core recommends:
ii  compiz-plugins0.8.4-4OpenGL window and compositing mana

Versions of packages compiz-core suggests:
pn  nvidia-glxnone (no description available)

-- 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/20111215075927.27329.37688.reportbug@tom1



Bug#531726: compiz-core: unresolved symbols in corelib

2011-12-15 Thread tom schorpp
Package: compiz-core
Version: 0.8.4-4
Severity: normal

ln -s /usr/lib/libgnome-window-settings1/libcompiz.so /usr/lib/compiz/libcore.so
compiz (core) - Error: dlsym: /usr/lib/compiz/libcore.so: undefined symbol: 
getCompPluginInfo20070830

y
tom

-- System Information:
Debian Release: 6.0.3
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'lucid-security')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-bpo.2-amd64 (SMP w/1 CPU core)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages compiz-core depends on:
ii  libc6  2.11.2-10 Embedded GNU C Library: Shared lib
ii  libgl1-mesa-glx [l 7.7.1-5   A free implementation of the OpenG
ii  libice62:1.0.6-2 X11 Inter-Client Exchange library
ii  libsm6 2:1.1.1-1 X11 Session Management library
ii  libstartup-notific 0.10-1library for program launch feedbac
ii  libx11-6   2:1.3.3-4 X11 client-side library
ii  libxcomposite1 1:0.4.2-1 X11 Composite extension library
ii  libxcursor11:1.1.10-2X cursor management library
ii  libxdamage11:1.1.3-1 X11 damaged region extension libra
ii  libxext6   2:1.1.2-1 X11 miscellaneous extension librar
ii  libxfixes3 1:4.0.5-1 X11 miscellaneous 'fixes' extensio
ii  libxinerama1   2:1.1-3   X11 Xinerama extension library
ii  libxml22.7.8.dfsg-2+squeeze1 GNOME XML library
ii  libxrandr2 2:1.3.0-3 X11 RandR extension library
ii  libxslt1.1 1.1.26-6  XSLT 1.0 processing library - runt
ii  mesa-utils 7.7.1-5   Miscellaneous Mesa GL utilities

Versions of packages compiz-core recommends:
ii  compiz-plugins0.8.4-4OpenGL window and compositing mana

Versions of packages compiz-core suggests:
pn  nvidia-glxnone (no description available)

-- 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/20111215082152.27703.90069.reportbug@tom1



Bug#652249: bypass default security level of the X wrapper

2011-12-15 Thread vladz

Package: xserver-xorg
Version: 1:7.5+8
Severity: important
Tags: security


By default, the wrapper's configuration file only allows any user whose
controlling TTY (console) to start the X server with root privileges: 

  # cat /etc/X11/Xwrapper.config
  [...]
  allowed_users=console

To determine if a user is controlling a TTY, the code checks the
properties of the file connected to its standard input:

  $ cat -n debian/local/xserver-wrapper.c
  [...]
  152 static int
  153 onConsole()
  154 {
  155 #if defined(__linux__)
  156   struct stat s;
  157
  158   /* see if stdin is a virtual console device */
  159   if (fstat(0, s) != 0) {
  160 (void) fprintf(stderr, X: cannot stat stdin\n);
  161 return FALSE;
  162   }
  163   if (S_ISCHR(s.st_mode) 
  164 s.st_rdev  8)  0xff) == TTY_MAJOR_DEV 
  165   (s.st_rdev  0xff)  64) ||
  166 (((s.st_rdev  8)  0xff) == ALT_TTY_MAJOR_DEV 
  167   (s.st_rdev  0xff)  64)
  168 )) {
  169 return TRUE;
  170   }

As seen, this is done by checking if this file:

  - is a character device [line 163]
  - has a TTY-specific major number (TTY_MAJOR_DEV or ALT_TTY_MAJOR_DEV,
respectively 4 or 5) [lines 164, 166]
  - has a minor number lower than 64 [lines 165, 167]

Unfortunately, by connecting a file with similar properties to its
stdin, a user can mislead the X wrapper and launch the X server.  This
file also needs to be readable by the user.

For instance, files /dev/tty and /dev/ptmx match those conditions:

  $ ls -l /dev/tty /dev/ptmx
  crw-rw-rw- 1 root root 5, 2 14 déc.  18:43 /dev/ptmx
  crw-rw-rw- 1 root root 5, 0 12 déc.  23:03 /dev/tty

Here is a quick PoC by using /dev/tty:

  $ ssh remote_host
  $ id
  uid=1000(vladz) gid=1000(vladz) groups=1000(vladz)
  $ tty
  /dev/pts/4   // not a TTY, won't have sufficient permissions to start X
  $ X :1
  X: user not authorized to run the X server, aborting.

  // This was the expected result, now lets connect /dev/tty to stdin and
  // retry...

  $ exec 0/dev/tty; X :1; exec 0/dev/pts/4
  [... Xorg starts ...]// start succeed!

This being said, this is a minor issue, but the attack against
CVE-2011-4029[1] which allows to set the read permission on any arbitrary
file, can now be launched from remote sessions and not even from a TTY.  It
become urgent to fix it.

  [1] http://security-tracker.debian.org/tracker/CVE-2011-4029

Thanks,
vladz. 

-- 
http://vladz.devzero.fr
PGP key 8F7E2D3C from pgp.mit.edu




-- 
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/20111215180236.ga32...@devzero.fr



Bug#652249: bypass default security level of the X wrapper

2011-12-15 Thread Julien Cristau
On Thu, Dec 15, 2011 at 19:02:36 +0100, vladz wrote:

 
 Package: xserver-xorg
 Version: 1:7.5+8
 Severity: important
 Tags: security
 
 
 By default, the wrapper's configuration file only allows any user whose
 controlling TTY (console) to start the X server with root privileges: 
 
   # cat /etc/X11/Xwrapper.config
   [...]
   allowed_users=console
 
 To determine if a user is controlling a TTY, the code checks the
 properties of the file connected to its standard input:
 
   $ cat -n debian/local/xserver-wrapper.c
   [...]
   152 static int
   153 onConsole()
   154 {
   155 #if defined(__linux__)
   156   struct stat s;
   157
   158   /* see if stdin is a virtual console device */
   159   if (fstat(0, s) != 0) {
   160 (void) fprintf(stderr, X: cannot stat stdin\n);
   161 return FALSE;
   162   }
   163   if (S_ISCHR(s.st_mode) 
   164 s.st_rdev  8)  0xff) == TTY_MAJOR_DEV 
   165   (s.st_rdev  0xff)  64) ||
   166 (((s.st_rdev  8)  0xff) == ALT_TTY_MAJOR_DEV 
   167   (s.st_rdev  0xff)  64)
   168 )) {
   169 return TRUE;
   170   }
 
 As seen, this is done by checking if this file:
 
   - is a character device [line 163]
   - has a TTY-specific major number (TTY_MAJOR_DEV or ALT_TTY_MAJOR_DEV,
 respectively 4 or 5) [lines 164, 166]
   - has a minor number lower than 64 [lines 165, 167]
 
 Unfortunately, by connecting a file with similar properties to its
 stdin, a user can mislead the X wrapper and launch the X server.  This
 file also needs to be readable by the user.
 
 For instance, files /dev/tty and /dev/ptmx match those conditions:
 
   $ ls -l /dev/tty /dev/ptmx
   crw-rw-rw- 1 root root 5, 2 14 déc.  18:43 /dev/ptmx
   crw-rw-rw- 1 root root 5, 0 12 déc.  23:03 /dev/tty
 
 Here is a quick PoC by using /dev/tty:
 
   $ ssh remote_host
   $ id
   uid=1000(vladz) gid=1000(vladz) groups=1000(vladz)
   $ tty
   /dev/pts/4   // not a TTY, won't have sufficient permissions to start X
   $ X :1
   X: user not authorized to run the X server, aborting.
 
   // This was the expected result, now lets connect /dev/tty to stdin and
   // retry...
 
   $ exec 0/dev/tty; X :1; exec 0/dev/pts/4
   [... Xorg starts ...]// start succeed!
 
 This being said, this is a minor issue, but the attack against
 CVE-2011-4029[1] which allows to set the read permission on any arbitrary
 file, can now be launched from remote sessions and not even from a TTY.  It
 become urgent to fix it.
 
Seems like we should revert the change accepting major 5 for stdin?

Cheers,
Julien



--
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/20111215183916.ga15...@radis.cristau.org



xorg: Changes to 'debian-unstable'

2011-12-15 Thread Julien Cristau
 debian/changelog   |   10 ++
 debian/control |1 +
 debian/local/xserver-wrapper.c |   16 +++-
 debian/rules   |9 -
 4 files changed, 26 insertions(+), 10 deletions(-)

New commits:
commit 0ebabb840bf52e5e5347414487668ae26ec16332
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 15 21:22:22 2011 +0100

Build the X wrapper with hardening enabled.

diff --git a/debian/changelog b/debian/changelog
index 20d3f7f..13dc513 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg (1:7.6+10) UNRELEASED; urgency=low
   things like /dev/tty and /dev/ptmx, which are world-readable (closes:
   #652249).  Thanks to vladz for the report.
 - use major() and minor() macros instead of manually extracting them
+  * Build the X wrapper with hardening enabled.
 
  -- Julien Cristau jcris...@debian.org  Tue, 01 Nov 2011 15:13:52 +0100
 
diff --git a/debian/control b/debian/control
index b825221..dfa7aa4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Drew Parsons dpars...@debian.org, Cyril Brulebois 
k...@debian.org
 Standards-Version: 3.9.2
 Build-Depends:
+ dpkg (= 1.16.1),
  debhelper (= 7),
  po-debconf,
 # xsf-docs:
diff --git a/debian/rules b/debian/rules
index 861737a..8d2c970 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,13 @@ CC=$(DEB_HOST_GNU_TYPE)-gcc
 else
 CC ?=gcc
 endif
+CFLAGS = \
+   -Wall \
+   $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get 
CFLAGS)
+CPPFLAGS = \
+   $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get 
CPPFLAGS)
+LDFLAGS = \
+   $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get 
LDFLAGS)
 
 # debhelper
 export DH_OPTIONS
@@ -49,7 +56,7 @@ build: build-stamp
 build-stamp: scripts-stamp
dh_testdir
# build Debian's X server wrapper
-   $(CC) -Wall -g -O2 -o debian/local/X debian/local/xserver-wrapper.c
+   $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o debian/local/X 
debian/local/xserver-wrapper.c
$(MAKE) -C xsf-docs
touch $@
 

commit 1d5cfd6fe0d46fcfcb6f79316cdc600f6da77f54
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 15 21:06:31 2011 +0100

xserver-wrapper: use major() and minor() macros instead of manually 
extracting them

diff --git a/debian/changelog b/debian/changelog
index ac28258..20d3f7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 xorg (1:7.6+10) UNRELEASED; urgency=low
 
-  * xserver-wrapper: when we drop privileges, don't forget to also reset
-effective group id, since we're installed setgid root.
-  * xserver-wrapper: revert change to allow devices with major 5 as consoles.
-This includes things like /dev/tty and /dev/ptmx, which are
-world-readable (closes: #652249).  Thanks to vladz for the report.
+  * Fixes for xserver-wrapper:
+- when we drop privileges, don't forget to also reset effective group id,
+  since we're installed setgid root.
+- revert change to allow devices with major 5 as consoles.  This includes
+  things like /dev/tty and /dev/ptmx, which are world-readable (closes:
+  #652249).  Thanks to vladz for the report.
+- use major() and minor() macros instead of manually extracting them
 
  -- Julien Cristau jcris...@debian.org  Tue, 01 Nov 2011 15:13:52 +0100
 
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 1e0d416..d4a6ab8 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -162,8 +162,8 @@ onConsole()
 return FALSE;
   }
   if (S_ISCHR(s.st_mode) 
-(((s.st_rdev  8)  0xff) == TTY_MAJOR_DEV 
-  (s.st_rdev  0xff)  64)) {
+(major(s.st_rdev) == TTY_MAJOR_DEV 
+ minor(s.st_rdev)  64)) {
 return TRUE;
   }
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)

commit acc6eda78b98d8a7af554bc578f5fdc21ec934bb
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 15 21:02:12 2011 +0100

xserver-wrapper: revert change to allow devices with major 5 as consoles.

This includes things like /dev/tty and /dev/ptmx, which are
world-readable (closes: #652249).  Thanks to vladz for the report.

diff --git a/debian/changelog b/debian/changelog
index 47f..ac28258 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xorg (1:7.6+10) UNRELEASED; urgency=low
 
   * xserver-wrapper: when we drop privileges, don't forget to also reset
 effective group id, since we're installed setgid root.
+  * xserver-wrapper: revert change to allow devices with major 5 as consoles.
+This includes things like /dev/tty and /dev/ptmx, which are
+world-readable (closes: #652249).  Thanks to vladz for the report.
 
  -- Julien Cristau jcris...@debian.org  Tue, 01 Nov 2011 15:13:52 +0100
 
diff --git a/debian/local/xserver-wrapper.c 

x11proto-input: Changes to 'debian-experimental'

2011-12-15 Thread Cyril Brulebois
 .gitignore|   78 +
 COPYING   |   22 
 ChangeLog | 1306 +++
 Makefile.am   |   13 
 README|   30 
 XI.h  |   11 
 XI2.h |   76 -
 XI2proto.h|   59 
 XI2proto.txt  | 1677 
 XIproto.txt   | 2542 -
 configure.ac  |   24 
 debian/README.source  |   28 
 debian/changelog  |   49 
 debian/compat |2 
 debian/control|   20 
 debian/copyright  |   21 
 debian/patches/series |1 
 debian/rules  |  105 -
 debian/watch  |1 
 debian/x11proto-input-dev.docs|2 
 debian/x11proto-input-dev.install |4 
 debian/xsfbs/repack.sh|   32 
 debian/xsfbs/xsfbs.mk |  289 
 debian/xsfbs/xsfbs.sh |  624 -
 specs/.gitignore  |1 
 specs/Makefile.am |   14 
 specs/XI2proto.txt| 2410 +++
 specs/XIproto.txt | 2576 ++
 28 files changed, 6677 insertions(+), 5340 deletions(-)

New commits:
commit f3ca4d321c2ebf385fcdaf9f28c228de89428165
Author: Cyril Brulebois k...@debian.org
Date:   Thu Dec 15 14:15:43 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index bd181bc..fc8805e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-input (2.1.99.3-1) UNRELEASED; urgency=low
+x11proto-input (2.1.99.3-1) experimental; urgency=low
 
   * New upstream release candidate:
 - With multitouch support.
@@ -7,7 +7,7 @@ x11proto-input (2.1.99.3-1) UNRELEASED; urgency=low
   * Get rid of .docs, XI{,2}proto.txt were already listed in .install; and
 add XI{,2}proto.html there accordingly (thanks, asciidoc).
 
- -- Cyril Brulebois k...@debian.org  Thu, 15 Dec 2011 13:53:23 +0100
+ -- Cyril Brulebois k...@debian.org  Thu, 15 Dec 2011 14:15:31 +0100
 
 x11proto-input (2.0.2-1) unstable; urgency=low
 

commit dd3ccc3e2fcb9d88d2e3bfacb2537dec6a3f7a97
Author: Cyril Brulebois k...@debian.org
Date:   Thu Dec 15 14:13:40 2011 +0100

Ship *.txt and *.html through dh_install.

diff --git a/debian/changelog b/debian/changelog
index e5be471..bd181bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x11proto-input (2.1.99.3-1) UNRELEASED; urgency=low
 - With multitouch support.
   * Pass --enable-unstable-protocol to configure accordingly.
   * Bump xutils-dev build-dep for new macros, add asciidoc build-dep.
+  * Get rid of .docs, XI{,2}proto.txt were already listed in .install; and
+add XI{,2}proto.html there accordingly (thanks, asciidoc).
 
  -- Cyril Brulebois k...@debian.org  Thu, 15 Dec 2011 13:53:23 +0100
 
diff --git a/debian/x11proto-input-dev.docs b/debian/x11proto-input-dev.docs
deleted file mode 100644
index d29dcf3..000
--- a/debian/x11proto-input-dev.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-XIproto.txt
-XI2proto.txt
diff --git a/debian/x11proto-input-dev.install 
b/debian/x11proto-input-dev.install
index e9f8c8e..d2b2266 100644
--- a/debian/x11proto-input-dev.install
+++ b/debian/x11proto-input-dev.install
@@ -2,3 +2,5 @@ usr/include/X11/extensions/*
 usr/lib/pkgconfig/inputproto.pc
 usr/share/doc/inputproto/XIproto.txt  usr/share/doc/x11proto-input-dev
 usr/share/doc/inputproto/XI2proto.txt usr/share/doc/x11proto-input-dev
+usr/share/doc/inputproto/XIproto.html  usr/share/doc/x11proto-input-dev
+usr/share/doc/inputproto/XI2proto.html usr/share/doc/x11proto-input-dev

commit 769af3b159fea8c32135ed6723c8b3efafea75e6
Author: Cyril Brulebois k...@debian.org
Date:   Thu Dec 15 14:10:03 2011 +0100

Bump xutils-dev build-dep for new macros, add asciidoc build-dep.

diff --git a/debian/changelog b/debian/changelog
index aa8ef80..e5be471 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11proto-input (2.1.99.3-1) UNRELEASED; urgency=low
   * New upstream release candidate:
 - With multitouch support.
   * Pass --enable-unstable-protocol to configure accordingly.
+  * Bump xutils-dev build-dep for new macros, add asciidoc build-dep.
 
  -- Cyril Brulebois k...@debian.org  Thu, 15 Dec 2011 13:53:23 +0100
 
diff --git a/debian/control b/debian/control
index ca78e8b..9574f25 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Build-Depends:
  debhelper (= 8),
  dh-autoreconf,
  quilt,
- xutils-dev (= 1:7.5~1),
+ xutils-dev (= 1:7.5+4),
+ asciidoc,
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-input
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-input.git

commit c1a533b29c3fdfb30fc44418ba7be2ebe2f8365e

x11proto-input: Changes to 'upstream-experimental'

2011-12-15 Thread Cyril Brulebois
 .gitignore |   78 +
 COPYING|   22 
 Makefile.am|   13 
 README |   30 
 XI.h   |   11 
 XI2.h  |   76 +
 XI2proto.h |   59 +
 XI2proto.txt   | 1677 --
 XIproto.txt| 2542 
 configure.ac   |   24 
 specs/.gitignore   |1 
 specs/Makefile.am  |   14 
 specs/XI2proto.txt | 2410 +
 specs/XIproto.txt  | 2576 +
 14 files changed, 5271 insertions(+), 4262 deletions(-)

New commits:
commit 02eadf00f07abb9b0f19a05728b70e42eac08adb
Author: Chase Douglas chase.doug...@canonical.com
Date:   Tue Dec 13 10:35:18 2011 -0800

inputproto 2.1.99.3

Signed-off-by: Chase Douglas chase.doug...@canonical.com

diff --git a/configure.ac b/configure.ac
index f34bda0..d2b1c3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([InputProto], [2.1.99.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [2.1.99.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 84c049b6603e370afcd267ce4c53a566f842fd69
Author: Chase Douglas chase.doug...@canonical.com
Date:   Mon Dec 12 10:50:58 2011 -0800

State that future touch IDs are indeterminate

This just makes it absolutely clear that clients should not make any
assumptions about future touch ID values.

I also added strictly monotonically increasing to the definition of
touch IDs. It's a more precise definition of the protocol.

Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Chase Douglas chase.doug...@canonical.com

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index ba5f7b7..6082166 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -2149,9 +2149,11 @@ may not be the logical center of the touch.
 
 Touch tracking IDs are provided in the detail field of touch events. Its
 value is always provided in every touch event. Tracking IDs are
-represented as unsigned 32-bit values and increase in value for each new
-touch, wrapping back to 0 upon reaching the numerical limit of IDs. IDs are
-globally unique.
+represented as unsigned 32-bit values and increase strictly monotonically in
+value for each new touch, wrapping back to 0 upon reaching the numerical limit
+of IDs. The increment between two touch IDs is indeterminate. Clients may not
+assume that any future touches will have specific touch IDs. IDs are globally
+unique.
 
 Touch events do not generate enter/leave events.
 

commit 7d20c9bf38d3d47adc7fb1a70faa370dda1a390c
Author: Chase Douglas cndougla@cndougla.(none)
Date:   Fri Dec 9 13:32:35 2011 -0800

Touch IDs must be globally unique

XIAllowEvents with a master device and a touch ID must uniquely identify
a touch sequence. If touch IDs were unique per slave device, multiple
slave devices could have valid sequences with the same touch ID, and the
sequences may both be grabbed through the same master device grab.

Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Chase Douglas chase.doug...@canonical.com

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index c467bb1..ba5f7b7 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -2151,7 +2151,7 @@ Touch tracking IDs are provided in the detail field of 
touch events. Its
 value is always provided in every touch event. Tracking IDs are
 represented as unsigned 32-bit values and increase in value for each new
 touch, wrapping back to 0 upon reaching the numerical limit of IDs. IDs are
-unique per each slave touch device.
+globally unique.
 
 Touch events do not generate enter/leave events.
 

commit c4703fd9d97c962d5c599a7f826a9a11fc91ee70
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Dec 12 10:26:20 2011 +1000

Remove XI2.1 and XI2.2 warnings and errors

This is too much of a pain, anyone who includes XI headers needs to define
this. And that affects input and output drivers as well as legacy clients
that don't even need the new stuff.

Removing the need for defines would be enough but then the warnings clog up
the output and hide real warnings. Just ditch them and laugh at those that
use an experimental branch and expect it to work.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Chase Douglas chase.doug...@canonical.com
Signed-off-by: Chase Douglas chase.doug...@canonical.com

diff --git a/XI2.h b/XI2.h
index 5a8afb7..4368006 100644
--- a/XI2.h
+++ b/XI2.h
@@ -25,16 +25,6 @@
 #ifndef _XI2_H_
 #define _XI2_H_
 
-#warning XI 2.1 is not stable yet.
-#warning Applications relying on this header will break as the protocol sees 
updates.
-#ifndef XINPUT2_1_USE_UNSTABLE_PROTOCOL
-#error 

x11proto-input: Changes to 'refs/tags/x11proto-input-2.1.99.3-1'

2011-12-15 Thread Cyril Brulebois
Tag 'x11proto-input-2.1.99.3-1' created by Cyril Brulebois k...@debian.org at 
2011-12-15 13:21 +

Tagging upload of x11proto-input 2.1.99.3-1 to experimental.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEABECAAYFAk7p9GgACgkQeGfVPHR5Nd2ahQCguepBf7wHkHEWMV/bAxqhyZk4
99gAn0J0iIjFwTJzSa/26iaP9JvhCXcq
=trQw
-END PGP SIGNATURE-

Changes since x11proto-input-2.0.2-1:
Alexandre Julliard (1):
  XI2.h: Fix off-by-one error in the XIMaskLen definition.

Chase Douglas (31):
  Include stdint.h
  Updates for pointer emulation and more touch device modes
  Many more updates to the XI 2.1 protocol
  Merge remote-tracking branch 'origin/master' into multitouch
  Separate XI2.x into XI 2.x for readability
  Yes, send TouchEnd to owner, TouchPendingEnd to other listeners
  Update device type terminology
  Prettyify touch device types
  Peter is right, floating devices can emit touch events
  Fix up pointer event emulation section
  Remove touch Observe grabs
  Use the same valuator axes for pointer and touch events
  Specify dependent device pointer/touch handling
  Introduce Touch grab mode
  Fix indentation of active_touches definition
  Fix touch cancel/resume semantics
  Revert Fix touch cancel/resume semantics
  Revert Specify dependent device pointer/touch handling
  Merge remote-tracking branch 'inputproto/master' into multitouch-devel
  Switch multitouch additions to XI 2.2
  Bump version to 2.1.99 for XI 2.2 multitouch changes
  Really kill touch valuators
  Add event windows to ownership events
  Extend XIAllowEvents for handling touch grab processing
  Allow grabbing clients to accept or reject touches any time
  inputproto 2.1.99.1 (first snapshot of 2.2)
  Fix Xi 2.x version comment in XI2.h
  Revert addition of active_touches to device events
  Touch IDs must be globally unique
  State that future touch IDs are indeterminate
  inputproto 2.1.99.3

Cyril Brulebois (7):
  Merge branch 'upstream-unstable' into debian-experimental
  Merge branch 'debian-unstable' into debian-experimental
  Bump changelogs.
  Pass --enable-unstable-protocol to configure accordingly.
  Bump xutils-dev build-dep for new macros, add asciidoc build-dep.
  Ship *.txt and *.html through dh_install.
  Upload to experimental.

Daniel Stone (13):
  Add touch classes and events, bump to 2.1
  Require configure flag to build this proto version.
  Formatting fixups and minor rewording
  Doc note: No seriously, this is WIP
  Add inline references, fix usecase bulleting
  Add FIXME sidebars, remove single-grab stipulation
  typo fix
  Reword touch introduction, labels for all
  Further cleanups and clarifications
  Mostly typographical
  Clean up and reword multitouch ownership/emulation
  Add XIPointerEmulated for emulated events
  Document smooth-scrolling support

Fernando Carrijo (1):
  Fix typos in XIproto.txt

Gaetan Nadon (3):
  specs: convert XI2proto.txt to html using asciidoc
  XI2proto.txt: fix whitespace issues
  XIproto.txt: fix whitespace issues

Peter Hutterer (51):
  Add minimal asciidoc syntax
  Merge branch 'master' into chase-multitouch
  specs: add a linebreak for asciidoc parsing
  specs: move from init move destroy to begin update end
  specs: move touch sequence handling (owner-only) up a bit.
  specs: move warning about out-of-band processing up a bit.
  spec: Move ClientPointer up again.
  specs: clean/rewrite touch grab and ownership bits
  specs: Add a fixme for using raw events instead of GrabModeObserve
  specs: Rewrite Touch events delivery section
  specs: rewrite pointer emulation for indirect devices
  specs: rewrite pointer emulation section
  specs: move erroneous Errors: line to where it belongs
  specs: enable asciidoc parsing for XIproto.txt
  Put a #warning and #error in to avoid unsuspecting XI 2.1 users.
  Add XI2-specific defines for grab and property requests
  Provide convenience defines for owner_events.
  specs: add a linebreak for asciidoc parsing
  Put a warning in about not adding any further libXi defines
  specs: ValuatorClass includes a mode
  specs: fix two typos in XI2proto.txt
  XITouchClass' props needs a num_props
  Changing the touch device mode generates a DeviceChangedEvent
  Add two linebreaks for asciidoc list parsing
  Coordinates are always absolute, no need to re-state it
  XISelectEvents: BadValue is generated, not returned
  Fix missing 'and' in GrabTypeFocusIn description
  Reword the passive touch grab rules to be similar to the others
  Indent Ownership explanation for consistent formatting
  AllowTouchEvents can take any device id, not just slaves
  DeviceEvent: active_touches needs marker that 

xorg: Changes to 'debian-unstable'

2011-12-15 Thread Julien Cristau
 debian/changelog |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f2dba93ad941cbc42fb4adc0b6c0ce2b63b7c0bc
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 15 23:46:14 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 13dc513..632ff14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+10) UNRELEASED; urgency=low
+xorg (1:7.6+10) unstable; urgency=high
 
   * Fixes for xserver-wrapper:
 - when we drop privileges, don't forget to also reset effective group id,
@@ -9,7 +9,7 @@ xorg (1:7.6+10) UNRELEASED; urgency=low
 - use major() and minor() macros instead of manually extracting them
   * Build the X wrapper with hardening enabled.
 
- -- Julien Cristau jcris...@debian.org  Tue, 01 Nov 2011 15:13:52 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 15 Dec 2011 23:45:48 +0100
 
 xorg (1:7.6+9) unstable; urgency=low
 


-- 
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/e1rbkbg-0005so...@vasks.debian.org



xorg: Changes to 'refs/tags/xorg-1_7.6+10'

2011-12-15 Thread Julien Cristau
Tag 'xorg-1_7.6+10' created by Julien Cristau jcris...@debian.org at 
2011-12-15 22:50 +

Tagging upload of xorg 1:7.6+10 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABCAAGBQJO6nnNAAoJEDEBgAUJBeQMFDYP/0pI5jQkD3/JUjxcWl/FXe0Z
4jMftxJ7tjOt7QQ+F0pWvuULAEAPRlq2diuhX1vdJ+UR9z9xLQoQmJWbWYIXQ9Vq
vNkbtuVS/dzsOFLADs2ppthfAaUFHptzJpRUuJxnwG9CXn7ydsn9SG+A/JXevJz7
Dh/TaG4tgK+hK70GetdHHZxvAc6YMEAaquZpNnlRZQ/Z7IJZqpx+1Br/5QSv3uQB
ga/tbshiVr76pjkouns5jP6c1Jar+2uFs21E3jjpAHJuzV0zXBAlU+8r8ouGLO2Z
B2d6Ad0F/O/nUV6u4jvnmBonCIkFmqNYp/5H4eXMnFLFYIpbEER1FrtC2DhfI7eB
nRJbvQ/lPwijyA77jhXagCvc+8QHFlpTIYaPW8nd3tZxQvkSBCj8jCucNmTD3a6X
OccRVIMMVOl8EqpQ5tatOnTJt49253NI5YJTmniOd1OX7n99MBzyotLfe2JomJIm
AFLanT82zjrW33+Cyius1GcAl0Wwdww0nhMcAFOCD0G/6IlViA2iRQlnEVc5TS86
jN9OGeC4P+5AL2VbHtDZPI0YcRT/pTNzaCQXJucOfwj1QJzlWcosVaEn7FFyPV/C
U7zFbW2Uo84JVk03YNCcHgmy+6l+eRkPNBOjjufOb9nTj/8Pfy/6KRhlOAUpdap5
F9u8gOTtGQHk5lzDNl1j
=m2wS
-END PGP SIGNATURE-

Changes since xorg-1_7.6+9:
Julien Cristau (5):
  Fix privileges dropping in the X wrapper
  xserver-wrapper: revert change to allow devices with major 5 as consoles.
  xserver-wrapper: use major() and minor() macros instead of manually 
extracting them
  Build the X wrapper with hardening enabled.
  Upload to unstable

---
 debian/changelog   |   13 +
 debian/control |1 +
 debian/local/xserver-wrapper.c |   16 +++-
 debian/rules   |9 -
 4 files changed, 29 insertions(+), 10 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/e1rbkbg-0005sv...@vasks.debian.org



Bug#652249: marked as done (bypass default security level of the X wrapper)

2011-12-15 Thread Debian Bug Tracking System
Your message dated Thu, 15 Dec 2011 23:03:21 +
with message-id e1rbkkf-0001xj...@franck.debian.org
and subject line Bug#652249: fixed in xorg 1:7.6+10
has caused the Debian Bug report #652249,
regarding bypass default security level of the X wrapper
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
652249: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652249
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
---BeginMessage---

Package: xserver-xorg
Version: 1:7.5+8
Severity: important
Tags: security


By default, the wrapper's configuration file only allows any user whose
controlling TTY (console) to start the X server with root privileges: 

  # cat /etc/X11/Xwrapper.config
  [...]
  allowed_users=console

To determine if a user is controlling a TTY, the code checks the
properties of the file connected to its standard input:

  $ cat -n debian/local/xserver-wrapper.c
  [...]
  152 static int
  153 onConsole()
  154 {
  155 #if defined(__linux__)
  156   struct stat s;
  157
  158   /* see if stdin is a virtual console device */
  159   if (fstat(0, s) != 0) {
  160 (void) fprintf(stderr, X: cannot stat stdin\n);
  161 return FALSE;
  162   }
  163   if (S_ISCHR(s.st_mode) 
  164 s.st_rdev  8)  0xff) == TTY_MAJOR_DEV 
  165   (s.st_rdev  0xff)  64) ||
  166 (((s.st_rdev  8)  0xff) == ALT_TTY_MAJOR_DEV 
  167   (s.st_rdev  0xff)  64)
  168 )) {
  169 return TRUE;
  170   }

As seen, this is done by checking if this file:

  - is a character device [line 163]
  - has a TTY-specific major number (TTY_MAJOR_DEV or ALT_TTY_MAJOR_DEV,
respectively 4 or 5) [lines 164, 166]
  - has a minor number lower than 64 [lines 165, 167]

Unfortunately, by connecting a file with similar properties to its
stdin, a user can mislead the X wrapper and launch the X server.  This
file also needs to be readable by the user.

For instance, files /dev/tty and /dev/ptmx match those conditions:

  $ ls -l /dev/tty /dev/ptmx
  crw-rw-rw- 1 root root 5, 2 14 déc.  18:43 /dev/ptmx
  crw-rw-rw- 1 root root 5, 0 12 déc.  23:03 /dev/tty

Here is a quick PoC by using /dev/tty:

  $ ssh remote_host
  $ id
  uid=1000(vladz) gid=1000(vladz) groups=1000(vladz)
  $ tty
  /dev/pts/4   // not a TTY, won't have sufficient permissions to start X
  $ X :1
  X: user not authorized to run the X server, aborting.

  // This was the expected result, now lets connect /dev/tty to stdin and
  // retry...

  $ exec 0/dev/tty; X :1; exec 0/dev/pts/4
  [... Xorg starts ...]// start succeed!

This being said, this is a minor issue, but the attack against
CVE-2011-4029[1] which allows to set the read permission on any arbitrary
file, can now be launched from remote sessions and not even from a TTY.  It
become urgent to fix it.

  [1] http://security-tracker.debian.org/tracker/CVE-2011-4029

Thanks,
vladz. 

-- 
http://vladz.devzero.fr
PGP key 8F7E2D3C from pgp.mit.edu



---End Message---
---BeginMessage---
Source: xorg
Source-Version: 1:7.6+10

We believe that the bug you reported is fixed in the latest version of
xorg, which is due to be installed in the Debian FTP archive:

x11-common_7.6+10_all.deb
  to main/x/xorg/x11-common_7.6+10_all.deb
xbase-clients_7.6+10_all.deb
  to main/x/xorg/xbase-clients_7.6+10_all.deb
xorg-dev_7.6+10_all.deb
  to main/x/xorg/xorg-dev_7.6+10_all.deb
xorg_7.6+10.dsc
  to main/x/xorg/xorg_7.6+10.dsc
xorg_7.6+10.tar.gz
  to main/x/xorg/xorg_7.6+10.tar.gz
xorg_7.6+10_amd64.deb
  to main/x/xorg/xorg_7.6+10_amd64.deb
xserver-xorg-input-all_7.6+10_amd64.deb
  to main/x/xorg/xserver-xorg-input-all_7.6+10_amd64.deb
xserver-xorg-video-all_7.6+10_amd64.deb
  to main/x/xorg/xserver-xorg-video-all_7.6+10_amd64.deb
xserver-xorg_7.6+10_amd64.deb
  to main/x/xorg/xserver-xorg_7.6+10_amd64.deb
xutils_7.6+10_all.deb
  to main/x/xorg/xutils_7.6+10_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 652...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Julien Cristau jcris...@debian.org (supplier of updated xorg package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)


-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Format: 1.8
Date: Thu, 15 Dec 2011 23:45:48 +0100
Source: xorg
Binary: x11-common xserver-xorg 

Processing of xorg_7.6+10_amd64.changes

2011-12-15 Thread Debian FTP Masters
xorg_7.6+10_amd64.changes uploaded successfully to localhost
along with the files:
  xorg_7.6+10.dsc
  xorg_7.6+10.tar.gz
  x11-common_7.6+10_all.deb
  xorg-dev_7.6+10_all.deb
  xbase-clients_7.6+10_all.deb
  xutils_7.6+10_all.deb
  xserver-xorg_7.6+10_amd64.deb
  xserver-xorg-video-all_7.6+10_amd64.deb
  xserver-xorg-input-all_7.6+10_amd64.deb
  xorg_7.6+10_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/e1rbkcp-00080g...@franck.debian.org



xorg_7.6+10_amd64.changes ACCEPTED into unstable

2011-12-15 Thread Debian FTP Masters



Accepted:
x11-common_7.6+10_all.deb
  to main/x/xorg/x11-common_7.6+10_all.deb
xbase-clients_7.6+10_all.deb
  to main/x/xorg/xbase-clients_7.6+10_all.deb
xorg-dev_7.6+10_all.deb
  to main/x/xorg/xorg-dev_7.6+10_all.deb
xorg_7.6+10.dsc
  to main/x/xorg/xorg_7.6+10.dsc
xorg_7.6+10.tar.gz
  to main/x/xorg/xorg_7.6+10.tar.gz
xorg_7.6+10_amd64.deb
  to main/x/xorg/xorg_7.6+10_amd64.deb
xserver-xorg-input-all_7.6+10_amd64.deb
  to main/x/xorg/xserver-xorg-input-all_7.6+10_amd64.deb
xserver-xorg-video-all_7.6+10_amd64.deb
  to main/x/xorg/xserver-xorg-video-all_7.6+10_amd64.deb
xserver-xorg_7.6+10_amd64.deb
  to main/x/xorg/xserver-xorg_7.6+10_amd64.deb
xutils_7.6+10_all.deb
  to main/x/xorg/xutils_7.6+10_all.deb


Override entries for your package:
x11-common_7.6+10_all.deb - optional x11
xbase-clients_7.6+10_all.deb - optional x11
xorg-dev_7.6+10_all.deb - optional x11
xorg_7.6+10.dsc - source x11
xorg_7.6+10_amd64.deb - optional x11
xserver-xorg-input-all_7.6+10_amd64.deb - optional x11
xserver-xorg-video-all_7.6+10_amd64.deb - optional x11
xserver-xorg_7.6+10_amd64.deb - optional x11
xutils_7.6+10_all.deb - optional x11

Announcing to debian-devel-chan...@lists.debian.org
Closing bugs: 652249 


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/e1rbkkf-0001xa...@franck.debian.org



xorg: Changes to 'debian-unstable'

2011-12-15 Thread Julien Cristau
 debian/changelog |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 22ce089c330c2be530802a09c929ef749b294c2b
Author: Julien Cristau jcris...@debian.org
Date:   Fri Dec 16 00:23:40 2011 +0100

Add CVE ref to 1:7.6+10 changelog

diff --git a/debian/changelog b/debian/changelog
index 07109a2..20397c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ xorg (1:7.6+10) unstable; urgency=high
 - revert change to allow devices with major 5 as consoles.  This includes
   things like /dev/tty and /dev/ptmx, which are world-readable (closes:
   #652249).  Thanks to vladz for the report.
+  Reference: CVE-2011-4613.
 - use major() and minor() macros instead of manually extracting them
   * Build the X wrapper with hardening enabled.
 


-- 
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/e1rbkel-00076f...@vasks.debian.org



libxi: Changes to 'upstream-experimental'

2011-12-15 Thread Cyril Brulebois
 Makefile.am  |2 
 configure.ac |   49 -
 doc/.gitignore   |6 
 doc/Makefile.am  |   66 --
 doc/porting.xml  | 1209 ---
 docbook.am   |  105 +++
 include/X11/extensions/XInput2.h |   13 
 man/Makefile.am  |   15 
 man/XGetExtensionVersion.txt |   11 
 man/XGetFeedbackControl.txt  |   55 -
 man/XIChangeHierarchy.txt|3 
 man/XIChangeProperty.txt |   16 
 man/XIGrabButton.txt |   21 
 man/XIGrabDevice.txt |   15 
 man/XIGrabEnter.txt  |   21 
 man/XIQueryDevice.txt|   41 +
 man/XIQueryPointer.txt   |3 
 specs/.gitignore |3 
 specs/Makefile.am|   68 --
 specs/encoding.xml   |2 
 specs/inputlib.xml   |   47 -
 specs/library.xml|  446 +++---
 src/Makefile.am  |   11 
 src/XExtInt.c|  103 ++-
 src/XIAllowEvents.c  |2 
 src/XIDefineCursor.c |2 
 src/XIGetDevFocus.c  |2 
 src/XIGrabDevice.c   |   10 
 src/XIHierarchy.c|5 
 src/XIPassiveGrab.c  |   10 
 src/XIProperties.c   |8 
 src/XIQueryDevice.c  |   14 
 src/XIQueryPointer.c |5 
 src/XISelEv.c|6 
 src/XISetCPtr.c  |   62 ++
 src/XISetDevFocus.c  |2 
 src/XIWarpPointer.c  |2 
 src/XIint.h  |   15 
 src/XListDProp.c |2 
 src/XSetCPtr.c   |   62 --
 src/XSndExEv.c   |   11 
 41 files changed, 762 insertions(+), 1789 deletions(-)

New commits:
commit c25debae73be50b9a77454ed4d72ffeaab726846
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Oct 10 10:24:38 2011 +1000

Bump to 1.4.99.1

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 245e0f6..10d2e5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libXi], [1.4.99],
+AC_INIT([libXi], [1.4.99.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([src/config.h])

commit 7ca05f3094958c04e8f78a786061124c58f8e1f3
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Sep 28 11:16:42 2011 +1000

Remove superfluous assignment of lib-classes in XIQueryDevices.

A few lines south from here we malloc lib-classes, this assignment is a
leftover from 225071e2e67fb65a0258397212f9826c9b25e078.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Chase Douglas chase.doug...@canonical.com

diff --git a/src/XIQueryDevice.c b/src/XIQueryDevice.c
index 464ab4d..af2f27a 100644
--- a/src/XIQueryDevice.c
+++ b/src/XIQueryDevice.c
@@ -78,7 +78,6 @@ XIQueryDevice(Display *dpy, int deviceid, int 
*ndevices_return)
 lib-use = wire-use;
 lib-attachment  = wire-attachment;
 lib-enabled = wire-enabled;
-lib-classes = (XIAnyClassInfo**)lib[1];
 nclasses = wire-num_classes;
 
 ptr += sizeof(xXIDeviceInfo);

commit e97c3dd00369b47af067e30e910335b199a2f147
Author: Matt Dew mar...@osource.org
Date:   Mon Oct 3 22:05:51 2011 -0600

1 - fix the capitalization of the ID attriutes to match either the
title or funcdef string it goes with.
2 - fix any linkend's that were affected by 1.
3 - any function in the docs that has an actual funcdef,
will become an olink.

Signed-off-by: Matt Dew mar...@osource.org

diff --git a/specs/encoding.xml b/specs/encoding.xml
index 7b4bceb..33318d1 100644
--- a/specs/encoding.xml
+++ b/specs/encoding.xml
@@ -1,4 +1,4 @@
-appendix id=input_extension_protocol_encoding
+appendix id=Input_Extension_Protocol_Encoding
 titleInput Extension Protocol Encoding/title
 para
 functionSyntactic Conventions/function
diff --git a/specs/library.xml b/specs/library.xml
index 4a51e09..b65b234 100644
--- a/specs/library.xml
+++ b/specs/library.xml
@@ -1,5 +1,5 @@
 chaptertitleInput Extension/title
-sect1 id=Input_Extension_Overview
+sect1 id='Overview'
 titleOverview/title
 !-- .XS --
 !-- (SN Input Extension Overview --
@@ -211,7 +211,7 @@ The device supports feedbacks.
 !-- .LP --
 Additional classes may be added in the future.
 Functions that support multiple input classes, such as the 
-functionXListInputDevices/function
+xref linkend='XListInputDevices' xrefstyle='select: title'/
 function that lists all available input devices,
 organize the data they return by input class.  Client programs that
 use these functions should not access data unless it matches a 
@@ -235,24 +235,24 @@ that a client 

libxi: Changes to 'debian-experimental'

2011-12-15 Thread Cyril Brulebois
 ChangeLog|  851 +++
 Makefile.am  |2 
 configure.ac |   49 -
 debian/changelog |   60 +
 debian/control   |   25 
 debian/libxi-dev.install |   14 
 debian/libxi6-udeb.install   |2 
 debian/libxi6.install|2 
 debian/patches/series|1 
 debian/rules |   16 
 doc/.gitignore   |6 
 doc/Makefile.am  |   66 --
 doc/porting.xml  | 1209 ---
 docbook.am   |  105 +++
 include/X11/extensions/XInput2.h |   13 
 man/Makefile.am  |   15 
 man/XGetExtensionVersion.txt |   11 
 man/XGetFeedbackControl.txt  |   55 -
 man/XIChangeHierarchy.txt|3 
 man/XIChangeProperty.txt |   16 
 man/XIGrabButton.txt |   21 
 man/XIGrabDevice.txt |   15 
 man/XIGrabEnter.txt  |   21 
 man/XIQueryDevice.txt|   41 +
 man/XIQueryPointer.txt   |3 
 specs/.gitignore |3 
 specs/Makefile.am|   68 --
 specs/encoding.xml   |2 
 specs/inputlib.xml   |   47 -
 specs/library.xml|  446 +++---
 src/Makefile.am  |   11 
 src/XExtInt.c|   98 ++-
 src/XIAllowEvents.c  |2 
 src/XIDefineCursor.c |2 
 src/XIGetDevFocus.c  |2 
 src/XIGrabDevice.c   |   10 
 src/XIHierarchy.c|5 
 src/XIPassiveGrab.c  |   10 
 src/XIProperties.c   |8 
 src/XIQueryDevice.c  |   14 
 src/XIQueryPointer.c |5 
 src/XISelEv.c|6 
 src/XISetCPtr.c  |   62 ++
 src/XISetDevFocus.c  |2 
 src/XIWarpPointer.c  |2 
 src/XIint.h  |   15 
 src/XListDProp.c |2 
 src/XSetCPtr.c   |   62 --
 src/XSndExEv.c   |   11 
 49 files changed, 1706 insertions(+), 1811 deletions(-)

New commits:
commit 797f55bf0a2d489f858f44adf751abf661910ae9
Author: Cyril Brulebois k...@debian.org
Date:   Thu Dec 15 15:03:42 2011 +0100

Add -c4 to dh_makeshlibs.

diff --git a/debian/changelog b/debian/changelog
index 1fc2b61..0c13a92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxi (2:1.4.99.1-1) UNRELEASED; urgency=low
 - Add xsltproc.
   * Update libxi-dev.install: specs/ and docs/ have been merged.
   * Don't install *.db yet.
+  * Add -c4 to dh_makeshlibs.
 
  -- Cyril Brulebois k...@debian.org  Thu, 15 Dec 2011 14:44:42 +0100
 
diff --git a/debian/rules b/debian/rules
index 8ab6c16..2959206 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,7 @@ binary-arch: build install
dh_strip -N$(PACKAGE)
dh_compress
dh_fixperms
-   dh_makeshlibs -V'libxi6 (= 2:1.2.99.4)' --add-udeb=$(PACKAGE)-udeb
+   dh_makeshlibs -V'libxi6 (= 2:1.2.99.4)' --add-udeb=$(PACKAGE)-udeb -- 
-c4
dh_shlibdeps
dh_installdeb
dh_gencontrol

commit 1ecc1b4b7de4dc5b07b1723d2543ef9b707e5861
Author: Cyril Brulebois k...@debian.org
Date:   Thu Dec 15 14:54:58 2011 +0100

Don't install *.db yet.

diff --git a/debian/changelog b/debian/changelog
index 8162a46..1fc2b61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libxi (2:1.4.99.1-1) UNRELEASED; urgency=low
 - Bump xutils-dev, x11proto-input-dev, xorg-sgml-doctools.
 - Add xsltproc.
   * Update libxi-dev.install: specs/ and docs/ have been merged.
+  * Don't install *.db yet.
 
  -- Cyril Brulebois k...@debian.org  Thu, 15 Dec 2011 14:44:42 +0100
 
diff --git a/debian/rules b/debian/rules
index d68052a..8ab6c16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,6 +89,7 @@ binary-arch: build install
 
dh_installdocs
find debian/tmp -name '*.xml' -delete
+   find debian/tmp -name '*.db' -delete
dh_install --sourcedir=debian/tmp --fail-missing --exclude=libXi.la 
--exclude=usr/share/man/man3
dh_installman
dh_installchangelogs ChangeLog

commit ae8cef890b237c94950a806789284960f31cebc2
Author: Cyril Brulebois k...@debian.org
Date:   Thu Dec 15 14:52:21 2011 +0100

Update libxi-dev.install: specs/ and docs/ have been merged.

diff --git a/debian/changelog b/debian/changelog
index 8c5e8b3..8162a46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxi (2:1.4.99.1-1) UNRELEASED; urgency=low
   * Update build dependencies accordingly:
 - Bump xutils-dev, x11proto-input-dev, xorg-sgml-doctools.
 - Add xsltproc.
+  * Update libxi-dev.install: specs/ and docs/ have been merged.
 
  -- Cyril Brulebois k...@debian.org  Thu, 15 Dec 2011 14:44:42 +0100
 
diff --git a/debian/libxi-dev.install b/debian/libxi-dev.install
index 

libxi: Changes to 'debian-experimental'

2011-12-15 Thread Cyril Brulebois
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 48f3c144225c2d82339bc941126ab2a6850d817d
Author: Cyril Brulebois k...@debian.org
Date:   Thu Dec 15 15:06:04 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 0c13a92..3652da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (2:1.4.99.1-1) UNRELEASED; urgency=low
+libxi (2:1.4.99.1-1) experimental; urgency=low
 
   * New upstream release candidate:
 - With multitouch support.
@@ -9,7 +9,7 @@ libxi (2:1.4.99.1-1) UNRELEASED; urgency=low
   * Don't install *.db yet.
   * Add -c4 to dh_makeshlibs.
 
- -- Cyril Brulebois k...@debian.org  Thu, 15 Dec 2011 14:44:42 +0100
+ -- Cyril Brulebois k...@debian.org  Thu, 15 Dec 2011 15:05:46 +0100
 
 libxi (2:1.4.3-3) unstable; urgency=low
 


-- 
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/e1rbki4-0007qc...@vasks.debian.org



libxi: Changes to 'refs/tags/libxi-2_1.4.99.1-1'

2011-12-15 Thread Cyril Brulebois
Tag 'libxi-2_1.4.99.1-1' created by Cyril Brulebois k...@debian.org at 
2011-12-15 23:27 +

Tagging upload of libxi 2:1.4.99.1-1 to experimental.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEABECAAYFAk7qglYACgkQeGfVPHR5Nd2tdwCgiglHD9PPOWVZwTW4TNk/1V1d
urYAoJiFu2TjOh9ZpKLtafObNDoGEmF3
=CfzJ
-END PGP SIGNATURE-

Changes since libxi-2_1.4.3-3:
Alan Coopersmith (3):
  Move Xinput server API documentation from libXi to xserver
  Fix the FIXME output in man page .TH macros generated by asciidoc
  Make shadow man pages generated by asciidoc work with Solaris man

Cyril Brulebois (8):
  Merge branch 'upstream-unstable' into debian-experimental
  Merge branch 'debian-unstable' into debian-experimental
  Bump changelogs.
  Update build dependencies accordingly.
  Update libxi-dev.install: specs/ and docs/ have been merged.
  Don't install *.db yet.
  Add -c4 to dh_makeshlibs.
  Upload to experimental.

Gaetan Nadon (13):
  Documentation: add Docbook external references support
  make: remove unneeded AM_V_GEN silent rule directive.
  make: use AM_V_at rather than AM_V_GEN to prefix the mv command
  Install target dbs alongside generated documents
  Install xml versions of specs even if HAVE_XMLTO is false
  docbook.am: global maintenance update - entities, images and olinking
  docbook.am: embed css styles inside the HTML HEAD element
  docs: remove productnumber which is not used by default
  docs: use the fullrelvers; entity to set X11 release information
  inputlib: fix copyright statements
  inputlib: prefix 1.0 with the word Version
  inputlib: restore original title X Input Device Extension Library
  specs: refactor and complete copyright legal text

Jeremy Huddleston (1):
  Use AM_CPPFLAGS to use in tree headers before installed headers

Matt Dew (2):
  Add id attributes to funcsynopsis to allow other docs to olink to them.
  1 - fix the capitalization of the ID attriutes to match either the

Matthieu Herrb (1):
  Fix XISelectEvents on 64 bits, strict alignement architectures.

Peter Hutterer (27):
  Allocate enough memory for raw events + extra data.
  XIChangeHierarchy: Return Success early if no actual changes are 
requested.
  Remove a few unused assignments.
  man: fix typo, layout in XGetExtensionVersion.man
  Silence compiler warning in XListDProp.c
  Silence compiler warning due to differnent event conversion procs
  man: fix missing comma in XIGrabEnter man page
  Use Data, not Data32 in XIPassiveGrabDevice
  man: Fix wrong event names in XIGrabButton.
  man: Fix typo in XIChangeProperty
  Bump to 1.4.99
  man: Fix formatting in XGetFeedbackControl
  Add XI2 library-internal array offsets to XIint.h
  Don't use the protocol defines for 2.0 versioning.
  Handle unknown device classes.
  man: fix typo in XIQueryDevice man page
  man: update property and grab man pages for new constants
  Handle unknown device classes.
  man: fix typo in XIQueryDevice man page
  man: update property and grab man pages for new constants
  Require inputproto 2.0.99.1 or later
  Support XI 2.1 internally
  Support XI 2.1 XIScrollClass
  Merge branch 'smooth-scrolling'
  Use a separate nclasses variable in XIQueryDevice
  Remove superfluous assignment of lib-classes in XIQueryDevices.
  Bump to 1.4.99.1

---
 ChangeLog|  516 
 Makefile.am  |2 
 configure.ac |   17 
 debian/changelog |   13 
 debian/control   |7 
 debian/libxi-dev.install |6 
 debian/rules |3 
 doc/.gitignore   |4 
 doc/Makefile.am  |   63 --
 doc/porting.xml  | 1209 ---
 docbook.am   |  105 +++
 include/X11/extensions/XInput2.h |   11 
 man/Makefile.am  |   15 
 man/XGetFeedbackControl.txt  |   55 -
 man/XIChangeProperty.txt |   16 
 man/XIGrabButton.txt |   13 
 man/XIGrabDevice.txt |   15 
 man/XIGrabEnter.txt  |   13 
 man/XIQueryDevice.txt|   41 +
 specs/.gitignore |1 
 specs/Makefile.am|   65 --
 specs/encoding.xml   |2 
 specs/inputlib.xml   |   47 -
 specs/library.xml|  446 +++---
 src/Makefile.am  |9 
 src/XExtInt.c|   77 ++
 src/XIQueryDevice.c  |   12 
 src/XIint.h  |   15 
 src/XListDProp.c |2 
 src/XSndExEv.c   |   11 
 30 files changed, 1123 insertions(+), 1688 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of 

Processing of x11proto-input_2.1.99.3-1_source+all.changes

2011-12-15 Thread Debian FTP Masters
x11proto-input_2.1.99.3-1_source+all.changes uploaded successfully to localhost
along with the files:
  x11proto-input_2.1.99.3-1.dsc
  x11proto-input_2.1.99.3.orig.tar.gz
  x11proto-input_2.1.99.3-1.diff.gz
  x11proto-input-dev_2.1.99.3-1_all.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/e1rbkfv-0002um...@franck.debian.org



Bug#546741: N/A

2011-12-15 Thread asta . kultalahti


OPEN ATTACHMENT 



CocaCola.rtf
Description: RTF file


x11proto-input_2.1.99.3-1_source+all.changes ACCEPTED into experimental

2011-12-15 Thread Debian FTP Masters



Accepted:
x11proto-input-dev_2.1.99.3-1_all.deb
  to main/x/x11proto-input/x11proto-input-dev_2.1.99.3-1_all.deb
x11proto-input_2.1.99.3-1.diff.gz
  to main/x/x11proto-input/x11proto-input_2.1.99.3-1.diff.gz
x11proto-input_2.1.99.3-1.dsc
  to main/x/x11proto-input/x11proto-input_2.1.99.3-1.dsc
x11proto-input_2.1.99.3.orig.tar.gz
  to main/x/x11proto-input/x11proto-input_2.1.99.3.orig.tar.gz


Override entries for your package:
x11proto-input-dev_2.1.99.3-1_all.deb - optional x11
x11proto-input_2.1.99.3-1.dsc - source x11

Announcing to debian-experimental-chan...@lists.debian.org
Announcing to debian-devel-chan...@lists.debian.org


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/e1rbknu-0004ex...@franck.debian.org



xserver-xorg-video-savage: Changes to 'ubuntu'

2011-12-15 Thread Christopher Halse Rogers
 .gitignore  |   78 +++
 COPYING |  118 -
 ChangeLog   |  487 +
 Makefile.am |   12 
 configure.ac|   50 +-
 debian/README.source|   24 -
 debian/changelog|   74 +++
 debian/compat   |2 
 debian/control  |   24 -
 debian/copyright|   71 +++
 debian/patches/101_fix_use_of_privates.diff |   23 -
 debian/patches/series   |1 
 debian/rules|  103 
 debian/watch|1 
 debian/xsfbs/repack.sh  |   32 -
 debian/xsfbs/xsfbs.mk   |  285 
 debian/xsfbs/xsfbs.sh   |  622 
 man/Makefile.am |   59 --
 man/savage.man  |1 
 src/savage_accel.c  |3 
 src/savage_cursor.c |6 
 src/savage_dga.c|8 
 src/savage_dri.c|  269 ++--
 src/savage_driver.c |   47 --
 src/savage_driver.h |   15 
 src/savage_exa.c|7 
 src/savage_hwmc.c   |   10 
 src/savage_vbe.c|   10 
 src/savage_video.c  |   79 ++-
 29 files changed, 1145 insertions(+), 1376 deletions(-)

New commits:
commit df43dfb3c5e47901fad6fd3aafac16867e526fac
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Fri Dec 16 12:20:24 2011 +1100

Merge in changelog entries missing from git.  Yay!

diff --git a/debian/changelog b/debian/changelog
index 0cd725c..943539b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,19 @@ xserver-xorg-video-savage (1:2.3.3-1) unstable; urgency=low
 
  -- Julien Cristau jcris...@debian.org  Sun, 23 Oct 2011 17:15:11 +0200
 
+xserver-xorg-video-savage (1:2.3.2-3ubuntu2) natty; urgency=low
+
+  * Rebuild to pick up new Xserver dependencies
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Wed, 09 Mar 2011 
14:51:44 +1100
+
+xserver-xorg-video-savage (1:2.3.2-3ubuntu1) natty; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+- 100_bustype_pci_by_default.diff (LP: 33617, 37218)
+
+ -- Tormod Volden debian.tor...@gmail.com  Tue, 22 Feb 2011 08:12:33 +0100
+
 xserver-xorg-video-savage (1:2.3.2-3) unstable; urgency=low
 
   * Merge from upstream up to aff8f966c6d3f7dbad2d92d040ce7f5c4b286eef

commit 18230696438fbe7a5d2d83947c594cbc3aef9970
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Fri Dec 16 12:16:42 2011 +1100

Finish documenting merge in changelog

diff --git a/debian/changelog b/debian/changelog
index 225ba05..0cd725c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 xserver-xorg-video-savage (1:2.3.3-1ubuntu1) precise; urgency=low
 
   * Merge from Debian Testing.  Remaining Ubuntu changes:
-- 
+- 100_bustype_pci_by_default.diff (LP: 33617, 37218)
   
  -- Christopher James Halse Rogers r...@ubuntu.com  Fri, 16 Dec 2011 
12:10:26 +1100
 

commit 6799a197f1ecd0079002e6d24c3aaa9f6bb304a4
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Fri Dec 16 12:13:51 2011 +1100

Remove 101_fix_use_of_privates; fixed upstream

diff --git a/debian/patches/101_fix_use_of_privates.diff 
b/debian/patches/101_fix_use_of_privates.diff
deleted file mode 100644
index 641ccd1..000
--- a/debian/patches/101_fix_use_of_privates.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From 830e58d086828fa0431303df32a847ddd3022654 Mon Sep 17 00:00:00 2001
-From: Keith Packard kei...@keithp.com
-Date: Thu, 25 Nov 2010 01:58:06 +
-Subject: savage: fix use of privates without initialisation
-
-Fixes bug 31614.
-
-Signed-off-by: Dave Airlie airl...@redhat.com

-diff --git a/src/savage_driver.c b/src/savage_driver.c
-index 7c3ce90..1cb91f6 100644
 a/src/savage_driver.c
-+++ b/src/savage_driver.c
-@@ -4267,6 +4267,7 @@ SavageUpdateKey(ScrnInfoPtr pScrn, int r, int g, int b)
-   ol = 0;
- }
- if (!(pScreen = pScrn-pScreen) 
-+  || !psav-FBStart2nd
-   || !(pScrOvlPriv = fbOverlayGetScrPriv(pScreen))) 
-   return;
- key = ((Shift(r,psav-overlay.redShift)  psav-overlay.redMask)
---
-cgit v0.8.3-6-g21f6
diff --git a/debian/patches/series b/debian/patches/series
index c063179..ddccdcf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 03_request_16bit_depth.diff
 100_bustype_pci_by_default.diff
-101_fix_use_of_privates.diff

commit 6a72e9198a2f0e1add63c12ac65ca4127203d5c2
Author: Julien Cristau 

xserver-xorg-video-fbdev: Changes to 'ubuntu'

2011-12-15 Thread Christopher Halse Rogers
 debian/README.source   |   24 -
 debian/changelog   |   34 ++
 debian/compat  |2 
 debian/control |   22 -
 debian/rules   |  137 ++
 debian/watch   |1 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 9 files changed, 81 insertions(+), 1078 deletions(-)

New commits:
commit 7a16897041fa68ed803268b463d1bde2f4cb45f2
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Fri Dec 16 18:05:33 2011 +1100

Merge changes from outside git

diff --git a/debian/changelog b/debian/changelog
index b8eeece..e1dd2f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xserver-xorg-video-fbdev (1:0.4.2-3ubuntu6) natty; urgency=low
+
+  * Rebuild to pick up new Xserver dependencies
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Wed, 09 Mar 2011 
14:49:00 +1100
+
+xserver-xorg-video-fbdev (1:0.4.2-3ubuntu5) natty; urgency=low
+
+  * Rebuild to pick up new Xserver dependencies
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Wed, 23 Feb 2011 
17:53:14 +1100
+
 xserver-xorg-video-fbdev (1:0.4.2-3ubuntu4) natty; urgency=low
 
   * debian/patches/100_bgnoneroot.patch: defer this initialization until we
diff --git a/debian/control b/debian/control
index d1cae4e..1ae30e3 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (= 5.0.0),
  quilt,
  pkg-config,
- xserver-xorg-dev (= 2:1.9.99.901+git20110131),
+ xserver-xorg-dev (= 2:1.9.99.903-2ubuntu1~),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-randr-dev,

commit 7edcf58276b1bae125f0d74fa5ef7fe9728498f5
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 14:44:43 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 534f028..deaead5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-fbdev (1:0.4.2-4) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.2-4) unstable; urgency=low
 
   * Switch to dh:
 - Use debhelper 8.
@@ -11,7 +11,7 @@ xserver-xorg-video-fbdev (1:0.4.2-4) UNRELEASED; urgency=low
   * Wrap Depends/Provides.
   * Bump Standards-Version to 3.9.1 (no changes needed).
 
- -- Cyril Brulebois k...@debian.org  Fri, 04 Feb 2011 13:13:17 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 14:44:43 +0100
 
 xserver-xorg-video-fbdev (1:0.4.2-3) experimental; urgency=low
 

commit 451d64028ec6c2908b5ab76fd1a413df80e307ca
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 13:57:42 2011 +0100

Fix spacing.

diff --git a/debian/rules b/debian/rules
index 1a3ebb8..34a61ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
-PACKAGE  = xserver-xorg-video-fbdev
-OOT  = --builddirectory=build
+PACKAGE = xserver-xorg-video-fbdev
+OOT = --builddirectory=build
 
 # Clean:
 override_dh_auto_clean:

commit 6107ec4acd31a61616fdaf02e1751f3ffb794333
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 13:52:23 2011 +0100

Make make $(MAKE).

diff --git a/debian/rules b/debian/rules
index d7f512a..1a3ebb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,13 +16,13 @@ override_dh_auto_configure:
 
 # Build:
 override_dh_auto_build:
-   make -C build-main/
-   make -C build-udeb/
+   $(MAKE) -C build-main/
+   $(MAKE) -C build-udeb/
 
 # Install:
 override_dh_auto_install:
-   make -C build-main/ install DESTDIR=$(CURDIR)/debian/tmp-main
-   make -C build-udeb/ install DESTDIR=$(CURDIR)/debian/tmp-udeb
+   $(MAKE) -C build-main/ install DESTDIR=$(CURDIR)/debian/tmp-main
+   $(MAKE) -C build-udeb/ install DESTDIR=$(CURDIR)/debian/tmp-udeb
 
 # Kill *.la files, and forget no-one:
 override_dh_install:

commit 3549c7e51314faf306d2dbc4f3589e48bfbeb5fc
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 13:38:22 2011 +0100

Fix missing cleaning.

diff --git a/debian/rules b/debian/rules
index 0fb3dd5..d7f512a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,12 @@
 PACKAGE  = xserver-xorg-video-fbdev
 OOT  = --builddirectory=build
 
+# Clean:
+override_dh_auto_clean:
+   dh_auto_clean
+   rm -rf build-main/ debian/tmp-main/
+   rm -rf build-udeb/ debian/tmp-udeb/
+
 # Configuration, with or without xv:
 override_dh_auto_configure:
dh_auto_configure $(OOT)-main/ -- --enable-xv

commit 7738c006964f87b4ab3a5aa4369de1cefb4372a1
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 13:35:36 2011 +0100

Bump Standards-Version to 3.9.1 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index 87a4ec9..534f028 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-fbdev (1:0.4.2-4) UNRELEASED; urgency=low
   * Update Uploaders list. Thanks, David  Brice!
   * Remove long obsolete Replaces/Conflicts.
   * Wrap Depends/Provides.
+  *