xorg-server: Changes to 'ubuntu+1'

2014-06-25 Thread Maarten Lankhorst 
 debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch |  297 
++
 1 file changed, 182 insertions(+), 115 deletions(-)

New commits:
commit e0717810ebc36a86d90d0c975de40ce030ddfeb4
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 10:59:06 2014 +0200

refresh xkbcomp caching patch

diff --git a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch 
b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
index c5a08bc..773be7d 100644
--- a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
+++ b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
@@ -1,10 +1,8 @@
 Last-Update: 2013-09-19
 
-Index: xorg-server-1.14.2.901/configure.ac
-===
 xorg-server-1.14.2.901.orig/configure.ac   2013-09-19 11:43:53.948797077 
-0400
-+++ xorg-server-1.14.2.901/configure.ac2013-09-19 11:43:53.944797077 
-0400
-@@ -517,9 +517,9 @@
+--- a/configure.ac
 b/configure.ac
+@@ -511,9 +511,9 @@
  AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to 
XKB base dir (default: ${datadir}/X11/xkb)]),
[ XKBPATH=$withval ],
[ XKBPATH=${datadir}/X11/xkb ])
@@ -16,7 +14,7 @@ Index: xorg-server-1.14.2.901/configure.ac
  AC_ARG_WITH(default-xkb-rules, 
AS_HELP_STRING([--with-default-xkb-rules=RULES],
 [Keyboard ruleset (default: base/evdev)]),
  [ XKB_DFLT_RULES=$withval ],
-@@ -1225,7 +1225,7 @@
+@@ -1449,7 +1449,7 @@
  dnl Make sure XKM_OUTPUT_DIR is an absolute path
  XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
  if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
@@ -25,10 +23,8 @@ Index: xorg-server-1.14.2.901/configure.ac
  fi
  
  dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
-Index: xorg-server-1.14.2.901/xkb/README.compiled
-===
 xorg-server-1.14.2.901.orig/xkb/README.compiled2013-09-19 
11:43:53.948797077 -0400
-+++ xorg-server-1.14.2.901/xkb/README.compiled 2013-09-19 11:43:53.944797077 
-0400
+--- a/xkb/README.compiled
 b/xkb/README.compiled
 @@ -4,10 +4,10 @@
  or some other tool might destroy or replace the files in this directory,
  so it is not a safe place to store compiled keymaps for long periods of
@@ -44,10 +40,8 @@ Index: xorg-server-1.14.2.901/xkb/README.compiled
  
  Unless the X server is modified, sharing this directory between servers on
  different hosts could cause problems.
-Index: xorg-server-1.14.2.901/xkb/ddxLoad.c
-===
 xorg-server-1.14.2.901.orig/xkb/ddxLoad.c  2013-09-19 11:43:53.948797077 
-0400
-+++ xorg-server-1.14.2.901/xkb/ddxLoad.c   2013-09-19 11:51:04.744800715 
-0400
+--- a/xkb/ddxLoad.c
 b/xkb/ddxLoad.c
 @@ -30,6 +30,12 @@
  
  #include xkb-config.h
@@ -83,9 +77,13 @@ Index: xorg-server-1.14.2.901/xkb/ddxLoad.c
  #define   PRE_ERROR_MSG \The XKEYBOARD keymap compiler (xkbcomp) 
reports:\
  #define   ERROR_PREFIX\ \
  #define   POST_ERROR_MSG1 \Errors from xkbcomp are not fatal to the X 
server\
-@@ -69,35 +64,87 @@
+@@ -69,28 +64,73 @@
  #endif
  
+ static unsigned
+-LoadXKM(unsigned want, unsigned need, const char *keymap, XkbDescPtr 
*xkbRtrn);
++LoadXKM(unsigned want, unsigned need, const char *keymap, XkbDescPtr 
*xkbRtrn, Bool is_private_directory);
+ 
  static void
 -OutputDirectory(char *outdir, size_t size)
 +OutputDirectory(char *outdir, size_t size, Bool *is_private_directory)
@@ -112,9 +110,9 @@ Index: xorg-server-1.14.2.901/xkb/ddxLoad.c
  (void) strcpy(outdir, /tmp/);
 +if (is_private_directory)
 +*is_private_directory = FALSE;
- }
- }
- 
++}
++}
++
 +#ifndef SHA_DIGEST_LENGTH
 +#define SHA_DIGEST_LENGTH 20
 +#endif
@@ -149,20 +147,18 @@ Index: xorg-server-1.14.2.901/xkb/ddxLoad.c
 +/* convert sha1 to sha1_asc */
 +for (i = 0; i  SHA_DIGEST_LENGTH; ++i) {
 +sprintf(sha1Asc + i * 2, %02X, sha1[i]);
-+}
+ }
 +
 +return Success;
-+}
-+
-+/* call xkbcomp and compile XKB keymap, return xkm file name in
-+   nameRtrn */
- static Bool
- XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
-XkbComponentNamesPtr names,
-unsigned want,
--   unsigned need, char *nameRtrn, int nameRtrnLen)
-+   unsigned need, char *nameRtrn, int nameRtrnLen,
-+   Bool *is_private_directory)
+ }
+ 
+ /**
+@@ -103,10 +143,13 @@
+  * return a strdup'd copy of the file name we've written to.
+  */
+ static char *
+-RunXkbComp(xkbcomp_buffer_callback callback, void *userdata)
++RunXkbComp(xkbcomp_buffer_callback callback, void *userdata, Bool 
*is_private_directory)
  {
  FILE *out;
 -

xorg-server: Changes to 'ubuntu+1'

2014-06-25 Thread Maarten Lankhorst 
 debian/patches/drm_device_keep_trying.patch |   10 --
 debian/patches/series   |2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 7c8629f9af0bd2db54d5fbc0c88a7239cba2c545
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 11:02:27 2014 +0200

disable xmir patch for now

diff --git a/debian/patches/series b/debian/patches/series
index 5e74491..f6b2b6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,7 +49,7 @@ disable-rotation-transform-gpuscreens.patch
 
 pixman-validate.patch
 fix-ftbfs-ppc64el.patch
-xmir.patch
+#xmir.patch
 drm_device_keep_trying.patch
 xi2-resize-touch.patch
 mi-dont-process-disabled.patch

commit 6010f051924cdaf3b2739831099593ce216cb578
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 11:02:00 2014 +0200

fixup drm_device_keep_trying.patch

diff --git a/debian/patches/drm_device_keep_trying.patch 
b/debian/patches/drm_device_keep_trying.patch
index ea36cf9..7f7c935 100644
--- a/debian/patches/drm_device_keep_trying.patch
+++ b/debian/patches/drm_device_keep_trying.patch
@@ -30,7 +30,7 @@ Signed-off-by: Bryce Harrington br...@canonical.com
  
  config_udev_odev_setup_attribs(path, syspath, major(devnum),
 minor(devnum), NewGPUDeviceRequest);
-@@ -456,6 +456,17 @@
+@@ -456,18 +456,55 @@
  
  #ifdef CONFIG_UDEV_KMS
  
@@ -48,7 +48,13 @@ Signed-off-by: Bryce Harrington br...@canonical.com
  static void
  config_udev_odev_setup_attribs(const char *path, const char *syspath,
 int major, int minor,
-@@ -468,6 +479,31 @@
+config_odev_probe_proc_ptr probe_callback)
+ {
+ struct OdevAttributes *attribs = config_odev_allocate_attribute_list();
++const char *platform;
+ 
+ config_odev_add_attribute(attribs, ODEV_ATTRIB_PATH, path);
+ config_odev_add_attribute(attribs, ODEV_ATTRIB_SYSPATH, syspath);
  config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MAJOR, major);
  config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MINOR, minor);
  


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wzj6e-0007sw...@moszumanska.debian.org

