x11-xserver-utils: Changes to 'debian-unstable'

2016-08-21 Thread Julien Cristau 
 debian/changelog |6 ++
 debian/copyright |4 ++--
 debian/copyright.head|2 +-
 debian/watch.iceauth |2 +-
 debian/watch.rgb |2 +-
 debian/watch.sessreg |2 +-
 debian/watch.xcmsdb  |2 +-
 debian/watch.xgamma  |2 +-
 debian/watch.xhost   |2 +-
 debian/watch.xmodmap |2 +-
 debian/watch.xrandr  |2 +-
 debian/watch.xrdb|2 +-
 debian/watch.xrefresh|2 +-
 debian/watch.xset|2 +-
 debian/watch.xsetmode|2 +-
 debian/watch.xsetpointer |2 +-
 debian/watch.xsetroot|2 +-
 debian/watch.xstdcmap|2 +-
 debian/watch.xvidtune|2 +-
 19 files changed, 25 insertions(+), 19 deletions(-)

New commits:
commit 42c7aa99f76439b21e0a229647ea89ada1b1b8bb
Author: Julien Cristau 
Date:   Sun Aug 21 17:50:10 2016 +0200

Switch all xorg.freedesktop.org URLs in packaging to https.

diff --git a/debian/changelog b/debian/changelog
index 84e9e98..5de98d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xserver-utils (7.7+8) UNRELEASED; urgency=medium
+
+  * Switch all xorg.freedesktop.org URLs in packaging to https.
+
+ -- Julien Cristau   Sun, 21 Aug 2016 17:49:57 +0200
+
 x11-xserver-utils (7.7+7) unstable; urgency=medium
 
   * Add Breaks on arandr << 0.1.9 (see #815731).
diff --git a/debian/copyright b/debian/copyright
index e3a39ee..9a6d5fb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 The contents of this package were downloaded from
-http://xorg.freedesktop.org/releases/individual/app/
+https://xorg.freedesktop.org/releases/individual/app/
 
 It contains the iceauth, rgb, sessreg, xcmsdb, xgamma, xhost, xmodmap, xrandr,
 xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap, xvidtune
@@ -290,7 +290,7 @@ xmodmap:
   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
   DEALINGS IN THE SOFTWARE.
 
-  Copyright 1988, 1998  The Open Group
+  Copyright 1988, 1989, 1990, 1998  The Open Group
 
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
diff --git a/debian/copyright.head b/debian/copyright.head
index b3faaeb..486f4d0 100644
--- a/debian/copyright.head
+++ b/debian/copyright.head
@@ -1,5 +1,5 @@
 The contents of this package were downloaded from
-http://xorg.freedesktop.org/releases/individual/app/
+https://xorg.freedesktop.org/releases/individual/app/
 
 It contains the iceauth, rgb, sessreg, xcmsdb, xgamma, xhost, xmodmap, xrandr,
 xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap, xvidtune
diff --git a/debian/watch.iceauth b/debian/watch.iceauth
index f77b731..f27052b 100644
--- a/debian/watch.iceauth
+++ b/debian/watch.iceauth
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/iceauth
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ iceauth-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ iceauth-(.*)\.tar\.gz
diff --git a/debian/watch.rgb b/debian/watch.rgb
index f645ede..613faff 100644
--- a/debian/watch.rgb
+++ b/debian/watch.rgb
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/rgb
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ rgb-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ rgb-(.*)\.tar\.gz
diff --git a/debian/watch.sessreg b/debian/watch.sessreg
index c75273b..86c1c4f 100644
--- a/debian/watch.sessreg
+++ b/debian/watch.sessreg
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/sessreg
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ sessreg-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ sessreg-(.*)\.tar\.gz
diff --git a/debian/watch.xcmsdb b/debian/watch.xcmsdb
index 233ae1d..a6baa20 100644
--- a/debian/watch.xcmsdb
+++ b/debian/watch.xcmsdb
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/xcmsdb
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ xcmsdb-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ xcmsdb-(.*)\.tar\.gz
diff --git a/debian/watch.xgamma b/debian/watch.xgamma
index e213420..8147f40 100644
--- a/debian/watch.xgamma
+++ b/debian/watch.xgamma
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/xgamma
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ xgamma-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ xgamma-(.*)\.tar\.gz
diff --git a/debian/watch.xhost b/debian/watch.xhost
index a80c995..e18aa0a 100644
--- a/debian/watch.xhost
+++ b/debian/watch.xhost
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/xhost
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \

x11-xserver-utils: Changes to 'debian-unstable'

2016-02-26 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 15cc6fbd574c788d099ddaf06db45b2067b7a364
Author: Julien Cristau 
Date:   Fri Feb 26 11:56:59 2016 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index a2211c0..84e9e98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-x11-xserver-utils (7.7+7) UNRELEASED; urgency=medium
+x11-xserver-utils (7.7+7) unstable; urgency=medium
 
   * Add Breaks on arandr << 0.1.9 (see #815731).
 
- -- Julien Cristau   Thu, 25 Feb 2016 16:12:32 +0100
+ -- Julien Cristau   Fri, 26 Feb 2016 11:56:46 +0100
 
 x11-xserver-utils (7.7+6) unstable; urgency=medium

x11-xserver-utils: Changes to 'debian-unstable'

2016-02-25 Thread Julien Cristau 
 debian/changelog |6 ++
 debian/control   |2 ++
 2 files changed, 8 insertions(+)

New commits:
commit e9cee18d11c1326b09861423e368e44d8faf010c
Author: Julien Cristau 
Date:   Thu Feb 25 16:12:56 2016 +0100

Add Breaks on arandr << 0.1.9 (see #815731).

diff --git a/debian/changelog b/debian/changelog
index 3f13d61..a2211c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xserver-utils (7.7+7) UNRELEASED; urgency=medium
+
+  * Add Breaks on arandr << 0.1.9 (see #815731).
+
+ -- Julien Cristau   Thu, 25 Feb 2016 16:12:32 +0100
+
 x11-xserver-utils (7.7+6) unstable; urgency=medium
 
   * xrandr 1.5.0.
diff --git a/debian/control b/debian/control
index 0474e49..ae1f001 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,8 @@ Conflicts: iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, 
xrdb, xrefresh, xrg
 Replaces: xbase-clients (<< 1:7.3), xutils (<< 1:7.2),
  iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
  xsetmode, xsetpointer, xsetroot, xstdcmap, xvidtune
+Breaks:
+ arandr (<< 0.1.9),
 Suggests: nickle, cairo-5c, xorg-docs-core
 Description: X server utilities
  An X client is a program that interfaces with an X server (almost always via

x11-xserver-utils: Changes to 'debian-unstable'

2016-02-23 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ca3b52b7e1c6c1d6929aa50c54694ab28342adb4
Author: Julien Cristau 
Date:   Tue Feb 23 20:52:45 2016 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index f306247..3f13d61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-x11-xserver-utils (7.7+6) UNRELEASED; urgency=medium
+x11-xserver-utils (7.7+6) unstable; urgency=medium
 
   * xrandr 1.5.0.
   * Bump Standards-Version to 3.9.6 (no changes).
   * Update Vcs-* fields to use https and cgit.
 
- -- Julien Cristau   Tue, 23 Feb 2016 20:47:37 +0100
+ -- Julien Cristau   Tue, 23 Feb 2016 20:52:25 +0100
 
 x11-xserver-utils (7.7+5) unstable; urgency=high

x11-xserver-utils: Changes to 'debian-unstable'

2016-02-23 Thread Julien Cristau 
 debian/changelog   |8 
 debian/control |6 
 xrandr/ChangeLog   |  139 +++
 xrandr/Makefile.in |  383 
 xrandr/aclocal.m4  |  898 +++--
 xrandr/compile |  347 ++
 xrandr/config.guess|  351 ++-
 xrandr/config.sub  |  130 ---
 xrandr/configure   |  593 
 xrandr/configure.ac|4 
 xrandr/depcomp |  487 --
 xrandr/install-sh  |  374 +---
 xrandr/keystone.5c |  118 +-
 xrandr/man/Makefile.in |  114 +-
 xrandr/missing |  414 --
 xrandr/xrandr.c|  394 +
 16 files changed, 3010 insertions(+), 1750 deletions(-)

New commits:
commit 8d97113c56a454b081156b0b2d03fe06adcdf93e
Author: Julien Cristau 
Date:   Tue Feb 23 20:52:21 2016 +0100

Update Vcs-* fields to use https and cgit.

diff --git a/debian/changelog b/debian/changelog
index f40186a..f306247 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-xserver-utils (7.7+6) UNRELEASED; urgency=medium
 
   * xrandr 1.5.0.
   * Bump Standards-Version to 3.9.6 (no changes).
+  * Update Vcs-* fields to use https and cgit.
 
  -- Julien Cristau   Tue, 23 Feb 2016 20:47:37 +0100
 
diff --git a/debian/control b/debian/control
index e0afc86..0474e49 100644
--- a/debian/control
+++ b/debian/control
@@ -39,8 +39,8 @@ Build-Depends:
 # xstdcmap: libxmu-dev, libx11-dev
 # xvidtune: libxaw7-dev, libxxf86vm-dev, libxt-dev
 Standards-Version: 3.9.6
-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xserver-utils
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xserver-utils.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/x11-xserver-utils
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/x11-xserver-utils.git
 
 Package: x11-xserver-utils
 Architecture: any

commit effeec36c800697955f150aba91e1add6d7fdabd
Author: Julien Cristau 
Date:   Tue Feb 23 20:50:46 2016 +0100

Bump Standards-Version to 3.9.6 (no changes).

diff --git a/debian/changelog b/debian/changelog
index ebd820e..f40186a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11-xserver-utils (7.7+6) UNRELEASED; urgency=medium
 
   * xrandr 1.5.0.
+  * Bump Standards-Version to 3.9.6 (no changes).
 
  -- Julien Cristau   Tue, 23 Feb 2016 20:47:37 +0100
 
diff --git a/debian/control b/debian/control
index 82d43ec..e0afc86 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Build-Depends:
 # xsetroot: libxmuu-dev, libx11-dev, xbitmaps, libxcursor-dev
 # xstdcmap: libxmu-dev, libx11-dev
 # xvidtune: libxaw7-dev, libxxf86vm-dev, libxt-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.6
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xserver-utils
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xserver-utils.git
 

commit 079b944af99b9721e938e010895af6772b7beabb
Author: Julien Cristau 
Date:   Tue Feb 23 20:47:53 2016 +0100

xrandr 1.5.0.

diff --git a/debian/changelog b/debian/changelog
index bd5933e..ebd820e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xserver-utils (7.7+6) UNRELEASED; urgency=medium
+
+  * xrandr 1.5.0.
+
+ -- Julien Cristau   Tue, 23 Feb 2016 20:47:37 +0100
+
 x11-xserver-utils (7.7+5) unstable; urgency=high
 
   * High urgency upload for RC bug fix.
diff --git a/xrandr/ChangeLog b/xrandr/ChangeLog
index 5be4d02..34ed906 100644
--- a/xrandr/ChangeLog
+++ b/xrandr/ChangeLog
@@ -1,3 +1,128 @@
+commit 65fd628cdfd1c95bd01a50706d4577655d1dd404
+Author: Aaron Plattner 
+Date:   Tue Feb 23 10:22:26 2016 -0800
+
+xrandr 1.5.0
+
+Signed-off-by: Aaron Plattner 
+
+commit d62030b506f6b686ffe1e750ea9d3a855beec1f0
+Author: Chris Wilson 
+Date:   Sun Sep 13 11:40:37 2015 +0100
+
+Only use the current information when setting modes
+
+Before we change the state (e.g. adding a mode or applying one to an
+output), we query the screen resources for the right identifiers. This
+should only use the current information rather than force a reprobe on
+all hardware - not only can that reprobe be very slow (e.g. EDID
+timeouts on the order of seconds), but it may perturb the setup that the
+user is trying to configure.
+
+Signed-off-by: Chris Wilson 
+
+commit 3d03be780fca4949b11ead46c5ea5d3266c03c32
+Author: Chris Wilson 
+Date:   Thu Jun 18 08:27:49 2015 +0100
+
+Mark all CRTC as currently unused for second picking CRTC pass
+
+We perform two passes over the CRTC in order to find the preferred CRTC
+for each enabled output. In the first pass, we try to preserve the
+

x11-xserver-utils: Changes to 'debian-unstable'

2015-09-12 Thread Julien Cristau 
 debian/changelog   
 |8 ++
 
debian/patches/03_sessreg_Pass-P-to-the-preprocessor-when-generating-filenames.diff
 |   29 ++
 debian/patches/series  
 |1 
 3 files changed, 38 insertions(+)

New commits:
commit e92cedc0101d5b71dc2bc46a8404c46de97dd0cb
Author: Julien Cristau 
Date:   Sat Sep 12 12:17:08 2015 +0200

sessreg: fix FTBFS with gcc 5 (closes: #778176)

Thanks to Matthias Klose, Daniel Schepler and Aurélien Jarno.

diff --git a/debian/changelog b/debian/changelog
index 2551b2f..bd5933e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+x11-xserver-utils (7.7+5) unstable; urgency=high
+
+  * High urgency upload for RC bug fix.
+  * sessreg: fix FTBFS with gcc 5 (closes: #778176).  Thanks to Matthias
+Klose, Daniel Schepler and Aurélien Jarno.
+
+ -- Julien Cristau   Sat, 12 Sep 2015 12:16:27 +0200
+
 x11-xserver-utils (7.7+4) unstable; urgency=medium
 
   * Let uscan verify tarball signatures.
diff --git 
a/debian/patches/03_sessreg_Pass-P-to-the-preprocessor-when-generating-filenames.diff
 
b/debian/patches/03_sessreg_Pass-P-to-the-preprocessor-when-generating-filenames.diff
new file mode 100644
index 000..cee38ab
--- /dev/null
+++ 
b/debian/patches/03_sessreg_Pass-P-to-the-preprocessor-when-generating-filenames.diff
@@ -0,0 +1,29 @@
+From a5103b826dbd601c9245ceff43a006d65da21199 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch 
+Date: Wed, 9 Sep 2015 23:44:06 +0200
+Subject: [PATCH sessreg] Pass -P to the preprocessor when generating filenames 
for the
+ manpage.
+
+Fixes build with GCC 5. Patch by Richard Biener 
+
+Signed-off-by: Julien Cristau 
+---
+ sessreg/man/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sessreg/man/Makefile.am b/sessreg/man/Makefile.am
+index 665ace5..2e5f146 100644
+--- a/sessreg/man/Makefile.am
 b/sessreg/man/Makefile.am
+@@ -9,7 +9,7 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
+ 
+ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+ filenames.sed: filenames.sed.c
+-  $(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++  $(AM_V_GEN)$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+   $(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \
+   $(SED) -n -e '/s|__/ p' -e '/^\/__/ p' > $@
+ 
+-- 
+2.5.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 3b892b3..0f3b708 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_sessreg_implement_hostname_hashing.diff
 02_xmodmap-include-config.h-before-system-headers.diff
+03_sessreg_Pass-P-to-the-preprocessor-when-generating-filenames.diff

x11-xserver-utils: Changes to 'debian-unstable'

2014-01-19 Thread Julien Cristau 
 debian/changelog |8 
 debian/clean |1 
 debian/compat|2 -
 debian/control   |4 +-
 debian/rules |   95 ---
 5 files changed, 41 insertions(+), 69 deletions(-)

New commits:
commit e0d6afa13e3982b1cf1b9b74d6f5c8e7a385307e
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 19 09:38:56 2014 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 02e8d75..01aa19a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-x11-xserver-utils (7.7+2) UNRELEASED; urgency=medium
+x11-xserver-utils (7.7+2) unstable; urgency=medium
 
   * Remove Cyril Brulebois from Uploaders.
   * Bump to debhelper compat level 7 and use dh with the autoreconf addon.
 Should make arm64 happy and closes: #735489.  Thanks, Wookey!
 
- -- Julien Cristau jcris...@debian.org  Sat, 18 Jan 2014 20:27:01 +0100
+ -- Julien Cristau jcris...@debian.org  Sun, 19 Jan 2014 09:38:17 +0100
 
 x11-xserver-utils (7.7+1) unstable; urgency=low
 

commit 992803dd44b73a9a449555ffb3a120ef87a5ca8b
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 18 20:29:59 2014 +0100

Bump to debhelper compat level 7 and use dh with the autoreconf addon.

Should make arm64 happy and closes: #735489.  Thanks, Wookey!

diff --git a/debian/changelog b/debian/changelog
index dee9c60..02e8d75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 x11-xserver-utils (7.7+2) UNRELEASED; urgency=medium
 
   * Remove Cyril Brulebois from Uploaders.
+  * Bump to debhelper compat level 7 and use dh with the autoreconf addon.
+Should make arm64 happy and closes: #735489.  Thanks, Wookey!
 
  -- Julien Cristau jcris...@debian.org  Sat, 18 Jan 2014 20:27:01 +0100
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000..57287f4
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/autoreconf
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 84c4c84..f3f722b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Build-Depends:
- debhelper (= 5.0.0),
+ debhelper (= 7.0.50),
+ dh-autoreconf,
  pkg-config,
  x11proto-core-dev (= 7.0.17),
  libx11-dev (= 2:1.0.0),
diff --git a/debian/rules b/debian/rules
index ae8c1bf..338b5d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ include debian/xsfbs/xsfbs.mk
 # subdirectory explicitly so that the build system knows what to build
 DEF_SUBDIRS=iceauth rgb sessreg xcmsdb xgamma xhost xmodmap xrandr xrdb 
xrefresh xset xsetmode xsetpointer xsetroot xstdcmap xvidtune
 SUBDIRS=$(DEF_SUBDIRS)
+CONFIG_STAMPS = $(addprefix $(STAMP_DIR)/configure-, $(SUBDIRS))
 BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
 
 CFLAGS = `dpkg-buildflags --get CFLAGS`
@@ -23,85 +24,47 @@ CFLAGS += -Wall
 LDFLAGS = `dpkg-buildflags --get LDFLAGS`
 CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-   NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
-   MAKEFLAGS += -j$(NUMJOBS)
-endif
+%:
+   dh $@ --with autoreconf,quilt --parallel
 
-DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-   confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
-   confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
+debian/autoreconf:
+   echo $(SUBDIRS)  $@
 
+override_dh_autoreconf: debian/autoreconf
+   dh_autoreconf
 
-build: build-stamp
-build-stamp: $(BUILD_STAMPS)
+override_dh_auto_configure: $(CONFIG_STAMPS)
+
+$(STAMP_DIR)/configure-%:
+   mkdir -p $(STAMP_DIR)
+   dh_auto_configure -D$* -B$*-build -- \
+   --disable-silent-rules \
+   CFLAGS=$(CFLAGS) \
+   CPPFLAGS=$(CPPFLAGS) \
+   LDFLAGS=$(LDFLAGS)
$@
 
-$(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
-   dh_testdir
-   mkdir -p $*-build
-   cd $*-build  \
-   ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
-   --infodir=\$${prefix}/share/info $(confflags) \
-   --disable-silent-rules \
-   CFLAGS=$(CFLAGS) \
-   CPPFLAGS=$(CPPFLAGS) \
-   LDFLAGS=$(LDFLAGS)
-   cd $*-build  $(MAKE)
+override_dh_auto_build: $(BUILD_STAMPS)
+
+$(STAMP_DIR)/build-%:
+   mkdir -p $(STAMP_DIR)
+   dh_auto_build -D$* -B$*-build
$@
 
-clean: xsfclean
-   dh_testdir
-   rm -f build-stamp
-   rm -f config.cache config.log

x11-xserver-utils: Changes to 'debian-unstable'

2013-09-15 Thread Michele Cane 
 debian/changelog|5 
 sessreg/ChangeLog   |  113 
 sessreg/Makefile.in |   61 
 sessreg/aclocal.m4  |  775 -
 sessreg/config.guess|  233 -
 sessreg/config.sub  |  134 -
 sessreg/configure   | 5897 +++-
 sessreg/configure.ac|2 
 sessreg/depcomp |   74 
 sessreg/install-sh  |   29 
 sessreg/man/Makefile.in |   30 
 sessreg/man/sessreg.man |3 
 sessreg/sessreg.c   |   28 
 sessreg/sessreg.h   |   14 
 xmodmap/COPYING |2 
 xmodmap/ChangeLog   |   60 
 xmodmap/Makefile.in |  398 +-
 xmodmap/aclocal.m4  |  718 +++--
 xmodmap/compile |  347 ++
 xmodmap/config.guess|  196 -
 xmodmap/config.sub  |  117 
 xmodmap/configure   |  569 ++--
 xmodmap/configure.ac|2 
 xmodmap/depcomp |  487 ++-
 xmodmap/exec.c  |8 
 xmodmap/install-sh  |   14 
 xmodmap/man/Makefile.in |  108 
 xmodmap/man/xmodmap.man |2 
 xmodmap/missing |  461 +--
 xmodmap/pf.c|4 
 xmodmap/xmodmap.c   |   43 
 xrdb/ChangeLog  |  187 +
 xrdb/INSTALL|  291 ++
 xrdb/Makefile.am|6 
 xrdb/Makefile.in|  450 +--
 xrdb/aclocal.m4 | 4987 +
 xrdb/compile|  347 ++
 xrdb/config.guess   |  477 +--
 xrdb/config.sub |  277 +-
 xrdb/configure  | 6380 ++--
 xrdb/configure.ac   |   16 
 xrdb/depcomp|  531 ++-
 xrdb/install-sh |   35 
 xrdb/man/Makefile.in|  135 -
 xrdb/man/xrdb.man   |   14 
 xrdb/missing|  461 +--
 xrdb/xrdb.c |  253 +
 47 files changed, 20437 insertions(+), 5344 deletions(-)

New commits:
commit d069f3a53dd74617366e71ce2e4bd44e2f8139cf
Author: Michele Cane michele.c...@gmail.com
Date:   Sun Sep 15 20:35:44 2013 +0200

xrdb 1.1.0

diff --git a/debian/changelog b/debian/changelog
index a3a8d22..cba536d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low
   [ Michele Cane ]
   * sessreg 1.0.8
   * xmodmap 1.0.8
+  * xrdb 1.1.0
 
  -- Robert Hooker sarv...@ubuntu.com  Wed, 15 May 2013 12:08:34 -0400
 
diff --git a/xrdb/ChangeLog b/xrdb/ChangeLog
index ce35754..4c55d1f 100644
--- a/xrdb/ChangeLog
+++ b/xrdb/ChangeLog
@@ -1,3 +1,190 @@
+commit 17eda976c8dca736ef63fc45ff7de8c73c0e2936
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sun Sep 8 10:16:42 2013 -0700
+
+xrdb 1.1.0
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 4e49a64191d3b08044d29d32896e15013e5e7540
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jul 19 19:51:09 2013 -0700
+
+Add -version flag to print package version string from autoconf
+
+Also adds missing entry for -help flag to usage message.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-By: Matt Dew mar...@osource.org
+
+commit ec7b273fd135a14a2ca6c19cd0e6afe1536db552
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jul 19 19:31:04 2013 -0700
+
+Only add -P flag if using cpp as our preprocessor
+
+Restores ability to use m4 (broken in xrdb-1.0.8 by commit 117021570515f)
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=34546
+
+Reviewed-by: wha...@bfs.de
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 11e7f4610cd6468aeea115081dd72ddd7eba0f3f
+Author: Matthieu Herrb matthieu.he...@laas.fr
+Date:   Fri Dec 3 15:52:04 2010 -0500
+
+predefined cpp macros can produce unexpected results (bug 3413)
+
+GNU cpp is predefining a number of symbols, depending on the host and 
target
+architecture. This can produce some unexpected results: for example, the
+expansion of CLIENTHOST if the host name is i386.my.domain.
+
+The attached patch creates a new -undef option to xrdb that is passed to
+cpp.
+
+Acked-by: Gaetan Nadon mems...@videotron.ca
+Signed-off-by: Matthieu Herrb matthieu.he...@laas.fr
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit d23e17e09c45e214737ddf8f653dc31cdcf3a0d2
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat Jul 6 18:53:49 2013 -0700
+
+Rename args to several functions to not shadow global variables
+
+Renamed buffer to b and dpy to display to match common patterns
+in other functions in xrdb.c
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 4b8da0a0a296dce4ead1baac4a39ac27dee144da
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat Jul 6 18:44:47 2013 -0700
+
+Mark fatal()  Syntax() with printf  noreturn attributes
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 45909ffe71788d80b2dabff886341b44c10a096d
+Author: Alan Coopersmith alan.coopersm...@oracle.com

x11-xserver-utils: Changes to 'debian-unstable'

2013-09-15 Thread Julien Cristau 
 debian/changelog  |   15 
++-
 debian/patches/01_sessreg_implement_hostname_hashing.diff |8 -
 debian/patches/02_xmodmap-include-config.h-before-system-headers.diff |   45 
--
 debian/rules  |1 
 4 files changed, 37 insertions(+), 32 deletions(-)

New commits:
commit 2757d30a2a64f303cb5556f5ecde375b31e249f7
Author: Julien Cristau jcris...@debian.org
Date:   Sun Sep 15 21:37:14 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 329a9c5..adf0185 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xserver-utils (7.7+1) UNRELEASED; urgency=low
+x11-xserver-utils (7.7+1) unstable; urgency=low
 
   [ Robert Hooker ]
   * New upstream releases:
@@ -29,7 +29,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low
   * Update/refresh patches.
   * Disable silent build rules.
 
- -- Robert Hooker sarv...@ubuntu.com  Wed, 15 May 2013 12:08:34 -0400
+ -- Julien Cristau jcris...@debian.org  Sun, 15 Sep 2013 20:00:22 +0200
 
 x11-xserver-utils (7.7~3) unstable; urgency=low
 

commit bc0e2b1555c5ec92fbe69d5128123d738e76574b
Author: Julien Cristau jcris...@debian.org
Date:   Sun Sep 15 20:00:20 2013 +0200

Disable silent build rules.

diff --git a/debian/changelog b/debian/changelog
index 8614226..329a9c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low
 - Ensure we don't read out of ClassName array bounds for unknown visual
   type (closes: #488535)
   * Update/refresh patches.
+  * Disable silent build rules.
 
  -- Robert Hooker sarv...@ubuntu.com  Wed, 15 May 2013 12:08:34 -0400
 
diff --git a/debian/rules b/debian/rules
index 5d657a7..ae8c1bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts 
$(STAMP_DIR)/patch
cd $*-build  \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+   --disable-silent-rules \
CFLAGS=$(CFLAGS) \
CPPFLAGS=$(CPPFLAGS) \
LDFLAGS=$(LDFLAGS)

commit 985dc739afc0ec528a9d843c0e216c488cb1461c
Author: Julien Cristau jcris...@debian.org
Date:   Sun Sep 15 19:58:39 2013 +0200

Update/refresh patches.

diff --git a/debian/changelog b/debian/changelog
index 36a0c0f..8614226 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low
 - Clarify .Xresources vs. .Xdefaults in man page (closes: #649187)
 - Ensure we don't read out of ClassName array bounds for unknown visual
   type (closes: #488535)
+  * Update/refresh patches.
 
  -- Robert Hooker sarv...@ubuntu.com  Wed, 15 May 2013 12:08:34 -0400
 
diff --git a/debian/patches/01_sessreg_implement_hostname_hashing.diff 
b/debian/patches/01_sessreg_implement_hostname_hashing.diff
index c2cd84f..d1ed5f7 100644
--- a/debian/patches/01_sessreg_implement_hostname_hashing.diff
+++ b/debian/patches/01_sessreg_implement_hostname_hashing.diff
@@ -39,12 +39,12 @@ Index: x11-xserver-utils/sessreg/sessreg.c
 +
  static int wflag, uflag, lflag;
  static const char *wtmp_file, *utmp_file;
- static char *line;
-@@ -397,21 +409,23 @@ set_utmp (struct utmp *u, char *line, ch
+ #ifdef USE_UTMPX
+@@ -399,21 +411,23 @@ set_utmp (struct utmp *u, char *line, ch
memset (u-ut_name, 0, sizeof (u-ut_name));
  #ifdef HAVE_STRUCT_UTMP_UT_ID
if (line) {
--  int i;
+-  size_t  i;
/*
 -   * this is a bit crufty, but
 -   * follows the apparent conventions in
@@ -76,7 +76,7 @@ Index: x11-xserver-utils/sessreg/sessreg.c
memset (u-ut_id, 0, sizeof (u-ut_id));
  #endif
  #ifdef HAVE_STRUCT_UTMP_UT_PID
-@@ -660,3 +674,129 @@ findslot (char *line_name, char *host_na
+@@ -662,3 +676,129 @@ findslot (char *line_name, char *host_na
return freeslot;
  }
  #endif
diff --git 
a/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff 
b/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff
index 583c99c..f793b48 100644
--- a/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff
+++ b/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff
@@ -13,13 +13,13 @@ Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
  xmodmap.c |4 
  3 files changed, 12 insertions(+)
 
-diff --git a/xmodmap/exec.c b/xmodmap/exec.c
-index dbcb669..419b10e 100644
 a/xmodmap/exec.c
-+++ b/xmodmap/exec.c
-@@ -54,6 +54,10 @@ from The Open Group.
-  * original xmodmap, written by David Rosenthal, of Sun Microsystems.
-  */
+Index: x11-xserver-utils/xmodmap/exec.c
+===

x11-xserver-utils: Changes to 'debian-unstable'

2013-08-09 Thread Robert Hooker 
 debian/changelog|2 
 iceauth/ChangeLog   |   98 
 iceauth/Makefile.in |  443 +-
 iceauth/aclocal.m4  | 1240 --
 iceauth/compile |  347 +
 iceauth/config.guess|  405 +-
 iceauth/config.h.in |3 
 iceauth/config.sub  |  277 -
 iceauth/configure   | 6356 +-
 iceauth/configure.ac|8 
 iceauth/depcomp |  531 +-
 iceauth/iceauth.c   |7 
 iceauth/install-sh  |   35 
 iceauth/man/Makefile.in |  135 
 iceauth/missing |  461 --
 iceauth/process.c   |  133 
 xset/ChangeLog  |  113 
 xset/Makefile.in|  440 +-
 xset/aclocal.m4 | 1413 +--
 xset/compile|  347 +
 xset/config.guess   |  407 +-
 xset/config.h.in|   32 
 xset/config.sub |  237 -
 xset/configure  | 8732 
 xset/configure.ac   |3 
 xset/depcomp|  531 +-
 xset/install-sh |   35 
 xset/man/Makefile.in|  132 
 xset/man/xset.man   |7 
 xset/missing|  461 --
 xset/xset.c |  293 -
 31 files changed, 19070 insertions(+), 4594 deletions(-)

New commits:
commit d06dd4175a9fe32a1704797b2b42f41e653264d5
Author: Robert Hooker sarv...@ubuntu.com
Date:   Fri Aug 9 11:45:45 2013 -0400

xset 1.2.3

diff --git a/debian/changelog b/debian/changelog
index 17f0a97..eeb3b12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low
   * xrefresh 1.0.5
   * xhost 1.0.6
   * iceauth 1.0.6
+  * xset 1.2.3
   * Update copyright
 
   [ Timo Aaltonen ]
diff --git a/xset/ChangeLog b/xset/ChangeLog
index f32696d..d009b41 100644
--- a/xset/ChangeLog
+++ b/xset/ChangeLog
@@ -1,3 +1,116 @@
+commit bee5b8e13837a02b5f2ac09e0c2b90fa5616e0fb
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Aug 8 20:43:18 2013 -0700
+
+xset 1.2.3
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit e44841fdd4552cde3aca28471a59ad64c5a05547
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jul 19 22:58:47 2013 -0700
+
+Pass buf size to on_or_off instead of just assuming it is big enough
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 86fda0478065488dfc423b67ea1747817106335f
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jul 19 22:47:38 2013 -0700
+
+Add -version flag
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 8d49ad3f03c858222863fa986de850d5a554d69f
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jul 19 22:32:38 2013 -0700
+
+Fix integer sign/size conversion warnings from clang
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 72296976365e6f91129f25468771fa864b20e862
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jul 19 22:05:07 2013 -0700
+
+Add printf attribute to usage function and fix warnings it causes
+
+gcc suggested it:
+ xset.c: In function ‘usage’:
+ xset.c:1577:2: warning: function might be possible candidate for 
‘gnu_printf’
+  format attribute [-Wmissing-format-attribute]
+
+But adding it unveiled many complaints about extra trailing NULL args
+from before usage took a variable number of arguments:
+
+xset.c:186:3: warning: too many arguments for format [-Wformat-extra-args]
+xset.c:193:2: warning: too many arguments for format [-Wformat-extra-args]
+xset.c:362:3: warning: too many arguments for format [-Wformat-extra-args]
+xset.c:370:3: warning: too many arguments for format [-Wformat-extra-args]
+xset.c:376:3: warning: too many arguments for format [-Wformat-extra-args]
+xset.c:382:3: warning: too many arguments for format [-Wformat-extra-args]
+xset.c:388:3: warning: too many arguments for format [-Wformat-extra-args]
+xset.c:402:7: warning: too many arguments for format [-Wformat-extra-args]
+xset.c:425:7: warning: too many arguments for format [-Wformat-extra-args]
+xset.c:542:4: warning: too many arguments for format [-Wformat-extra-args]
+xset.c:735:3: warning: too many arguments for format [-Wformat-extra-args]
+
+so those were deleted.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit d3f87090b92b0c77a75027ba660351d18a733c8b
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jul 19 22:00:51 2013 -0700
+
+Fix gcc warnings about discarded const qualifiers
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit c42515672b2552b2ce604fe523cf133593ab88ec
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Feb 20 19:43:46 2013 -0800
+
+Combine error message strings
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 5e3ab67c50ddfda53a0e8366bc854562cf297442
+Author: Alan Coopersmith

x11-xserver-utils: Changes to 'debian-unstable'

2013-07-18 Thread Robert Hooker 
 debian/changelog   |3 
 xhost/ChangeLog|  199 +
 xhost/Makefile.in  |  440 ++-
 xhost/aclocal.m4   |  705 +++---
 xhost/compile  |  347 +++
 xhost/config.guess |  407 ++-
 xhost/config.sub   |  237 +-
 xhost/configure|  692 --
 xhost/configure.ac |   15 
 xhost/depcomp  |  531 +++-
 xhost/install-sh   |   35 
 xhost/man/Makefile.in  |  131 -
 xhost/missing  |  461 +---
 xhost/xhost.c  |  189 -
 xrandr/ChangeLog   |   97 
 xrandr/Makefile.in |  366 +--
 xrandr/aclocal.m4  | 5519 +
 xrandr/compile |  347 +++
 xrandr/config.guess|  184 -
 xrandr/config.sub  |   95 
 xrandr/configure   |  352 ++-
 xrandr/configure.ac|2 
 xrandr/depcomp |  487 ++--
 xrandr/install-sh  |   14 
 xrandr/man/Makefile.in |  102 
 xrandr/man/xrandr.man  |6 
 xrandr/missing |  414 +--
 xrandr/xrandr.c|  131 -
 28 files changed, 7233 insertions(+), 5275 deletions(-)

New commits:
commit e7c164c36de31b004f0016450b2823828564d4a4
Author: Robert Hooker sarv...@ubuntu.com
Date:   Thu Jul 18 11:40:30 2013 -0400

xhost 1.0.6

diff --git a/debian/changelog b/debian/changelog
index 8b5be5a..ced8b40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low
   * xstdcmap 1.0.3
   * xvidtune 1.0.3
   * xrefresh 1.0.5
+  * xhost 1.0.6
   * Update copyright
 
   [ Timo Aaltonen ]
diff --git a/xhost/ChangeLog b/xhost/ChangeLog
index 1e33528..4bed0dd 100644
--- a/xhost/ChangeLog
+++ b/xhost/ChangeLog
@@ -1,3 +1,202 @@
+commit 6c3d341467acd10eafc1462ee94c3efd3a4788ef
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Tue Jul 16 23:10:37 2013 -0700
+
+xhost 1.0.6
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 4ffd1c45709bf8aa41e57d23a5241c4b4817d318
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jun 14 00:02:21 2013 -0700
+
+Fix const warning for FamilyLocalHost empty address string
+
+xhost.c: In function ‘change_host’:
+xhost.c:452:13: warning: assignment discards ‘const’ qualifier from 
pointer target type [enabled by default]
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit e100ad533203fdc0d80078835c557f1bc47954bd
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat Mar 2 08:49:40 2013 -0800
+
+Mark argument to nameserver_lost signal handler as unused
+
+Quiets clang warning:
+xhost.c:812:21: warning: unused parameter 'sig' [-Wunused-parameter]
+nameserver_lost(int sig)
+^
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 214c90d6b01017fe02675e133129cf389e740533
+Author: Jon TURNEY jon.tur...@dronecode.org.uk
+Date:   Fri Oct 26 14:48:03 2012 +0100
+
+If SIGALRM isn't available, don't use alarm() to timeout gethostaddr(), 
just wait
+
+Win32 has neither SIGALRM nor sigaction(), so don't use SIGALRM to timeout
+gethostaddr(), just wait
+
+Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Reviewed-by: Colin Harrison colin.harri...@virgin.net
+
+commit 19250c1aed852e151bf66819e75f8d796018223b
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat Feb 23 09:47:42 2013 -0800
+
+Drop pre-POSIX signal handling support in favor of sigaction()
+
+X_NOT_POSIX has never been defined by our autoconf scripts, only for a few
+platforms in X11/Xosdefs.h, of which MinGW seems to be the most relevant
+today, and since that doesn't have alarm() it doesn't need this code 
either.
+
+First pass was done with 'unifdef -UX_NOT_POSIX', followed by
+manual tweaking to adjust indent levels, etc.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Jon TURNEY jon.tur...@dronecode.org.uk
+
+commit 618eebf5aa99138f6ab3b8a96f93eb422f1a138e
+Author: Jon TURNEY jon.tur...@dronecode.org.uk
+Date:   Fri Oct 26 14:46:51 2012 +0100
+
+Provide dummy sethostent(),endhostent() for Win32 also
+
+Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Reviewed-by: Colin Harrison colin.harri...@virgin.net
+
+commit 4dc834b5d98a6b07bee7ec8d06ed63efe03d1076
+Author: Jon TURNEY jon.tur...@dronecode.org.uk
+Date:   Fri Oct 26 14:52:45 2012 +0100
+
+Link with winsock for MinGW
+
+Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Reviewed-by: Colin Harrison colin.harri...@virgin.net
+
+commit 9316e88c68c2a2189cf90c55e9850d7428bcd356
+Author: Jon TURNEY jon.tur...@dronecode.org.uk
+Date:   Wed Jan 4 18:25:26 2012 +
+
+Use Xwinsock.h on WIN32
+
+Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Reviewed-by: Colin Harrison colin.harri...@virgin.net
+
+commit 01433c7bdd169ae8a59ffe79842de55e318bc3b8
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat

x11-xserver-utils: Changes to 'debian-unstable'

2013-05-20 Thread Robert Hooker 
 debian/changelog  |1 
 xrefresh/ChangeLog|  111 
 xrefresh/Makefile.am  |   18 
 xrefresh/Makefile.in  |  545 +-
 xrefresh/aclocal.m4   | 1655 +--
 xrefresh/config.guess |  307 -
 xrefresh/config.h.in  |   35 
 xrefresh/config.sub   |  237 -
 xrefresh/configure|10104 --
 xrefresh/configure.ac |   12 
 xrefresh/depcomp  |  530 +-
 xrefresh/install-sh   |   35 
 xrefresh/man/Makefile.am  |   12 
 xrefresh/man/Makefile.in  |  483 ++
 xrefresh/man/xrefresh.man |  101 
 xrefresh/missing  |  461 --
 xrefresh/xrefresh.c   |   61 
 xrefresh/xrefresh.man |  101 
 18 files changed, 11269 insertions(+), 3540 deletions(-)

New commits:
commit f857499cba97a431085cb8a804fa140c93ad5751
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon May 20 11:56:26 2013 -0400

Update xrefresh to 1.0.5

diff --git a/debian/changelog b/debian/changelog
index 5e294bb..ce537bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low
   * xsetroot 1.1.1
   * xstdcmap 1.0.3
   * xvidtune 1.0.3
+  * xrefresh 1.0.5
 
   [ Timo Aaltonen ]
   * control: Bump libxrandr-dev build-dependency.
diff --git a/xrefresh/ChangeLog b/xrefresh/ChangeLog
index 3fab798..116c4dd 100644
--- a/xrefresh/ChangeLog
+++ b/xrefresh/ChangeLog
@@ -1,3 +1,114 @@
+commit 2c08f5dee8b3f2d2da9db8e3c1d4593a66db401e
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri May 17 18:20:13 2013 -0700
+
+xrefresh 1.0.5
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 1a26cd81c08c008f8252ca03211705ce4951bab2
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sun Jan 13 09:09:19 2013 -0800
+
+Use strcasecmp if available, instead of downcasing string before strcmp
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 865c7c3da3a827cff080a763613d02729e9d4e33
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sun Jan 13 08:37:49 2013 -0800
+
+Fix implicit sign conversion  integer size truncation warnings
+
+xrefresh.c:125:14: warning: implicit conversion loses integer precision:
+  'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32]
+arglen = strlen (arg);
+   ~ ^~~~
+xrefresh.c:126:12: warning: implicit conversion loses integer precision:
+  'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32]
+slen = strlen (s);
+ ~ ^~
+xrefresh.c:132:26: warning: implicit conversion changes signedness: 'int' 
to
+  'size_t' (aka 'unsigned long') [-Wsign-conversion]
+if (strncmp (arg, s, slen) == 0) return (True);
+~~~  ^~~~
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 4fa0dd48d6c9fcd54276a66c221fdafda2395c02
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Mon Apr 16 17:22:16 2012 -0700
+
+Combine usage message strings
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit c0b077a85fb2e624ec87fb8bec906ce30bc473e4
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Mon Apr 16 17:18:35 2012 -0700
+
+Mark Syntax() with _X_NORETURN to silence gcc warning
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit d944df52b7b2c5c9e6789b0ff7bb390108613c6c
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Mon Apr 16 17:10:23 2012 -0700
+
+Add const qualifiers to structs for mapping strings to values
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 71c97a091a511d403fdb8587d0e1240ec3913820
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Mon Apr 16 17:04:35 2012 -0700
+
+Add const qualifiers to fix gcc -Wwrite-strings warnings
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit cde30320d98b95f7c0cec5bed906b7107124f8fa
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sun May 8 16:52:55 2011 -0700
+
+Properly fallback on CWBackPixmap = None when failing to parse or allocate 
a solid color
+
+xrefresh.c:319:3: warning: Value stored to 'action' is never read
+action = doNone;
+^~~
+
+Found-by: clang static analyzer
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 289e8d27a8417ca94fd2063a44b84338ff499a3e
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jan 28 20:53:06 2011 -0800
+
+Fix allocateded typo in comment
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 18f7dcdd9fb30b784b3d99cb91d9f5c80cc19f44
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jan 19 10:06:57 2011 -0500
+
+config: move man pages into their own directory
+
+Use services provided by XORG_MANPAGE_SECTIONS.
+Use standard

x11-xserver-utils: Changes to 'debian-unstable'

2013-05-20 Thread Robert Hooker 
 debian/changelog |1 +
 debian/copyright |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5a1442efaef3ef422dc0612457ba7cac720a7b2b
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon May 20 13:27:33 2013 -0400

debian/copyright: update

diff --git a/debian/changelog b/debian/changelog
index ce537bb..159e13f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low
   * xstdcmap 1.0.3
   * xvidtune 1.0.3
   * xrefresh 1.0.5
+  * Update copyright
 
   [ Timo Aaltonen ]
   * control: Bump libxrandr-dev build-dependency.
diff --git a/debian/copyright b/debian/copyright
index eec7f4e..e3a39ee 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -100,7 +100,7 @@ sessreg:
   other dealings in this Software without prior written authorization
   from The Open Group.
 
-  Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+  Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 
   Permission is hereby granted, free of charge, to any person obtaining a
   copy of this software and associated documentation files (the Software),


-- 
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/e1uets6-00017l...@vasks.debian.org

x11-xserver-utils: Changes to 'debian-unstable'

2013-05-17 Thread Timo Aaltonen 
 debian/changelog |6 +-
 debian/control   |4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 01defd1205c551f2be01af567721b8f61f76cebb
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri May 17 15:37:40 2013 +0300

fix the version string, this is a native package

diff --git a/debian/changelog b/debian/changelog
index 8af95fe..5e294bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xserver-utils (7.7-1) UNRELEASED; urgency=low
+x11-xserver-utils (7.7+1) UNRELEASED; urgency=low
 
   [ Robert Hooker ]
   * New upstream releases:

commit b17d86a6dc5d3d54b1988cf8584dfd543ebace31
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri May 17 15:32:11 2013 +0300

control: Bump libxrandr-dev build-dependency.

diff --git a/debian/changelog b/debian/changelog
index 9bdc3cf..8af95fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 x11-xserver-utils (7.7-1) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * New upstream releases:
   * xrandr 1.4.0
 - Drop upstream patches.
@@ -8,6 +9,9 @@ x11-xserver-utils (7.7-1) UNRELEASED; urgency=low
   * xstdcmap 1.0.3
   * xvidtune 1.0.3
 
+  [ Timo Aaltonen ]
+  * control: Bump libxrandr-dev build-dependency.
+
  -- Robert Hooker sarv...@ubuntu.com  Wed, 15 May 2013 12:08:34 -0400
 
 x11-xserver-utils (7.7~3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 663f9db..8be6f27 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  libxext-dev (= 1:1.0.0),
  libxi-dev (= 1:1.0.0-3),
  libxmuu-dev (= 1:1.0.1),
- libxrandr-dev (= 2:1.2.99.3),
+ libxrandr-dev (= 2:1.4.0),
  libxt-dev (= 1:1.0.0),
  libxxf86vm-dev (= 1:1.0.0),
  xbitmaps,
@@ -28,7 +28,7 @@ Build-Depends:
 # xgamma: libx11-dev, libxxf86vm-dev
 # xhost: libx11-dev, libxmuu-dev, libxau-dev
 # xmodmap: libx11-dev
-# xrandr: libxrandr-dev (= 2:1.2.0), libxrender, libx11
+# xrandr: libxrandr-dev (= 2:1.4.0), libxrender, libx11
 # xrdb: libxmuu-dev, libx11-dev
 # xrefresh: libx11-dev
 # xset: x11proto-core-dev (= 7.0.17), libxmuu-dev, libx11-dev, libxext-dev,


-- 
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/e1udk20-00023a...@vasks.debian.org

x11-xserver-utils: Changes to 'debian-unstable'

2013-05-15 Thread Robert Hooker 
 debian/changelog   
|   12 
 debian/patches/03_xrandr-Update-keystone-program-to-run-with-new-nichrome.diff 
|   76 
 
debian/patches/04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff
 |   41 
 debian/patches/series  
|2 
 rgb/ChangeLog  
|   79 
 rgb/Makefile.in
|   72 
 rgb/aclocal.m4 
| 1233 +
 rgb/config.guess   
|  233 
 rgb/config.sub 
|  134 
 rgb/configure  
| 6090 +++-
 rgb/configure.ac   
|   13 
 rgb/depcomp
|   74 
 rgb/install-sh 
|   29 
 rgb/man/Makefile.in
|   31 
 rgb/man/rgb.man
|4 
 rgb/rgb.c  
|6 
 rgb/showrgb.c  
|   19 
 xrandr/ChangeLog   
|  491 
 xrandr/Makefile.in 
|  141 
 xrandr/aclocal.m4  
| 5162 +++---
 xrandr/config.guess
|  259 
 xrandr/config.sub  
|  156 
 xrandr/configure   
| 6147 
 xrandr/configure.ac
|   12 
 xrandr/depcomp 
|   74 
 xrandr/install-sh  
|   29 
 xrandr/keystone.5c 
|   24 
 xrandr/man/Makefile.in 
|   47 
 xrandr/man/xrandr.man  
|   48 
 xrandr/missing 
|   53 
 xrandr/xrandr.c
| 1264 +
 xsetroot/ChangeLog 
|   80 
 xsetroot/Makefile.am   
|   18 
 xsetroot/Makefile.in   
|  354 
 xsetroot/aclocal.m4
| 1143 +
 xsetroot/config.guess  
|  233 
 xsetroot/config.sub
|  134 
 xsetroot/configure 
| 5906 +++
 xsetroot/configure.ac  
|   17 
 xsetroot/depcomp   
|   74 
 xsetroot/install-sh
|   29 
 xsetroot/man/Makefile.am   
|   12 
 xsetroot/man/Makefile.in   
|  425 
 xsetroot/man/xsetroot.man  
|  115 
 xsetroot/xsetroot.c
|   44 
 xsetroot/xsetroot.man  
|  113 
 xstdcmap/ChangeLog 
|   96 
 xstdcmap/Makefile.am   
|   18 
 xstdcmap/Makefile.in   
|  356 
 xstdcmap/aclocal.m4
| 1233 +
 xstdcmap/config.guess  
|  233 
 xstdcmap/config.sub
|  134 
 xstdcmap/configure 
| 6106 
 xstdcmap/configure.ac

x11-xserver-utils: Changes to 'debian-unstable'

2012-05-11 Thread Julien Cristau 
 debian/changelog   
|7 +
 
debian/patches/04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff
 |   41 ++
 debian/patches/series  
|1 
 3 files changed, 49 insertions(+)

New commits:
commit ac659fd0be36d8d65952015eb12c4395ff6abe09
Author: Julien Cristau jcris...@debian.org
Date:   Fri May 11 22:59:23 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 22975f5..22d1254 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11-xserver-utils (7.7~3) UNRELEASED; urgency=low
+x11-xserver-utils (7.7~3) unstable; urgency=low
 
   * xrandr: keystone.5c: cairo-5 box semantics changed default layout (allows
 to work with new cairo-5c)
 
- -- Julien Cristau jcris...@debian.org  Fri, 11 May 2012 22:52:04 +0200
+ -- Julien Cristau jcris...@debian.org  Fri, 11 May 2012 22:58:40 +0200
 
 x11-xserver-utils (7.7~2) unstable; urgency=low
 

commit 4039112f06bbf6ad9d236b6dab622d805f6b7341
Author: Julien Cristau jcris...@debian.org
Date:   Fri May 11 22:58:18 2012 +0200

Fix xkeystone for new cairo-5c

keystone.5c: cairo-5 box semantics changed default layout (allows to
work with new cairo-5c)

diff --git a/debian/changelog b/debian/changelog
index a41f831..22975f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-xserver-utils (7.7~3) UNRELEASED; urgency=low
+
+  * xrandr: keystone.5c: cairo-5 box semantics changed default layout (allows
+to work with new cairo-5c)
+
+ -- Julien Cristau jcris...@debian.org  Fri, 11 May 2012 22:52:04 +0200
+
 x11-xserver-utils (7.7~2) unstable; urgency=low
 
   * xrandr: update keystone program to run with new nichrome bits
diff --git 
a/debian/patches/04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff
 
b/debian/patches/04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff
new file mode 100644
index 000..df2af15
--- /dev/null
+++ 
b/debian/patches/04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff
@@ -0,0 +1,41 @@
+From b9d260a49961b5e311e77e8600e7e5a8f2e8d475 Mon Sep 17 00:00:00 2001
+From: Keith Packard kei...@keithp.com
+Date: Tue, 1 May 2012 21:53:02 -0700
+Subject: [PATCH] keystone.5c: cairo-5 box semantics changed default layout
+
+cairo-5c version 1.6 includes a new 2D box layout widget that
+needs widget stretch defined in both dimensions to create
+the desired layout.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+---
+ keystone.5c |9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/xrandr/keystone.5c b/xrandr/keystone.5c
+index c616f12..4b698ee 100644
+--- a/xrandr/keystone.5c
 b/xrandr/keystone.5c
+@@ -543,15 +543,14 @@ void main ()
+ box_thbox = Box::new (Box::dir_t.horizontal,
+Box::widget_item (doit, 0),
+Box::widget_item (show, 0),
+-   
+Box::widget_item (quit, 0),
+Box::glue_item (1));
+ box_tbox = Box::new (Box::dir_t.vertical,
+   Box::box_item (hbox),
+-  Box::widget_item (label[0], 0),
+-  Box::widget_item (label[1], 0),
+-  Box::widget_item (label[2], 0),
+-  Box::widget_item (space, 0),
++  Box::widget_item (label[0], 1, 0),
++  Box::widget_item (label[1], 1, 0),
++  Box::widget_item (label[2], 1, 0),
++  Box::widget_item (space, 1, 0),
+   Box::widget_item (quad, 1));
+ Nichrome::set_box (nichrome, box);
+ Nichrome::main_loop (nichrome);
+-- 
+1.7.10
+
diff --git a/debian/patches/series b/debian/patches/series
index 8962555..7b620cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_sessreg_implement_hostname_hashing.diff
 02_xmodmap-include-config.h-before-system-headers.diff
 03_xrandr-Update-keystone-program-to-run-with-new-nichrome.diff
+04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff


-- 
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/e1ssyvx-00040o...@vasks.debian.org

x11-xserver-utils: Changes to 'debian-unstable'

2012-05-01 Thread Julien Cristau 
 debian/changelog   
|7 
 debian/patches/03_xrandr-Update-keystone-program-to-run-with-new-nichrome.diff 
|   76 ++
 debian/patches/series  
|1 
 3 files changed, 84 insertions(+)

New commits:
commit 3017fc34ae7bb2cb7908a0035a76bf5042b1e0e3
Author: Julien Cristau jcris...@debian.org
Date:   Tue May 1 10:35:53 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 96bd8c0..a41f831 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11-xserver-utils (7.7~2) UNRELEASED; urgency=low
+x11-xserver-utils (7.7~2) unstable; urgency=low
 
   * xrandr: update keystone program to run with new nichrome bits
 (cherry-picked from upstream git)
 
- -- Julien Cristau jcris...@debian.org  Tue, 01 May 2012 10:28:42 +0200
+ -- Julien Cristau jcris...@debian.org  Tue, 01 May 2012 10:35:40 +0200
 
 x11-xserver-utils (7.7~1) unstable; urgency=low
 

commit 801eaeb377246e5f2f3e63bdf6f432eb960c1c74
Author: Julien Cristau jcris...@debian.org
Date:   Tue May 1 10:29:27 2012 +0200

xrandr: update keystone program to run with new nichrome bits

cherry-picked from upstream git

diff --git a/debian/changelog b/debian/changelog
index 613ac76..96bd8c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-xserver-utils (7.7~2) UNRELEASED; urgency=low
+
+  * xrandr: update keystone program to run with new nichrome bits
+(cherry-picked from upstream git)
+
+ -- Julien Cristau jcris...@debian.org  Tue, 01 May 2012 10:28:42 +0200
+
 x11-xserver-utils (7.7~1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git 
a/debian/patches/03_xrandr-Update-keystone-program-to-run-with-new-nichrome.diff
 
b/debian/patches/03_xrandr-Update-keystone-program-to-run-with-new-nichrome.diff
new file mode 100644
index 000..06f2f2c
--- /dev/null
+++ 
b/debian/patches/03_xrandr-Update-keystone-program-to-run-with-new-nichrome.diff
@@ -0,0 +1,76 @@
+From 8ca08e32ee7daae75992cbf1f554ca9a389e5420 Mon Sep 17 00:00:00 2001
+From: Keith Packard kei...@keithp.com
+Date: Wed, 29 Feb 2012 16:26:25 +1300
+Subject: [PATCH] Update keystone program to run with new nichrome bits
+
+Will also work with old nichrome bits.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+---
+ keystone.5c |   15 ++-
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/xrandr/keystone.5c b/xrandr/keystone.5c
+index 228c020..c616f12 100644
+--- a/xrandr/keystone.5c
 b/xrandr/keystone.5c
+@@ -37,7 +37,7 @@ extend namespace Nichrome {
+   rgba_color_tcorner_color;
+   booldown;
+   boolstarted;
+-  int active;
++  int active_corner;
+   void(quad_t)   callback;
+   } quad_t;
+ 
+@@ -49,6 +49,10 @@ extend namespace Nichrome {
+   }
+   }
+ 
++  protected void natural (cairo_t cr, quad_t quad) {
++  rectangle (cr, 0, 0, 256, 256);
++  }
++
+   void text_at (cairo_t cr, point_t p, string text) {
+   text_extents_t  e = text_extents (cr, text);
+   p.x = p.x - e.width / 2 - e.x_bearing;
+@@ -102,7 +106,7 @@ extend namespace Nichrome {
+   enum switch (event.type) {
+   case press:
+   quad.down = true;
+-  quad.active = nearest (quad, event);
++  quad.active_corner = nearest (quad, event);
+   break;
+   case release:
+   quad.down = false;
+@@ -116,8 +120,8 @@ extend namespace Nichrome {
+   if (quad.down) {
+   motion.x = max (0, min (quad.geometry.width, motion.x));
+   motion.y = max (0, min (quad.geometry.height, motion.y));
+-  quad.p[quad.active].x = motion.x;
+-  quad.p[quad.active].y = motion.y;
++  quad.p[quad.active_corner].x = motion.x;
++  quad.p[quad.active_corner].y = motion.y;
+   quad.callback (quad);
+   Widget::reoutline (quad);
+   Widget::redraw (quad);
+@@ -149,6 +153,7 @@ extend namespace Nichrome {
+   quad.button = button;
+   quad.motion = motion;
+   quad.configure = configure;
++  quad.natural = natural;
+   quad.p = (point_t[4]) {
+   { x = 0, y = 0 } ...
+   };
+@@ -161,7 +166,7 @@ extend namespace Nichrome {
+   };
+   quad.corner_diameter = 20;
+   quad.down = false;
+-  quad.active = -1;
++  quad.active_corner = -1;
+   quad.callback = callback;
+   quad.started = false;
+   }
+-- 
+1.7.10
+
diff --git a/debian/patches/series b/debian/patches/series
index 3b892b3..8962555 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_sessreg_implement_hostname_hashing.diff

x11-xserver-utils: Changes to 'debian-unstable'

2012-04-30 Thread Julien Cristau 
 debian/changelog  |   10 
 debian/patches/01_sessreg_implement_hostname_hashing.diff |   26 
 debian/patches/02_xmodmap-include-config.h-before-system-headers.diff |   63 
 debian/patches/series |1 
 debian/rules  |3 
 xmodmap/ChangeLog |   31 
 xmodmap/Makefile.in   |   58 
 xmodmap/aclocal.m4|   67 
 xmodmap/config.guess  |  233 
 xmodmap/config.h.in   |   32 
 xmodmap/config.sub|  134 
 xmodmap/configure | 3987 
+-
 xmodmap/configure.ac  |   11 
 xmodmap/depcomp   |   74 
 xmodmap/install-sh|   29 
 xmodmap/man/Makefile.in   |   29 
 16 files changed, 2617 insertions(+), 2171 deletions(-)

New commits:
commit 4d0f0097917f773cf957601c8bf557087c356b18
Author: Julien Cristau jcris...@debian.org
Date:   Mon Apr 30 21:23:10 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 438217e..613ac76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xserver-utils (7.6+4) UNRELEASED; urgency=low
+x11-xserver-utils (7.7~1) unstable; urgency=low
 
   [ Julien Cristau ]
   * xset 1.2.2
@@ -19,7 +19,7 @@ x11-xserver-utils (7.6+4) UNRELEASED; urgency=low
   [ Moritz Muehlenhoff ]
   * Enable hardened build flags (closes: #655503)
 
- -- Julien Cristau jcris...@debian.org  Sun, 31 Jul 2011 14:31:05 +0200
+ -- Julien Cristau jcris...@debian.org  Mon, 30 Apr 2012 21:22:58 +0200
 
 x11-xserver-utils (7.6+3) unstable; urgency=low
 

commit 8fd70577afcb08e6b59e2e6e1bc688842f145fc4
Author: Julien Cristau jcris...@debian.org
Date:   Mon Apr 30 21:22:24 2012 +0200

Cherry-picked patch to fix xmodmap's build

diff --git a/debian/changelog b/debian/changelog
index b9398cc..438217e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ x11-xserver-utils (7.6+4) UNRELEASED; urgency=low
   * xmodmap 1.0.7.
   * Don't use dh_testroot in debian/rules clean.
   * Rediff 01_sessreg_implement_hostname_hashing.diff.
+  * 02_xmodmap-include-config.h-before-system-headers.diff: patch from
+upstream git to fix a build failure.
 
   [ Moritz Muehlenhoff ]
   * Enable hardened build flags (closes: #655503)
diff --git 
a/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff 
b/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff
new file mode 100644
index 000..583c99c
--- /dev/null
+++ b/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff
@@ -0,0 +1,63 @@
+From 42f99a7a7b836f6f9704a7b1747eb722c93446ec Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith alan.coopersm...@oracle.com
+Date: Mon, 23 Apr 2012 07:28:39 -0700
+Subject: [PATCH] include config.h before stdio.h  other system headers
+
+Ensures definitions like _GNU_SOURCE are visible when needed.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+---
+ exec.c|4 
+ pf.c  |4 
+ xmodmap.c |4 
+ 3 files changed, 12 insertions(+)
+
+diff --git a/xmodmap/exec.c b/xmodmap/exec.c
+index dbcb669..419b10e 100644
+--- a/xmodmap/exec.c
 b/xmodmap/exec.c
+@@ -54,6 +54,10 @@ from The Open Group.
+  * original xmodmap, written by David Rosenthal, of Sun Microsystems.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include config.h
++#endif
++
+ #include X11/Xos.h
+ #include X11/Xlib.h
+ #include stdio.h
+diff --git a/xmodmap/pf.c b/xmodmap/pf.c
+index 0eb0f55..3f0c3f4 100644
+--- a/xmodmap/pf.c
 b/xmodmap/pf.c
+@@ -26,6 +26,10 @@ from The Open Group.
+ 
+ */
+ 
++#ifdef HAVE_CONFIG_H
++# include config.h
++#endif
++
+ #include X11/Xos.h
+ #include X11/Xlib.h
+ #include stdio.h
+diff --git a/xmodmap/xmodmap.c b/xmodmap/xmodmap.c
+index 58a8e70..0f89629 100644
+--- a/xmodmap/xmodmap.c
 b/xmodmap/xmodmap.c
+@@ -26,6 +26,10 @@ from The Open Group.
+ 
+ */
+ 
++#ifdef HAVE_CONFIG_H
++# include config.h
++#endif
++
+ #include X11/Xos.h
+ #include X11/Xlib.h
+ #include stdio.h
+-- 
+1.7.10
+
diff --git a/debian/patches/series b/debian/patches/series
index 2044539..3b892b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_sessreg_implement_hostname_hashing.diff
+02_xmodmap-include-config.h-before-system-headers.diff

commit b917b7ec8fb83755781cd91bb87deeeb946181c4
Author: Julien Cristau jcris...@debian.org
Date:   Mon Apr 30

x11-xserver-utils: Changes to 'debian-unstable'

2012-04-08 Thread Julien Cristau 
 debian/changelog|5 
 sessreg/COPYING |2 
 sessreg/ChangeLog   |  252 +
 sessreg/Makefile.am |   43 
 sessreg/Makefile.in |  321 +-
 sessreg/aclocal.m4  |  682 +++-
 sessreg/config.guess|   18 
 sessreg/config.h.in |   27 
 sessreg/config.sub  |   76 
 sessreg/configure   | 1992 +-
 sessreg/configure.ac|   56 
 sessreg/filenames.sed.c |   29 
 sessreg/man/Makefile.am |   22 
 sessreg/man/Makefile.in |  423 +++
 sessreg/man/filenames.sed.c |   29 
 sessreg/man/sessreg.man |  135 
 sessreg/sessreg.c   |  302 +-
 sessreg/sessreg.h   |   45 
 sessreg/sessreg.man |  135 
 xcmsdb/ChangeLog|   82 
 xcmsdb/Makefile.am  |   17 
 xcmsdb/Makefile.in  |  297 +-
 xcmsdb/aclocal.m4   | 1074 +--
 xcmsdb/configure| 5489 ++-
 xcmsdb/configure.ac |9 
 xcmsdb/loadData.c   |6 
 xcmsdb/man/Makefile.am  |   12 
 xcmsdb/man/Makefile.in  |  414 ++
 xcmsdb/man/xcmsdb.man   |   96 
 xcmsdb/xcmsdb.c |7 
 xcmsdb/xcmsdb.man   |   96 
 xgamma/ChangeLog|   46 
 xgamma/Makefile.am  |   16 
 xgamma/Makefile.in  |  294 +-
 xgamma/aclocal.m4   | 1066 ++-
 xgamma/configure| 5873 +
 xgamma/configure.ac |7 
 xgamma/man/Makefile.am  |   12 
 xgamma/man/Makefile.in  |  414 ++
 xgamma/man/xgamma.man   |  100 
 xgamma/xgamma.man   |   96 
 xhost/ChangeLog |  138 
 xhost/Makefile.am   |   14 
 xhost/Makefile.in   |  295 +-
 xhost/aclocal.m4| 1099 ++-
 xhost/configure | 6179 ++--
 xhost/configure.ac  |   24 
 xhost/man/Makefile.am   |   12 
 xhost/man/Makefile.in   |  416 ++
 xhost/man/xhost.man |  187 +
 xhost/xhost.c   |   46 
 xhost/xhost.man |  175 -
 xmodmap/ChangeLog   |  108 
 xmodmap/Makefile.in |2 
 xmodmap/aclocal.m4  | 1168 ++--
 xmodmap/config.h.in |3 
 xmodmap/configure   | 5851 +
 xmodmap/configure.ac|8 
 xmodmap/exec.c  |5 
 xmodmap/handle.c|   27 
 xmodmap/man/Makefile.in |2 
 xmodmap/man/xmodmap.man |6 
 xmodmap/pf.c|   27 
 xmodmap/wq.h|4 
 xmodmap/xmodmap.c   |   77 
 xmodmap/xmodmap.h   |   10 
 66 files changed, 32047 insertions(+), 3953 deletions(-)

New commits:
commit b8f254f1fb5332d7e042d1d403cdb2bbac8a4e0f
Author: Julien Cristau jcris...@debian.org
Date:   Sat Apr 7 18:11:57 2012 +0200

xmodmap 1.0.6.

diff --git a/debian/changelog b/debian/changelog
index 87ba39f..d0c76a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x11-xserver-utils (7.6+4) UNRELEASED; urgency=low
   * xcmsdb 1.0.4.
   * xgamma 1.0.5.
   * xhost 1.0.5.
+  * xmodmap 1.0.6.
 
   [ Moritz Muehlenhoff ]
   * Enable hardened build flags (closes: #655503)
diff --git a/xmodmap/ChangeLog b/xmodmap/ChangeLog
index 1be40e6..f74007d 100644
--- a/xmodmap/ChangeLog
+++ b/xmodmap/ChangeLog
@@ -1,3 +1,111 @@
+commit b355a23e6787f348db97faaa48085428277c659b
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Mar 22 23:04:32 2012 -0700
+
+xmodmap 1.0.6
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit d0dfd2128e6111b967c51136d97093d3b53ee6d6
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Nov 11 21:07:30 2011 -0800
+
+Replace chk_malloc + sprintf with asprintf
+
+Includes local private copy of asprintf for OS'es without it in libc.
+Removes chk_malloc as no callers remain anymore.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit fecb1f5a0c2121de6d9209fc9525ac7d9b9555ea
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Nov 11 20:46:00 2011 -0800
+
+Free copy of input line at end of process_line instead of leaking it
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit 66c09c83aa2f64b31dc657f90447c269621545b7
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Nov 11 20:40:18 2011 -0800
+
+Fix gcc -Wwrite-strings warnings
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit 8751095511c7d9065ab12a40e90e38bdd9d728e4
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Fri Nov 11 11:22:43 2011 -0800
+
+Add missing _X_NORETURN to functions that need it
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com

x11-xserver-utils: Changes to 'debian-unstable'

2012-01-11 Thread Julien Cristau 
 debian/changelog |4 
 debian/rules |   13 ++---
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 301db48f25d750455c855ee165545f8185f4df98
Author: Moritz Muehlenhoff j...@debian.org
Date:   Wed Jan 11 20:58:31 2012 +0100

Enable hardened build flags

diff --git a/debian/changelog b/debian/changelog
index aaf9c51..bc611a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 x11-xserver-utils (7.6+4) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * xset 1.2.2
 + add build-dep on x11proto-core-dev 7.0.17
   * Drop --disable-xprint from configure flags, it's not used anywhere.
 
+  [ Moritz Muehlenhoff ]
+  * Enable hardened build flags (closes: #655503)
+
  -- Julien Cristau jcris...@debian.org  Sun, 31 Jul 2011 14:31:05 +0200
 
 x11-xserver-utils (7.6+3) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 6061351..214662e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,12 +18,11 @@ DEF_SUBDIRS=iceauth rgb sessreg xcmsdb xgamma xhost xmodmap 
xrandr xrdb xrefresh
 SUBDIRS=$(DEF_SUBDIRS)
 BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
 
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-   CFLAGS += -O0
-else
-   CFLAGS += -O2
-endif
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS += -Wall
+LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -49,7 +48,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts 
$(STAMP_DIR)/patch
cd $*-build  \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
-   CFLAGS=$(CFLAGS) \
+   CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) 
LDFLAGS=$(LDFLAGS) \
RSH=rsh \
MANCONF=/etc/manpath.config
cd $*-build  $(MAKE)


-- 
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/e1rl4jy-gj...@vasks.debian.org

x11-xserver-utils: Changes to 'debian-unstable'

2012-01-11 Thread Julien Cristau 
 debian/changelog |2 ++
 debian/rules |6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit c181d85a777f301db306481c359519f4b019b4ca
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jan 11 21:02:13 2012 +0100

Stop passing RSH and MANCONF to configure.

The former was only needed by xsm, the latter by xman, before the
xbase-clients split.

diff --git a/debian/changelog b/debian/changelog
index bc611a0..b71cc3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x11-xserver-utils (7.6+4) UNRELEASED; urgency=low
   * xset 1.2.2
 + add build-dep on x11proto-core-dev 7.0.17
   * Drop --disable-xprint from configure flags, it's not used anywhere.
+  * Stop passing RSH and MANCONF to configure.  The former was only needed by
+xsm, the latter by xman, before the xbase-clients split.
 
   [ Moritz Muehlenhoff ]
   * Enable hardened build flags (closes: #655503)
diff --git a/debian/rules b/debian/rules
index 214662e..4bda066 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,9 +48,9 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts 
$(STAMP_DIR)/patch
cd $*-build  \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
-   CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) 
LDFLAGS=$(LDFLAGS) \
-   RSH=rsh \
-   MANCONF=/etc/manpath.config
+   CFLAGS=$(CFLAGS) \
+   CPPFLAGS=$(CPPFLAGS) \
+   LDFLAGS=$(LDFLAGS)
cd $*-build  $(MAKE)
$@
 


-- 
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/e1rl4np-0004bo...@vasks.debian.org

x11-xserver-utils: Changes to 'debian-unstable'

2011-07-31 Thread Julien Cristau 
 debian/changelog |8 
 debian/control   |   21 +-
 debian/rules |1 
 xset/ChangeLog   |  101 
 xset/Makefile.am |   10 -
 xset/Makefile.in |  292 +++
 xset/aclocal.m4  |  412 ++---
 xset/configure   |  123 --
 xset/configure.ac|   15 -
 xset/man/Makefile.am |   12 +
 xset/man/Makefile.in |  423 +++
 xset/man/xset.man|  298 +++
 xset/xset.c  |   28 ---
 xset/xset.man|  298 ---
 14 files changed, 1523 insertions(+), 519 deletions(-)

New commits:
commit e6b6d2b33de8a1110e1e8d24e849d8cf3455bac5
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jul 31 14:45:13 2011 +0200

Drop --disable-xprint from configure flags, it's not used anywhere.

diff --git a/debian/changelog b/debian/changelog
index 776344a..aaf9c51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-xserver-utils (7.6+4) UNRELEASED; urgency=low
 
   * xset 1.2.2
 + add build-dep on x11proto-core-dev 7.0.17
+  * Drop --disable-xprint from configure flags, it's not used anywhere.
 
  -- Julien Cristau jcris...@debian.org  Sun, 31 Jul 2011 14:31:05 +0200
 
diff --git a/debian/rules b/debian/rules
index a608d32..6061351 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,6 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts 
$(STAMP_DIR)/patch
cd $*-build  \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
-   --disable-xprint \
CFLAGS=$(CFLAGS) \
RSH=rsh \
MANCONF=/etc/manpath.config

commit 9ab1005a2cfd814429ad59abda6c80ac35c58085
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jul 31 14:32:45 2011 +0200

update changelog and build-deps for xset 1.2.2

diff --git a/debian/changelog b/debian/changelog
index 3a90c21..776344a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-xserver-utils (7.6+4) UNRELEASED; urgency=low
+
+  * xset 1.2.2
++ add build-dep on x11proto-core-dev 7.0.17
+
+ -- Julien Cristau jcris...@debian.org  Sun, 31 Jul 2011 14:31:05 +0200
+
 x11-xserver-utils (7.6+3) unstable; urgency=low
 
   * iceauth 1.0.5
diff --git a/debian/control b/debian/control
index 20651c1..663f9db 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,20 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Cyril Brulebois k...@debian.org
-Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 2:1.0.0),
- libxaw7-dev (= 1:1.0.1), libxext-dev (= 1:1.0.0),
- libxi-dev (= 1:1.0.0-3), libxmuu-dev (= 1:1.0.1),
- libxrandr-dev (= 2:1.2.99.3), libxt-dev (= 1:1.0.0),
- libxxf86vm-dev (= 1:1.0.0), xbitmaps, quilt,
+Build-Depends:
+ debhelper (= 5.0.0),
+ pkg-config,
+ x11proto-core-dev (= 7.0.17),
+ libx11-dev (= 2:1.0.0),
+ libxaw7-dev (= 1:1.0.1),
+ libxext-dev (= 1:1.0.0),
+ libxi-dev (= 1:1.0.0-3),
+ libxmuu-dev (= 1:1.0.1),
+ libxrandr-dev (= 2:1.2.99.3),
+ libxt-dev (= 1:1.0.0),
+ libxxf86vm-dev (= 1:1.0.0),
+ xbitmaps,
+ quilt,
  x11proto-input-dev (= 1.4),
  xutils-dev (= 1:7.5+4),
  libxcursor-dev,
@@ -22,7 +31,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev 
(= 2:1.0.0),
 # xrandr: libxrandr-dev (= 2:1.2.0), libxrender, libx11
 # xrdb: libxmuu-dev, libx11-dev
 # xrefresh: libx11-dev
-# xset: libxmuu-dev, libx11-dev, libxext-dev,
+# xset: x11proto-core-dev (= 7.0.17), libxmuu-dev, libx11-dev, libxext-dev,
 #   (libxxf86misc-dev), (libxfontcache-dev)
 # xsetmode: libxi-dev, libx11-dev
 # xsetpointer: libxi-dev, libx11-dev, x11proto-input-dev (= 1.4)

commit 72cb62ae2b1e44fc62a38a95c77956b735326c0b
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jul 31 14:29:33 2011 +0200

xset 1.2.2

diff --git a/xset/ChangeLog b/xset/ChangeLog
index 8f0f5fc..f32696d 100644
--- a/xset/ChangeLog
+++ b/xset/ChangeLog
@@ -1,3 +1,104 @@
+commit 1e3ae11d125f5146dd6821161e17522bae702e71
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Jul 28 21:10:22 2011 -0700
+
+xset 1.2.2
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 6572d75b102b463c974a5969997fc646d36a1797
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jul 15 18:12:36 2011 -0700
+
+Remove direct call to Solaris nanosleep system call
+
+Attempted to workaround nanosleep() being only in POSIX realtime
+extensions library, but both usleep()  nanosleep() are in libc now,
+so not useful anymore, nor was it ever officially supported.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit

x11-xserver-utils: Changes to 'debian-unstable'

2011-07-02 Thread Cyril Brulebois 
 debian/changelog   |6 
 debian/control |2 
 xrandr/ChangeLog   |  134 +++
 xrandr/Makefile.am |   19 --
 xrandr/Makefile.in |  289 +++--
 xrandr/aclocal.m4  |  424 -
 xrandr/configure   |  121 -
 xrandr/configure.ac|   11 -
 xrandr/man/Makefile.am |   12 +
 xrandr/man/Makefile.in |  413 +++
 xrandr/man/xrandr.man  |  352 
 xrandr/xrandr.c|   15 -
 xrandr/xrandr.man  |  352 
 13 files changed, 1590 insertions(+), 560 deletions(-)

New commits:
commit c7b93cd9bf66049fb13765d989e4ad4b31e9893b
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jul 2 19:55:29 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index fc1a957..3a90c21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-x11-xserver-utils (7.6+3) UNRELEASED; urgency=low
+x11-xserver-utils (7.6+3) unstable; urgency=low
 
   * iceauth 1.0.5
   * Drop 03_iceauth_manpage_commands.patch (merged upstream).
   * xrandr 1.3.5
   * Bump Standards-Version to 3.9.2 (no changes).
 
- -- Cyril Brulebois k...@debian.org  Sat, 04 Jun 2011 01:10:31 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 02 Jul 2011 19:55:25 +0200
 
 x11-xserver-utils (7.6+2) unstable; urgency=high
 

commit f7e3d39d1a337884ac0db72e7dc136d741653558
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jul 2 19:55:21 2011 +0200

Bump Standards-Version to 3.9.2 (no changes).

diff --git a/debian/changelog b/debian/changelog
index 5c896dc..fc1a957 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-xserver-utils (7.6+3) UNRELEASED; urgency=low
   * iceauth 1.0.5
   * Drop 03_iceauth_manpage_commands.patch (merged upstream).
   * xrandr 1.3.5
+  * Bump Standards-Version to 3.9.2 (no changes).
 
  -- Cyril Brulebois k...@debian.org  Sat, 04 Jun 2011 01:10:31 +0200
 
diff --git a/debian/control b/debian/control
index 97cbac2..20651c1 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev 
(= 2:1.0.0),
 # xsetroot: libxmuu-dev, libx11-dev, xbitmaps, libxcursor-dev
 # xstdcmap: libxmu-dev, libx11-dev
 # xvidtune: libxaw7-dev, libxxf86vm-dev, libxt-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xserver-utils
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xserver-utils.git
 

commit 1802a1bd42f621468b4fddfe4fed24cd74fe48bc
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jul 2 19:52:42 2011 +0200

xrandr 1.3.5

diff --git a/debian/changelog b/debian/changelog
index 527b26f..5c896dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-xserver-utils (7.6+3) UNRELEASED; urgency=low
 
   * iceauth 1.0.5
   * Drop 03_iceauth_manpage_commands.patch (merged upstream).
+  * xrandr 1.3.5
 
  -- Cyril Brulebois k...@debian.org  Sat, 04 Jun 2011 01:10:31 +0200
 
diff --git a/xrandr/ChangeLog b/xrandr/ChangeLog
index 5a2c9f1..05b6e22 100644
--- a/xrandr/ChangeLog
+++ b/xrandr/ChangeLog
@@ -1,3 +1,137 @@
+commit 9e7a1f88de66c65cca1eb732278f76dab125f30e
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Jun 29 21:18:23 2011 -0700
+
+xrandr 1.3.5
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit a187677a93a215ccbba819f98425a6c682a50a6c
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Mon May 9 09:26:34 2011 -0700
+
+find_mode: Search for the mode closes to the specified rate
+
+This was the intention of d9aeb4a7544ad4a33f6f54bc46bff5cdf231a986, but
+find_mode was still picking the first string match rather than the
+match with the closest refresh rate.
+
+xrandr.c:740:3: warning: Value stored to 'bestDist' is never read
+   bestDist = dist;
+   ^  
+
+Found-by: clang static analyzer
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 30e9137bf94f58f66cc6883b0a47eab3159c8be6
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sun May 8 16:42:50 2011 -0700
+
+Dead code removal
+
+xrandr.c:2978:33: warning: Value stored to 'first' is never read
+if (!first) printf ( ); first = False;
+  ^   ~
+xrandr.c:2966:30: warning: Value stored to 'first' is never read
+if (!first) printf ( ); first = False;
+  ^   ~
+
+Found-by: clang static analyzer
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 1e48aad532aa19a35efbee24cddca4c43e02afe7
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sun May 8 16:35:47 2011 -0700
+
+Dead code removal
+

x11-xserver-utils: Changes to 'debian-unstable'

2011-06-03 Thread Cyril Brulebois 
 debian/changelog |7 
 debian/patches/03_iceauth_manpage_commands.patch |  103 ---
 debian/patches/series|1 
 iceauth/ChangeLog|   90 +++
 iceauth/Makefile.am  |   18 
 iceauth/Makefile.in  |  294 +++
 iceauth/aclocal.m4   |  601 ---
 iceauth/autogen.sh   |   13 
 iceauth/config.guess |   18 
 iceauth/config.sub   |   76 --
 iceauth/configure|  172 +++---
 iceauth/configure.ac |   11 
 iceauth/iceauth.man  |   40 -
 iceauth/man/Makefile.am  |   12 
 iceauth/man/Makefile.in  |  416 +++
 iceauth/man/iceauth.man  |  124 
 iceauth/process.c|7 
 17 files changed, 1397 insertions(+), 606 deletions(-)

New commits:
commit 7e3104eff9dea2af2c0d39c0edacbf5716516868
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jun 4 01:13:27 2011 +0200

Drop 03_iceauth_manpage_commands.patch (merged upstream).

diff --git a/debian/changelog b/debian/changelog
index dcb58e8..527b26f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11-xserver-utils (7.6+3) UNRELEASED; urgency=low
 
   * iceauth 1.0.5
+  * Drop 03_iceauth_manpage_commands.patch (merged upstream).
 
  -- Cyril Brulebois k...@debian.org  Sat, 04 Jun 2011 01:10:31 +0200
 
diff --git a/debian/patches/03_iceauth_manpage_commands.patch 
b/debian/patches/03_iceauth_manpage_commands.patch
deleted file mode 100644
index 2b5ef6d..000
--- a/debian/patches/03_iceauth_manpage_commands.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 3deeff7e94fc6400b8e5d4cfb32a5e95b22318bc Mon Sep 17 00:00:00 2001
-From: David Nusinow dnusi...@debian.org
-Date: Tue, 3 Feb 2009 21:35:30 -0500
-Subject: [PATCH] Make iceauth manpage describe commands. (fd.o bug#2354)
-

- iceauth.man |   86 ++-
- 1 files changed, 85 insertions(+), 1 deletions(-)
-
-Index: x11-xserver-utils/iceauth/iceauth.man
-===
 x11-xserver-utils.orig/iceauth/iceauth.man
-+++ x11-xserver-utils/iceauth/iceauth.man
-@@ -36,5 +36,89 @@ used to extract authorization records fr
- another (as is the case when using remote logins or granting access to
- other users).  Commands (described below) may be entered interactively,
- on the \fIiceauth\fP command line, or in scripts.
-+.SH OPTIONS
-+.PP
-+\fB\-f\fP \fIauthfile\fP  Name of the authority file to use. Will default to 
-+ the file currently in use by the session.
-+.PP
-+\fB\-v\fP   Turns on extra messages (verbose mode)
-+.PP
-+\fB\-q\fP   Turns off extra messages (quiet mode)
-+.PP
-+\fB\-i\fP   Ignore the locks on the authority file
-+.PP
-+\fB\-b\fP   Break the locks on the authority file
-+.PP
-+\fB\-u\fP   Print basic usage instructions
-+.PP
-+.SH USAGE
-+.PP
-+When \fIiceauth\fP is run it will allow the following set of commands
-+to be entered interactively or in scripts.
-+.PP
-+\fB?\fP
-+.PP
-+List available commands.
-+.PP
-+\fBhelp\fP
-+.PP
-+Print help information. You may supply a command name to \fIhelp\fP to
-+get specific information about it.
-+.PP
-+\fBinfo\fP
-+.PP
-+Print information about the entries in the authority file.
-+.PP
-+\fBlist\fP
-+.PP
-+List (print) entries in the authority file. You may specify optional
-+modifiers as below to specify which entries are listed.  
-+.PP
-+\fIlist\fP [ \fIprotocol_name\fP ] [ \fIprotocol_data\fP ] [
-+\fInetid\fP ] [ \fIauthname\fP ]
-+.PP
-+\fBadd\fP
-+.PP
-+Add an entry to the authority file. This must be in the format
-+.PP
-+\fIadd\fP \fIprotocol_name\fP \fIprotocol_data\fP \fInetid\fP \fIauthname\fP 
\fIauthdata\fP
-+.PP
-+\fBremove\fP
-+.PP
-+Remove entries from the authority file.
-+.PP
-+\fIremove\fP [ \fIprotocol_name\fP ] [ \fIprotocol_data\fP ] [
-+\fInetid\fP ] [ \fIauthname\fP ]
-+.PP
-+\fBextract\fP
-+.PP
-+Extract entries from the authority file in to a destination file. You
-+must supply the path to the destination to this command as in the
-+following format. Optional specifiers allow you to narrow which
-+entries are extracted.
-+.PP
-+\fIextract\fP \fIfilename\fP [ \fIprotocol_name\fP ] [ \fIprotocol_data\fP ]
-+[ \fInetid\fP ] [ \fIauthname\fP ]
-+.PP
-+\fBmerge\fP
-+.PP
-+Merge entries from other files in to the authority file selected by the 
program. You may supply any number of file paths to this command as follows:
-+.PP
-+\fImerge\fP \fIfilename1\fP [ \fIfilename2\fP ] [ \fIfilename3\fP ] ...
-+.PP
-+\fBexit\fP
-+.PP
-+Save changes and exit the program.
-+.PP
-+\fBquit\fP
-+.PP
-+Abort

x11-xserver-utils: Changes to 'debian-unstable'

2011-04-06 Thread Julien Cristau 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5d32fde671a952d476a3f2d6862e40c047aec8ca
Author: Julien Cristau jcris...@debian.org
Date:   Wed Apr 6 10:26:31 2011 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 62bf1e2..c08488d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-x11-xserver-utils (7.6+2) UNRELEASED; urgency=low
+x11-xserver-utils (7.6+2) unstable; urgency=high
 
+  [ Robert Hooker ]
   * xrdb 1.0.9 (Fixes CVE-2011-0465)
 
- -- Robert Hooker sarv...@ubuntu.com  Tue, 05 Apr 2011 14:36:19 -0400
+ -- Julien Cristau jcris...@debian.org  Wed, 06 Apr 2011 10:25:37 +0200
 
 x11-xserver-utils (7.6+1) 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/e1q7ofb-0001el...@alioth.debian.org

x11-xserver-utils: Changes to 'debian-unstable'

2011-04-05 Thread Robert Hooker 
 debian/changelog  |6 
 xrdb/ChangeLog|   17 
 xrdb/INSTALL  |  291 ---
 xrdb/aclocal.m4   | 1996 +++---
 xrdb/config.guess |  136 +--
 xrdb/configure|   21 
 xrdb/configure.ac |2 
 xrdb/xrdb.c   |   79 +-
 8 files changed, 1168 insertions(+), 1380 deletions(-)

New commits:
commit 52b85a64989483df69812ea78e00666dbdcec993
Author: Robert Hooker robert.hoo...@canonical.com
Date:   Tue Apr 5 14:39:56 2011 -0400

xrdb 1.0.9

diff --git a/debian/changelog b/debian/changelog
index 9f37d5a..62bf1e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xserver-utils (7.6+2) UNRELEASED; urgency=low
+
+  * xrdb 1.0.9 (Fixes CVE-2011-0465)
+
+ -- Robert Hooker sarv...@ubuntu.com  Tue, 05 Apr 2011 14:36:19 -0400
+
 x11-xserver-utils (7.6+1) unstable; urgency=low
 
   [ David Nusinow ]
diff --git a/xrdb/ChangeLog b/xrdb/ChangeLog
index 7a18aa0..ce35754 100644
--- a/xrdb/ChangeLog
+++ b/xrdb/ChangeLog
@@ -1,3 +1,20 @@
+commit 4b8990ea599aee08284481b258cccdc25dd5d8d8
+Author: Matthias Hopf mh...@suse.de
+Date:   Tue Apr 5 17:50:00 2011 +0200
+
+Bump to 1.0.9
+
+commit 1027d5df07398c1507fb1fe3a9981aa6b4bc3a56
+Author: Matthias Hopf mh...@suse.de
+Date:   Tue Mar 1 19:37:34 2011 +0100
+
+Create shell-escape-safe cpp options in the non-pathetic-cpp case.
+
+Fixes CVE-2011-0465.
+
+Signed-off-by: Matthias Hopf mh...@suse.de
+Reviewed-by: Adam Jackson a...@redhat.com
+
 commit ce9709b2811eb06bc7e03d26599c40b60effd0f8
 Author: Jeremy Huddleston jerem...@apple.com
 Date:   Wed Feb 2 15:30:45 2011 -0800
diff --git a/xrdb/INSTALL b/xrdb/INSTALL
index 8b82ade..e69de29 100644
--- a/xrdb/INSTALL
+++ b/xrdb/INSTALL
@@ -1,291 +0,0 @@
-Installation Instructions
-*
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
-
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while.  While running, it prints
- some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
-  4. Type `make install' to install the programs and any data files and
- documentation.
-
-  5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'.  To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'.  There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers.  If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-  6. Often, you can also type `make uninstall' to remove the installed
- files again.
-
-Compilers and Options

x11-xserver-utils: Changes to 'debian-unstable'

2011-02-10 Thread Julien Cristau 
 debian/changelog  |   43 
 debian/control|   10 
 debian/copyright  |  447 
 debian/copyright.head |6 
 debian/patches/01_sessreg_implement_hostname_hashing.diff |   12 
 debian/patches/03_iceauth_manpage_commands.patch  |  103 
 debian/patches/series |1 
 debian/rules  |   11 
 iceauth/COPYING   |   26 
 iceauth/ChangeLog |  134 
 iceauth/INSTALL   |  291 
 iceauth/Makefile.am   |   31 
 iceauth/Makefile.in   |   62 
 iceauth/aclocal.m4|  851 +
 iceauth/config.guess  |  210 
 iceauth/config.h.in   |3 
 iceauth/config.sub|  115 
 iceauth/configure | 3967 +++-
 iceauth/configure.ac  |   15 
 iceauth/iceauth.c |3 
 iceauth/iceauth.h |4 
 iceauth/iceauth.man   |3 
 iceauth/process.c |4 
 rgb/COPYING   |   42 
 rgb/ChangeLog |  143 
 rgb/INSTALL   |  291 
 rgb/Makefile.am   |  103 
 rgb/Makefile.in   |  607 -
 rgb/README|   31 
 rgb/aclocal.m4| 1360 ++
 rgb/config.guess  |  257 
 rgb/config.h.in   |3 
 rgb/config.sub|  161 
 rgb/configure | 6676 +++---
 rgb/configure.ac  |   62 
 rgb/depcomp   |  116 
 rgb/install-sh|  231 
 rgb/man/Makefile.am   |   41 
 rgb/man/Makefile.in   |  445 
 rgb/man/rgb.man   |   85 
 rgb/man/showrgb.man   |   45 
 rgb/missing   |   49 
 rgb/rgb.man   |   91 
 rgb/showrgb.c |3 
 rgb/showrgb.man   |   45 
 xcmsdb/COPYING|   47 
 xcmsdb/ChangeLog  |  105 
 xcmsdb/INSTALL|  291 
 xcmsdb/Makefile.am|   30 
 xcmsdb/Makefile.in|   63 
 xcmsdb/aclocal.m4 |  833 +
 xcmsdb/config.guess   |  210 
 xcmsdb/config.h.in|3 
 xcmsdb/config.sub |  115 
 xcmsdb/configure  | 3932 +++-
 xcmsdb/configure.ac   |   20 
 xgamma/ChangeLog  |  107 
 xgamma/INSTALL|  291 
 xgamma/Makefile.am|   31 
 xgamma/Makefile.in|   62 
 xgamma/aclocal.m4 |  863 +
 xgamma/config.guess   |  210 
 xgamma/config.h.in|3 
 xgamma/config.sub |  115 
 xgamma/configure  | 3936 +++-
 xgamma/configure.ac   |   26 
 xgamma/xgamma.c   |1 
 xgamma/xgamma.man |2 
 xhost/COPYING |   22 
 xhost/ChangeLog   |  146 
 xhost/INSTALL |  291 
 xhost/Makefile.am |   30 
 xhost/Makefile.in |   59 
 xhost/aclocal.m4  |

x11-xserver-utils: Changes to 'debian-unstable'

2010-07-24 Thread Cyril Brulebois 
 debian/changelog |   11 
 debian/control   |2 
 sessreg/COPYING  |   21 
 sessreg/ChangeLog|  102 
 sessreg/INSTALL  |  291 ++
 sessreg/Makefile.am  |   11 
 sessreg/Makefile.in  |   65 
 sessreg/aclocal.m4   |  669 -
 sessreg/config.guess |  196 -
 sessreg/config.h.in  |   44 
 sessreg/config.sub   |   43 
 sessreg/configure| 6391 +--
 sessreg/configure.ac |   37 
 sessreg/sessreg.c|  100 
 sessreg/sessreg.h|   52 
 xrandr/ChangeLog |  288 ++
 xrandr/INSTALL   |  291 ++
 xrandr/Makefile.am   |   12 
 xrandr/Makefile.in   |  347 +-
 xrandr/README|   26 
 xrandr/aclocal.m4| 1887 ---
 xrandr/config.guess  |  328 +-
 xrandr/config.h.in   |3 
 xrandr/config.sub|  156 +
 xrandr/configure | 4727 +
 xrandr/configure.ac  |   17 
 xrandr/depcomp   |  116 
 xrandr/install-sh|  231 -
 xrandr/missing   |   49 
 xrandr/xrandr.c  |  241 +
 xrandr/xrandr.man|   59 
 31 files changed, 9907 insertions(+), 6906 deletions(-)

New commits:
commit be929fe82ef3d6059dbafc0da32176b6e23a5a1d
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jul 24 16:27:36 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index ab65b5c..0791f05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
+x11-xserver-utils (7.5+2) unstable; urgency=low
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -15,7 +15,7 @@ x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
   * sessreg 1.0.6.
   * Add myself to Uploaders.
 
- -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:13 +
+ -- Cyril Brulebois k...@debian.org  Sat, 24 Jul 2010 16:27:24 +0200
 
 x11-xserver-utils (7.5+1) unstable; urgency=low
 

commit 2764dff2f766a3cc98bd9681bb4c52eba1734c10
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jul 24 16:27:22 2010 +0200

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index d64ba9d..ab65b5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
   * xrandr 1.3.3.
 + Fix segmentation fault on “xrandr --transform none” (closes: #579542).
   * sessreg 1.0.6.
+  * Add myself to Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:13 +
 
diff --git a/debian/control b/debian/control
index e6c0de0..f10e3b1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-xserver-utils
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org, Cyril Brulebois k...@debian.org
 Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 2:1.0.0),
  libxaw7-dev (= 1:1.0.1), libxext-dev (= 1:1.0.0),
  libxi-dev (= 1:1.0.0-3), libxmuu-dev (= 1:1.0.1),

commit daa99a5e2069f2ec7a3a124aa9cd3298e0ab8af1
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jul 24 16:23:17 2010 +0200

sessreg 1.0.6

diff --git a/debian/changelog b/debian/changelog
index 88a2da1..d64ba9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
   [ Cyril Brulebois ]
   * xrandr 1.3.3.
 + Fix segmentation fault on “xrandr --transform none” (closes: #579542).
+  * sessreg 1.0.6.
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:13 +
 
diff --git a/sessreg/COPYING b/sessreg/COPYING
index fd647dd..33b0d72 100644
--- a/sessreg/COPYING
+++ b/sessreg/COPYING
@@ -21,3 +21,24 @@ Except as contained in this notice, the name of The Open 
Group shall
 not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
 from The Open Group.
+
+Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the Software),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

x11-xserver-utils: Changes to 'debian-unstable'

2010-05-09 Thread Julien Cristau 
 debian/README.source   |2 
 debian/changelog   |4 
 debian/control |5 
 debian/rules   |7 
 debian/watch.iceauth   |2 
 debian/watch.rgb   |2 
 debian/watch.sessreg   |2 
 debian/watch.xcmsdb|2 
 debian/watch.xgamma|2 
 debian/watch.xhost |2 
 debian/watch.xmodmap   |2 
 debian/watch.xrandr|2 
 debian/watch.xrdb  |2 
 debian/watch.xrefresh  |2 
 debian/watch.xset  |2 
 debian/watch.xsetmode  |2 
 debian/watch.xsetpointer   |2 
 debian/watch.xsetroot  |2 
 debian/watch.xstdcmap  |2 
 debian/watch.xvidtune  |2 
 debian/xsfbs/xsfbs.mk  |   54 
 debian/xsfbs/xsfbs.sh  |  233 -
 xvidtune/COPYING   |   29 
 xvidtune/ChangeLog |  429 ++
 xvidtune/INSTALL   |  143 
 xvidtune/Makefile.am   |   29 
 xvidtune/Makefile.in   |  456 +-
 xvidtune/README|   26 
 xvidtune/Xvidtune.cpp  |  182 -
 xvidtune/aclocal.m4| 1943 ++--
 xvidtune/app-defaults/Xvidtune |  183 +
 xvidtune/compile   |  142 
 xvidtune/config.guess  |  271 -
 xvidtune/config.h.in   |   33 
 xvidtune/config.sub|  139 
 xvidtune/configure | 6376 +++--
 xvidtune/configure.ac  |   40 
 xvidtune/depcomp   |  172 -
 xvidtune/install-sh|  517 ++-
 xvidtune/missing   |  104 
 xvidtune/mkinstalldirs |  158 -
 xvidtune/xvidtune.c|   42 
 xvidtune/xvidtune.man  |6 
 43 files changed, 6628 insertions(+), 5129 deletions(-)

New commits:
commit 6a0c26eee5d536989e8161a1d5869149abd18b9e
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 9 14:37:53 2010 +0200

Drop Pre-Depends on x11-common, only needed for upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index 27905df..291c20a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
   * debian/rules: add get-tarballs rule.
   * xvidtune 1.0.2.
   * Drop XS- prefix from Vcs-* control fields.
+  * Drop Pre-Depends on x11-common, only needed for upgrades from sarge.
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:13 +
 
diff --git a/debian/control b/debian/control
index 148c390..e6c0de0 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,6 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/app/x11-xserver-utils.git
 Package: x11-xserver-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
-Pre-Depends: x11-common (= 1:7.0.0)
 Conflicts: iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, 
xrgb, xset,
  xsetmode, xsetpointer, xsetroot, xstdcmap, xvidtune
 Replaces: xbase-clients ( 1:7.3), xutils ( 1:7.2),

commit 979b2fb8273f23fc96599f8e82174f8698969bda
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 9 14:37:18 2010 +0200

Drop XS- prefix from Vcs-* control fields.

diff --git a/debian/changelog b/debian/changelog
index 297318f..27905df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
   * Remove myself from Uploaders
   * debian/rules: add get-tarballs rule.
   * xvidtune 1.0.2.
+  * Drop XS- prefix from Vcs-* control fields.
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:13 +
 
diff --git a/debian/control b/debian/control
index b90b6d1..148c390 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,8 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev 
(= 2:1.0.0),
 # xstdcmap: libxmu-dev, libx11-dev
 # xvidtune: libxaw7-dev, libxxf86vm-dev, libxt-dev
 Standards-Version: 3.8.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xserver-utils
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xserver-utils.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xserver-utils
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xserver-utils.git
 
 Package: x11-xserver-utils
 Architecture: any

commit b4bfdbbb57797baadb0e9f709a6cd6c55f3053ef
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 9 14:32:56 2010 +0200

xvidtune 1.0.2.

diff --git a/debian/changelog b/debian/changelog
index cbf3e52..297318f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
   * debian/rules: add get-tarballs rule.
+  * xvidtune 1.0.2.
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:13 +
 
diff --git a/xvidtune/AUTHORS b/xvidtune/AUTHORS
deleted file mode 100644
index e69de29..000
diff --git a/xvidtune/COPYING

x11-xserver-utils: Changes to 'debian-unstable'

2010-01-22 Thread Julien Cristau 
 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6c07bd3638e407b8d09d12106ecc6dd576d14bb8
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 23 01:46:26 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index 97e5026..1a900bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:13 +
 
diff --git a/debian/control b/debian/control
index ef7d3ac..b90b6d1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-xserver-utils
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Julien Cristau 
jcris...@debian.org, Brice Goglin bgog...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 2:1.0.0),
  libxaw7-dev (= 1:1.0.1), libxext-dev (= 1:1.0.0),
  libxi-dev (= 1:1.0.0-3), libxmuu-dev (= 1:1.0.1),


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

x11-xserver-utils: Changes to 'debian-unstable'

2010-01-16 Thread Julien Cristau 
 debian/changelog |7 +++
 debian/rules |   10 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit bb6f4c6e7b70875c2b90f8fbe692c947398acced
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 16 16:48:38 2010 +

Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good 
reason.  Thanks, Colin Watson!

diff --git a/debian/changelog b/debian/changelog
index 1ccbc75..97e5026 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-xserver-utils (7.5+2) UNRELEASED; urgency=low
+
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
+ -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:13 +
+
 x11-xserver-utils (7.5+1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index 2cce569..e07ce46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,15 +45,15 @@ build-stamp: $(BUILD_STAMPS)
 
 $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
dh_testdir
-   mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE)
-   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  \
+   mkdir -p $*-build
+   cd $*-build  \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
--disable-xprint \
CFLAGS=$(CFLAGS) \
RSH=rsh \
MANCONF=/etc/manpath.config
-   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   cd $*-build  $(MAKE)
$@
 
 clean: xsfclean
@@ -65,7 +65,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
-   rm -rf *-obj-*
+   rm -rf *-build
 
dh_clean
 
@@ -76,7 +76,7 @@ install: build
dh_installdirs
 
for FILE in $(SUBDIRS); do \
-   cd $$FILE-obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) 
DESTDIR=$(CURDIR)/debian/tmp install ; \
+   cd $$FILE-build  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install ; \
cd ..; \
done
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

x11-xserver-utils: Changes to 'debian-unstable'

2009-12-06 Thread Julien Cristau 
 debian/changelog   |1 
 debian/control |9 
 debian/copyright   |   35 
 debian/rules   |2 
 xtrap/COPYING  |   12 
 xtrap/ChangeLog|   42 
 xtrap/INSTALL  |  236 --
 xtrap/Makefile.am  |  159 -
 xtrap/Makefile.in  |  961 -
 xtrap/XEKeybCtrl.c |  236 --
 xtrap/XEKeybCtrl.h |8 
 xtrap/aclocal.m4   | 1533 ---
 xtrap/chparse.c|  406 
 xtrap/chparse.h|   10 
 xtrap/compile  |  142 -
 xtrap/config.guess | 1516 ---
 xtrap/config.h.in  |   31 
 xtrap/config.sub   | 1622 
 xtrap/configure| 5209 -
 xtrap/configure.ac |   42 
 xtrap/depcomp  |  530 -
 xtrap/install-sh   |  323 ---
 xtrap/missing  |  360 ---
 xtrap/xtrap.man|  216 --
 xtrap/xtrapchar.c  |  739 ---
 xtrap/xtrapin.c|  276 --
 xtrap/xtrapinfo.c  |   88 
 xtrap/xtrapout.c   |  292 --
 xtrap/xtrapproto.c |  109 -
 xtrap/xtrapreset.c |   85 
 xtrap/xtrapstats.c |  134 -
 31 files changed, 7 insertions(+), 15357 deletions(-)

New commits:
commit c3695642d0c4d78c631abc0610b9b63e1c24
Author: Julien Cristau jcris...@debian.org
Date:   Sun Dec 6 12:00:45 2009 +0100

Remove xtrap (closes: #547547).

diff --git a/debian/changelog b/debian/changelog
index 815f81e..8bdff5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-xserver-utils (7.4+3) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Update xsetroot config.{guess,sub} for avr32 support (closes: #535715).
   * Add README.source from xsfbs, and bump Standards-Version to 3.8.2.
+  * Remove xtrap (closes: #547547).
 
   [ Brice Goglin ]
   * xrandr 1.3.2.
diff --git a/debian/control b/debian/control
index 936ae3e..103855f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 
2:1.0.0),
  libxaw7-dev (= 1:1.0.1), libxext-dev (= 1:1.0.0),
  libxi-dev (= 1:1.0.0-3), libxmuu-dev (= 1:1.0.1),
  libxrandr-dev (= 2:1.2.99.3), libxt-dev (= 1:1.0.0),
- libxtrap-dev (= 1:1.0.0), libxxf86vm-dev (= 1:1.0.0), xbitmaps, quilt,
+ libxxf86vm-dev (= 1:1.0.0), xbitmaps, quilt,
  x11proto-input-dev (= 1.4), libxxf86misc-dev
 # Reasons for build-depends:
 # debhelper for the packaging, pkg-config needed by configure scripts
@@ -26,7 +26,6 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev 
(= 2:1.0.0),
 # xsetpointer: libxi-dev, libx11-dev, x11proto-input-dev (= 1.4)
 # xsetroot: libxmuu-dev, libx11-dev, xbitmaps
 # xstdcmap: libxmu-dev, libx11-dev
-# xtrap: libx11-dev, libxtrap-dev
 # xvidtune: libxaw7-dev, libxxf86vm-dev, libxt-dev
 Standards-Version: 3.8.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xserver-utils
@@ -37,10 +36,10 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (= 1:7.0.0)
 Conflicts: iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, 
xrgb, xset,
- xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
+ xsetmode, xsetpointer, xsetroot, xstdcmap, xvidtune
 Replaces: xbase-clients ( 1:7.3), xutils ( 1:7.2),
  iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
- xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
+ xsetmode, xsetpointer, xsetroot, xstdcmap, xvidtune
 Suggests: nickle, cairo-5c, xorg-docs-core
 Description: X server utilities
  An X client is a program that interfaces with an X server (almost always via
@@ -64,6 +63,4 @@ Description: X server utilities
   - xsetmode and xsetpointer, tools for handling X Input devices;
   - xsetroot, a tool for tailoring the appearance of the root window;
   - xstdcmap, a utility to selectively define standard colormap properties;
-  - xtrapchar, xtrapin, xtrapinfo, xtrapout, xtrapproto, xtrapreset, and
-xtrapstats, a group of sample clients that use the XTrap extension;
   - xvidtune, a tool for customizing X server modelines for your monitor.
diff --git a/debian/copyright b/debian/copyright
index 16c9b69..a0f74a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 The contents of this package were downloaded from
 http://xorg.freedesktop.org/releases/individual/app/
 It contains the iceauth, rgb, sessreg, xcmsdb, xgamma, xhost, xmodmap, xrandr,
-xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap and
-xvidtune applications.
+xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap and xvidtune
+applications.
 
 iceauth:
   Copyright 1989, 1998  The Open Group
@@ -442,37 +442,6 @@ xstdcmap:
* *
* Author:  Donna Converse, MIT X Consortium
 
-xtrap:
-  Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1993 by Digital Equipment 
Corp., 
-  Maynard, MA
-  
-  Permission to use, copy, modify, and distribute this software and its 
-  documentation for any purpose and without fee is hereby granted, 
-  provided that the above copyright notice appear in all copies and that
-  both that copyright notice and this

x11-xserver-utils: Changes to 'debian-unstable'

2009-12-06 Thread Brice Goglin 
 debian/changelog  |   16 
 debian/patches/01_sessreg_implement_hostname_hashing.diff |   18 
 debian/patches/02_xmodmap_manpage.diff|   10 
 iceauth/ChangeLog |   33 
 iceauth/Makefile.am   |6 
 iceauth/Makefile.in   |  274 
 iceauth/README|   27 
 iceauth/aclocal.m4|  579 -
 iceauth/config.guess  |  107 
 iceauth/config.h.in   |   30 
 iceauth/config.sub|  116 
 iceauth/configure | 4077 +---
 iceauth/configure.ac  |   13 
 iceauth/depcomp   |  116 
 iceauth/install-sh|  231 
 iceauth/missing   |   49 
 sessreg/ChangeLog |   49 
 sessreg/Makefile.am   |   11 
 sessreg/Makefile.in   |  276 
 sessreg/README|   27 
 sessreg/aclocal.m4|  569 -
 sessreg/config.guess  |   55 
 sessreg/config.sub|   58 
 sessreg/configure | 3882 
 sessreg/configure.ac  |   14 
 sessreg/depcomp   |  116 
 sessreg/filenames.sed.c   |8 
 sessreg/install-sh|  231 
 sessreg/missing   |   49 
 sessreg/sessreg.c |   27 
 sessreg/sessreg.man   |   11 
 xcmsdb/ChangeLog  |  213 
 xcmsdb/INSTALL|  236 
 xcmsdb/Makefile.am|   14 
 xcmsdb/Makefile.in|  403 
 xcmsdb/README |   28 
 xcmsdb/aclocal.m4 | 1865 ++-
 xcmsdb/compile|  142 
 xcmsdb/config.guess   |   85 
 xcmsdb/config.h.in|   30 
 xcmsdb/config.sub |  104 
 xcmsdb/configure  | 4076 +---
 xcmsdb/configure.ac   |   12 
 xcmsdb/depcomp|  172 
 xcmsdb/install-sh |  517 -
 xcmsdb/loadData.c |2 
 xcmsdb/missing|  104 
 xcmsdb/mkinstalldirs  |  158 
 xcmsdb/xcmsdb.c   |2 
 xgamma/ChangeLog  |   30 
 xgamma/Makefile.am|6 
 xgamma/Makefile.in|  274 
 xgamma/README |   26 
 xgamma/aclocal.m4 |  579 -
 xgamma/config.guess   |  107 
 xgamma/config.h.in|   30 
 xgamma/config.sub |  116 
 xgamma/configure  | 3968 +---
 xgamma/configure.ac   |   12 
 xgamma/depcomp|  116 
 xgamma/install-sh |  231 
 xgamma/missing|   49 
 xgamma/xgamma.c   |6 
 xhost/ChangeLog   |   36 
 xhost/INSTALL |  234 
 xhost/Makefile.am |   11 
 xhost/Makefile.in |  301 
 xhost/README  |   26 
 xhost/aclocal.m4  | 2018 ++--
 xhost/autogen.sh  |   13 
 xhost/config.guess|   85 
 xhost/config.h.in |   36 
 xhost/config.sub  |  104 
 xhost/configure   |

x11-xserver-utils: Changes to 'debian-unstable'

2009-12-06 Thread Julien Cristau 
 debian/changelog  |7 +
 debian/control|4 +--
 debian/patches/01_sessreg_implement_hostname_hashing.diff |6 ++--
 debian/patches/02_xmodmap_manpage.diff|   17 --
 debian/patches/series |3 --
 5 files changed, 13 insertions(+), 24 deletions(-)

New commits:
commit 6e01e40661179f6a6b023f542b99446d5f27918f
Author: Julien Cristau jcris...@debian.org
Date:   Sun Dec 6 13:51:33 2009 +0100

Add bug closer

diff --git a/debian/changelog b/debian/changelog
index d17ae0f..d8d2adc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ x11-xserver-utils (7.5+1) UNRELEASED; urgency=low
   * xrefresh 1.0.3.
   * xset 1.1.0.
 + Fix some typos in the manpage, closes: #525255.
++ Avoid warning from xset r rate when XF86Misc extension is not present,
+  closes: #526028.
   * xsetroot 1.0.3.
   * Suggests: xorg-docs-core since some manpages reference it in their
 SEE ALSO section. Thanks Vincent Lefevre. Closes: #541220.

commit 9c340cde280dfae919ad60a9688defb6d657f2f2
Author: Julien Cristau jcris...@debian.org
Date:   Sun Dec 6 13:47:59 2009 +0100

Make 01_sessreg_implement_hostname_hashing.diff apply with -p1 instead of 
-p0.

diff --git a/debian/changelog b/debian/changelog
index 28b35e4..d17ae0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ x11-xserver-utils (7.5+1) UNRELEASED; urgency=low
   * Remove xtrap (closes: #547547).
   * Drop libxxf86misc-dev from Build-Depends.  It's optional for xset, and
 recent X servers don't support this extension anymore.
+  * Make 01_sessreg_implement_hostname_hashing.diff apply with -p1 instead of
+-p0.
 
   [ Brice Goglin ]
   * iceauth 1.0.3.
diff --git a/debian/patches/01_sessreg_implement_hostname_hashing.diff 
b/debian/patches/01_sessreg_implement_hostname_hashing.diff
index 370c3fe..887a54c 100644
--- a/debian/patches/01_sessreg_implement_hostname_hashing.diff
+++ b/debian/patches/01_sessreg_implement_hostname_hashing.diff
@@ -17,10 +17,10 @@ Not submitted to XFree86.
  sessreg/sessreg.c |  164 
++
  1 file changed, 152 insertions(+), 12 deletions(-)
 
-Index: sessreg/sessreg.c
+Index: a/sessreg/sessreg.c
 ===
 sessreg/sessreg.c.orig 2009-12-06 13:02:16.0 +0100
-+++ sessreg/sessreg.c  2009-12-06 13:30:49.0 +0100
+--- a/sessreg/sessreg.c.orig   2009-12-06 13:02:16.0 +0100
 b/sessreg/sessreg.c2009-12-06 13:30:49.0 +0100
 @@ -97,6 +97,18 @@
   const char *host, Time_t date, int addp);
  #endif
diff --git a/debian/patches/series b/debian/patches/series
index a068c05..2044539 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_sessreg_implement_hostname_hashing.diff -p0
+01_sessreg_implement_hostname_hashing.diff

commit 7b2d25d5d0aeb31c98c9fbf4ec50a3eed4f5106b
Author: Julien Cristau jcris...@debian.org
Date:   Sun Dec 6 13:44:18 2009 +0100

02_xmodmap_manpage.diff is obsolete

diff --git a/debian/changelog b/debian/changelog
index 1fe1fdb..28b35e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x11-xserver-utils (7.5+1) UNRELEASED; urgency=low
   * xgamma 1.0.3.
   * xhost 1.0.3.
   * xmodmap 1.0.4.
++ fix XKeysymDB path in manpage, obsoleting 02_xmodmap_manpage.diff
   * xrandr 1.3.2.
   * xrdb 1.0.6.
   * xrefresh 1.0.3.
diff --git a/debian/patches/02_xmodmap_manpage.diff 
b/debian/patches/02_xmodmap_manpage.diff
deleted file mode 100644
index 1341ead..000
--- a/debian/patches/02_xmodmap_manpage.diff
+++ /dev/null
@@ -1,17 +0,0 @@

- xmodmap/xmodmap.man |2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: x11-xserver-utils/xmodmap/xmodmap.man
-===
 x11-xserver-utils.orig/xmodmap/xmodmap.man 2009-05-11 19:11:44.0 
+0200
-+++ x11-xserver-utils/xmodmap/xmodmap.man  2009-12-06 13:32:33.0 
+0100
-@@ -141,7 +141,7 @@
- used to perform the corresponding set of \fBkeycode\fP expressions.
- The list of keysym names may be
- found in the header file \fIX11/keysymdef.h\fP (without the \fIXK_\fP 
prefix)
--or the keysym database \fI __X11datadir__/XKeysymDB\fP.  Note that
-+or the keysym database \fI __projectroot__/share/X11/XKeysymDB\fP.  Note that
- if the same keysym is bound to multiple keys, the expression is executed
- for each matching keycode.
- .TP 8
diff --git a/debian/patches/series b/debian/patches/series
index 3dcbcaf..a068c05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01_sessreg_implement_hostname_hashing.diff -p0
-02_xmodmap_manpage.diff

commit 93b9c8373f9fdc6ea15bba6c6b8616438a973039
Author: Julien Cristau jcris...@debian.org
Date:   Sun Dec 6 13:37:08

x11-xserver-utils: Changes to 'debian-unstable'

2009-12-06 Thread Brice Goglin 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c6e81d90a7f39c6a9f593449f42fec2a7dd62a56
Author: Brice Goglin bgog...@debian.org
Date:   Sun Dec 6 20:41:46 2009 +0100

Prepare Changelog for upload

diff --git a/debian/changelog b/debian/changelog
index d8d2adc..1ccbc75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xserver-utils (7.5+1) UNRELEASED; urgency=low
+x11-xserver-utils (7.5+1) unstable; urgency=low
 
   [ Julien Cristau ]
   * Update xsetroot config.{guess,sub} for avr32 support (closes: #535715).
@@ -29,7 +29,7 @@ x11-xserver-utils (7.5+1) UNRELEASED; urgency=low
 SEE ALSO section. Thanks Vincent Lefevre. Closes: #541220.
   * Refresh patches.
 
- -- Brice Goglin bgog...@debian.org  Sun, 06 Dec 2009 13:32:48 +0100
+ -- Brice Goglin bgog...@debian.org  Sun, 06 Dec 2009 20:41:37 +0100
 
 x11-xserver-utils (7.4+2) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

x11-xserver-utils: Changes to 'debian-unstable'

2009-09-11 Thread Brice Goglin 
 debian/changelog|3 
 xrandr/ChangeLog|   95 +++
 xrandr/Makefile.in  |4 
 xrandr/aclocal.m4   |  690 +---
 xrandr/config.guess |  138 +++---
 xrandr/config.sub   |   99 +--
 xrandr/configure|   81 ++
 xrandr/configure.ac |4 
 xrandr/depcomp  |   33 +-
 xrandr/install-sh   |  228 -
 xrandr/xrandr.c |  135 ++
 xrandr/xrandr.man   |5 
 12 files changed, 968 insertions(+), 547 deletions(-)

New commits:
commit 1ef8b969a4f93a2143471c55ea6e086e0b099414
Author: Brice Goglin bgog...@debian.org
Date:   Fri Sep 11 21:57:20 2009 +0200

xrandr 1.3.2

diff --git a/debian/changelog b/debian/changelog
index 3561d76..815f81e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,11 @@ x11-xserver-utils (7.4+3) UNRELEASED; urgency=low
   * Add README.source from xsfbs, and bump Standards-Version to 3.8.2.
 
   [ Brice Goglin ]
+  * xrandr 1.3.2.
   * Suggests: xorg-docs-core since some manpages reference it in their
 SEE ALSO section. Thanks Vincent Lefevre. Closes: #541220.
 
- -- Brice Goglin bgog...@debian.org  Thu, 20 Aug 2009 09:00:06 +0200
+ -- Brice Goglin bgog...@debian.org  Fri, 11 Sep 2009 21:55:44 +0200
 
 x11-xserver-utils (7.4+2) unstable; urgency=low
 
diff --git a/xrandr/ChangeLog b/xrandr/ChangeLog
index 9f89094..ddcf153 100644
--- a/xrandr/ChangeLog
+++ b/xrandr/ChangeLog
@@ -1,3 +1,98 @@
+commit 5da0cb3533aa829588b2e6d715d511691fa1e45f
+Author: Matthias Hopf mh...@suse.de
+Date:   Thu Sep 10 13:18:35 2009 +0200
+
+Bump to 1.3.2
+
+commit e5861530a6c3bb6219217e5f3ddc71f13b9509c4
+Author: Matthias Hopf mh...@suse.de
+Date:   Thu Sep 10 13:17:56 2009 +0200
+
+Add missing 'static's to get rid of warnings.
+
+commit ab875be43651befa654a24719f1ea365dde09073
+Author: Bart Massey b...@cs.pdx.edu
+Date:   Thu Feb 7 14:03:24 2008 -0800
+
+changed a bunch of string to number conversions for reliability
+
+commit 25325aae2e80cb33af17682a6cd1bcd292a5f445
+Author: Bart Massey b...@cs.pdx.edu
+Date:   Fri Sep 4 15:36:51 2009 +0200
+
+Warn if one of the outputs given did not exist
+
+commit 713a8ea5646f7c893b52afeb3c2443b21b837e46
+Author: Matthias Hopf mh...@suse.de
+Date:   Tue Aug 11 16:11:39 2009 +0200
+
+Bump to 1.3.1
+
+Also finally bump xrandr requirement to 1.3
+
+commit b9166441bdb08ef76b9c6712da5902b0dcbf03f3
+Author: Federico Mena Quintero feder...@novell.com
+Date:   Mon Jul 20 16:44:52 2009 -0500
+
+bfo#22864 - grab the server around all modifications to CRTCs
+
+We were not grabbed while disabling the CRTCs that should be off, so other 
clients could think
+that there was an intermediate stage with no enabled outputs.
+
+Signed-off-by: Federico Mena Quintero feder...@novell.com
+
+commit 68d5134142e3c616f3996c7ea8d08c887ce56118
+Author: Éric Piel e.a.b.p...@tudelft.nl
+Date:   Tue Jul 14 21:36:32 2009 +0200
+
+xrandr: Document --nograb option
+
+Op 08-07-09 15:19, Matthias Hopf schreef:
+ On Jul 07, 09 22:02:51 +0200, Éric Piel wrote:
+ Op 21-05-09 13:23, Éric Piel schreef:
+ This documents the --nograb option with whichever I could understand of
+ the advantages and drawbacks of grabbing the screen.
+
+ Also fixes the formatting in the xrandr 1.3 options.
+ Please review and apply.
+
+ Please resend as attachment.
+
+Please find attached the git patch.
+
+Thanks,
+Eric
+
+From 34e7c1036ba0e0d7827563deaffea9371031fa0b Mon Sep 17 00:00:00 2001
+From: Eric Piel eric.p...@tremplin-utc.net
+Date: Thu, 21 May 2009 13:01:52 +0200
+Subject: [PATCH] xrandr: Document --nograb option
+
+This documents the --nograb option with whichever I could understand of
+the advantages and drawback of grabbing the screen.
+
+Also fixes the formatting in the xrandr 1.3 options
+
+commit 73e38a31e5b7c68f8f3227a47d98ec55097999c7
+Author: Matthias Hopf mh...@suse.de
+Date:   Mon Jul 6 18:30:05 2009 +0200
+
+Fix missing prototype warning.
+
+commit 3408ca77af6a45b15b89bdd1ce9d5aac9646f6b8
+Author: Matthias Hopf mh...@suse.de
+Date:   Mon Jul 6 18:28:23 2009 +0200
+
+Report program version as well with --version.
+
+This has bitten us too often already (the infamous uncloning bug).
+
+commit 47502f66f7c51ad575d63f28de49f285c4de7062
+Author: Adam Jackson a...@redhat.com
+Date:   Wed Apr 1 11:03:10 2009 -0400
+
+xrandr 1.3.0
+
 commit beb228842c77fab4a446e028dd501a01f0fb3fd3
 Author: Adam Jackson a...@redhat.com
 Date:   Tue Feb 17 13:45:32 2009 -0500
diff --git a/xrandr/Makefile.in b/xrandr/Makefile.in
index 961e52e..4010605 100644
--- a/xrandr/Makefile.in
+++ b/xrandr/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@

x11-xserver-utils: Changes to 'debian-unstable'

2009-08-20 Thread Brice Goglin 
 debian/changelog |7 ++-
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 145d78caf6dfdf33d4c159882042613fa43c89e7
Author: Brice Goglin bgog...@debian.org
Date:   Thu Aug 20 09:01:21 2009 +0200

Suggests: xorg-docs-core

diff --git a/debian/changelog b/debian/changelog
index 334f1e2..3561d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 x11-xserver-utils (7.4+3) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Update xsetroot config.{guess,sub} for avr32 support (closes: #535715).
   * Add README.source from xsfbs, and bump Standards-Version to 3.8.2.
 
- -- Julien Cristau jcris...@debian.org  Sun, 02 Aug 2009 15:52:39 +0200
+  [ Brice Goglin ]
+  * Suggests: xorg-docs-core since some manpages reference it in their
+SEE ALSO section. Thanks Vincent Lefevre. Closes: #541220.
+
+ -- Brice Goglin bgog...@debian.org  Thu, 20 Aug 2009 09:00:06 +0200
 
 x11-xserver-utils (7.4+2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1cbefa3..936ae3e 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Conflicts: iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, 
xrdb, xrefresh, xrg
 Replaces: xbase-clients ( 1:7.3), xutils ( 1:7.2),
  iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
  xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
-Suggests: nickle, cairo-5c
+Suggests: nickle, cairo-5c, xorg-docs-core
 Description: X server utilities
  An X client is a program that interfaces with an X server (almost always via
  the X libraries), and thus with some input and output hardware like a


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

x11-xserver-utils: Changes to 'debian-unstable'

2009-08-02 Thread Julien Cristau 
 debian/README.source  |   73 ++
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.sh |   12 ---
 xsetroot/config.guess |  152 +++---
 xsetroot/config.sub   |  199 ++
 6 files changed, 359 insertions(+), 86 deletions(-)

New commits:
commit d176189fab7d853ac73da05065995374f4f23d5f
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 2 15:55:39 2009 +0200

Bump Standards-Version to 3.8.2.

diff --git a/debian/changelog b/debian/changelog
index fea6d85..334f1e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11-xserver-utils (7.4+3) UNRELEASED; urgency=low
 
   * Update xsetroot config.{guess,sub} for avr32 support (closes: #535715).
+  * Add README.source from xsfbs, and bump Standards-Version to 3.8.2.
 
  -- Julien Cristau jcris...@debian.org  Sun, 02 Aug 2009 15:52:39 +0200
 
diff --git a/debian/control b/debian/control
index f340340..1cbefa3 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev 
(= 2:1.0.0),
 # xstdcmap: libxmu-dev, libx11-dev
 # xtrap: libx11-dev, libxtrap-dev
 # xvidtune: libxaw7-dev, libxxf86vm-dev, libxt-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.8.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xserver-utils
 XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xserver-utils.git
 

commit 63984cf5bdaf14a2866f48482255c398a1b30494
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 2 15:53:12 2009 +0200

Update xsetroot config.{guess,sub} for avr32 support (closes: #535715).

diff --git a/debian/changelog b/debian/changelog
index 8a94ce5..fea6d85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xserver-utils (7.4+3) UNRELEASED; urgency=low
+
+  * Update xsetroot config.{guess,sub} for avr32 support (closes: #535715).
+
+ -- Julien Cristau jcris...@debian.org  Sun, 02 Aug 2009 15:52:39 +0200
+
 x11-xserver-utils (7.4+2) unstable; urgency=low
 
   * xrandr 1.3.
diff --git a/xsetroot/config.guess b/xsetroot/config.guess
index 917bbc5..da83314 100755
--- a/xsetroot/config.guess
+++ b/xsetroot/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2009-04-27'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -55,8 +56,8 @@ version=\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 
2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -106,7 +107,7 @@ set_cc_for_build='
 trap exitcode=\$?; (rm -f \$tmpfiles 2/dev/null; rmdir \$tmp 2/dev/null)  
exit \$exitcode 0 ;
 trap rm -f \$tmpfiles 2/dev/null; rmdir \$tmp 2/dev/null; exit 1 1 2 13 15 
;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077  mktemp -d -q $TMPDIR/cgXX) 2/dev/null`  test -n 
$tmp  test -d $tmp ; } ||
+ { tmp=`(umask 077  mktemp -d $TMPDIR/cgXX) 2/dev/null`  test -n 
$tmp  test -d $tmp ; } ||
  { test -n $RANDOM  tmp=$TMPDIR/cg$$-$RANDOM  (umask 077  mkdir $tmp) 
; } ||
  { tmp=$TMPDIR/cg-$$  (umask 077  mkdir $tmp)  echo Warning: creating 
insecure temp directory 2 ; } ||
  { echo $me: cannot create a temporary directory in $TMPDIR 2 ; exit 1 ; } 
;
@@ -160,6 +161,7 @@ case 
${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION} in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+   sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -206,8 +208,11 @@ case 
${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION} in
 *:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
+*:SolidBSD:*:*)
+   echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+   exit ;;
 macppc:MirBSD:*:*)
-   echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+   echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
 *:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -319,14 +324,30 @@ case 
${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}

x11-xserver-utils: Changes to 'debian-unstable'

2009-04-06 Thread Julien Cristau 
 debian/changelog   
|   26 
 debian/control 
|   11 
 debian/copyright   
|   77 
 debian/patches/01_sessreg_implement_hostname_hashing.diff  
|   10 
 
debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch
  |   56 
 
debian/patches/04_xrandr-Fix-for-64bit-feed-a-pointer-to-the-right-size-vari.patch
 |   29 
 debian/patches/05_xrandr-update-the-manpage.patch  
|  270 
 debian/patches/06_xrandr-Manpage-typo-fixes.patch  
|   45 
 debian/patches/series  
|4 
 debian/rules   
|4 
 debian/xsfbs/repack.sh 
|   32 
 debian/xsfbs/xsfbs.sh  
|   66 
 rgb/COPYING
|   27 
 rgb/ChangeLog  
|  287 
 rgb/INSTALL
|  236 
 rgb/Makefile.am
|   42 
 rgb/Makefile.in
|  200 
 rgb/aclocal.m4 
| 1434 ++--
 rgb/compile
|  142 
 rgb/config.guess   
|   32 
 rgb/config.h.in
|   33 
 rgb/config.sub 
|   48 
 rgb/configure  
| 1685 -
 rgb/configure.ac   
|   32 
 rgb/depcomp
|   64 
 rgb/install-sh 
|  348 -
 rgb/missing
|   61 
 rgb/rgb.c  
|   26 
 rgb/rgb.man
|   91 
 rgb/rgb.txt
|1 
 rgb/showrgb.c  
|   20 
 rgb/showrgb.man
|   13 
 sessreg/ChangeLog  
|   24 
 sessreg/INSTALL
|  236 
 sessreg/Makefile.am
|2 
 sessreg/Makefile.in
|  113 
 sessreg/aclocal.m4 
| 1434 ++--
 sessreg/config.guess   
|   32 
 sessreg/config.sub 
|   48 
 sessreg/configure  
|  230 
 sessreg/configure.ac   
|4 
 sessreg/depcomp
|   64 
 sessreg/install-sh 
|  348 -
 sessreg/missing
|   61 
 sessreg/sessreg.c  
|   93 
 xrandr/ChangeLog   
|  367 +
 xrandr/Makefile.am 
|   18 
 xrandr/Makefile.in 
|   89 
 xrandr/aclocal.m4  
|   94 
 xrandr/autogen.sh  
|   13 
 xrandr/config.guess
|   32 
 xrandr/config.h.in 
|   33 
 xrandr/config.sub  
|   37 
 xrandr/configure

x11-xserver-utils: Changes to 'debian-unstable'

2009-02-03 Thread David Nusinow 
 debian/changelog |7 +
 debian/patches/07_iceauth_manpage_commands.patch |  112 +++
 debian/patches/series|1 
 3 files changed, 119 insertions(+), 1 deletion(-)

New commits:
commit e351fac2f1234b0837d4f8bddec63a25cb042ddb
Author: David Nusinow dnusi...@debian.org
Date:   Tue Feb 3 21:47:03 2009 -0500

Add 07_iceauth_manpage_commands.patch for fd.o bug# 2354. closes: #509837

diff --git a/debian/changelog b/debian/changelog
index 72a7361..bc0d7a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 x11-xserver-utils (7.3+6) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Add support for parallel=n in DEB_BUILD_OPTIONS, and for actually building
 the apps in parallel.  Install is still sequential, at least for now.
 
- -- Julien Cristau jcris...@debian.org  Sun, 03 Aug 2008 01:26:58 +0200
+  [ David Nusinow ]
+  * Add 07_iceauth_manpage_commands.patch for fd.o bug# 2354.
+closes: #509837
+
+ -- David Nusinow dnusi...@debian.org  Tue, 03 Feb 2009 21:44:48 -0500
 
 x11-xserver-utils (7.3+5) unstable; urgency=low
 
diff --git a/debian/patches/07_iceauth_manpage_commands.patch 
b/debian/patches/07_iceauth_manpage_commands.patch
new file mode 100644
index 000..2d692d4
--- /dev/null
+++ b/debian/patches/07_iceauth_manpage_commands.patch
@@ -0,0 +1,112 @@
+From 3deeff7e94fc6400b8e5d4cfb32a5e95b22318bc Mon Sep 17 00:00:00 2001
+From: David Nusinow dnusi...@debian.org
+Date: Tue, 3 Feb 2009 21:35:30 -0500
+Subject: [PATCH] Make iceauth manpage describe commands. (fd.o bug#2354)
+
+---
+ iceauth.man |   86 ++-
+ 1 files changed, 85 insertions(+), 1 deletions(-)
+
+diff --git a/iceauth/iceauth.man b/iceauth/iceauth.man
+index 6a8d32f..c967eb4 100644
+--- a/iceauth/iceauth.man
 b/iceauth/iceauth.man
+@@ -1,4 +1,4 @@
+-.\ $Xorg: iceauth.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $
++m.\ $Xorg: iceauth.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $
+ .\ Copyright 1994, 1998  The Open Group
+ .\ 
+ .\ Permission to use, copy, modify, distribute, and sell this software and 
its
+@@ -39,5 +39,89 @@ used to extract authorization records from one machine and 
merge them in on
+ another (as is the case when using remote logins or granting access to
+ other users).  Commands (described below) may be entered interactively,
+ on the \fIiceauth\fP command line, or in scripts.
++.SH OPTIONS
++.PP
++\fB\-f\fP \fIauthfile\fP  Name of the authority file to use. Will default to 
++ the file currently in use by the session.
++.PP
++\fB\-v\fP   Turns on extra messages (verbose mode)
++.PP
++\fB\-q\fP   Turns off extra messages (quiet mode)
++.PP
++\fB\-i\fP   Ignore the locks on the authority file
++.PP
++\fB\-b\fP   Break the locks on the authority file
++.PP
++\fB\-u\fP   Print basic usage instructions
++.PP
++.SH USAGE
++.PP
++When \fIiceauth\fP is run it will allow the following set of commands
++to be entered interactively or in scripts.
++.PP
++\fB?\fP
++.PP
++List available commands.
++.PP
++\fBhelp\fP
++.PP
++Print help information. You may supply a command name to \fIhelp\fP to
++get specific information about it.
++.PP
++\fBinfo\fP
++.PP
++Print information about the entries in the authority file.
++.PP
++\fBlist\fP
++.PP
++List (print) entries in the authority file. You may specify optional
++modifiers as below to specify which entries are listed.  
++.PP
++\fIlist\fP [ \fIprotocol_name\fP ] [ \fIprotocol_data\fP ] [
++\fInetid\fP ] [ \fIauthname\fP ]
++.PP
++\fBadd\fP
++.PP
++Add an entry to the authority file. This must be in the format
++.PP
++\fIadd\fP \fIprotocol_name\fP \fIprotocol_data\fP \fInetid\fP \fIauthname\fP 
\fIauthdata\fP
++.PP
++\fBremove\fP
++.PP
++Remove entries from the authority file.
++.PP
++\fIremove\fP [ \fIprotocol_name\fP ] [ \fIprotocol_data\fP ] [
++\fInetid\fP ] [ \fIauthname\fP ]
++.PP
++\fBextract\fP
++.PP
++Extract entries from the authority file in to a destination file. You
++must supply the path to the destination to this command as in the
++following format. Optional specifiers allow you to narrow which
++entries are extracted.
++.PP
++\fIextract\fP \fIfilename\fP [ \fIprotocol_name\fP ] [ \fIprotocol_data\fP ]
++[ \fInetid\fP ] [ \fIauthname\fP ]
++.PP
++\fBmerge\fP
++.PP
++Merge entries from other files in to the authority file selected by the 
program. You may supply any number of file paths to this command as follows:
++.PP
++\fImerge\fP \fIfilename1\fP [ \fIfilename2\fP ] [ \fIfilename3\fP ] ...
++.PP
++\fBexit\fP
++.PP
++Save changes and exit the program.
++.PP
++\fBquit\fP
++.PP
++Abort changes and exit the program without saving.
++.PP
++\fBsource\fP
++.PP
++Read and execute commands from a file.
++.PP
++\fIsource\fP \fIfilename\fP
++.PP
+ .SH AUTHOR
+ Ralph Mor, X Consortium
+-- 
+1.5.6.5
+
diff --git a/debian/patches/series b/debian/patches/series

x11-xserver-utils: Changes to 'debian-unstable'

2009-02-03 Thread David Nusinow 
 debian/changelog |7 -
 debian/patches/07_iceauth_manpage_commands.patch |  112 ---
 debian/patches/series|1 
 3 files changed, 1 insertion(+), 119 deletions(-)

New commits:
commit 7baf34403cca75c66aef1d3cac828e6be5732f62
Author: David Nusinow dnusi...@debian.org
Date:   Tue Feb 3 21:53:03 2009 -0500

Revert Add 07_iceauth_manpage_commands.patch for fd.o bug# 2354. closes: 
#509837

This should just be applied to experimental and pulled in later. It's
clearly not pressing enough to disrupt the release.

This reverts commit e351fac2f1234b0837d4f8bddec63a25cb042ddb.

diff --git a/debian/changelog b/debian/changelog
index bc0d7a1..72a7361 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,9 @@
 x11-xserver-utils (7.3+6) UNRELEASED; urgency=low
 
-  [ Julien Cristau ]
   * Add support for parallel=n in DEB_BUILD_OPTIONS, and for actually building
 the apps in parallel.  Install is still sequential, at least for now.
 
-  [ David Nusinow ]
-  * Add 07_iceauth_manpage_commands.patch for fd.o bug# 2354.
-closes: #509837
-
- -- David Nusinow dnusi...@debian.org  Tue, 03 Feb 2009 21:44:48 -0500
+ -- Julien Cristau jcris...@debian.org  Sun, 03 Aug 2008 01:26:58 +0200
 
 x11-xserver-utils (7.3+5) unstable; urgency=low
 
diff --git a/debian/patches/07_iceauth_manpage_commands.patch 
b/debian/patches/07_iceauth_manpage_commands.patch
deleted file mode 100644
index 2d692d4..000
--- a/debian/patches/07_iceauth_manpage_commands.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 3deeff7e94fc6400b8e5d4cfb32a5e95b22318bc Mon Sep 17 00:00:00 2001
-From: David Nusinow dnusi...@debian.org
-Date: Tue, 3 Feb 2009 21:35:30 -0500
-Subject: [PATCH] Make iceauth manpage describe commands. (fd.o bug#2354)
-

- iceauth.man |   86 ++-
- 1 files changed, 85 insertions(+), 1 deletions(-)
-
-diff --git a/iceauth/iceauth.man b/iceauth/iceauth.man
-index 6a8d32f..c967eb4 100644
 a/iceauth/iceauth.man
-+++ b/iceauth/iceauth.man
-@@ -1,4 +1,4 @@
--.\ $Xorg: iceauth.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $
-+m.\ $Xorg: iceauth.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $
- .\ Copyright 1994, 1998  The Open Group
- .\ 
- .\ Permission to use, copy, modify, distribute, and sell this software and 
its
-@@ -39,5 +39,89 @@ used to extract authorization records from one machine and 
merge them in on
- another (as is the case when using remote logins or granting access to
- other users).  Commands (described below) may be entered interactively,
- on the \fIiceauth\fP command line, or in scripts.
-+.SH OPTIONS
-+.PP
-+\fB\-f\fP \fIauthfile\fP  Name of the authority file to use. Will default to 
-+ the file currently in use by the session.
-+.PP
-+\fB\-v\fP   Turns on extra messages (verbose mode)
-+.PP
-+\fB\-q\fP   Turns off extra messages (quiet mode)
-+.PP
-+\fB\-i\fP   Ignore the locks on the authority file
-+.PP
-+\fB\-b\fP   Break the locks on the authority file
-+.PP
-+\fB\-u\fP   Print basic usage instructions
-+.PP
-+.SH USAGE
-+.PP
-+When \fIiceauth\fP is run it will allow the following set of commands
-+to be entered interactively or in scripts.
-+.PP
-+\fB?\fP
-+.PP
-+List available commands.
-+.PP
-+\fBhelp\fP
-+.PP
-+Print help information. You may supply a command name to \fIhelp\fP to
-+get specific information about it.
-+.PP
-+\fBinfo\fP
-+.PP
-+Print information about the entries in the authority file.
-+.PP
-+\fBlist\fP
-+.PP
-+List (print) entries in the authority file. You may specify optional
-+modifiers as below to specify which entries are listed.  
-+.PP
-+\fIlist\fP [ \fIprotocol_name\fP ] [ \fIprotocol_data\fP ] [
-+\fInetid\fP ] [ \fIauthname\fP ]
-+.PP
-+\fBadd\fP
-+.PP
-+Add an entry to the authority file. This must be in the format
-+.PP
-+\fIadd\fP \fIprotocol_name\fP \fIprotocol_data\fP \fInetid\fP \fIauthname\fP 
\fIauthdata\fP
-+.PP
-+\fBremove\fP
-+.PP
-+Remove entries from the authority file.
-+.PP
-+\fIremove\fP [ \fIprotocol_name\fP ] [ \fIprotocol_data\fP ] [
-+\fInetid\fP ] [ \fIauthname\fP ]
-+.PP
-+\fBextract\fP
-+.PP
-+Extract entries from the authority file in to a destination file. You
-+must supply the path to the destination to this command as in the
-+following format. Optional specifiers allow you to narrow which
-+entries are extracted.
-+.PP
-+\fIextract\fP \fIfilename\fP [ \fIprotocol_name\fP ] [ \fIprotocol_data\fP ]
-+[ \fInetid\fP ] [ \fIauthname\fP ]
-+.PP
-+\fBmerge\fP
-+.PP
-+Merge entries from other files in to the authority file selected by the 
program. You may supply any number of file paths to this command as follows:
-+.PP
-+\fImerge\fP \fIfilename1\fP [ \fIfilename2\fP ] [ \fIfilename3\fP ] ...
-+.PP
-+\fBexit\fP
-+.PP
-+Save changes and exit the program.
-+.PP
-+\fBquit\fP
-+.PP
-+Abort changes and exit the program without saving.
-+.PP

x11-xserver-utils: Changes to 'debian-unstable'

2008-08-15 Thread Julien Cristau 
 debian/changelog   
|   12 
 
debian/patches/04_xrandr-Fix-for-64bit-feed-a-pointer-to-the-right-size-vari.patch
 |   29 +
 debian/patches/05_xrandr-update-the-manpage.patch  
|  270 ++
 debian/patches/06_xrandr-Manpage-typo-fixes.patch  
|   45 +
 debian/patches/series  
|3 
 5 files changed, 358 insertions(+), 1 deletion(-)

New commits:
commit a43952f9bfaf464530c74c623bb637f0da9393e9
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Aug 15 21:03:58 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 35d6f00..fe607d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xserver-utils (7.3+5) UNRELEASED; urgency=low
+x11-xserver-utils (7.3+5) unstable; urgency=low
 
   * xrandr: Fix for 64bit: feed a pointer to the right size variable to
 scanf().
@@ -6,7 +6,7 @@ x11-xserver-utils (7.3+5) UNRELEASED; urgency=low
   * xrandr: manpage typo fixes.
   (all patches from upstream git)
 
- -- Julien Cristau [EMAIL PROTECTED]  Fri, 15 Aug 2008 20:58:12 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 15 Aug 2008 22:02:17 +0200
 
 x11-xserver-utils (7.3+4) unstable; urgency=low
 

commit 28e5a55bb555d127c40d21f6e01a7e945b2f0c8b
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Aug 15 21:01:34 2008 +0200

Add three xrandr patches from upstream git

* xrandr: Fix for 64bit: feed a pointer to the right size variable to
  scanf().
* xrandr: update the manpage.
* xrandr: manpage typo fixes.

diff --git a/debian/changelog b/debian/changelog
index 4c1bc58..35d6f00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+x11-xserver-utils (7.3+5) UNRELEASED; urgency=low
+
+  * xrandr: Fix for 64bit: feed a pointer to the right size variable to
+scanf().
+  * xrandr: update the manpage.
+  * xrandr: manpage typo fixes.
+  (all patches from upstream git)
+
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 15 Aug 2008 20:58:12 +0200
+
 x11-xserver-utils (7.3+4) unstable; urgency=low
 
   * xrandr: move outputs among CRTCs as necessary (closes: #486142).
diff --git 
a/debian/patches/04_xrandr-Fix-for-64bit-feed-a-pointer-to-the-right-size-vari.patch
 
b/debian/patches/04_xrandr-Fix-for-64bit-feed-a-pointer-to-the-right-size-vari.patch
new file mode 100644
index 000..2a2fdf7
--- /dev/null
+++ 
b/debian/patches/04_xrandr-Fix-for-64bit-feed-a-pointer-to-the-right-size-vari.patch
@@ -0,0 +1,29 @@
+From 3046799a06ecb79211ef0f4a2db9de4eec7233fb Mon Sep 17 00:00:00 2001
+From: Egbert Eich [EMAIL PROTECTED]
+Date: Sun, 3 Aug 2008 13:24:49 +0200
+Subject: [PATCH] Fix for 64bit: feed a pointer to the right size variable to 
scanf().
+
+XID is unsigned long, however %x in scanf takes a pointer to an unsigned int.
+Thus with XID xid, a sscanf(..., 0x%x, xid) will most likely produce the
+wrong results.
+---
+ xrandr.c |3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/xrandr.c b/xrandr.c
+index 41e15dd..b1e133e 100644
+--- a/xrandr/xrandr.c
 b/xrandr/xrandr.c
+@@ -428,7 +428,8 @@ set_name_all (name_t *name, name_t *old)
+ static void
+ set_name (name_t *name, char *string, name_kind_t valid)
+ {
+-XID   xid;
++unsigned int xid; /* don't make it XID (which is unsigned long):
++   scanf() takes unsigned int */
+ int index;
+ 
+ if ((valid  name_xid)  sscanf (string, 0x%x, xid) == 1)
+-- 
+1.5.6.3
+
diff --git a/debian/patches/05_xrandr-update-the-manpage.patch 
b/debian/patches/05_xrandr-update-the-manpage.patch
new file mode 100644
index 000..45630f5
--- /dev/null
+++ b/debian/patches/05_xrandr-update-the-manpage.patch
@@ -0,0 +1,270 @@
+From 977275a13be0687efc3db1fd3763174ff1256210 Mon Sep 17 00:00:00 2001
+From: Eric Piel [EMAIL PROTECTED]
+Date: Sun, 10 Aug 2008 23:28:25 +0200
+Subject: [PATCH] update the manpage
+
+Describe all the options supported, including: --dryrun, -display,
+--q1, --q12, and --rate for 1.1
+Describe all short and long version of the option.
+Use the usual man style for the option arugments.
+Move the four --*mode options out of the output section as they are
+independant of an output.
+Mention cvt for computing modelines.
+Gives some examples.
+---
+ xrandr.man |  143 +--
+ 1 files changed, 90 insertions(+), 53 deletions(-)
+
+diff --git a/xrandr.man b/xrandr.man
+index c6bbd42..ac29367 100644
+--- a/xrandr/xrandr.man
 b/xrandr/xrandr.man
+@@ -29,42 +29,46 @@ xrandr \- primitive command line interface to RandR 
extension
+ [\-help]  [\-display \fIdisplay\fP]
+ [\-q] [\-v]
+ [\-\-verbose]
++[\-\-dryrun]
+ [\-\-screen \fIsnum\fP]
++[\-\-q1]
++[\-\-q12]
+ .br
+ .B RandR version 1.2 options
+ .br
+ [\-\-prop]
+-[\-\-fb widthxheight]
+-[\-\-fbmm widthxheight]

x11-xserver-utils: Changes to 'debian-unstable'

2008-08-02 Thread Julien Cristau 
 debian/changelog   
   |7 +
 
debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch
 |   56 ++
 debian/patches/series  
   |1 
 debian/rules   
   |4 
 debian/xsfbs/xsfbs.mk  
   |   29 +
 5 files changed, 77 insertions(+), 20 deletions(-)

New commits:
commit 1c4e3c0aead3c0d33693d1eb3c19a8a3d11aeb64
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Aug 2 17:24:59 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 40804bb..4c1bc58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11-xserver-utils (7.3+4) UNRELEASED; urgency=low
+x11-xserver-utils (7.3+4) unstable; urgency=low
 
   * xrandr: move outputs among CRTCs as necessary (closes: #486142).
   * debian/rules, xsfbs: fix rule dependencies.
 
- -- Julien Cristau [EMAIL PROTECTED]  Sat, 02 Aug 2008 16:58:20 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Sat, 02 Aug 2008 17:24:30 +0200
 
 x11-xserver-utils (7.3+3) unstable; urgency=low
 

commit a5c171a67de0b26961ed5efe934e372ba3b4
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Aug 2 17:22:31 2008 +0200

debian/rules, xsfbs: fix rule dependencies.

diff --git a/debian/changelog b/debian/changelog
index 107c26f..40804bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11-xserver-utils (7.3+4) UNRELEASED; urgency=low
 
   * xrandr: move outputs among CRTCs as necessary (closes: #486142).
+  * debian/rules, xsfbs: fix rule dependencies.
 
  -- Julien Cristau [EMAIL PROTECTED]  Sat, 02 Aug 2008 16:58:20 +0200
 
diff --git a/debian/rules b/debian/rules
index d9cf5f4..3d263df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,8 +37,8 @@ else
 endif
 
 
-build: genscripts patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
dh_testdir
for FILE in $(DEF_SUBDIRS); do \
echo $$FILE ; \

commit 7bcd07ba5e3b2b62061e1c0f02b6115778388578
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Aug 2 16:59:07 2008 +0200

xrandr: move outputs among CRTCs as necessary (closes: #486142).

diff --git a/debian/changelog b/debian/changelog
index 2954c42..107c26f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xserver-utils (7.3+4) UNRELEASED; urgency=low
+
+  * xrandr: move outputs among CRTCs as necessary (closes: #486142).
+
+ -- Julien Cristau [EMAIL PROTECTED]  Sat, 02 Aug 2008 16:58:20 +0200
+
 x11-xserver-utils (7.3+3) unstable; urgency=low
 
   * xrdb 1.0.5
diff --git 
a/debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch
 
b/debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch
new file mode 100644
index 000..47bebd0
--- /dev/null
+++ 
b/debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch
@@ -0,0 +1,56 @@
+From 4dcc8ae1a6903434def1a2706f7c68ff9e2a17c4 Mon Sep 17 00:00:00 2001
+From: Hong Liu [EMAIL PROTECTED]
+Date: Mon, 10 Mar 2008 21:37:09 -0700
+Subject: [PATCH] Move outputs among crtcs as necessary. Fixes 14570
+
+This patch makes new requests override existing crtc allocations. Outputs
+with restricted crtc usage can now force existing outputs to switch
+automatcially.
+---
+ xrandr.c |9 ++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/xrandr/xrandr.c b/xrandr/xrandr.c
+index e2a657f..41e15dd 100644
+--- a/xrandr/xrandr.c
 b/xrandr/xrandr.c
+@@ -1241,7 +1241,7 @@ mark_changing_crtcs (void)
+  * Test whether 'crtc' can be used for 'output'
+  */
+ Bool
+-check_crtc_for_output (crtc_t *crtc, output_t *output)
++check_crtc_for_output (crtc_t *crtc, output_t *output, Bool ignore_state)
+ {
+ int   c;
+ int   l;
+@@ -1272,6 +1272,9 @@ check_crtc_for_output (crtc_t *crtc, output_t *output)
+   return False;
+ }
+ 
++if (ignore_state)
++  return True;
++
+ if (crtc-noutput)
+ {
+   /* make sure the state matches */
+@@ -1313,7 +1316,7 @@ find_crtc_for_output (output_t *output)
+   crtc = find_crtc_by_xid (output-output_info-crtcs[c]);
+   if (!crtc) fatal (cannot find crtc 0x%x\n, 
output-output_info-crtcs[c]);
+ 
+-  if (check_crtc_for_output (crtc, output))
++  if (check_crtc_for_output (crtc, output, False))
+   return crtc;
+ }
+ return NULL;
+@@ -1518,7 +1521,7 @@ pick_crtcs_score (output_t *outputs)
+   
+   /* reset crtc allocation for following outputs */
+   disable_outputs (outputs);
+-  if (!check_crtc_for_output (crtc, output))
++  if (!check_crtc_for_output (crtc, output, True))
+   continue;
+   
+   my_score = 1000;
+-- 
+1.5.6.3
+
diff --git

x11-xserver-utils: Changes to 'debian-unstable'

2008-08-02 Thread Julien Cristau 
 debian/changelog |7 +++
 debian/rules |   37 +++--
 2 files changed, 26 insertions(+), 18 deletions(-)

New commits:
commit 1e7894c84299c78d11f9286166fcbcc1f4aef9c8
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Aug 3 01:27:28 2008 +0200

Support parallel builds

Add support for parallel=n in DEB_BUILD_OPTIONS, and for
actually building the apps in parallel.  Install is still
sequential, at least for now.

diff --git a/debian/changelog b/debian/changelog
index 4c1bc58..4115841 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-xserver-utils (7.3+5) UNRELEASED; urgency=low
+
+  * Add support for parallel=n in DEB_BUILD_OPTIONS, and for actually building
+the apps in parallel.  Install is still sequential, at least for now.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Sun, 03 Aug 2008 01:26:58 +0200
+
 x11-xserver-utils (7.3+4) unstable; urgency=low
 
   * xrandr: move outputs among CRTCs as necessary (closes: #486142).
diff --git a/debian/rules b/debian/rules
index 3d263df..1e3bb62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,15 +16,17 @@ include debian/xsfbs/xsfbs.mk
 # subdirectory explicitly so that the build system knows what to build
 DEF_SUBDIRS=iceauth rgb sessreg xcmsdb xgamma xhost xmodmap xrandr xrdb 
xrefresh xset xsetmode xsetpointer xsetroot xstdcmap xtrap xvidtune
 SUBDIRS=$(DEF_SUBDIRS)
+BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
 else
CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+   NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
+   MAKEFLAGS += -j$(NUMJOBS)
 endif
 
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -38,22 +40,21 @@ endif
 
 
 build: build-stamp
-build-stamp: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
-   dh_testdir
-   for FILE in $(DEF_SUBDIRS); do \
-   echo $$FILE ; \
-   mkdir $$FILE-obj-$(DEB_BUILD_GNU_TYPE); \
-   (cd $$FILE-obj-$(DEB_BUILD_GNU_TYPE)  \
-   ../$$FILE/configure --prefix=/usr 
--mandir=\$${prefix}/share/man \
---infodir=\$${prefix}/share/info $(confflags) \
---disable-xprint \
-CFLAGS=$(CFLAGS) \
-RSH=rsh \
-MANCONF=/etc/manpath.config  \
-   $(MAKE)) || exit 1; \
-   done
+build-stamp: $(BUILD_STAMPS)
+   $@
 
-   touch build-stamp
+$(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
+   dh_testdir
+   mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE)
+   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  \
+   ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
+   --infodir=\$${prefix}/share/info $(confflags) \
+   --disable-xprint \
+   CFLAGS=$(CFLAGS) \
+   RSH=rsh \
+   MANCONF=/etc/manpath.config
+   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   $@
 
 clean: xsfclean
dh_testdir


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

x11-xserver-utils: Changes to 'debian-unstable'

2008-06-01 Thread Julien Cristau 
 debian/changelog |6 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 --
 debian/xsfbs/xsfbs.mk|  102 --
 debian/xsfbs/xsfbs.sh|  394 ---
 4 files changed, 220 insertions(+), 432 deletions(-)

New commits:
commit 99b71c962b5c7f178303eb5ed37936075acd63ac
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Jun 1 14:04:31 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 58f1048..2954c42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xserver-utils (7.3+3) UNRELEASED; urgency=low
+x11-xserver-utils (7.3+3) unstable; urgency=low
 
   * xrdb 1.0.5
 + Prevent cpp from prefixing errors with stdin when the xrdb input is a
@@ -7,7 +7,7 @@ x11-xserver-utils (7.3+3) UNRELEASED; urgency=low
   * xrandr 1.2.3
   * update debian/copyright with information from xrandr's COPYING file.
 
- -- Julien Cristau [EMAIL PROTECTED]  Fri, 07 Mar 2008 20:27:02 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Sun, 01 Jun 2008 14:03:26 +0200
 
 x11-xserver-utils (7.3+2) unstable; urgency=low
 

commit df0a41a393cad096f364d94effead3d1891b2667
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Jun 1 13:42:13 2008 +0200

Add bug closer

diff --git a/debian/changelog b/debian/changelog
index ca4f43c..58f1048 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 x11-xserver-utils (7.3+3) UNRELEASED; urgency=low
 
   * xrdb 1.0.5
++ Prevent cpp from prefixing errors with stdin when the xrdb input is a
+  file (closes: #458246)
   * xset 1.0.4
   * xrandr 1.2.3
   * update debian/copyright with information from xrandr's COPYING file.

commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sat May 31 13:23:24 2008 +0200

Update xsfbs/quilt patching rules to be compatible with the
3.0 (quilt) source package.

Thanks to Raphael Hertzog.
See http://lists.debian.org/debian-x/2008/05/msg01250.html for details.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index c11923f..b871b3b 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,10 +21,8 @@
 # Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
 export DH_OPTIONS
 
-# force quilt to not use ~/.quiltrc
-QUILT = quilt --quiltrc /dev/null
-# force QUILT_PATCHES to the default in case it is exported in the environment
-QUILT_PATCHES = patches/
+# force quilt to not use ~/.quiltrc and to use debian/patches
+QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
 
 # Set up parameters for the upstream build environment.
 
@@ -121,19 +119,11 @@ $(STAMP_DIR)/stampdir:
 # Set up the package build directory as quilt expects to find it.
 .PHONY: prepare
 stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches 
$(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
 $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
-   if [ ! -e $(STAMP_DIR)/patches ]; then \
-   mkdir $(STAMP_DIR)/patches; \
-   ln -s $(STAMP_DIR)/patches .pc; \
-   echo 2 $(STAMP_DIR)/patches/.version; \
-   fi; \
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
-   if [ -e debian/patches ]  [ ! -e patches ]; then \
-   ln -s debian/patches patches; \
-   fi; \
$@
 
 # Apply all patches to the upstream source.
@@ -162,10 +152,10 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
 
 # Revert all patches to the upstream source.
 .PHONY: unpatch
-unpatch:
+unpatch: $(STAMP_DIR)/prepare
rm -f $(STAMP_DIR)/patch
@echo -n Unapplying patches...; \
-   if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
+   if $(QUILT) applied /dev/null 2/dev/null; then \
  if $(QUILT) pop -a -v $(STAMP_DIR)/log/unpatch 21; then \
cat $(STAMP_DIR)/log/unpatch; \
echo successful.; \
@@ -192,7 +182,7 @@ cleanscripts:
 .PHONY: xsfclean
 xsfclean: cleanscripts unpatch
dh_testdir
-   rm -rf .pc patches
+   rm -rf .pc
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \

commit dcf4204d5328834172df80951a18de014b0f74ef
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri May 30 12:26:18 2008 +0200

xsfbs.sh: use 'local' now that policy allows it

Policy 3.7.3 allows /bin/sh scripts to use 'local'.

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 0c7607a..72efa95 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -238,19 +238,19 @@ analyze_path () {
   # analyze_path /usr/X11R6/bin - ls -dl /usr /usr/X11R6 /usr/X11R6/bin
   # Thanks to Randolph Chung for this clever hack.
 
-  #local f g
+  local f g
 
   while [ -n $1 ]; do
 reject_whitespace $1
-_g=
+g=
 message Analyzing $1:
-for _f in

x11-xserver-utils: Changes to 'debian-unstable'

2008-03-07 Thread Julien Cristau 
 debian/changelog   |7 
 xrdb/ChangeLog |   14 
 xrdb/Makefile.am   |2 
 xrdb/Makefile.in   |   45 -
 xrdb/aclocal.m4| 1302 
 xrdb/config.guess  |   56 +
 xrdb/config.sub|   66 +
 xrdb/configure |  117 +-
 xrdb/configure.ac  |3 
 xrdb/depcomp   |   33 
 xrdb/install-sh|  228 ++---
 xrdb/xrdb.c|7 
 xset/ChangeLog |   45 +
 xset/INSTALL   |  236 -
 xset/Makefile.in   |  140 +--
 xset/aclocal.m4|  220 ++---
 xset/autogen.sh|   13 
 xset/compile   |  142 ---
 xset/config.guess  |   28 
 xset/config.sub|   44 -
 xset/configure |  387 -
 xset/configure.ac  |2 
 xset/depcomp   |   93 +-
 xset/install-sh|  514 
 xset/missing   |   61 -
 xset/mkinstalldirs |  158 ---
 xset/xset.c| 2155 ++---
 xset/xset.man  |7 
 28 files changed, 3084 insertions(+), 3041 deletions(-)

New commits:
commit a7dc94904b2393dcf4069de3d847614407f6adb6
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 7 20:29:03 2008 +0100

* xset 1.0.4

diff --git a/debian/changelog b/debian/changelog
index 35a983f..7a46e77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11-xserver-utils (7.3+3) UNRELEASED; urgency=low
 
   * xrdb 1.0.5
+  * xset 1.0.4
 
  -- Julien Cristau [EMAIL PROTECTED]  Fri, 07 Mar 2008 20:27:02 +0100
 
diff --git a/xset/ChangeLog b/xset/ChangeLog
index 3855654..43366f3 100644
--- a/xset/ChangeLog
+++ b/xset/ChangeLog
@@ -1,3 +1,48 @@
+commit b6343fa846eeadb6736f383577b91dbb46d46971
+Author: Alan Coopersmith [EMAIL PROTECTED]
+Date:   Tue Jan 15 18:11:25 2008 -0800
+
+Delete duplicated #include statements
+
+commit e92294748383b0eaca6cb7f3883cf909077963a1
+Author: Alan Coopersmith [EMAIL PROTECTED]
+Date:   Tue Jan 15 18:10:37 2008 -0800
+
+Convert function declarations from KR to ANSI C
+
+commit 685fe4692583d383ffec8e0db52ea055fca0ed11
+Author: Alan Coopersmith [EMAIL PROTECTED]
+Date:   Tue Jan 15 17:54:14 2008 -0800
+
+Make code formatting consistent
+
+Too many different indent styles/levels made code hard to read
+
+commit 5dfbc61487623448c82d043c4f4f29d5e047d498
+Author: gsr.bugs [EMAIL PROTECTED]
+Date:   Thu Nov 15 00:04:34 2007 +0200
+
+Manpage: Add mention of mouse acceleration with zero threshold
+
+xset m A/B 0 gives a different behaviour, smooth acceleration, than typical
+A/B C (C not zero) which is two speed. This behaviour is, for some people,
+nice. But the point is that it is not documented in man page, so nobody
+can just test it except if discovered due some reason more complex than 
read
+the docs.
+
+commit 6d56c1f8d25ce84c797c3b72070073bc44d1a7ac
+Merge: c4f7c40... 3decc85...
+Author: James Cloos [EMAIL PROTECTED]
+Date:   Mon Sep 3 06:02:50 2007 -0400
+
+Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/app/xset
+
+commit c4f7c402ad52c784c01655b5d3a9d4d33c6598d6
+Author: James Cloos [EMAIL PROTECTED]
+Date:   Mon Sep 3 05:51:47 2007 -0400
+
+Add *~ to .gitignore to skip patch/emacs droppings
+
 commit 3decc85623f023a31b8c19526b29092a9f2d0357
 Author: Alan Coopersmith [EMAIL PROTECTED]
 Date:   Mon Aug 27 16:37:20 2007 -0700
diff --git a/xset/INSTALL b/xset/INSTALL
index 23e5f25..e69de29 100644
--- a/xset/INSTALL
+++ b/xset/INSTALL
@@ -1,236 +0,0 @@
-Installation Instructions
-*
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The

x11-xserver-utils: Changes to 'debian-unstable'

2008-03-07 Thread Julien Cristau 
 debian/changelog  |2 
 debian/copyright  |   25 -
 xrandr/COPYING|   29 +
 xrandr/ChangeLog  |  901 --
 xrandr/INSTALL|  236 -
 xrandr/Makefile.am|   12 
 xrandr/Makefile.in|  152 
 xrandr/aclocal.m4 |  220 ++--
 xrandr/autogen.sh |   13 
 xrandr/compile|  142 ---
 xrandr/config.guess   |   32 +
 xrandr/config.sub |   52 ++
 xrandr/configure  |  193 +-
 xrandr/configure.ac   |3 
 xrandr/depcomp|   93 -
 xrandr/install-sh |  514 +++-
 xrandr/missing|   61 +--
 xrandr/xrandr.c   |   49 ++
 xrandr/xrandr.man |   11 
 xrandr/xrandr_test.pl |  329 ++
 20 files changed, 2153 insertions(+), 916 deletions(-)

New commits:
commit 194c7797710c344c1bda74dcd3869a746f760310
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 7 23:39:23 2008 +0100

update debian/copyright with information from xrandr's COPYING file.

diff --git a/debian/changelog b/debian/changelog
index 1ae38c5..ca4f43c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-xserver-utils (7.3+3) UNRELEASED; urgency=low
   * xrdb 1.0.5
   * xset 1.0.4
   * xrandr 1.2.3
+  * update debian/copyright with information from xrandr's COPYING file.
 
  -- Julien Cristau [EMAIL PROTECTED]  Fri, 07 Mar 2008 20:27:02 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 8dc97f4..60a9d62 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -159,24 +159,25 @@ xmodmap:
 xrandr:
   Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
   Copyright © 2002 Hewlett Packard Company, Inc.
+  Copyright © 2006 Intel Corporation
   
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation, and that the name of Keith Packard or HP not be used in
-  advertising or publicity pertaining to distribution of the software without
-  specific, written prior permission.  Keith Packard and HP makes no
-  representations about the suitability of this software for any purpose.  It
-  is provided as is without express or implied warranty.
-  
-  KEITH PACKARD and HP DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  the above copyright notice appear in all copies and that both that copyright
+  notice and this permission notice appear in supporting documentation, and
+  that the name of the copyright holders not be used in advertising or
+  publicity pertaining to distribution of the software without specific,
+  written prior permission.  The copyright holders make no representations
+  about the suitability of this software for any purpose.  It is provided as
+  is without express or implied warranty.
+  
+  THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
   INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
   CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
   DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THIS SOFTWARE.
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+  OF THIS SOFTWARE.
 
 xrdb:
  COPYRIGHT 1987, 1991

commit 7a0e4af477d13aef0c2102b276dd593a01d816e4
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 7 23:35:56 2008 +0100

xrandr 1.2.3

diff --git a/debian/changelog b/debian/changelog
index 7a46e77..1ae38c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-xserver-utils (7.3+3) UNRELEASED; urgency=low
 
   * xrdb 1.0.5
   * xset 1.0.4
+  * xrandr 1.2.3
 
  -- Julien Cristau [EMAIL PROTECTED]  Fri, 07 Mar 2008 20:27:02 +0100
 
diff --git a/xrandr/COPYING b/xrandr/COPYING
index 7f33cbf..c405625 100644
--- a/xrandr/COPYING
+++ b/xrandr/COPYING
@@ -1,12 +1,21 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+Copyright © 2002 Hewlett Packard Company, Inc.
+Copyright © 2006 Intel Corporation
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear

x11-xserver-utils: Changes to 'debian-unstable'

2007-12-03 Thread Julien Cristau 
 debian/changelog |   10 +++---
 debian/control   |6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 47b09da8149ec2f5c62d260354676d6a7ced8e1e
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Dec 3 19:13:49 2007 +0100

xset needs libxxf86misc-dev, not x11proto-xf86misc-dev.

diff --git a/debian/changelog b/debian/changelog
index b1a1fb1..95dc449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
 x11-xserver-utils (7.3+2) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
-  * control: add x11proto-xf86misc-dev to build-depends, it's useful
-for xset.
+  * control: add libxxf86misc-dev to build-depends, it's useful for xset.
 
   [ Julien Cristau ]
   * Preventively relax Replaces on xutils and xbase-clients so those packages
diff --git a/debian/control b/debian/control
index efbe8ab..4b13a97 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 
2:1.0.0-1),
  libxi-dev (= 1:1.0.0-3), libxmuu-dev (= 1:1.0.1-1),
  libxrandr-dev (= 2:1.2.0-1), libxt-dev (= 1:1.0.0-1),
  libxtrap-dev (= 1:1.0.0-1), libxxf86vm-dev (= 1:1.0.0-1), xbitmaps, quilt,
- x11proto-input-dev (= 1.4), x11proto-xf86misc-dev
+ x11proto-input-dev (= 1.4), libxxf86misc-dev
 # Reasons for build-depends:
 # debhelper for the packaging, pkg-config needed by configure scripts
 # Individual apps:
@@ -21,7 +21,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev 
(= 2:1.0.0-1),
 # xrdb: libxmuu-dev, libx11-dev
 # xrefresh: libx11-dev
 # xset: libxmuu-dev, libx11-dev, libxext-dev,
-#   x11proto-xf86misc-dev, (libxfontcache-dev)
+#   libxxf86misc-dev, (libxfontcache-dev)
 # xsetmode: libxi-dev, libx11-dev
 # xsetpointer: libxi-dev, libx11-dev, x11proto-input-dev (= 1.4)
 # xsetroot: libxmuu-dev, libx11-dev, xbitmaps

commit a92704c7e57a79836cdb84daf8ce8b654acce9d1
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Aug 17 00:44:24 2007 +0200

Relax Replaces on xutils and xbase-clients so further updates are possible.

diff --git a/debian/changelog b/debian/changelog
index 7b30b04..b1a1fb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 x11-xserver-utils (7.3+2) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * control: add x11proto-xf86misc-dev to build-depends, it's useful
 for xset.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Fri, 30 Nov 2007 00:59:58 +0200
+  [ Julien Cristau ]
+  * Preventively relax Replaces on xutils and xbase-clients so those packages
+can still be updated if needed (e.g. in stable updates).
+
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 03 Dec 2007 19:09:45 +0100
 
 x11-xserver-utils (7.3+1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 956739b..efbe8ab 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (= 1:7.0.0)
 Conflicts: iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, 
xrgb, xset,
  xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
-Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
+Replaces: xbase-clients ( 1:7.3), xutils ( 1:7.2),
  iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
  xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
 Description: X server utilities


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

x11-xserver-utils: Changes to 'debian-unstable'

2007-12-03 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d823ae788047f7036b11b0410bc22a1746c80f15
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Dec 3 20:07:50 2007 +0100

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 95dc449..937e5f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xserver-utils (7.3+2) UNRELEASED; urgency=low
+x11-xserver-utils (7.3+2) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * control: add libxxf86misc-dev to build-depends, it's useful for xset.
@@ -7,7 +7,7 @@ x11-xserver-utils (7.3+2) UNRELEASED; urgency=low
   * Preventively relax Replaces on xutils and xbase-clients so those packages
 can still be updated if needed (e.g. in stable updates).
 
- -- Julien Cristau [EMAIL PROTECTED]  Mon, 03 Dec 2007 19:09:45 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 03 Dec 2007 20:07:36 +0100
 
 x11-xserver-utils (7.3+1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

x11-xserver-utils: Changes to 'debian-unstable'

2007-11-29 Thread Timo Aaltonen 
 debian/changelog |7 +++
 debian/control   |4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 9eefd5232ad01636c690d7ec1eae36240970eb44
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Fri Nov 30 01:03:45 2007 +0200

* control: add x11proto-xf86misc-dev to build-depends, it's useful
  for xset.

https://launchpad.net/bugs/164434

diff --git a/debian/changelog b/debian/changelog
index e6b2bbb..7b30b04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-xserver-utils (7.3+2) UNRELEASED; urgency=low
+
+  * control: add x11proto-xf86misc-dev to build-depends, it's useful
+for xset.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  Fri, 30 Nov 2007 00:59:58 +0200
+
 x11-xserver-utils (7.3+1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 0ff2563..956739b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 
2:1.0.0-1),
  libxi-dev (= 1:1.0.0-3), libxmuu-dev (= 1:1.0.1-1),
  libxrandr-dev (= 2:1.2.0-1), libxt-dev (= 1:1.0.0-1),
  libxtrap-dev (= 1:1.0.0-1), libxxf86vm-dev (= 1:1.0.0-1), xbitmaps, quilt,
- x11proto-input-dev (= 1.4)
+ x11proto-input-dev (= 1.4), x11proto-xf86misc-dev
 # Reasons for build-depends:
 # debhelper for the packaging, pkg-config needed by configure scripts
 # Individual apps:
@@ -21,7 +21,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev 
(= 2:1.0.0-1),
 # xrdb: libxmuu-dev, libx11-dev
 # xrefresh: libx11-dev
 # xset: libxmuu-dev, libx11-dev, libxext-dev,
-#   (libxxf86misc-dev, libxfontcache-dev)
+#   x11proto-xf86misc-dev, (libxfontcache-dev)
 # xsetmode: libxi-dev, libx11-dev
 # xsetpointer: libxi-dev, libx11-dev, x11proto-input-dev (= 1.4)
 # xsetroot: libxmuu-dev, libx11-dev, xbitmaps


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

x11-xserver-utils: Changes to 'debian-unstable'

2007-09-14 Thread Brice Goglin 
 debian/changelog   |   56 
 debian/control |   15 
 debian/copyright   |   43 
 debian/patches/02_xmodmap_manpage.diff |8 
 debian/rules   |1 
 debian/x11-xserver-utils.menu  |   13 
 debian/xsfbs/xsfbs.mk  |   27 
 iceauth/ChangeLog  |  283 ++
 iceauth/INSTALL|  236 -
 iceauth/Makefile.am|   20 
 iceauth/Makefile.in|  171 -
 iceauth/aclocal.m4 | 1412 +--
 iceauth/autogen.sh |   13 
 iceauth/compile|  142 -
 iceauth/config.h.in|9 
 iceauth/config.sub |   14 
 iceauth/configure  |  315 +-
 iceauth/configure.ac   |7 
 iceauth/depcomp|   64 
 iceauth/iceauth.c  |   46 
 iceauth/iceauth.h  |6 
 iceauth/iceauth.man|1 
 iceauth/install-sh |  348 ++
 iceauth/missing|   61 
 iceauth/mkinstalldirs  |  158 -
 iceauth/process.c  |  384 +--
 rgb/INSTALL|  236 +
 rgb/aclocal.m4 |  107 
 rgb/config.guess   |   83 
 rgb/config.h.in|9 
 rgb/config.sub |  109 
 rgb/configure  |  360 +-
 sessreg/ChangeLog  |  305 ++
 sessreg/INSTALL|  236 +
 sessreg/Makefile.am|   30 
 sessreg/Makefile.in|   57 
 sessreg/aclocal.m4 |  109 
 sessreg/compile|   99 
 sessreg/config.guess   |  685 +++--
 sessreg/config.h.in|9 
 sessreg/config.sub |  240 +
 sessreg/configure  |  816 ++
 sessreg/configure.ac   |   12 
 sessreg/depcomp|  103 
 sessreg/filenames.sed.c|   21 
 sessreg/install-sh |  477 +--
 sessreg/missing|  142 -
 sessreg/mkinstalldirs  |  111 
 sessreg/sessreg.h  |  123 
 sessreg/sessreg.man|   39 
 xcmsdb/aclocal.m4  |   22 
 xcmsdb/config.guess|   32 
 xcmsdb/config.h.in |9 
 xcmsdb/config.sub  |   28 
 xcmsdb/configure   |   23 
 xgamma/COPYING |   50 
 xgamma/ChangeLog   |  199 +
 xgamma/INSTALL |  236 -
 xgamma/Makefile.am |   14 
 xgamma/Makefile.in |  147 -
 xgamma/aclocal.m4  | 1412 +--
 xgamma/compile |  142 -
 xgamma/config.h.in |9 
 xgamma/config.sub  |   14 
 xgamma/configure   |  225 -
 xgamma/configure.ac|2 
 xgamma/depcomp |   64 
 xgamma/install-sh  |  348 ++
 xgamma/missing |   61 
 xgamma/mkinstalldirs   |  158 -
 xgamma/xgamma.man  |   13 
 xhost/ChangeLog|  235 +
 xhost/INSTALL  |   50 
 xhost/Makefile.am  |   10 
 xhost/Makefile.in  |  137 -
 xhost/aclocal.m4   |  216 +
 xhost/autogen.sh   |   13 
 xhost/compile  |  142 -
 xhost/config.guess |   32 
 xhost/config.h.in  |   12 
 xhost/config.sub   |   28 
 xhost/configure|  364 +-
 xhost/configure.ac |4 
 xhost/depcomp  |   64 
 xhost/install-sh   |  348 ++
 xhost/missing  |   61 
 xhost/mkinstalldirs|  158 -
 xhost/xhost.c  |2 
 xhost/xhost.man|8 
 xmodmap/ChangeLog  |  285 ++
 xmodmap/INSTALL|  236 -
 xmodmap/Makefile.am|   21 
 xmodmap/Makefile.in|  202 -
 xmodmap/aclocal.m4 | 1412 +--
 xmodmap/autogen.sh |   13 
 xmodmap/compile|  142 -
 xmodmap/config.h.in|   12 
 xmodmap/config.sub |   14 
 xmodmap/configure  |  387 ++-
 xmodmap/configure.ac   |7 
 xmodmap/depcomp|   64 
 xmodmap/handle.c   |   72

x11-xserver-utils: Changes to 'debian-unstable'

2007-05-26 Thread Timo Aaltonen 
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b08782e35d5d095eba17f96f2e92f430c75c1fc7
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Sat May 26 10:00:47 2007 +0300

Start versioning from 0.1

diff --git a/debian/changelog b/debian/changelog
index e44f19a..34a64fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xserver-utils (1) UNRELEASED; urgency=low
+x11-xserver-utils (0.1) UNRELEASED; urgency=low
 
   * Split xbase-clients, new versioning.
   * Included packages:


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Re: x11-xserver-utils: Changes to 'debian-unstable'

2007-05-26 Thread David Nusinow 
On Sat, May 26, 2007 at 07:00:54AM +, Timo Aaltonen wrote:
  debian/changelog |2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 New commits:
 commit b08782e35d5d095eba17f96f2e92f430c75c1fc7
 Author: Timo Aaltonen [EMAIL PROTECTED]
 Date:   Sat May 26 10:00:47 2007 +0300
 
 Start versioning from 0.1

Why are you starting the versioning at 0.1? Besides this, I think you
should ultimately follow the convention we were previously using which was
to match these packages to the upstream katamari release (right now 7.2).
It's not an ideal system, but users can at least match the package version
to the xorg package version then.

 - David Nusinow


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

x11-xserver-utils: Changes to 'debian-unstable'

2007-05-22 Thread Timo Aaltonen 
 debian/changelog |4 ++--
 debian/control   |6 --
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit ad6e57b05d464a54e2abf39b47dad316b99baf99
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Tue May 22 12:13:19 2007 +0300

Conflict with the ubuntu packages to force removal on upgrade.

Add xrgb and xsetpointer to the C/R list.

diff --git a/debian/changelog b/debian/changelog
index 9284755..e44f19a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,7 +25,7 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
 - Modify description.
 - Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (=1:7.1.ds.3-1)
   to make upgrades smoother.
-- Replaces: all the included packages to work around old Ubuntu
+- C/R: all the included packages to work around old Ubuntu
   packaging.
   * debian/copyright: Leave only copyright notices that relate to
 this package. FIXME:*rgb, sessreg missing*
@@ -35,7 +35,7 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
   * debian/local/: Remove.
   * debian/patches: Delete patches which do not relate to this package.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Sat, 19 May 2007 01:37:29 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 22 May 2007 12:00:41 +0300
 
 xbase-clients (1:7.2.ds2-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6023ee1..8fc2bc9 100644
--- a/debian/control
+++ b/debian/control
@@ -35,9 +35,11 @@ Package: x11-xserver-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (= 1:7.0.0)
+Conflicts: iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, 
xrgb, xset,
+ xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
 Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
- iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
- xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
+ iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
+ xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
 Description: X server utilities
  An X client is a program that interfaces with an X server (almost always via
  the X libraries), and thus with some input and output hardware like a


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

x11-xserver-utils: Changes to 'debian-unstable'

2007-05-19 Thread Timo Aaltonen 
 debian/changelog |7 ---
 debian/control   |3 ---
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 6e1e2a7e1be922bea95398bae71c1329e8a71478
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Sat May 19 14:10:14 2007 +0300

Remove Conflicts:, which shouldn't be necessary.

diff --git a/debian/changelog b/debian/changelog
index 101169e..9284755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,9 +23,10 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
 - Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Modify description.
-- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3),
-  xutils (=1:7.1.ds.3-1) to make upgrades smoother.
-- C/R: all the included packages to work around old Ubuntu packaging.
+- Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (=1:7.1.ds.3-1)
+  to make upgrades smoother.
+- Replaces: all the included packages to work around old Ubuntu
+  packaging.
   * debian/copyright: Leave only copyright notices that relate to
 this package. FIXME:*rgb, sessreg missing*
   * debian/x11-xserver-utils.install, rules: Edit to reflect new
diff --git a/debian/control b/debian/control
index f5edb7a..6023ee1 100644
--- a/debian/control
+++ b/debian/control
@@ -35,9 +35,6 @@ Package: x11-xserver-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (= 1:7.0.0)
-Conflicts: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
- iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
- xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
 Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
  iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
  xsetmode, xsetroot, xstdcmap, xtrap, xvidtune


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

x11-xserver-utils: Changes to 'debian-unstable'

2007-05-18 Thread Timo Aaltonen 
 debian/changelog  |6 
 debian/control|   10 
 debian/patches/01_sessreg_implement_hostname_hashing.diff |  204 ++
 debian/patches/02_xmodmap_manpage.diff|   13 
 debian/patches/17_xmodmap_manpage.diff|   13 
 debian/patches/series |3 
 6 files changed, 231 insertions(+), 18 deletions(-)

New commits:
commit 923173d4c1dca40738393854e54172720098c762
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Sat May 19 01:39:57 2007 +0300

debian/control: add Replaces/Conflicts plus other small changes.
debian/patches/series: add option to sessreg patch.

diff --git a/debian/changelog b/debian/changelog
index 3d02433..101169e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
 - Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Modify description.
+- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3),
+  xutils (=1:7.1.ds.3-1) to make upgrades smoother.
+- C/R: all the included packages to work around old Ubuntu packaging.
   * debian/copyright: Leave only copyright notices that relate to
 this package. FIXME:*rgb, sessreg missing*
   * debian/x11-xserver-utils.install, rules: Edit to reflect new
@@ -30,9 +33,8 @@ x11-xserver-utils (1) UNRELEASED; urgency=low
   * debian/x11-xserver-utils.dirs: Remove.
   * debian/local/: Remove.
   * debian/patches: Delete patches which do not relate to this package.
-  * 
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Thu, 17 May 2007 00:55:55 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED]  Sat, 19 May 2007 01:37:29 +0300
 
 xbase-clients (1:7.2.ds2-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d0a17a4..f5edb7a 100644
--- a/debian/control
+++ b/debian/control
@@ -35,12 +35,18 @@ Package: x11-xserver-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (= 1:7.0.0)
-Description: miscellaneous X clients
+Conflicts: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
+ iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
+ xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
+Replaces: xbase-clients (= 1:7.2.ds2-3), xutils (= 1:7.1.ds.3-1),
+ iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xset,
+ xsetmode, xsetroot, xstdcmap, xtrap, xvidtune
+Description: X server utilities
  An X client is a program that interfaces with an X server (almost always via
  the X libraries), and thus with some input and output hardware like a
  graphics card, monitor, keyboard, and pointing device (such as a mouse).
  .
- This package provides a miscellaneous assortment of several dozen X clients
+ This package provides a miscellaneous assortment of X Server utilities
  that ship with the X Window System, including:
   - iceauth, a tool for manipulating ICE protocol authorization records;
   - rgb;
diff --git a/debian/patches/01_sessreg_implement_hostname_hashing.diff 
b/debian/patches/01_sessreg_implement_hostname_hashing.diff
new file mode 100644
index 000..69787a4
--- /dev/null
+++ b/debian/patches/01_sessreg_implement_hostname_hashing.diff
@@ -0,0 +1,204 @@
+$Id: 085_sessreg_implement_hostname_hashing.diff 689 2005-10-19 22:11:30Z 
dnusinow $
+
+The sessreg program assumes that hostnames in utmp entries are unique in
+the last four characters.  When two entries are test:0 and fist:0, for
+example, this assumption fails.
+
+Rectify this problem by hashing the entire hostname field from the utmp
+entry, so that we can tell unlike hostnames apart with much greater
+reliability.  There is still a possiblility of one hash collision in 2^32.
+
+This patch by Maximiliano Curia and Damián Viano, using a public-domain
+hash algorithm by Bob Jenkins.
+
+Not submitted to XFree86.
+
+Index: sessreg/sessreg.c
+===
+--- sessreg/sessreg.c.orig 2005-10-18 19:45:25.0 -0400
 sessreg/sessreg.c  2005-10-18 21:36:02.0 -0400
+@@ -182,6 +182,18 @@
+  const char *host, Time_t date, int addp);
+ #endif
+ 
++#ifdef SYSV
++/* used for hashing ut_id */
++typedef  unsigned long  int  ub4;   /* unsigned 4-byte quantities */
++typedef  unsigned   char ub1;   /* unsigned 1-byte quantities */
++
++#define hashsize(n) ((ub4)1(n))
++#define hashmask(n) (hashsize(n)-1)
++
++ub4 hash(register ub1 *k, register ub4 length, register ub4 initval);
++
++#endif
++
+ int   wflag, uflag, lflag;
+ char  *wtmp_file, *utmp_file, *line;
+ #ifdef USE_UTMPX
+@@ -469,21 +481,23 @@
+   bzero (u-ut_name, sizeof (u-ut_name));
+ #ifdef SYSV
+   if (line) {
+-  int i;
+   /*
+-   * this is a bit crufty, but
+-   * follows the apparent conventions in
+-   * the ttys file.

x11-xserver-utils: Changes to 'debian-unstable'

2007-05-18 Thread Timo Aaltonen 
 debian/rules |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 12eae675d3812e0b41b8a94188bd568fd61cc986
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Sat May 19 01:48:44 2007 +0300

debian/rules: add '-Xrgb.txt' from xutils.

diff --git a/debian/rules b/debian/rules
index 98251e0..d11d712 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ binary-arch: build install
dh_testroot
 
dh_installdocs
-   dh_install --sourcedir=debian/tmp --list-missing
+   dh_install --sourcedir=debian/tmp -Xrgb.txt --list-missing
dh_installchangelogs
dh_link
dh_strip


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

x11-xserver-utils: Changes to 'debian-unstable'

2007-05-16 Thread Timo Aaltonen 
New branch 'debian-unstable' available with the following commits:
commit 128d532d9ac12d33fc0a7e818e66c99e7e374eea
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Thu May 17 00:56:51 2007 +0300

Split xbase-clients, include xserver related utilities here.

commit 2ae6373794edcade76e8deb403d4fbdf529a39e9
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed May 9 16:30:01 2007 +0200

xsm: autoreconf

commit 710b00382004e6d028cff06358100e58b7629e69
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed May 9 16:29:28 2007 +0200

Fix xsm's configure.ac to not require rsh, and drop the openssh build-dep.

commit 3f2b543846b267ce7b94d2496ba2105dd1059854
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Apr 20 22:00:38 2007 +0200

Prepare changelog for upload.

commit 36583884f30bc161d500a03f0f076a066da9deb7
Merge: d8b681b7fd716cd936e90020618c64846dcdf846 
271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Apr 20 21:42:31 2007 +0200

Merge branch 'xsfbs-unstable' of ../../xsfbs into debian-unstable

commit d8b681b7fd716cd936e90020618c64846dcdf846
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Apr 20 21:41:42 2007 +0200

Add XS-Vcs-* in debian/control.

commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson [EMAIL PROTECTED](none)
Date:   Thu Apr 12 23:18:32 2007 -0400

Test for existence of debian/patches directory before creating a symlink to 
it.

This prevents packages that apply no patches from ending up with a broken
symlink in them.

Remove SVN keyword.

Update copyright notice.

commit bdedaeb6f91abf59a10190e6b0ab0c227a4c5ba1
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Apr 12 11:46:00 2007 +0200

Update long description.

XKB configuration data is in xkb-data, not xlibs;
Base bitmap images have moved to xbitmaps.

commit d71d95be45c5f5939523ed4d69f817beecc83b25
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Wed Apr 11 21:42:17 2007 +0200

Remove mention of xf86cfg in package description (really closes: #362066).

commit 0cf66c046cb53d95a2b994034e008906ff16f0c6
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 30 15:53:48 2007 +0200

Document each app's build-dependencies in debian/control

commit 6e403cb28bc215733a0bdc16625249d3e437ce0f
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 30 14:52:19 2007 +0200

Add patch for xmodmap(1) to refer to the correct location for XKeysymDB.

commit d251a8ca189c07129110297eb3202e55cc6e78c2
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Mon Mar 12 00:43:40 2007 +0100

  * Restore Depends: on cpp (got lost during modularization)
since xrdb needs it to process .Xdefaults.

commit 88ec478ece124aa4422fe030a7267810a420e131
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 9 12:49:43 2007 +0100

Fix versioned build-dep on libxinerama-dev. Thanks, Paul Hampson!

commit 956849d7c73b5bc8a59303399f04ca5eaf16f73b
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Mar 7 18:00:22 2007 +0100

Build-depend on libxinerama-dev

xdpyinfo needs to be built against libxinerama to support the corresponding
extension.

commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 2 20:28:15 2007 +0100

Fix copy/paste typo in the input driver provides.

commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow [EMAIL PROTECTED]
Date:   Thu Mar 1 22:06:04 2007 -0500

Fix one missed bit from the serverabiver - serverminver rename

commit 1344bb9deda5ba54215d0ec5b164706999236b0b
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Feb 28 23:08:17 2007 -0500

Fix typo that prevented the input abi versioning from working.
Good catch Julien

commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Feb 27 21:50:20 2007 -0500

Add support for X server input ABI versioning

commit 00fc799ec3107c0c29286b75e780bef82c1fa137
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Feb 21 22:47:30 2007 -0500

Fix name of serverminver

commit dacefd5a6bb9f786c78f35358273e3214c7492e9
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Feb 21 21:37:52 2007 -0500

Update serverabi generation to also account for driver Provides

* Have the drivers use the file serverminver instead of serverabiver in 
order
  to generate the versioned dependency on the server. This is clearer
  naming.
* Use serverabiver to actually store the server's video ABI version. This
  is used to generate the Provides: line for drivers so the server can
  depend on them properly. This goes in to the substvar
  xviddriver:Provides.

commit aa3a74d10a25cf19c5290963d33cc05e9a5e9762
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Feb 20 08:29:44 2007 +0100

Autoreconf with patches applied.

This makes the __XKBCONFIGROOT__ substitution actually work.

commit