xserver-xorg-input-evdev: Changes to 'ubuntu'

2014-06-25 Thread Maarten Lankhorst 
 ChangeLog   |  729 -
 autogen.sh  |4 
 configure.ac|4 
 debian/changelog|   58 +
 debian/control  |7 
 debian/patches/series   |2 
 debian/patches/use-sigsafe-logging.diff |   73 -
 debian/rules|3 
 include/evdev-properties.h  |4 
 man/evdev.man   |   21 
 src/Makefile.am |7 
 src/apple.c |3 
 src/axis_labels.h   |  198 
 src/emuMB.c |4 
 src/emuWheel.c  |   16 
 src/evdev.c | 1298 
 src/evdev.h |   31 
 17 files changed, 1648 insertions(+), 814 deletions(-)

New commits:
commit cecd2bf51162a97cc4095340c318e9f15856fc76
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 13:18:39 2014 +0200

Merge from debian-experimental.

diff --git a/debian/changelog b/debian/changelog
index cf6091f..ed14f5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.9.0-1ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from debian-experimental.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
13:17:16 +0200
+
 xserver-xorg-input-evdev (1:2.9.0-1) experimental; urgency=medium
 
   * New upstream release

commit 5420644f18cc82d6210cdf900ec9fcb1dca1d4e7
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 13:15:22 2014 +0200

Rebuild for xorg 1.15 abi.

diff --git a/debian/changelog b/debian/changelog
index 177d927..f5f6e4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.8.2-1ubuntu2) trusty; urgency=medium
+
+  * Rebuild for xorg 1.15 abi.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 05 Feb 2014 
09:36:37 +
+
 xserver-xorg-input-evdev (1:2.8.2-1ubuntu1) trusty; urgency=low
 
   * Merge from unreleased debian git, remaining changes:

commit d9a5284b1afa79464c2c60458edcebd0042c0b88
Author: Julien Cristau jcris...@debian.org
Date:   Fri Jun 6 09:16:34 2014 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 507cc7d..e51c6b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
+xserver-xorg-input-evdev (1:2.9.0-1) experimental; urgency=medium
 
   * New upstream release
 - smooth scrolling improvements (closes: #702739)
@@ -6,7 +6,7 @@ xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
   * Remove Cyril from Uploaders.
   * Build against xserver 1.16 RC.
 
- -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 22:17:26 +0200
+ -- Julien Cristau jcris...@debian.org  Fri, 06 Jun 2014 09:16:30 +0200
 
 xserver-xorg-input-evdev (1:2.8.2-1) unstable; urgency=low
 

commit a9fa37763847b741ac18c86f573a7879a95f4630
Author: Julien Cristau jcris...@debian.org
Date:   Fri Jun 6 09:16:22 2014 +0200

Build against xserver 1.16 RC.

diff --git a/debian/changelog b/debian/changelog
index b53815e..507cc7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
 - smooth scrolling improvements (closes: #702739)
   * Add build-dep on libevdev-dev.
   * Remove Cyril from Uploaders.
+  * Build against xserver 1.16 RC.
 
  -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 22:17:26 +0200
 
diff --git a/debian/control b/debian/control
index 3bddcb7..8e25605 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  dh-autoreconf,
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.11.99.901),
+ xserver-xorg-dev (= 2:1.15.99),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev (= 2.1.99.3),

commit f0fbd4743bac70ec674b01fee66d7542b923e72f
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 5 22:47:33 2014 +0200

Remove Cyril from Uploaders.

diff --git a/debian/changelog b/debian/changelog
index d714cdb..b53815e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
   * New upstream release
 - smooth scrolling improvements (closes: #702739)
   * Add build-dep on libevdev-dev.
+  * Remove Cyril from Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 22:17:26 +0200
 
diff --git a/debian/control b/debian/control
index c4964f4..3bddcb7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-evdev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Drew Parsons dpars...@debian.org, Cyril Brulebois 
k...@debian.org
+Uploaders: Drew

xorg-server: Changes to 'ubuntu+1'

2014-06-25 Thread Maarten Lankhorst 
 debian/changelog |8 
 1 file changed, 8 insertions(+)

New commits:
commit f85c27dc6b158a92e26ee0be9e1576ded0e7f930
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 13:33:14 2014 +0200

annotate new release

diff --git a/debian/changelog b/debian/changelog
index d496f46..5bc9ea2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.15.99.903-3ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+- Refresh patches.
+- Disable xmir, for now.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
12:57:16 +0200
+
 xorg-server (2:1.15.99.903-3) experimental; urgency=medium
 
   * Set shared memory dir to /dev/shm (closes: #747894).


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wzltz-00088j...@moszumanska.debian.org

xserver-xorg-input-synaptics: Changes to 'ubuntu'

2014-06-25 Thread Maarten Lankhorst 
 conf/11-x11-synaptics.fdi |9 --
 conf/50-synaptics.conf|   24 ++--
 configure.ac  |2 -
 debian/changelog  |   31 
 debian/control|4 +-
 man/synaptics.man |   31 
 src/eventcomm.c   |   68 +-
 src/properties.c  |3 ++
 src/synaptics.c   |   45 +++---
 src/synapticsstr.h|1 
 src/synproto.h|   10 +++---
 11 files changed, 144 insertions(+), 84 deletions(-)

New commits:
commit bdcb5efeb7804ba7050e190bc2ad685fcd0e3e65
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 16 20:19:32 2014 +0200

Remove Cyril from Uploaders.

diff --git a/debian/changelog b/debian/changelog
index fb5be39..97fb909 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.8.0-1~exp3) UNRELEASED; urgency=medium
+
+  * Remove Cyril from Uploaders.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 16 Jun 2014 20:19:21 +0200
+
 xserver-xorg-input-synaptics (1.8.0-1~exp2) experimental; urgency=medium
 
   * Mark libevdev-dev build dependency [linux-any]. (closes: #749286)
diff --git a/debian/control b/debian/control
index 965fbb2..06289c8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-synaptics
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Mattia Dongili malat...@debian.org, Cyril Brulebois 
k...@debian.org, maximilian attems m...@debian.org
+Uploaders: Mattia Dongili malat...@debian.org, maximilian attems 
m...@debian.org
 Build-Depends:
  debhelper (= 8),
  dh-autoreconf,

commit 0173190ae24f0fe85920a4d14eecc0fb49876602
Author: maximilian attems m...@debian.org
Date:   Wed May 28 05:47:00 2014 +0200

prepare to release 1.8.0-1~exp2

Signed-off-by: maximilian attems m...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 43d2b18..fb5be39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-synaptics (1.8.0-1~exp2) UNRELEASED; urgency=medium
+xserver-xorg-input-synaptics (1.8.0-1~exp2) experimental; urgency=medium
 
   * Mark libevdev-dev build dependency [linux-any]. (closes: #749286)
 Thanks to Pino Toscano p...@debian.org.
 
- -- maximilian attems m...@debian.org  Tue, 27 May 2014 14:12:32 +0200
+ -- maximilian attems m...@debian.org  Wed, 28 May 2014 05:46:25 +0200
 
 xserver-xorg-input-synaptics (1.8.0-1~exp1) experimental; urgency=medium
 

commit 7f1abd50d35c66f8b4f3a14ae8299f439cbc0d5c
Author: maximilian attems m...@debian.org
Date:   Tue May 27 14:14:38 2014 +0200

care about !linux ftbfs

Signed-off-by: maximilian attems m...@debian.org

diff --git a/debian/changelog b/debian/changelog
index dd1e671..43d2b18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-synaptics (1.8.0-1~exp2) UNRELEASED; urgency=medium
+
+  * Mark libevdev-dev build dependency [linux-any]. (closes: #749286)
+Thanks to Pino Toscano p...@debian.org.
+
+ -- maximilian attems m...@debian.org  Tue, 27 May 2014 14:12:32 +0200
+
 xserver-xorg-input-synaptics (1.8.0-1~exp1) experimental; urgency=medium
 
   [ Maarten Lankhorst ]
diff --git a/debian/control b/debian/control
index 0da51a5..965fbb2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  libx11-dev,
  libxext-dev,
  libxi-dev (= 2:1.2.0),
- libevdev-dev,
+ libevdev-dev [linux-any],
  x11proto-core-dev,
  xserver-xorg-dev (= 2:1.12),
  pkg-config,

commit ca09f7ebb599b9fdaba55a3cfa4e78188a8b229d
Author: maximilian attems m...@debian.org
Date:   Fri May 23 18:27:47 2014 +0200

changelog prepare to upload 1.8.0 to experimental

Signed-off-by: maximilian attems m...@debian.org

diff --git a/debian/changelog b/debian/changelog
index d6bc073..dd1e671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.8.0-1~exp1) UNRELEASED; urgency=medium
+xserver-xorg-input-synaptics (1.8.0-1~exp1) experimental; urgency=medium
 
   [ Maarten Lankhorst ]
   * Drop libxtst-dev conflicts, add libevdev-dev.
@@ -9,7 +9,7 @@ xserver-xorg-input-synaptics (1.8.0-1~exp1) UNRELEASED; 
urgency=medium
 - support newer Thinkpads (closes: #705807)
   * add myself to Uploaders.
 
- -- maximilian attems m...@debian.org  Fri, 23 May 2014 00:09:40 +0200
+ -- maximilian attems m...@debian.org  Fri, 23 May 2014 18:27:28 +0200
 
 xserver-xorg-input-synaptics (1.7.3-1) unstable; urgency=medium
 

commit b72abe3763bf938820198b0a2d80c1f4156bde22
Author: maximilian attems m...@debian.org
Date:   Fri May 23 00:34:05 2014 +0200

add myself to uploaders

Signed-off-by: maximilian attems m...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 9ba86aa..d6bc073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7

xserver-xorg-video-ati: Changes to 'refs/tags/xserver-xorg-video-ati-1%7.4.0-1'

2014-06-25 Thread Maarten Lankhorst 
Tag 'xserver-xorg-video-ati-1%7.4.0-1' created by Maarten Lankhorst 
maarten.lankho...@canonical.com at 2014-06-25 14:36 +

Debian release 1:7.4.0-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABAgAGBQJTqt6DAAoJEP5VjHKmcBPDZh4P+wUNkUqGJcE3iMRItiP69EVT
/cvsapO7CUQqhAnDA8purgaoQq0oLrvWpLB9bDwtOxWtiZUHnFAaHmWrY2D7UGaZ
saii8FTD3COJGX10QSF9+RGhhBWbGwTbZUgWKMGCG5yLwkXMtKl1o1rPa/ZBImms
9a1YygRT60uylJHYHAb9NVz/FDVndOSpFWta0ghPGWpCp7HdeZLz1RMJA9Tp3jff
msc8v9w/BSFDW8bj7TYvtQt0YqgFpvErBNNBkt+bqXxN/lAeb9XK4c4vZNZcBma+
CvE5JKHEq/QfzkHYiR1c95tFman1jckQXCTfnKW6bgT7IkiC+OJGLrcamBklZYuM
K+L4/I/49WiNIGSV2TyNmRjHQblv0EHql+yDh4+2XvMb+801QTGYLIeZyS8TybJv
teEFfLGZi0EP70qSnR1bpUmS12YZ70EfARjAmIfYtULL7Zt/2oeYmNnX/yTE2XbX
jHFXD/vuLOsz9P01zpV/KPunD7WgKvZ4/WNnH/a7vToEM8g12PuZQQj56s+y7Ga7
kZWQRNdU0ov/pBO9NWapI54pvOGVOdJGF9M3M6/oCWMkXPJ78WNiEaQXbTFDO2Wl
hO1J3szyNLwCdbEmLQNQ0jTbPxkgpe4RCWqYKQFJTCyF02dD5VjQeuvAUPgND8T3
shGzKUp/Z0xdDPL1JRiJ
=9YQS
-END PGP SIGNATURE-

Changes since xserver-xorg-video-ati-1%7.3.0-1:
Adam Jackson (1):
  kms: Use own thunk function instead of shadowUpdatePackedWeak

Alex Deucher (7):
  bump version post release
  radeon: don't install colormap handling if there are no crtcs
  radeon: require libdrm 2.4.51
  radeon: enable tiling by default on CIK
  update man page to reflect tiling changes for CI parts
  radeon: require libdrm_radeon 2.4.54 for mullins support
  radeon: enable tiling for mullins

Dave Airlie (1):
  radeon: fix use-after-free in modesetting cleanup

Hans de Goede (4):
  radeon_open_drm_master get rid of unnecessary goto
  Add radeon_get_drm_master_fd helper function
  Add support for server managed fds
  Fix building on older servers without xf86platformBus.h

Jérôme Glisse (1):
  evergreen: fix shader constant upload on ppc

Maarten Lankhorst (6):
  release to unstable
  return immediately in preinit when called with PROBE_DETECT
  bump version for release
  Merge tag 'xf86-video-ati-7.4.0' into debian-unstable
  Bump libdrm-dev to 2.4.54 and add changelogs.
  release to unstable

Michel Dänzer (10):
  Only log debugging output about initializing colormaps when we're doing so
  Allow enabling glamor on R500 (and R300) class 3D engines as well.
  Build against glamor in the xserver tree if available
  dri2: Fix conflicting CreatePixmap usage flag definitions
  glamor: Fix test for creating shared pixmaps
  Adapt to load_cursor_argb signature change in xserver 1.15.99.902
  dri2: Handle PRIME for source buffer as well in radeon_dri2_copy_region2
  Revert Adapt to load_cursor_argb signature change in xserver 1.15.99.902
  Don't disable acceleration on = SI on attempts to force EXA
  Rename Option NoAccel to Accel

Samuel Li (2):
  radeon: add support for Mullins.
  radeon: add Mullins pci ids.

---
 ChangeLog |  626 ++
 configure.ac  |   24 +
 debian/changelog  |   11 
 debian/control|2 
 man/radeon.man|   25 -
 src/ati_pciids_gen.h  |   16 
 src/drmmode_display.c |   28 -
 src/evergreen_accel.c |2 
 src/pcidb/ati_pciids.csv  |   16 
 src/radeon.h  |   21 -
 src/radeon_chipinfo_gen.h |   16 
 src/radeon_chipset_gen.h  |   16 
 src/radeon_dri2.c |9 
 src/radeon_glamor.c   |   37 +-
 src/radeon_kms.c  |  127 +--
 src/radeon_pci_chipset_gen.h  |   16 
 src/radeon_pci_device_match_gen.h |   16 
 src/radeon_probe.c|5 
 src/radeon_probe.h|9 
 19 files changed, 936 insertions(+), 86 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wzoos-0004pn...@moszumanska.debian.org

xserver-xorg-video-ati: Changes to 'debian-unstable'

2014-06-25 Thread Maarten Lankhorst 
 ChangeLog |  626 ++
 configure.ac  |   24 +
 debian/changelog  |7 
 debian/control|2 
 man/radeon.man|   25 -
 src/ati_pciids_gen.h  |   16 
 src/drmmode_display.c |   28 -
 src/evergreen_accel.c |2 
 src/pcidb/ati_pciids.csv  |   16 
 src/radeon.h  |   21 -
 src/radeon_chipinfo_gen.h |   16 
 src/radeon_chipset_gen.h  |   16 
 src/radeon_dri2.c |9 
 src/radeon_glamor.c   |   37 +-
 src/radeon_kms.c  |  127 +--
 src/radeon_pci_chipset_gen.h  |   16 
 src/radeon_pci_device_match_gen.h |   16 
 src/radeon_probe.c|5 
 src/radeon_probe.h|9 
 19 files changed, 934 insertions(+), 84 deletions(-)

New commits:
commit 6dfb858c612e07da2a6075df9704b142157332ba
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:35:56 2014 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index b13c8f4..b79f3f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-ati (1:7.4.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:7.4.0-1) unstable; urgency=low
 
   * New upstream release.
   * Bump libdrm-dev requirement to 2.4.54.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
16:29:57 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
16:35:44 +0200
 
 xserver-xorg-video-ati (1:7.3.0-1) unstable; urgency=low
 

commit 111448475cc073c1a46f2e9b62c3040dffad9ab8
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:35:13 2014 +0200

Bump libdrm-dev to 2.4.54 and add changelogs.

diff --git a/ChangeLog b/ChangeLog
index 3413e10..32d2d1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,629 @@
+commit 906a0ec9224146098bb4581486129d2934d36495
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Wed Jun 25 16:10:21 2014 +0200
+
+bump version for release
+
+commit cc615d06db0332fc6e673b55632bcc7bf957b44b
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Wed Jun 4 16:58:53 2014 +0900
+
+Rename Option NoAccel to Accel
+
+Removes the need for a double negation when forcing acceleration on.
+
+Note that this change is backwards compatible, as the option parser
+automagically handles the 'No' prefix.
+
+Reviewed-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 851b2cf8714618843725f6d067915375485ade9d
+Author: Adam Jackson a...@redhat.com
+Date:   Wed May 21 09:34:32 2014 -0400
+
+kms: Use own thunk function instead of shadowUpdatePackedWeak
+
+I plan to delete the Weak functions from a future server.
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit b2dba2906f0b2284f17f53fd5251ba0f03d52a8b
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Thu May 15 16:07:53 2014 +0900
+
+Don't disable acceleration on = SI on attempts to force EXA
+
+Also make this case clear in the log file:
+
+ (WW) RADEON(0): EXA not supported, using glamor
+
+Reviewed-by: Alex Deucher alexander.deuc...@amd.com
+
+commit be1469cc23aba46daf3293b3d09c5f2e792e7f42
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Fri May 2 17:48:07 2014 -0400
+
+radeon: enable tiling for mullins
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 2ae8e4b8d12f5c9bab6655eb8cd3c5c1d5cfb10e
+Author: Samuel Li samuel...@amd.com
+Date:   Tue Nov 12 15:30:42 2013 -0500
+
+radeon: add Mullins pci ids.
+
+Signed-off-by: Samuel Li samuel...@amd.com
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+
+commit 5c86a3461597647224c33d5190b4531aeeb2655f
+Author: Samuel Li samuel...@amd.com
+Date:   Thu Apr 17 15:17:28 2014 -0400
+
+radeon: add support for Mullins.
+
+Signed-off-by: Samuel Li samuel...@amd.com
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+
+commit fdb90ffc50acbb7d5ba0598470f9feeac6ce55fc
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Fri May 2 17:45:45 2014 -0400
+
+radeon: require libdrm_radeon 2.4.54 for mullins support
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 06e3c8c53ef4bd159f5864eabf726438d008b49a
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Apr 23 13:39:42 2014 +1000
+
+radeon: fix use-after-free in modesetting cleanup
+
+noticed while looking at something else.
+
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit dbac18c361f9e514ecb40d0617f9d68b65a542e0
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Mon Apr 28 17:51:56 2014 +0900
+
+Revert Adapt

xserver-xorg-video-ati: Changes to 'upstream-unstable'

2014-06-25 Thread Maarten Lankhorst 
 configure.ac  |   24 +--
 man/radeon.man|   25 ---
 src/ati_pciids_gen.h  |   16 
 src/drmmode_display.c |   28 
 src/evergreen_accel.c |2 
 src/pcidb/ati_pciids.csv  |   16 
 src/radeon.h  |   21 --
 src/radeon_chipinfo_gen.h |   16 
 src/radeon_chipset_gen.h  |   16 
 src/radeon_dri2.c |9 ++
 src/radeon_glamor.c   |   37 +++
 src/radeon_kms.c  |  127 +++---
 src/radeon_pci_chipset_gen.h  |   16 
 src/radeon_pci_device_match_gen.h |   16 
 src/radeon_probe.c|5 +
 src/radeon_probe.h|9 ++
 16 files changed, 300 insertions(+), 83 deletions(-)

New commits:
commit 906a0ec9224146098bb4581486129d2934d36495
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:10:21 2014 +0200

bump version for release

diff --git a/configure.ac b/configure.ac
index dc2a656..2fed8c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-ati],
-[7.3.99],
+[7.4.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-ati])
 

commit cc615d06db0332fc6e673b55632bcc7bf957b44b
Author: Michel Dänzer michel.daen...@amd.com
Date:   Wed Jun 4 16:58:53 2014 +0900

Rename Option NoAccel to Accel

Removes the need for a double negation when forcing acceleration on.

Note that this change is backwards compatible, as the option parser
automagically handles the 'No' prefix.

Reviewed-by: Alex Deucher alexander.deuc...@amd.com

diff --git a/man/radeon.man b/man/radeon.man
index 65b880c..802f6c2 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -225,12 +225,12 @@ are supported:
 Selects software cursor.  The default is
 .B off.
 .TP
-.BI Option \*qNoAccel\*q \*q boolean \*q
+.BI Option \*qAccel\*q \*q boolean \*q
 Enables or disables all hardware acceleration.
 .br
-The default is to
-.B enable
-hardware acceleration.
+The default is
+.B on
+except for HAWAII.
 .TP
 .BI Option \*qZaphodHeads\*q \*q string \*q
 Specify the RandR output(s) to use with zaphod mode for a particular driver
diff --git a/src/radeon.h b/src/radeon.h
index 136a430..eac6ed5 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -135,7 +135,7 @@
 #endif
 
 typedef enum {
-OPTION_NOACCEL,
+OPTION_ACCEL,
 OPTION_SW_CURSOR,
 OPTION_PAGE_FLIP,
 OPTION_EXA_PIXMAPS,
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index ceaf575..707d0c7 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -59,7 +59,7 @@ extern SymTabRec RADEONChipsets[];
 static Bool radeon_setup_kernel_mem(ScreenPtr pScreen);
 
 const OptionInfoRec RADEONOptions_KMS[] = {
-{ OPTION_NOACCEL,NoAccel,  OPTV_BOOLEAN, {0}, FALSE },
+{ OPTION_ACCEL,  Accel,OPTV_BOOLEAN, {0}, FALSE },
 { OPTION_SW_CURSOR,  SWcursor, OPTV_BOOLEAN, {0}, FALSE },
 { OPTION_PAGE_FLIP,  EnablePageFlip,   OPTV_BOOLEAN, {0}, FALSE },
 { OPTION_COLOR_TILING,   ColorTiling,  OPTV_BOOLEAN, {0}, FALSE },
@@ -499,8 +499,8 @@ static Bool RADEONPreInitAccel_KMS(ScrnInfoPtr pScrn)
info-is_fast_fb = TRUE;
 }
 
-if (xf86ReturnOptValBool(info-Options, OPTION_NOACCEL,
-info-ChipFamily == CHIP_FAMILY_HAWAII) ||
+if (!xf86ReturnOptValBool(info-Options, OPTION_ACCEL,
+info-ChipFamily != CHIP_FAMILY_HAWAII) ||
(!RADEONIsAccelWorking(pScrn))) {
xf86DrvMsg(pScrn-scrnIndex, X_INFO,
   GPU accel disabled or not working, using shadowfb for 
KMS\n);

commit 851b2cf8714618843725f6d067915375485ade9d
Author: Adam Jackson a...@redhat.com
Date:   Wed May 21 09:34:32 2014 -0400

kms: Use own thunk function instead of shadowUpdatePackedWeak

I plan to delete the Weak functions from a future server.

Signed-off-by: Adam Jackson a...@redhat.com

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 5e052e4..ceaf575 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -212,6 +212,12 @@ radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 
offset, int mode,
 return ((uint8_t *)info-front_bo-ptr + row * stride + offset);
 }
 
+static void
+radeonUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+shadowUpdatePacked(pScreen, pBuf);
+}
+
 static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen)
 {
 ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
@@ -232,7 +238,7 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr 
pScreen)
 if (info-r600_shadow_fb) {
pixmap = pScreen-GetScreenPixmap(pScreen);
 
-   if (!shadowAdd(pScreen, pixmap, shadowUpdatePackedWeak(),
+   if (!shadowAdd(pScreen, pixmap, radeonUpdatePacked,

xserver-xorg-video-ati: Changes to 'debian-experimental'

2014-06-25 Thread Maarten Lankhorst 
 ChangeLog|6 ++
 configure.ac |2 +-
 debian/changelog |   13 +
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 8ebb885d14a111b57548c7019cdd7d070e282194
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:45:35 2014 +0200

rebuild against experimental

diff --git a/debian/changelog b/debian/changelog
index d3e73e8..6929c25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:7.4.0-1+exp1) experimental; urgency=low
+
+  * Rebuild against xorg 1.16 rc.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
16:43:52 +0200
+
 xserver-xorg-video-ati (1:7.4.0-1) unstable; urgency=low
 
   * New upstream release.

commit 6dfb858c612e07da2a6075df9704b142157332ba
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:35:56 2014 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index b13c8f4..b79f3f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-ati (1:7.4.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:7.4.0-1) unstable; urgency=low
 
   * New upstream release.
   * Bump libdrm-dev requirement to 2.4.54.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
16:29:57 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
16:35:44 +0200
 
 xserver-xorg-video-ati (1:7.3.0-1) unstable; urgency=low
 

commit 111448475cc073c1a46f2e9b62c3040dffad9ab8
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:35:13 2014 +0200

Bump libdrm-dev to 2.4.54 and add changelogs.

diff --git a/ChangeLog b/ChangeLog
index 3413e10..32d2d1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,629 @@
+commit 906a0ec9224146098bb4581486129d2934d36495
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Wed Jun 25 16:10:21 2014 +0200
+
+bump version for release
+
+commit cc615d06db0332fc6e673b55632bcc7bf957b44b
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Wed Jun 4 16:58:53 2014 +0900
+
+Rename Option NoAccel to Accel
+
+Removes the need for a double negation when forcing acceleration on.
+
+Note that this change is backwards compatible, as the option parser
+automagically handles the 'No' prefix.
+
+Reviewed-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 851b2cf8714618843725f6d067915375485ade9d
+Author: Adam Jackson a...@redhat.com
+Date:   Wed May 21 09:34:32 2014 -0400
+
+kms: Use own thunk function instead of shadowUpdatePackedWeak
+
+I plan to delete the Weak functions from a future server.
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit b2dba2906f0b2284f17f53fd5251ba0f03d52a8b
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Thu May 15 16:07:53 2014 +0900
+
+Don't disable acceleration on = SI on attempts to force EXA
+
+Also make this case clear in the log file:
+
+ (WW) RADEON(0): EXA not supported, using glamor
+
+Reviewed-by: Alex Deucher alexander.deuc...@amd.com
+
+commit be1469cc23aba46daf3293b3d09c5f2e792e7f42
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Fri May 2 17:48:07 2014 -0400
+
+radeon: enable tiling for mullins
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 2ae8e4b8d12f5c9bab6655eb8cd3c5c1d5cfb10e
+Author: Samuel Li samuel...@amd.com
+Date:   Tue Nov 12 15:30:42 2013 -0500
+
+radeon: add Mullins pci ids.
+
+Signed-off-by: Samuel Li samuel...@amd.com
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+
+commit 5c86a3461597647224c33d5190b4531aeeb2655f
+Author: Samuel Li samuel...@amd.com
+Date:   Thu Apr 17 15:17:28 2014 -0400
+
+radeon: add support for Mullins.
+
+Signed-off-by: Samuel Li samuel...@amd.com
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+
+commit fdb90ffc50acbb7d5ba0598470f9feeac6ce55fc
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Fri May 2 17:45:45 2014 -0400
+
+radeon: require libdrm_radeon 2.4.54 for mullins support
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 06e3c8c53ef4bd159f5864eabf726438d008b49a
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Apr 23 13:39:42 2014 +1000
+
+radeon: fix use-after-free in modesetting cleanup
+
+noticed while looking at something else.
+
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit dbac18c361f9e514ecb40d0617f9d68b65a542e0
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Mon Apr 28 17:51:56 2014 +0900
+
+Revert Adapt to load_cursor_argb signature change in xserver 1.15.99.902
+
+This reverts commit 48d3dbc8a0d3bfde88f46e402e530438f9317715.
+
+xserver Git has been

xserver-xorg-video-ati: Changes to 'upstream-experimental'

2014-06-25 Thread Maarten Lankhorst 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 906a0ec9224146098bb4581486129d2934d36495
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:10:21 2014 +0200

bump version for release

diff --git a/configure.ac b/configure.ac
index dc2a656..2fed8c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-ati],
-[7.3.99],
+[7.4.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-ati])
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wzoup-0005sx...@moszumanska.debian.org

xserver-xorg-video-ati: Changes to 'refs/tags/xserver-xorg-video-ati-1%7.4.0-1+exp1'

2014-06-25 Thread Maarten Lankhorst 
Tag 'xserver-xorg-video-ati-1%7.4.0-1+exp1' created by Maarten Lankhorst 
maarten.lankho...@canonical.com at 2014-06-25 14:47 +

Debian release 1:7.4.0-1+exp1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABAgAGBQJTquEOAAoJEP5VjHKmcBPDqi8P/iTPUBYP0hCA34k82jThn6UX
DxFXJFfWHivp5OhG7OzsSqDjl0/ORHm3ccg5/1X0oxL5ydUKh8d7P2w2UWKcI0VS
Q1dx5/XRCneW7nDG2c9+LfYnI4FE85ODPo188U+J/AJpI5Bxekqps3WVL1ogt6XE
TVeg0Hqi9ck1627WTwpcXjQOhAQhVAbLe19Sj7/aCmJduULCoKHc4NaZyBrq2c7M
iLmvPIFnKw/cNGYX8gkVGFlrqDmVQzYAmOm+zvIHvfR5Tn7nv3xOQpVasGQjV5n1
ZHefEZXOyhd4zqs32rTF+6aAu8jRAQ8buMjX4qOUv7aQeR3sUjve4UNvsJfI3X2d
LNHv7WF4bF4fcm3ajJaR1eoOojthsstDZb7CTjl9mwegbOmob6y2r5T0o+bXrDPX
shp6k1vD7X+YN6JgEA/GXKgSPtWwXuG/YbBER2vfaL41fHqsTrulLBZu7K6PtonE
eaCQBMoTREo8G6m93w6mWRi/TC7NJ1Y2XkDj2T8lccPZaF2IcHmnxG6ojj4eCIg+
P369S3d5y9x9hJA2uafINw01Uf9ablgjSofip/xOfA/QrFXgmvJov3rsiOkjRb/F
wczxIdcCBfBEDE4UyA/NE6gYPWoS3lNO+uXDrLxYuTCl+BcoBPhHNXQJQC2AOQNo
jUPJWlI6Zme6w/EM+9YO
=sfn5
-END PGP SIGNATURE-

Changes since xserver-xorg-video-ati-1_7.3.0-2:
Maarten Lankhorst (6):
  bump version for release
  Merge tag 'xf86-video-ati-7.4.0' into debian-unstable
  Bump libdrm-dev to 2.4.54 and add changelogs.
  release to unstable
  Merge branch 'debian-unstable' into debian-experimental
  rebuild against experimental

---
 ChangeLog|6 ++
 configure.ac |2 +-
 debian/changelog |   13 +
 3 files changed, 20 insertions(+), 1 deletion(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wzov1-0005uw...@moszumanska.debian.org

Processing of xserver-xorg-video-ati_7.4.0-1+exp1_amd64.changes

2014-06-25 Thread Debian FTP Masters 
xserver-xorg-video-ati_7.4.0-1+exp1_amd64.changes uploaded successfully to 
localhost
along with the files:
  xserver-xorg-video-ati_7.4.0-1+exp1_amd64.deb
  xserver-xorg-video-ati-dbg_7.4.0-1+exp1_amd64.deb
  xserver-xorg-video-radeon_7.4.0-1+exp1_amd64.deb
  xserver-xorg-video-radeon-dbg_7.4.0-1+exp1_amd64.deb
  xserver-xorg-video-ati_7.4.0-1+exp1.dsc
  xserver-xorg-video-ati_7.4.0-1+exp1.diff.gz

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: https://lists.debian.org/e1wzoww-0002px...@franck.debian.org

Bug#752680: Add ctrl:rwin_rctl

2014-06-25 Thread Ari Pollak 
Package: xkb-data
Version: 2.12-1
Severity: wishlist
Tags: patch

Apple keyboards, when the hid_apple kernel module is loaded with
swap_opt_cmd=1, have two modifier keys on the right side of the space bar:
Alt Win. Having a right-side windows key is not nearly as useful
as having a right-side control key, so the attached patch adds an option to swap
them. I couldn't figure out how to get this to work locally in a clean
fashion without modifying this package.  

I also noticed that there were a bunch of missing ctrl: options from
rules/base, which seemed to prevent them from being used in setxkbmap
-option, so I fixed that too.

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

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

-- 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: https://lists.debian.org/20140625151110.19269.47968.reportbug@ari

Processing of xserver-xorg-video-ati_7.4.0-1_amd64.changes

2014-06-25 Thread Debian FTP Masters 
xserver-xorg-video-ati_7.4.0-1_amd64.deb has incorrect size; deleting it
Due to the errors above, the .changes file couldn't be processed.
Please fix the problems for the upload to happen.

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: https://lists.debian.org/e1wzoum-0005mp...@franck.debian.org

xserver-xorg-video-ati_7.4.0-1+exp1_amd64.changes REJECTED

2014-06-25 Thread Debian FTP Masters 


Processing raised an exception: [Errno 2] No such file or directory: 
'/srv/ftp-master.debian.org/tmp/dakx0dKp_/xserver-xorg-video-ati_7.4.0.orig.tar.gz'.
Traceback (most recent call last):
  File /srv/ftp-master.debian.org/dak/dak/daklib/archive.py, line 899, in 
check
chk().check(self)
  File /srv/ftp-master.debian.org/dak/dak/daklib/checks.py, line 132, in check
self._check_hashes(upload, source.filename, source.files.itervalues())
  File /srv/ftp-master.debian.org/dak/dak/daklib/checks.py, line 151, in 
_check_hashes
f.check(upload.directory)
  File /srv/ftp-master.debian.org/dak/dak/daklib/upload.py, line 140, in check
size = os.stat(path).st_size
OSError: [Errno 2] No such file or directory: 
'/srv/ftp-master.debian.org/tmp/dakx0dKp_/xserver-xorg-video-ati_7.4.0.orig.tar.gz'


===

Please feel free to respond to this email if you don't understand why
your files were rejected, or if you upload new files which address our
concerns.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wzpi4-0001g1...@franck.debian.org

Bug#752695: libxfont1: xorg fails to start up. Segfaults at libxfont

2014-06-25 Thread Dario Andres Susman 
Package: libxfont1
Version: 1:1.4.7-2
Severity: important

Dear Maintainer,


   * What led up to the situation?
After the latest update of the nvidia legacy driver 173xx, xorg fails 
to start up, but from another package
   * What exactly did you do (or not do) that was effective (or
 ineffective)?
Couldn't do anything to resolve this
   * What was the outcome of this action?
Can't use Xorg
   * What outcome did you expect instead?
Xorg to work



-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.14-1-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
Shell: /bin/sh linked to /bin/bash

Versions of packages libxfont1 depends on:
ii  libbz2-1.0 1.0.6-5
ii  libc6  2.19-3
ii  libfontenc11:1.1.2-1
ii  libfreetype6   2.5.2-1
ii  multiarch-support  2.19-3
ii  zlib1g 1:1.2.8.dfsg-1

libxfont1 recommends no packages.

libxfont1 suggests no packages.

-- no debconf information
[2478424.240] 
X.Org X Server 1.15.1
Release Date: 2014-04-13
[2478424.241] X Protocol Version 11, Revision 0
[2478424.241] Build Operating System: Linux 3.13-1-amd64 x86_64 Debian
[2478424.241] Current Operating System: Linux warpcore 3.14-1-amd64 #1 SMP 
Debian 3.14.4-1 (2014-05-13) x86_64
[2478424.241] Kernel command line: auto BOOT_IMAGE=Linux ro 
root=UUID=1155a15b-3d39-462d-9641-db37fdf21281
[2478424.241] Build Date: 15 April 2014  06:58:36PM
[2478424.241] xorg-server 2:1.15.1-1 (http://www.debian.org/support) 
[2478424.241] Current version of pixman: 0.32.4
[2478424.242]   Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
[2478424.242] Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
[2478424.243] (==) Log file: /var/log/Xorg.0.log, Time: Wed Jun 25 14:04:40 
2014
[2478424.243] (==) Using config file: /etc/X11/xorg.conf
[2478424.243] (==) Using system config directory /usr/share/X11/xorg.conf.d
[2478424.243] (==) ServerLayout Layout0
[2478424.243] (**) |--Screen Screen0 (0)
[2478424.243] (**) |   |--Monitor Monitor0
[2478424.244] (**) |   |--Device Device0
[2478424.244] (**) |--Input Device Keyboard0
[2478424.244] (**) |--Input Device Mouse0
[2478424.244] (==) Automatically adding devices
[2478424.244] (==) Automatically enabling devices
[2478424.244] (==) Automatically adding GPU devices
[2478424.244] (WW) The directory /usr/share/fonts/X11/cyrillic does not exist.
[2478424.244]   Entry deleted from font path.
[2478424.244] (==) FontPath set to:
/usr/share/fonts/X11/misc,
/usr/share/fonts/X11/100dpi/:unscaled,
/usr/share/fonts/X11/75dpi/:unscaled,
/usr/share/fonts/X11/Type1,
/usr/share/fonts/X11/100dpi,
/usr/share/fonts/X11/75dpi,
built-ins
[2478424.244] (==) ModulePath set to /usr/lib/xorg/modules
[2478424.244] (WW) Hotplugging is on, devices using drivers 'kbd', 'mouse' or 
'vmmouse' will be disabled.
[2478424.244] (WW) Disabling Keyboard0
[2478424.244] (WW) Disabling Mouse0
[2478424.244] (II) Loader magic: 0x7f1e625f7d40
[2478424.244] (II) Module ABI versions:
[2478424.244]   X.Org ANSI C Emulation: 0.4
[2478424.244]   X.Org Video Driver: 15.0
[2478424.244]   X.Org XInput driver : 20.0
[2478424.244]   X.Org Server Extension : 8.0
[2478424.245] (--) PCI:*(0:1:0:0) 10de:0322:1462:9171 rev 161, Mem @ 
0xfb00/16777216, 0xf000/134217728, BIOS @ 0x/131072
[2478424.245] Initializing built-in extension Generic Event Extension
[2478424.245] Initializing built-in extension SHAPE
[2478424.245] Initializing built-in extension MIT-SHM
[2478424.245] Initializing built-in extension XInputExtension
[2478424.246] Initializing built-in extension XTEST
[2478424.246] Initializing built-in extension BIG-REQUESTS
[2478424.246] Initializing built-in extension SYNC
[2478424.246] Initializing built-in extension XKEYBOARD
[2478424.246] Initializing built-in extension XC-MISC
[2478424.246] Initializing built-in extension SECURITY
[2478424.246] Initializing built-in extension XINERAMA
[2478424.246] Initializing built-in extension XFIXES
[2478424.246] Initializing built-in extension RENDER
[2478424.247] Initializing built-in extension RANDR
[2478424.247] Initializing built-in extension COMPOSITE
[2478424.247] Initializing built-in extension DAMAGE
[2478424.247] Initializing built-in extension MIT-SCREEN-SAVER
[2478424.247] Initializing built-in extension DOUBLE-BUFFER
[2478424.247] Initializing built-in extension RECORD
[2478424.247] Initializing built-in extension DPMS
[2478424.247] Initializing built-in extension Present
[2478424.247] Initializing built-in extension DRI3
[2478424.247] Initializing built-in extension X-Resource
[2478424.248] Initializing

Bug#752680: Fwd: Patch

2014-06-25 Thread Ari Pollak 
Adding missing patch.
--- xkeyboard-config-2.12.orig/rules/base.o_s.part
+++ xkeyboard-config-2.12/rules/base.o_s.part
@@ -79,6 +79,10 @@
   ctrl:rctrl_ralt  =   +ctrl(rctrl_ralt)
   ctrl:menu_rctrl  =   +ctrl(menu_rctrl)
   ctrl:ralt_rctrl  =   +ctrl(ralt_rctrl)
+  ctrl:swap_lalt_lctl  =   +ctrl(swap_lalt_lctl)
+  ctrl:swap_lwin_lctl  =   +ctrl(swap_lwin_lctl)
+  ctrl:swap_rwin_rctl  =   +ctrl(swap_rwin_rctl)
+  ctrl:swap_lalt_lctl_lwin  =  +ctrl(swap_lalt_lctl_lwin)
   compose:ralt =   +compose(ralt)
   compose:lwin =   +compose(lwin)
   compose:lwin-altgr   =   +compose(lwin-altgr)
--- xkeyboard-config-2.12.orig/rules/base.xml.in
+++ xkeyboard-config-2.12/rules/base.xml.in
@@ -6103,6 +6103,11 @@
   namectrl:swap_lwin_lctl/name
   _descriptionSwap Left Win key with Left Ctrl key/_description
 /configItem
+  /optionoption
+configItem
+  namectrl:swap_rwin_rctl/name
+  _descriptionSwap Right Win key with Right Ctrl key/_description
+/configItem
   /option
   option
 configItem
--- xkeyboard-config-2.12.orig/rules/evdev.xml.in
+++ xkeyboard-config-2.12/rules/evdev.xml.in
@@ -6103,6 +6103,11 @@
   namectrl:swap_lwin_lctl/name
   _descriptionSwap Left Win key with Left Ctrl key/_description
 /configItem
+  /optionoption
+configItem
+  namectrl:swap_rwin_rctl/name
+  _descriptionSwap Right Win key with Right Ctrl key/_description
+/configItem
   /option
   option
 configItem
--- xkeyboard-config-2.12.orig/symbols/ctrl
+++ xkeyboard-config-2.12/symbols/ctrl
@@ -70,6 +70,13 @@
 replace key LCTL { [ Super_L ] };
 };
 
+// Swap the functions of the right Win key and the right Ctrl key.
+partial modifier_keys
+xkb_symbols swap_rwin_rctl {
+replace key RWIN { [ Control_R ] };
+replace key RCTL { [ Super_R ] };
+};
+
 // Map Ctrl to the left Alt key, Alt to the left Win key,
 // and Super to the left Ctrl key.
 partial modifier_keys