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

2016-08-21 Thread Julien Cristau 
 debian/changelog   |6 ++
 debian/copyright   |2 +-
 debian/watch.setxkbmap |2 +-
 debian/watch.xkbcomp   |2 +-
 debian/watch.xkbevd|2 +-
 debian/watch.xkbprint  |2 +-
 debian/watch.xkbutils  |2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 10091384233e1dcd3a4fd46dc6d77606dd907ad2
Author: Julien Cristau 
Date:   Sun Aug 21 18:20:20 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 795dd87..e1bcee6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xkb-utils (7.7+4) UNRELEASED; urgency=medium
+
+  * Switch all xorg.freedesktop.org URLs in packaging to https.
+
+ -- Julien Cristau   Sun, 21 Aug 2016 18:20:08 +0200
+
 x11-xkb-utils (7.7+3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/copyright b/debian/copyright
index 060256e..78126ef 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 setxkbmap, xkbcomp, xkbevd, xkbprint and xkbutils applications.
 
 setxkbmap:
diff --git a/debian/watch.setxkbmap b/debian/watch.setxkbmap
index 76cadb4..2f6eeae 100644
--- a/debian/watch.setxkbmap
+++ b/debian/watch.setxkbmap
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/setxkbmap
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ setxkbmap-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ setxkbmap-(.*)\.tar\.gz
diff --git a/debian/watch.xkbcomp b/debian/watch.xkbcomp
index d64768b..d0236da 100644
--- a/debian/watch.xkbcomp
+++ b/debian/watch.xkbcomp
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/xkbcomp
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ xkbcomp-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ xkbcomp-(.*)\.tar\.gz
diff --git a/debian/watch.xkbevd b/debian/watch.xkbevd
index 4bf910f..1b67054 100644
--- a/debian/watch.xkbevd
+++ b/debian/watch.xkbevd
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/xkbevd
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ xkbevd-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ xkbevd-(.*)\.tar\.gz
diff --git a/debian/watch.xkbprint b/debian/watch.xkbprint
index b61a996..4289e9f 100644
--- a/debian/watch.xkbprint
+++ b/debian/watch.xkbprint
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/xkbprint
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ xkbprint-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ xkbprint-(.*)\.tar\.gz
diff --git a/debian/watch.xkbutils b/debian/watch.xkbutils
index cf66c61..33d52f1 100644
--- a/debian/watch.xkbutils
+++ b/debian/watch.xkbutils
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/xkbutils
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ xkbutils-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ xkbutils-(.*)\.tar\.gz

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

2016-05-13 Thread Julien Cristau 
 debian/changelog|9 ++
 debian/control  |6 ++--
 xkbcomp/ChangeLog   |   68 
 xkbcomp/Makefile.in |   46 
 xkbcomp/aclocal.m4  |   65 -
 xkbcomp/configure   |   33 ---
 xkbcomp/configure.ac|2 -
 xkbcomp/expr.c  |4 +-
 xkbcomp/listing.c   |1 
 xkbcomp/man/Makefile.in |   22 ---
 xkbcomp/parseutils.c|1 
 xkbcomp/symbols.c   |2 -
 12 files changed, 182 insertions(+), 77 deletions(-)

New commits:
commit 176444e090e2f1caebcc6b23113ac45ade21a778
Author: Julien Cristau 
Date:   Fri May 13 13:59:45 2016 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 260f55c..795dd87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-x11-xkb-utils (7.7+3) UNRELEASED; urgency=medium
+x11-xkb-utils (7.7+3) unstable; urgency=medium
 
+  * Team upload.
   * xkbcomp 1.3.1.
   * Bump Standards-Version to 3.9.8 (no change needed).
   * Update Vcs-* control headers.
 
- -- Julien Cristau   Fri, 13 May 2016 13:54:26 +0200
+ -- Julien Cristau   Fri, 13 May 2016 13:59:38 +0200
 
 x11-xkb-utils (7.7+2) unstable; urgency=medium
 

commit 78c8e9f97f41b8baf1618ae007f66e524f289289
Author: Julien Cristau 
Date:   Fri May 13 13:56:52 2016 +0200

Update Vcs-* control headers.

diff --git a/debian/changelog b/debian/changelog
index 7e5a22c..260f55c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-xkb-utils (7.7+3) UNRELEASED; urgency=medium
 
   * xkbcomp 1.3.1.
   * Bump Standards-Version to 3.9.8 (no change needed).
+  * Update Vcs-* control headers.
 
  -- Julien Cristau   Fri, 13 May 2016 13:54:26 +0200
 
diff --git a/debian/control b/debian/control
index cea7ebf..d5d671a 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,8 @@ Build-Depends:
 # xkbprint: libx11-dev, libxkbfile-dev
 # xkbutils: libx11-dev, libxaw7-dev, x11proto-core-dev
 Standards-Version: 3.9.8
-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xkb-utils
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xkb-utils.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/x11-xkb-utils.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/app/x11-xkb-utils.git
 
 Package: x11-xkb-utils
 Architecture: any

commit f8693e8d58efab2a54b25fa597a8ac4d6bb99091
Author: Julien Cristau 
Date:   Fri May 13 13:56:30 2016 +0200

Bump Standards-Version to 3.9.8 (no change needed).

diff --git a/debian/changelog b/debian/changelog
index c08c196..7e5a22c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11-xkb-utils (7.7+3) UNRELEASED; urgency=medium
 
   * xkbcomp 1.3.1.
+  * Bump Standards-Version to 3.9.8 (no change needed).
 
  -- Julien Cristau   Fri, 13 May 2016 13:54:26 +0200
 
diff --git a/debian/control b/debian/control
index 1f1fd17..cea7ebf 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
 # xkbevd: libx11-dev, libxkbfile-dev, (bison)
 # xkbprint: libx11-dev, libxkbfile-dev
 # xkbutils: libx11-dev, libxaw7-dev, x11proto-core-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.8
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xkb-utils
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xkb-utils.git
 

commit b536a7490df735998597406b271e2257514eef21
Author: Julien Cristau 
Date:   Fri May 13 13:54:42 2016 +0200

xkbcomp 1.3.1.

diff --git a/debian/changelog b/debian/changelog
index 0263225..c08c196 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xkb-utils (7.7+3) UNRELEASED; urgency=medium
+
+  * xkbcomp 1.3.1.
+
+ -- Julien Cristau   Fri, 13 May 2016 13:54:26 +0200
+
 x11-xkb-utils (7.7+2) unstable; urgency=medium
 
   * Delete debian/xsfbs, no longer used.
diff --git a/xkbcomp/ChangeLog b/xkbcomp/ChangeLog
index 7c22308..ce9d275 100644
--- a/xkbcomp/ChangeLog
+++ b/xkbcomp/ChangeLog
@@ -1,3 +1,71 @@
+commit f909259b1da70bc145f19e5ce595c8e945a2a808
+Author: Peter Hutterer 
+Date:   Thu Nov 5 12:19:22 2015 +1000
+
+xkbcomp 1.3.1
+
+Signed-off-by: Peter Hutterer 
+
+commit 26d1c57a938ce5c0d4fd9d645ace25308e6a7070
+Author: Peter Hutterer 
+Date:   Tue Nov 3 09:01:19 2015 +1000
+
+symbols: increase the warning level for shortening a key type
+
+Any use of the german keyboard layout or anything else using
+level3(ralt_switch) produces the warning
+Type "ONE_LEVEL" has 1 levels, but  has 2 symbols
+Ignoring extra symbols
+This warning is meaningless, the default definition for RALT comes from
+pc(pc105) including altwin(meta_alt) which

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

2013-12-25 Thread Julien Cristau 
 debian/changelog |   10 
 debian/compat|2 
 debian/control   |3 
 debian/rules |   96 
 debian/x11-xkb-utils.install |2 
 xkbutils/ChangeLog   |  203 +
 xkbutils/LED.c   |  329 +-
 xkbutils/LED.h   |6 
 xkbutils/LEDP.h  |   39 
 xkbutils/Makefile.am |   16 
 xkbutils/Makefile.in |  426 +-
 xkbutils/aclocal.m4  | 1143 ++-
 xkbutils/compile |  173 +
 xkbutils/config.guess|  233 -
 xkbutils/config.h.in |3 
 xkbutils/config.sub  |  134 
 xkbutils/configure   | 6275 +--
 xkbutils/configure.ac|   23 
 xkbutils/depcomp |   74 
 xkbutils/install-sh  |   29 
 xkbutils/man/Makefile.am |   12 
 xkbutils/man/Makefile.in |  427 ++
 xkbutils/man/xkbbell.man |   84 
 xkbutils/man/xkbvleds.man|   83 
 xkbutils/man/xkbwatch.man|   36 
 xkbutils/utils.c |  294 --
 xkbutils/utils.h |  240 -
 xkbutils/xkbbell.c   |  353 +-
 xkbutils/xkbbell.man |   75 
 xkbutils/xkbvleds.c  |  537 +--
 xkbutils/xkbvleds.man|   77 
 xkbutils/xkbwatch.c  |  368 +-
 xkbutils/xkbwatch.man|   26 
 33 files changed, 9543 insertions(+), 2288 deletions(-)

New commits:
commit 2f2ae2939164844a1f4d17a6160acd1148f75189
Author: Julien Cristau jcris...@debian.org
Date:   Wed Dec 25 16:13:45 2013 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 57cd991..caeb12a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.7+1) UNRELEASED; urgency=medium
+x11-xkb-utils (7.7+1) unstable; urgency=medium
 
   * xkbutils 1.0.4.
   * Switch to dh, use the autotools-dev addon; should give us new enough
@@ -6,7 +6,7 @@ x11-xkb-utils (7.7+1) UNRELEASED; urgency=medium
   * Disable silent build rules.
   * Install xkbcomp.pc, in case anything ever needs it.
 
- -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 13:04:17 +0100
+ -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 16:13:32 +0100
 
 x11-xkb-utils (7.7~1) unstable; urgency=low
 

commit 1f79400f35650062f6f0fa5a2e97c9511f677ae2
Author: Julien Cristau jcris...@debian.org
Date:   Wed Dec 25 16:12:43 2013 +0100

Install xkbcomp.pc, in case anything ever needs it.

Also restore xkbevd-example.cf's filename.

diff --git a/debian/changelog b/debian/changelog
index 334cfdc..57cd991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x11-xkb-utils (7.7+1) UNRELEASED; urgency=medium
   * Switch to dh, use the autotools-dev addon; should give us new enough
 config.{guess,sub} for arm64 (closes: #717841).
   * Disable silent build rules.
+  * Install xkbcomp.pc, in case anything ever needs it.
 
  -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 13:04:17 +0100
 
diff --git a/debian/rules b/debian/rules
index b93ee27..f02d106 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# set this to the name of the main shlib's binary package
-PACKAGE = x11-xkb-utils
-
 STAMP_DIR = stampdir
 
 # This package contains multiple modules as shipped by upstream. Each module is
@@ -43,6 +40,11 @@ override_dh_auto_install:
cd $$FILE-build  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install ; \
cd ..; \
done
+   install -d debian/tmp/usr/share/doc/x11-xkb-utils
+   install -m 644 xkbevd/example.cf 
debian/tmp/usr/share/doc/x11-xkb-utils/xkbevd-example.cf
+
+override_dh_install:
+   dh_install --fail-missing
 
 override_dh_auto_clean: $(addprefix clean-, $(SUBDIRS))
rm -rf $(STAMP_DIR)
diff --git a/debian/x11-xkb-utils.docs b/debian/x11-xkb-utils.docs
deleted file mode 100644
index 82ead1e..000
--- a/debian/x11-xkb-utils.docs
+++ /dev/null
@@ -1 +0,0 @@
-xkbevd/example.cf
diff --git a/debian/x11-xkb-utils.install b/debian/x11-xkb-utils.install
index 68671de..308034e 100644
--- a/debian/x11-xkb-utils.install
+++ b/debian/x11-xkb-utils.install
@@ -1,2 +1,4 @@
 usr/bin/*
 usr/share/man/man1/*
+usr/share/doc/x11-xkb-utils
+usr/lib/pkgconfig

commit 07cf735d5803a4e4f01a74972a0813bd82826a9c
Author: Julien Cristau jcris...@debian.org
Date:   Wed Dec 25 13:29:02 2013 +0100

Disable silent build rules.

diff --git a/debian/changelog b/debian/changelog
index d88f354..334cfdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-xkb-utils (7.7+1) UNRELEASED; urgency=medium
   * xkbutils 1.0.4.
   * Switch to dh, use the autotools-dev addon; should give us new enough
 config.{guess,sub} for arm64 (closes: #717841).
+  * Disable silent build rules.
 
  -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 13:04:17 +0100
 
diff --git a/debian/rules b/debian/rules
index a959392..b93ee27 100755
--- a/debian/rules
+++ b/debian/rules

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

2013-12-25 Thread Julien Cristau 
 debian/README.source   |   73 -
 debian/changelog   |6 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 5 files changed, 6 insertions(+), 1012 deletions(-)

New commits:
commit ec6e16b9043bab51f66fdc80dc6a3e88396e9af6
Author: Julien Cristau jcris...@debian.org
Date:   Wed Dec 25 16:35:49 2013 +0100

Delete debian/xsfbs, no longer used.

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index b09a1ab..000
--- a/debian/README.source
+++ /dev/null
@@ -1,73 +0,0 @@
---
-Quick Guide To Patching This Package For The Impatient
---
-
-1. Make sure you have quilt installed
-2. Unpack the package as usual with dpkg-source -x
-3. Run the patch target in debian/rules
-4. Create a new patch with quilt new (see quilt(1))
-5. Edit all the files you want to include in the patch with quilt edit 
-   (see quilt(1)).
-6. Write the patch with quilt refresh (see quilt(1))
-7. Run the clean target in debian/rules
-
-Alternatively, instead of using quilt directly, you can drop the patch in to 
-debian/patches and add the name of the patch to debian/patches/series.
-
-
-Guide To The X Strike Force Packages
-
-
-The X Strike Force team maintains X packages in git repositories on
-git.debian.org in the pkg-xorg subdirectory. Most upstream packages
-are actually maintained in git repositories as well, so they often
-just need to be pulled into git.debian.org in a upstream-* branch.
-Otherwise, the upstream sources are manually installed in the Debian
-git repository.
-
-The .orig.tar.gz upstream source file could be generated using this
-upstream-* branch in the Debian git repository but it is actually
-copied from upstream tarballs directly.
-
-Due to X.org being highly modular, packaging all X.org applications
-as their own independent packages would have created too many Debian
-packages. For this reason, some X.org applications have been grouped
-into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
-x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
-Most packages, including the X.org server itself and all libraries
-and drivers are, however maintained independently.
-
-The Debian packaging is added by creating the debian-* git branch
-which contains the aforementioned upstream-* branch plus the debian/
-repository files.
-When a patch has to be applied to the Debian package, two solutions
-are involved:
-* If the patch is available in one of the upstream branches, it
-  may be git'cherry-picked into the Debian repository. In this
-  case, it appears directly in the .diff.gz.
-* Otherwise, the patch is added to debian/patches/ which is managed
-  with quilt as documented in /usr/share/doc/quilt/README.source.
-
-quilt is actually invoked by the Debian X packaging through a larger
-set of scripts called XSFBS. XSFBS brings some other X specific
-features such as managing dependencies and conflicts due to the video
-and input driver ABIs.
-XSFBS itself is maintained in a separate repository at
-  git://git.debian.org/pkg-xorg/xsfbs.git
-and it is pulled inside the other Debian X repositories when needed.
-
-The XSFBS patching system requires a build dependency on quilt. Also
-a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
-so that the XSFBS patching occurs before the actual build. So the
-very first target of the build (likely the one running autoreconf)
-should depend on $(STAMP_DIR)/patch. It should also not depend on
-anything so that parallel builds are correctly supported (nothing
-should probably run while patching is being done). And finally, the
-clean target should depend on the xsfclean target so that patches
-are unapplied on clean.
-
-When the upstream sources contain some DFSG-nonfree files, they are
-listed in text files in debian/prune/ in the debian-* branch of
-the Debian repository. XSFBS' scripts then take care of removing
-these listed files during the build so as to generate a modified
-DFSG-free .orig.tar.gz tarball.
diff --git a/debian/changelog b/debian/changelog
index caeb12a..eac6c45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xkb-utils (7.7+2) UNRELEASED; urgency=medium
+
+  * Delete debian/xsfbs, no longer used.
+
+ -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 16:35:35 +0100
+
 x11-xkb-utils (7.7+1) unstable; urgency=medium
 
   * xkbutils 1.0.4.
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
deleted file mode 100755
index 5935cc9..000
--- a/debian/xsfbs/repack.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if ! [ -d debian/prune ]; then
-   exit 0
-fi
-
-if [ x$1 != x--upstream-version ]; then
-   exit 1
-fi
-
-version=$2
-filename=$3

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

2012-04-30 Thread Julien Cristau 
 debian/changelog|   11 
 debian/control  |2 
 debian/rules|5 
 setxkbmap/ChangeLog |  306 ++
 setxkbmap/Makefile.am   |   20 
 setxkbmap/Makefile.in   |  299 +-
 setxkbmap/aclocal.m4| 1168 ++--
 setxkbmap/config.guess  |   18 
 setxkbmap/config.sub|   76 
 setxkbmap/configure | 5873 +
 setxkbmap/configure.ac  |   11 
 setxkbmap/man/Makefile.am   |   14 
 setxkbmap/man/Makefile.in   |  418 ++
 setxkbmap/man/setxkbmap.man |  141 +
 setxkbmap/setxkbmap.c   |  668 ++--
 setxkbmap/setxkbmap.man |  139 
 xkbcomp/ChangeLog   |  147 +
 xkbcomp/Makefile.am |3 
 xkbcomp/Makefile.in |   79 
 xkbcomp/aclocal.m4  | 5107 +++-
 xkbcomp/alias.c |   10 
 xkbcomp/compat.c|6 
 xkbcomp/config.guess|  218 -
 xkbcomp/config.sub  |  103 
 xkbcomp/configure   | 6118 ++-
 xkbcomp/configure.ac|   10 
 xkbcomp/geometry.c  |   10 
 xkbcomp/man/Makefile.in |4 
 xkbcomp/man/xkbcomp.man |3 
 xkbcomp/parseutils.c|4 
 xkbcomp/symbols.c   |6 
 xkbcomp/utils.h |4 
 xkbcomp/xkbcomp.c   |   21 
 xkbcomp/xkbcomp.pc.in   |9 
 xkbcomp/xkbparse.c  |  663 +---
 xkbcomp/xkbscan.c   |6 
 xkbevd/ChangeLog|   87 
 xkbevd/Makefile.am  |   27 
 xkbevd/Makefile.in  |  310 +-
 xkbevd/aclocal.m4   | 1044 ++-
 xkbevd/cfgparse.c   |   77 
 xkbevd/cfgparse.y   |9 
 xkbevd/cfgscan.c|6 
 xkbevd/config.h.in  |3 
 xkbevd/configure| 6178 ++--
 xkbevd/configure.ac |9 
 xkbevd/man/Makefile.am  |   12 
 xkbevd/man/Makefile.in  |  417 ++
 xkbevd/man/xkbevd.man   |   96 
 xkbevd/printev.c|6 
 xkbevd/utils.c  |   85 
 xkbevd/utils.h  |   55 
 xkbevd/xkbevd.c |   26 
 xkbevd/xkbevd.h |2 
 xkbevd/xkbevd.man   |   96 
 55 files changed, 25219 insertions(+), 5026 deletions(-)

New commits:
commit 0cec6d0310fab5531dd53a34b9e64f8b84052613
Author: Julien Cristau jcris...@debian.org
Date:   Mon Apr 30 20:40:17 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index a7f11cb..722750f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.7~1) UNRELEASED; urgency=low
+x11-xkb-utils (7.7~1) unstable; urgency=low
 
   * setxkbmap 1.3 0
   * xkbcomp 1.2.4
@@ -7,7 +7,7 @@ x11-xkb-utils (7.7~1) UNRELEASED; urgency=low
   * Bump x11proto-core-dev build-dep to 7.0.17.
   * Tell dh_install to ignore xkbcomp.pc, nothing uses that AFAIK.
 
- -- Julien Cristau jcris...@debian.org  Mon, 30 Apr 2012 20:24:08 +0200
+ -- Julien Cristau jcris...@debian.org  Mon, 30 Apr 2012 20:40:11 +0200
 
 x11-xkb-utils (7.6+4) unstable; urgency=low
 

commit 62bd68d1e4d89b533d87f05da4dd50bc80a4d360
Author: Julien Cristau jcris...@debian.org
Date:   Mon Apr 30 20:40:06 2012 +0200

Tell dh_install to ignore xkbcomp.pc, nothing uses that AFAIK.

diff --git a/debian/changelog b/debian/changelog
index b355768..a7f11cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11-xkb-utils (7.7~1) UNRELEASED; urgency=low
   * Don't use dh_testroot in debian/rules clean.
   * xkbevd 1.1.3
   * Bump x11proto-core-dev build-dep to 7.0.17.
+  * Tell dh_install to ignore xkbcomp.pc, nothing uses that AFAIK.
 
  -- Julien Cristau jcris...@debian.org  Mon, 30 Apr 2012 20:24:08 +0200
 
diff --git a/debian/rules b/debian/rules
index 9f53a93..dc630bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ binary-arch: build install
dh_testroot
 
dh_installdocs
-   dh_install --sourcedir=debian/tmp --fail-missing
+   dh_install --sourcedir=debian/tmp --fail-missing -Xxkbcomp.pc
install -m 644 xkbevd/example.cf \

debian/x11-xkb-utils/usr/share/doc/x11-xkb-utils/xkbevd-example.cf
dh_installchangelogs

commit e55ec112ba582dbcd96a28c7b74eaf60f539873a
Author: Julien Cristau jcris...@debian.org
Date:   Mon Apr 30 20:31:31 2012 +0200

Bump x11proto-core-dev build-dep to 7.0.17.

diff --git a/debian/changelog b/debian/changelog
index a9e6e99..b355768 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x11-xkb-utils (7.7~1) UNRELEASED; urgency=low
   * xkbcomp 1.2.4
   * Don't use dh_testroot in debian/rules clean.
   * xkbevd 1.1.3
+  * Bump x11proto-core-dev build-dep to 7.0.17.
 
  -- Julien Cristau jcris...@debian.org  Mon, 30 Apr 2012 20:24:08 +0200
 
diff --git a/debian/control b/debian/control
index 320a808..736f882 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  bison,
  quilt,

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

2011-06-21 Thread Cyril Brulebois 
 debian/changelog|8 
 xkbcomp/ChangeLog   |  105 +
 xkbcomp/Makefile.am |6 
 xkbcomp/Makefile.in |   21 
 xkbcomp/aclocal.m4  | 4221 +++
 xkbcomp/compat.c|9 
 xkbcomp/config.guess|  457 ++--
 xkbcomp/config.sub  |  230 +-
 xkbcomp/configure   |  308 +--
 xkbcomp/configure.ac|2 
 xkbcomp/depcomp |   87 
 xkbcomp/geometry.c  |4 
 xkbcomp/install-sh  |5 
 xkbcomp/man/Makefile.in |1 
 xkbcomp/missing |   49 
 xkbcomp/utils.h |   63 
 xkbcomp/xkbparse.c  | 4661 
 xkbcomp/xkbscan.c   |9 
 xkbcomp/ylwrap  |   11 
 19 files changed, 6221 insertions(+), 4036 deletions(-)

New commits:
commit f2c5b4e04ecf63e9c4a07c8634062af9f65f6de4
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jun 21 16:00:50 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 04757fb..3053c07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.6+3) UNRELEASED; urgency=low
+x11-xkb-utils (7.6+3) unstable; urgency=low
 
   [ Julien Cristau ]
   * xkbcomp 1.2.1.
@@ -6,7 +6,7 @@ x11-xkb-utils (7.6+3) UNRELEASED; urgency=low
   [ Cyril Brulebois ]
   * xkbcomp 1.2.2.
 
- -- Julien Cristau jcris...@debian.org  Sun, 13 Feb 2011 12:53:45 +0100
+ -- Cyril Brulebois k...@debian.org  Tue, 21 Jun 2011 16:00:47 +0200
 
 x11-xkb-utils (7.6+2) unstable; urgency=low
 

commit 8b970d7fbffb3e6d2ca87024a13315758494d7dd
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jun 21 16:00:42 2011 +0200

xkbcomp 1.2.2.

diff --git a/debian/changelog b/debian/changelog
index b4d2a49..04757fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 x11-xkb-utils (7.6+3) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * xkbcomp 1.2.1.
 
+  [ Cyril Brulebois ]
+  * xkbcomp 1.2.2.
+
  -- Julien Cristau jcris...@debian.org  Sun, 13 Feb 2011 12:53:45 +0100
 
 x11-xkb-utils (7.6+2) unstable; urgency=low
diff --git a/xkbcomp/ChangeLog b/xkbcomp/ChangeLog
index 5b33ab9..a4cc18f 100644
--- a/xkbcomp/ChangeLog
+++ b/xkbcomp/ChangeLog
@@ -1,3 +1,108 @@
+commit e68a8ef1067f98056237d8067052e2a0d9896133
+Author: Daniel Stone dan...@fooishbar.org
+Date:   Tue Jun 21 14:06:05 2011 +0100
+
+Bump to 1.2.2
+
+Emergency bugfix for the syminterp declarations.  They've been broken
+since the beginning of time, but I guess we just haven't added new
+interpreted symbols since around then.
+
+Signed-off-by: Daniel Stone dan...@fooishbar.org
+
+commit 2a473b906943ffd807ad81960c47530ee7ae9a60
+Author: Daniel Stone dan...@fooishbar.org
+Date:   Tue Jun 21 14:03:53 2011 +0100
+
+Interp: Ignore NoSymbol definitions
+
+A NoSymbol syminterp leads to a Any+AnyOfOrAll(None) definition, which
+is never what anyone would actually ever want in a sym interp.  The
+failure mode here was:
+interpret XF86SomeKeysymYouDontHaveYet {
+action=Something()
+}
+leading to:
+interpret Any+AnyOfOrAll(None) {
+action=Something()
+}
+leading to every single non-action key triggering your shiny new action
+that was only supposed to come from a new keysym.
+
+At least you could VT switch or zap, I guess.
+
+Later, more invasive, revisions will bring a more useful error message.
+
+Signed-off-by: Daniel Stone dan...@fooishbar.org
+
+commit a2816345e58c88f5806a5c6df310c7d9c62264f0
+Author: Daniel Stone dan...@fooishbar.org
+Date:   Tue Jun 21 14:03:12 2011 +0100
+
+Interp: Don't make modifier lookup failure fatal
+
+If we can't look up a modifier in a SymInterp declaration, don't make
+that fatal enough to kill the entire file, just ignore it and move on.
+
+Signed-off-by: Daniel Stone dan...@fooishbar.org
+
+commit c7a42b364f0ca06d9859945fa11664d0e0ea2742
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Mar 8 08:16:35 2011 -0500
+
+config: move pre-processor flags to AM_CPPFLAGS
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 7899a1f4745c8d111dab4dd3abc2b59b40ecdcbc
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Mar 8 08:02:54 2011 -0500
+
+config: let Automake handle Yacc dist and cleaning
+
+BUILT_SOURCES and MAINTAINERCLEANFILES are already handled by Automake.
+
+Automake generates all the rules to handle building,
+distribution and cleaning.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 137418c63d01d5db0dcaed257d7a26865efa53ae
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Tue Jun 7 23:47:32 2011 -0700
+
+Replace repeated checks for gcc with _X_ATTRIBUTE_PRINTF from xproto
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Mark Kettenis kette...@openbsd.org
+
+commit

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

2011-06-21 Thread Cyril Brulebois 
 debian/changelog |6 ++
 xkbcomp/ChangeLog|   41 +
 xkbcomp/compat.c |4 ++--
 xkbcomp/configure|   20 ++--
 xkbcomp/configure.ac |2 +-
 xkbcomp/parseutils.c |9 ++---
 xkbcomp/parseutils.h |4 ++--
 xkbcomp/xkbcomp.h|1 +
 xkbcomp/xkbparse.c   |4 ++--
 xkbcomp/xkbparse.y   |4 ++--
 10 files changed, 73 insertions(+), 22 deletions(-)

New commits:
commit fe23a727f05c7cc66527fc30fd598b8659285da0
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jun 21 17:37:11 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 54f1ecf..c22309e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-x11-xkb-utils (7.6+4) UNRELEASED; urgency=low
+x11-xkb-utils (7.6+4) unstable; urgency=low
 
   * xkbcomp 1.2.3.
 
- -- Cyril Brulebois k...@debian.org  Tue, 21 Jun 2011 17:36:00 +0200
+ -- Cyril Brulebois k...@debian.org  Tue, 21 Jun 2011 17:37:06 +0200
 
 x11-xkb-utils (7.6+3) unstable; urgency=low
 

commit 1eb4f836623e9766feb6ddaa9acfdbefd0e447a0
Author: Cyril Brulebois k...@debian.org
Date:   Tue Jun 21 17:37:02 2011 +0200

xkbcomp 1.2.3.

diff --git a/debian/changelog b/debian/changelog
index 3053c07..54f1ecf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xkb-utils (7.6+4) UNRELEASED; urgency=low
+
+  * xkbcomp 1.2.3.
+
+ -- Cyril Brulebois k...@debian.org  Tue, 21 Jun 2011 17:36:00 +0200
+
 x11-xkb-utils (7.6+3) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/xkbcomp/ChangeLog b/xkbcomp/ChangeLog
index a4cc18f..eba4470 100644
--- a/xkbcomp/ChangeLog
+++ b/xkbcomp/ChangeLog
@@ -1,3 +1,44 @@
+commit cef4ba4b8fdc9a5439f71437c08cf690a750bd6b
+Author: Daniel Stone dan...@fooishbar.org
+Date:   Tue Jun 21 16:04:45 2011 +0100
+
+Bump to 1.2.3
+
+Signed-off-by: Daniel Stone dan...@fooishbar.org
+
+commit 3caab5aa37decb7b5dc1642a0452efc3e1f5100e
+Author: Daniel Stone dan...@fooishbar.org
+Date:   Tue Jun 21 15:55:59 2011 +0100
+
+Interp: Allow explicit Any/NoSymbol mappings
+
+Brown paper bag in full effect.
+
+The previous fix, while crushing the previous problem where an unknown
+keysym for an interp def would lead to every key matching it, also
+ignored explicit Any+AnyOfOrNone(All) mappings.
+
+Such as the one xkeyboard-config relied on for Control to actually
+update the modifier state.
+
+Fix this by allowing mappings explicitly declared as Any/NoSymbol, while
+ignoring only those with failed keysym lookups.  Unfortunately, due to
+the structure of the parser, it's a deeply inelegant fix.
+
+Verified with a quick check of all layouts (albeit using default
+variants only) in xkeyboard-config that this results in no changes to
+the output at all, compared to xkbcomp 1.1.1.
+
+Signed-off-by: Daniel Stone dan...@fooishbar.org
+
+commit b34af8b0aec3a1dfc58f9732996274cbf2646a53
+Author: Daniel Stone dan...@fooishbar.org
+Date:   Tue Jun 21 15:55:28 2011 +0100
+
+Constify LookupKeysym input argument
+
+Signed-off-by: Daniel Stone dan...@fooishbar.org
+
 commit e68a8ef1067f98056237d8067052e2a0d9896133
 Author: Daniel Stone dan...@fooishbar.org
 Date:   Tue Jun 21 14:06:05 2011 +0100
diff --git a/xkbcomp/compat.c b/xkbcomp/compat.c
index a058dfb..759535a 100644
--- a/xkbcomp/compat.c
+++ b/xkbcomp/compat.c
@@ -658,9 +658,9 @@ HandleInterpDef(InterpDef * def, XkbDescPtr xkb, unsigned 
merge,
 ACTION(Symbol interpretation ignored\n);
 return True;
 }
-if (def-sym == NoSymbol)
+if (def-ignore)
 {
-ERROR(Couldn't determine keysym\n);
+ERROR(Couldn't lookup keysym\n);
 ACTION(Symbol interpretation ignored\n);
 return True;
 }
diff --git a/xkbcomp/configure b/xkbcomp/configure
index 36d48a5..2d22733 100755
--- a/xkbcomp/configure
+++ b/xkbcomp/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for xkbcomp 1.2.2.
+# Generated by GNU Autoconf 2.68 for xkbcomp 1.2.3.
 #
 # Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
 #
@@ -561,8 +561,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkbcomp'
 PACKAGE_TARNAME='xkbcomp'
-PACKAGE_VERSION='1.2.2'
-PACKAGE_STRING='xkbcomp 1.2.2'
+PACKAGE_VERSION='1.2.3'
+PACKAGE_STRING='xkbcomp 1.2.3'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -1294,7 +1294,7 @@ if test $ac_init_help = long; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat _ACEOF
-\`configure' configures xkbcomp 1.2.2 to adapt to many kinds of systems.
+\`configure' configures xkbcomp 1.2.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1364,7 +1364,7 @@ fi

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

2011-02-13 Thread Julien Cristau 
 debian/changelog |6 
 xkbcomp/ChangeLog|   96 +
 xkbcomp/Makefile.am  |   21 
 xkbcomp/Makefile.in  |  297 ++-
 xkbcomp/README   |8 
 xkbcomp/README.config|  195 --
 xkbcomp/README.enhancing |  508 -
 xkbcomp/aclocal.m4   |  434 ++--
 xkbcomp/config.guess |  257 +-
 xkbcomp/config.sub   |  159 -
 xkbcomp/configure|  280 +--
 xkbcomp/configure.ac |   20 
 xkbcomp/depcomp  |   87 
 xkbcomp/install-sh   |5 
 xkbcomp/man/Makefile.am  |   12 
 xkbcomp/man/Makefile.in  |  418 
 xkbcomp/man/xkbcomp.man  |  107 +
 xkbcomp/missing  |   49 
 xkbcomp/xkbcomp.c|2 
 xkbcomp/xkbcomp.man  |  106 -
 xkbcomp/xkbparse.c   | 4286 ---
 xkbcomp/ylwrap   |   11 
 22 files changed, 2936 insertions(+), 4428 deletions(-)

New commits:
commit 2d6b8b365a7d66c2825c44bafe02a0da2cd99184
Author: Julien Cristau jcris...@debian.org
Date:   Sun Feb 13 12:54:05 2011 +0100

xkbcomp 1.2.1.

diff --git a/debian/changelog b/debian/changelog
index f46e181..b4d2a49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xkb-utils (7.6+3) UNRELEASED; urgency=low
+
+  * xkbcomp 1.2.1.
+
+ -- Julien Cristau jcris...@debian.org  Sun, 13 Feb 2011 12:53:45 +0100
+
 x11-xkb-utils (7.6+2) unstable; urgency=low
 
   [ Cyril Brulebois ]
diff --git a/xkbcomp/ChangeLog b/xkbcomp/ChangeLog
index f1b325f..5b33ab9 100644
--- a/xkbcomp/ChangeLog
+++ b/xkbcomp/ChangeLog
@@ -1,3 +1,99 @@
+commit c8375bcb7eb9f86ca1534cdf1143e91372d0499e
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Feb 11 09:06:04 2011 +1000
+
+xkbcomp 1.2.1
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit ab5371cefe2b7438b74338f71ff890e0e868b3df
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jan 19 10:06:56 2011 -0500
+
+config: move man pages into their own directory
+
+Use services provided by XORG_MANPAGE_SECTIONS.
+Use standard Makefile for man pages.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 9ce8e2f42ab7695b5165ff0a3d892df96a3c3f01
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Jan 13 11:15:47 2011 -0500
+
+man: remove trailing spaces and tabs
+
+Using s/[ \t]*$//
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 5ecf21cc130d7a45cb5e82e9c2c3025edee5d74f
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jan 12 16:28:02 2011 -0500
+
+config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+This silences an Autoconf warning
+
+commit e27e8c2a15ddcf51b2ea58f8eced7f035aa1301e
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jan 12 15:29:50 2011 -0500
+
+config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+This silences an Automake warning.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit f524cfae6951442c9a9da65ef317b9c04199500f
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Tue Jan 4 00:05:18 2011 -0800
+
+Remove out-of-date copies of README.config  README.enhancing
+
+The up-to-date master copies of those documents are found in the
+xorg-docs module, and posted on the X.Org website.
+
+Also, x-docs.org no longer carries X11 docs, so point to X.Org's
+website instead in the README.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Daniel Stone dan...@fooishbar.org
+
+commit cc55d8f5ab021861308b071aab9c03016be15187
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sun Oct 31 20:35:24 2010 -0400
+
+config: replace AC_CHECK_FILE with test -f as it fails to cross-compile
+
+Testing for the presence of xkbparse.c is legitimate as this is a build
+file, but the Autoconf macro assumes it is testing on the host system
+and fails.
+
+Tested-by: Abdoulaye Walsimou Gaye a...@embtoolkit.org
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 1d59f5b0387b18028017cfab4e55b703417dd735
+Author: Dirk Wallenstein hals...@t-online.de
+Date:   Fri Oct 29 13:08:25 2010 +0200
+
+man: Improve description of device selection option
+
+The device selection option takes effect when loading keymaps, too.
+
+Signed-off-by: Dirk Wallenstein hals...@t-online.de
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 281c7744f682c1ba4f44c0ee22f9bf7188c14fe6
+Author: Dirk Wallenstein hals...@t-online.de
+Date:   Fri Oct 29 11:35:10 2010 +0200
+
+Allow uploading a keymap to a single device
+
+Signed-off-by: Dirk Wallenstein hals...@t-online.de
+Reviewed-by: Julien Cristau jcris...@debian.org
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
 commit 851a5f6e0c1b2a98d4714d95e40198ab5dc61607
 Author: Alan Coopersmith alan.coopersm...@oracle.com
 Date:   Sat Oct 30 09:59:52 2010 -0700
diff --git a/xkbcomp/Makefile.am b/xkbcomp/Makefile.am

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

2011-02-10 Thread Julien Cristau 
 debian/changelog|   35 
 debian/control  |9 
 debian/copyright|   66 
 debian/rules|6 
 setxkbmap/COPYING   |   30 
 setxkbmap/ChangeLog |  165 +
 setxkbmap/INSTALL   |  291 ++
 setxkbmap/Makefile.am   |   36 
 setxkbmap/Makefile.in   |  300 +--
 setxkbmap/README|   27 
 setxkbmap/aclocal.m4| 1244 +---
 setxkbmap/config.guess  |  243 +-
 setxkbmap/config.h.in   |3 
 setxkbmap/config.sub|   91 
 setxkbmap/configure | 3927 +++-
 setxkbmap/configure.ac  |   28 
 setxkbmap/depcomp   |   87 
 setxkbmap/install-sh|5 
 setxkbmap/missing   |   49 
 setxkbmap/setxkbmap.c   |   16 
 setxkbmap/setxkbmap.man |6 
 xkbcomp/ChangeLog   |   79 
 xkbcomp/Makefile.am |   22 
 xkbcomp/Makefile.in |   26 
 xkbcomp/aclocal.m4  | 2528 +-
 xkbcomp/config.guess|   11 
 xkbcomp/config.h.in |3 
 xkbcomp/config.sub  |   61 
 xkbcomp/configure   | 1813 ++
 xkbcomp/configure.ac|   19 
 xkbcomp/parseutils.c|2 
 xkbcomp/xkbparse.c  |  663 +-
 xkbevd/COPYING  |   30 
 xkbevd/ChangeLog|  223 ++
 xkbevd/INSTALL  |  291 ++
 xkbevd/Makefile.am  |   36 
 xkbevd/Makefile.in  |   68 
 xkbevd/aclocal.m4   |  877 +++--
 xkbevd/cfgparse.c   |   70 
 xkbevd/cfgparse.y   |   26 
 xkbevd/cfgscan.c|   38 
 xkbevd/config.guess |  210 --
 xkbevd/config.h.in  |3 
 xkbevd/config.sub   |  115 -
 xkbevd/configure| 3994 ++---
 xkbevd/configure.ac |   37 
 xkbevd/evargs.c |   22 
 xkbevd/example.cf   |1 
 xkbevd/printev.c|   26 
 xkbevd/tokens.h |   19 
 xkbevd/utils.c  |   40 
 xkbevd/utils.h  |   49 
 xkbevd/xkbevd.c |   74 
 xkbevd/xkbevd.h |   20 
 xkbevd/xkbevd.man   |   44 
 xkbprint/ChangeLog  |  109 +
 xkbprint/INSTALL|  291 ++
 xkbprint/Makefile.am|   30 
 xkbprint/Makefile.in|   62 
 xkbprint/aclocal.m4 |  877 +++--
 xkbprint/config.guess   |  210 --
 xkbprint/config.h.in|3 
 xkbprint/config.sub |  115 -
 xkbprint/configure  | 4657 +---
 xkbprint/configure.ac   |   24 
 xkbutils/COPYING|   72 
 xkbutils/ChangeLog  |  179 +
 xkbutils/INSTALL|  291 ++
 xkbutils/LED.c  |2 
 xkbutils/Makefile.am|   31 
 xkbutils/Makefile.in|   62 
 xkbutils/aclocal.m4 |  851 +++-
 xkbutils/compile|6 
 xkbutils/config.guess   |  210 --
 xkbutils/config.h.in|3 
 xkbutils/config.sub |  115 -
 xkbutils/configure  | 4401 +++--
 xkbutils/configure.ac   |   34 
 xkbutils/xkbbell.man|   39 
 xkbutils/xkbvleds.man   |   39 
 xkbutils/xkbwatch.man   |   39 
 81 files changed, 16100 insertions(+), 14856 deletions(-)

New commits:
commit ea90177cecc75f21c995a88498ea3ed6750ab1db
Author: Julien Cristau jcris...@debian.org
Date:   Thu Feb 10 17:49:31 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 0f29dbd..f46e181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.6+2) UNRELEASED; urgency=low
+x11-xkb-utils (7.6+2) unstable; urgency=low
 
   [ Cyril Brulebois ]
   * Install xkbevd's example.cf file (Closes: #80510).
@@ -10,8 +10,9 @@ x11-xkb-utils (7.6+2) UNRELEASED; urgency=low
 work!
   * Drop Pre-Depends on x11-common.
   * Bump Standards-Version to 3.9.1.
+  * Upload to unstable.
 
- -- Cyril Brulebois k...@debian.org  Fri, 14 Jan 2011 23:45:32 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 10 Feb 2011 17:59:27 +0100
 
 x11-xkb-utils (7.6+1) experimental; urgency=low
 

commit 1d929b6aedd67fd79ad436ad2d18dd91828c1a1a
Author: Julien Cristau jcris...@debian.org
Date:   Thu Feb 10 17:56:01 2011 +0100

Bump Standards-Version to 3.9.1.

diff --git a/debian/changelog b/debian/changelog
index 17800b5..0f29dbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11-xkb-utils (7.6+2) UNRELEASED; urgency=low
   * Remove Brice Goglin and David Nusinow from Uploaders.  Thanks for your
 work!
   * Drop Pre-Depends on x11-common.
+  * Bump Standards-Version to 3.9.1.
 
  -- Cyril Brulebois k...@debian.org  Fri, 14 Jan 2011 23:45:32 +0100
 
diff --git a/debian/control b/debian/control
index 166a14c..320a808 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
 # xkbevd: libx11-dev, libxkbfile-dev, (bison)
 # xkbprint: libx11-dev, libxkbfile-dev
 # xkbutils: libx11-dev, libxaw7-dev, x11proto-core-dev
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xkb-utils
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xkb-utils.git
 

commit b401887e9272ffdd82e9f66cddc5b4f0a3cbc723

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

2010-07-12 Thread Julien Cristau 
 debian/changelog  |7 +++
 xkbcomp/ChangeLog |   11 +++
 xkbcomp/xkbscan.c |4 ++--
 3 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit ed61083127d1ec0cfe65d112b22b7f04fab502ad
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jul 12 10:41:09 2010 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 144bad4..5f06cc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11-xkb-utils (7.5+5) UNRELEASED; urgency=low
+x11-xkb-utils (7.5+5) unstable; urgency=low
 
   * One more xkbcomp fix, this time to be able to detect EOF on architectures
 where 'char' is unsigned (closes: #588658).
 
- -- Julien Cristau jcris...@debian.org  Mon, 12 Jul 2010 10:38:55 +0100
+ -- Julien Cristau jcris...@debian.org  Mon, 12 Jul 2010 10:40:30 +0100
 
 x11-xkb-utils (7.5+4) unstable; urgency=low
 

commit ec227124be8f870bbc7281933d5b4cf7ad51ca8d
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jul 12 10:40:17 2010 +0100

Fix xkbcomp vs unsigned char

One more xkbcomp fix, this time to be able to detect EOF on
architectures where 'char' is unsigned (closes: #588658).

diff --git a/debian/changelog b/debian/changelog
index d13ed63..144bad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-xkb-utils (7.5+5) UNRELEASED; urgency=low
+
+  * One more xkbcomp fix, this time to be able to detect EOF on architectures
+where 'char' is unsigned (closes: #588658).
+
+ -- Julien Cristau jcris...@debian.org  Mon, 12 Jul 2010 10:38:55 +0100
+
 x11-xkb-utils (7.5+4) unstable; urgency=low
 
   * Pull an xkbcomp fix from git, thanks to Alexandre Isoard for the report.
diff --git a/xkbcomp/ChangeLog b/xkbcomp/ChangeLog
index 15ccfbb..677b0c1 100644
--- a/xkbcomp/ChangeLog
+++ b/xkbcomp/ChangeLog
@@ -1,3 +1,14 @@
+commit 61b3d4b024d8146cb0e7659aa958045ceb72c482
+Author: Julien Cristau jcris...@debian.org
+Date:   Mon Jul 12 10:28:32 2010 +0100
+
+Fix signedness issue with getc() return value
+
+getc() and ungetc() return and take, respectively, an int rather than a
+char to allow for error values as well.  Oops.
+
+Signed-off-by: Daniel Stone dan...@fooishbar.org
+
 commit a281386fa887e6bf4110840779aed46dd0ac89b6
 Author: Daniel Stone dan...@fooishbar.org
 Date:   Fri Jul 9 19:34:29 2010 +0100
diff --git a/xkbcomp/xkbscan.c b/xkbcomp/xkbscan.c
index 1e7902d..03193e2 100644
--- a/xkbcomp/xkbscan.c
+++ b/xkbcomp/xkbscan.c
@@ -269,7 +269,7 @@ tokText(int tok)
 }
 #endif
 
-static char
+static int
 scanchar(void)
 {
 if (readBufPos = readBufLen) {
@@ -285,7 +285,7 @@ scanchar(void)
 }
 
 static void
-unscanchar(char c)
+unscanchar(int c)
 {
 if (readBuf[--readBufPos] != c) {
 fprintf(stderr, UNGETCHAR FAILED! Put back %c, was expecting %c at 


-- 
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/e1oyj9j-oh...@alioth.debian.org

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

2010-07-09 Thread Julien Cristau 
 debian/changelog |6 ++
 xkbcomp/ChangeLog|   12 +
 xkbcomp/config.h.in  |3 +
 xkbcomp/configure|  105 +++
 xkbcomp/configure.ac |1 
 xkbcomp/parseutils.c |   12 +
 xkbcomp/xkbparse.c   |2 
 xkbcomp/xkbparse.y   |2 
 8 files changed, 141 insertions(+), 2 deletions(-)

New commits:
commit 129c9b283867442ead2833b993dea2ed63b02d7f
Author: Julien Cristau jcris...@debian.org
Date:   Fri Jul 9 19:53:33 2010 +0100

Pull an xkbcomp fix from git, thanks to Alexandre Isoard for the report.

diff --git a/debian/changelog b/debian/changelog
index 11526d3..d13ed63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xkb-utils (7.5+4) unstable; urgency=low
+
+  * Pull an xkbcomp fix from git, thanks to Alexandre Isoard for the report.
+
+ -- Julien Cristau jcris...@debian.org  Fri, 09 Jul 2010 19:53:29 +0100
+
 x11-xkb-utils (7.5+3) unstable; urgency=low
 
   * debian/rules: add get-tarballs target.
diff --git a/xkbcomp/ChangeLog b/xkbcomp/ChangeLog
index 7f1a062..15ccfbb 100644
--- a/xkbcomp/ChangeLog
+++ b/xkbcomp/ChangeLog
@@ -1,3 +1,15 @@
+commit a281386fa887e6bf4110840779aed46dd0ac89b6
+Author: Daniel Stone dan...@fooishbar.org
+Date:   Fri Jul 9 19:34:29 2010 +0100
+
+Fix parsing of 0x1a2b3c4d-style symbols
+
+Raw keysyms were not getting parsed correctly, due to forgetting to add
+the code to libX11, forgetting to add the backwards-compat code for old
+libX11s, and then stuffing the lexing up anyway.  Yeesh.
+
+Signed-off-by: Daniel Stone dan...@fooishbar.org
+
 commit 0b04ecbb7a6afb223c91d3b15baab0bc48542281
 Author: Daniel Stone dan...@fooishbar.org
 Date:   Tue Jun 15 19:26:19 2010 +0100
diff --git a/xkbcomp/config.h.in b/xkbcomp/config.h.in
index d60fda1..2b2b039 100644
--- a/xkbcomp/config.h.in
+++ b/xkbcomp/config.h.in
@@ -3,6 +3,9 @@
 /* Define to 1 if you have the inttypes.h header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the limits.h header file. */
+#undef HAVE_LIMITS_H
+
 /* Define to 1 if you have the memory.h header file. */
 #undef HAVE_MEMORY_H
 
diff --git a/xkbcomp/configure b/xkbcomp/configure
index 5cd33af..377ef53 100755
--- a/xkbcomp/configure
+++ b/xkbcomp/configure
@@ -1782,6 +1782,99 @@ $as_echo $ac_res 6; }
   eval $as_lineno_stack; test x$as_lineno_stack = x  { as_lineno=; unset 
as_lineno;}
 
 } # ac_fn_c_check_func
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-$1} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { as_var=$3; eval test \\${$as_var+set}\ = set; }; then :
+  { $as_echo $as_me:${as_lineno-$LINENO}: checking for $2 5
+$as_echo_n checking for $2...  6; }
+if { as_var=$3; eval test \\${$as_var+set}\ = set; }; then :
+  $as_echo_n (cached)  6
+fi
+eval ac_res=\$$3
+  { $as_echo $as_me:${as_lineno-$LINENO}: result: $ac_res 5
+$as_echo $ac_res 6; }
+else
+  # Is the header compilable?
+{ $as_echo $as_me:${as_lineno-$LINENO}: checking $2 usability 5
+$as_echo_n checking $2 usability...  6; }
+cat confdefs.h - _ACEOF conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include $2
+_ACEOF
+if ac_fn_c_try_compile $LINENO; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo $as_me:${as_lineno-$LINENO}: result: $ac_header_compiler 5
+$as_echo $ac_header_compiler 6; }
+
+# Is the header present?
+{ $as_echo $as_me:${as_lineno-$LINENO}: checking $2 presence 5
+$as_echo_n checking $2 presence...  6; }
+cat confdefs.h - _ACEOF conftest.$ac_ext
+/* end confdefs.h.  */
+#include $2
+_ACEOF
+if ac_fn_c_try_cpp $LINENO; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo $as_me:${as_lineno-$LINENO}: result: $ac_header_preproc 5
+$as_echo $ac_header_preproc 6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+{ $as_echo $as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the 
compiler, rejected by the preprocessor! 5
+$as_echo $as_me: WARNING: $2: accepted by the compiler, rejected by the 
preprocessor! 2;}
+{ $as_echo $as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the 
compiler's result 5
+$as_echo $as_me: WARNING: $2: proceeding with the compiler's result 2;}
+;;
+  no:yes:* )
+{ $as_echo $as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot 
be compiled 5
+$as_echo $as_me: WARNING: $2: present but cannot be compiled 2;}
+{ $as_echo $as_me:${as_lineno-$LINENO}: WARNING: $2: check for 
missing prerequisite headers? 5
+$as_echo $as_me: WARNING: $2: check

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

2010-07-08 Thread Julien Cristau 
 debian/README.source   |2 
 debian/changelog   |   13 
 debian/control |   17 
 debian/patches/10_debian_add_xkbpath_env_variable.diff |   87 
 debian/patches/11_xkb_documentation_updates.diff   |2 
 debian/patches/series  |1 
 debian/xsfbs/xsfbs.mk  |   35 
 xkbcomp/ChangeLog  |  148 
 xkbcomp/INSTALL|  291 +
 xkbcomp/Makefile.am|   14 
 xkbcomp/Makefile.in|   46 
 xkbcomp/aclocal.m4 | 1715 --
 xkbcomp/config.guess   |  248 
 xkbcomp/config.h.in|3 
 xkbcomp/config.sub |  102 
 xkbcomp/configure  | 4506 +
 xkbcomp/configure.ac   |   17 
 xkbcomp/depcomp|   87 
 xkbcomp/install-sh |5 
 xkbcomp/keycodes.c |   16 
 xkbcomp/missing|   49 
 xkbcomp/parseutils.c   |   10 
 xkbcomp/parseutils.h   |6 
 xkbcomp/symbols.c  |9 
 xkbcomp/xkbcomp.c  |2 
 xkbcomp/xkbcomp.h  |2 
 xkbcomp/xkbparse.c |   87 
 xkbcomp/xkbparse.y |   53 
 xkbcomp/xkbscan.c  |  142 
 xkbcomp/ylwrap |   11 
 30 files changed, 4597 insertions(+), 3129 deletions(-)

New commits:
commit ce733d67ec8ad7fcf9d710da5813bf2ea9b9fd89
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jul 8 17:19:28 2010 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 5b7f48c..11526d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
+x11-xkb-utils (7.5+3) unstable; urgency=low
 
   * debian/rules: add get-tarballs target.
   * Update xkbcomp to git master, with performance improvements.
@@ -9,7 +9,7 @@ x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
 which were only in old ubuntu releases.
   * Bump Standards-Version to 3.9.0.
 
- -- Julien Cristau jcris...@debian.org  Sun, 09 May 2010 14:23:46 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 08 Jul 2010 17:19:03 +0100
 
 x11-xkb-utils (7.5+2) unstable; urgency=low
 

commit 4c1e42ea3ed47ca77672b8ec9ae00a851628ef11
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jul 8 17:19:02 2010 +0100

Bump Standards-Version to 3.9.0.

diff --git a/debian/changelog b/debian/changelog
index 214dfc0..5b7f48c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
   * Drop dependency on cpp, leftover from the xbase-clients split.
   * Drop Conflicts/Replaces on setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils
 which were only in old ubuntu releases.
+  * Bump Standards-Version to 3.9.0.
 
  -- Julien Cristau jcris...@debian.org  Sun, 09 May 2010 14:23:46 +0200
 
diff --git a/debian/control b/debian/control
index 1e2ebbd..ca93554 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
 # xkbevd: libx11-dev, libxkbfile-dev, (bison)
 # xkbprint: libx11-dev, libxkbfile-dev
 # xkbutils: libx11-dev, libxaw7-dev, libxkbfile-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xkb-utils
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xkb-utils.git
 

commit be428bfd3dd5d048e0f11641e26cc5b040930f1e
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jul 8 17:04:28 2010 +0100

Drop obsolete Conflicts/Replaces

Drop Conflicts/Replaces on setxkbmap, xkbcomp, xkbevd, xkbprint,
xkbutils which were only in old ubuntu releases.

diff --git a/debian/changelog b/debian/changelog
index b696236..214dfc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
   * Drop 10_debian_add_xkbpath_env_variable.diff, long obsolete.
   * Add build-dep on bison, xkbcomp wants yacc.
   * Drop dependency on cpp, leftover from the xbase-clients split.
+  * Drop Conflicts/Replaces on setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils
+which were only in old ubuntu releases.
 
  -- Julien Cristau jcris...@debian.org  Sun, 09 May 2010 14:23:46 +0200
 
diff --git a/debian/control b/debian/control
index a1e6c26..1e2ebbd 100644
--- a/debian/control
+++ b/debian/control
@@ -27,8 +27,7 @@

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

2010-05-09 Thread Julien Cristau 
 debian/changelog   |6 ++
 debian/rules   |7 +++
 debian/watch.setxkbmap |2 ++
 debian/watch.xkbcomp   |2 ++
 debian/watch.xkbevd|2 ++
 debian/watch.xkbprint  |2 ++
 debian/watch.xkbutils  |2 ++
 7 files changed, 23 insertions(+)

New commits:
commit 63d79b010ab2f4d8cffd0f1c64e70c15912dd913
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 9 14:23:57 2010 +0200

debian/rules: add get-tarballs target.

diff --git a/debian/changelog b/debian/changelog
index b2d495f..81a14bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xkb-utils (7.5+3) UNRELEASED; urgency=low
+
+  * debian/rules: add get-tarballs target.
+
+ -- Julien Cristau jcris...@debian.org  Sun, 09 May 2010 14:23:46 +0200
+
 x11-xkb-utils (7.5+2) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index 7c0c702..ffd4348 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,3 +104,10 @@ binary-indep: build install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
+
+.PHONY: get-tarballs
+get-tarballs: $(addprefix get-tarball-,$(SUBDIRS))
+
+.PHONY: get-tarball-%
+get-tarball-%:
+   uscan --no-conf --download --no-symlink --package $* --upstream-version 
$(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }'  $*/configure ) 
--watchfile debian/watch.$* || test $$? = 1
diff --git a/debian/watch.setxkbmap b/debian/watch.setxkbmap
new file mode 100644
index 000..363e04b
--- /dev/null
+++ b/debian/watch.setxkbmap
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/app/ setxkbmap-(.*)\.tar\.gz
diff --git a/debian/watch.xkbcomp b/debian/watch.xkbcomp
new file mode 100644
index 000..ad0d1fb
--- /dev/null
+++ b/debian/watch.xkbcomp
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/app/ xkbcomp-(.*)\.tar\.gz
diff --git a/debian/watch.xkbevd b/debian/watch.xkbevd
new file mode 100644
index 000..6578b52
--- /dev/null
+++ b/debian/watch.xkbevd
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/app/ xkbevd-(.*)\.tar\.gz
diff --git a/debian/watch.xkbprint b/debian/watch.xkbprint
new file mode 100644
index 000..df9e496
--- /dev/null
+++ b/debian/watch.xkbprint
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/app/ xkbprint-(.*)\.tar\.gz
diff --git a/debian/watch.xkbutils b/debian/watch.xkbutils
new file mode 100644
index 000..d0934a3
--- /dev/null
+++ b/debian/watch.xkbutils
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/app/ xkbutils-(.*)\.tar\.gz


-- 
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/e1ob5zu-cq...@alioth.debian.org

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

2010-03-11 Thread Cyril Brulebois 
 debian/changelog   |   20 +++--
 debian/control |   16 ++---
 debian/patches/10_debian_add_xkbpath_env_variable.diff |   18 +--
 debian/patches/series  |2 -
 debian/rules   |4 +--
 debian/x11-xkb-utils-udeb.install  |2 +
 6 files changed, 41 insertions(+), 21 deletions(-)

New commits:
commit 16a4855fd91f86f5d76607dcbbe0ac1c0164e471
Author: Cyril Brulebois k...@debian.org
Date:   Thu Mar 11 22:30:40 2010 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index b21c0a0..b2d495f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
+x11-xkb-utils (7.5+2) unstable; urgency=low
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -20,7 +20,7 @@ x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
  - Get rid of -p0 in debian/patches/series accordingly.
   * Add myself to Uploaders.
 
- -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:14 +
+ -- Cyril Brulebois k...@debian.org  Thu, 11 Mar 2010 22:30:32 +0100
 
 x11-xkb-utils (7.5+1) unstable; urgency=low
 

commit 290abc91940af7bf8eaec8e6737511f8983e0971
Author: Cyril Brulebois k...@debian.org
Date:   Thu Mar 11 22:28:17 2010 +0100

Standardize patch handling.

diff --git a/debian/changelog b/debian/changelog
index 37f9641..b21c0a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
  - libxkbfile-dev
   * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
   * Fix dh_makeshlibs/dh_shlibdeps/dh_installdeb order, thanks to lintian.
+  * Standardize patch handling:
+ - Add {a,b}/ to debian/patches/10_debian_add_xkbpath_env_variable.diff
+ - Get rid of -p0 in debian/patches/series accordingly.
   * Add myself to Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:14 +
diff --git a/debian/patches/10_debian_add_xkbpath_env_variable.diff 
b/debian/patches/10_debian_add_xkbpath_env_variable.diff
index 859292e..f23f764 100644
--- a/debian/patches/10_debian_add_xkbpath_env_variable.diff
+++ b/debian/patches/10_debian_add_xkbpath_env_variable.diff
@@ -15,10 +15,8 @@ This patch will not be submitted upstream.
  xkbevd/xkbevd.c   |   22 +++---
  3 files changed, 24 insertions(+), 7 deletions(-)
 
-Index: setxkbmap/setxkbmap.c
-===
 setxkbmap/setxkbmap.c.orig 2009-12-06 22:36:21.0 +0100
-+++ setxkbmap/setxkbmap.c  2009-12-06 22:41:25.0 +0100
+--- a/setxkbmap/setxkbmap.c.orig   2009-12-06 22:36:21.0 +0100
 b/setxkbmap/setxkbmap.c2009-12-06 22:41:25.0 +0100
 @@ -371,9 +371,13 @@
  int i;
  Bool ok;
@@ -33,10 +31,8 @@ Index: setxkbmap/setxkbmap.c
  addToList(szInclPath, numInclPath, inclPath, DFLT_XKB_CONFIG_ROOT);
  for (i = 1; (i  argc)  ok; i++)
  {
-Index: xkbcomp/xkbpath.c
-===
 xkbcomp/xkbpath.c.orig 2009-12-06 22:36:21.0 +0100
-+++ xkbcomp/xkbpath.c  2009-12-06 22:41:25.0 +0100
+--- a/xkbcomp/xkbpath.c.orig   2009-12-06 22:36:21.0 +0100
 b/xkbcomp/xkbpath.c2009-12-06 22:41:25.0 +0100
 @@ -171,8 +171,13 @@
  void
  XkbAddDefaultDirectoriesToPath(void)
@@ -51,10 +47,8 @@ Index: xkbcomp/xkbpath.c
  XkbAddDirectoryToPath(DFLT_XKB_CONFIG_ROOT);
  }
  
-Index: xkbevd/xkbevd.c
-===
 xkbevd/xkbevd.c.orig   2009-12-06 22:36:21.0 +0100
-+++ xkbevd/xkbevd.c2009-12-06 22:41:25.0 +0100
+--- a/xkbevd/xkbevd.c.orig 2009-12-06 22:36:21.0 +0100
 b/xkbevd/xkbevd.c  2009-12-06 22:41:25.0 +0100
 @@ -481,20 +481,28 @@
  else {
file= fopen(cfgFileName,r);
diff --git a/debian/patches/series b/debian/patches/series
index dfe5c16..fb0a336 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-10_debian_add_xkbpath_env_variable.diff -p0
+10_debian_add_xkbpath_env_variable.diff
 #11_xkb_documentation_updates.diff -p0

commit 3b749ee235656bd29460025c5ab59dd742fb87c9
Author: Cyril Brulebois k...@debian.org
Date:   Thu Mar 11 22:19:10 2010 +0100

Fix dh_makeshlibs/dh_shlibdeps/dh_installdeb order, thanks to lintian.

diff --git a/debian/changelog b/debian/changelog
index dede107..37f9641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x11-xkb-utils (7.5+2) UNRELEASED; urgency=low
  - libx11-dev
  - libxkbfile-dev
   * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+  * Fix dh_makeshlibs/dh_shlibdeps/dh_installdeb order, thanks to lintian.
   * Add

x11-xkb-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 57ee3a924bc3d7e9fb4b53c322a1a53aeac57020
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 23 01:46:27 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index bf2d6df..46016b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-xkb-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:14 +
 
diff --git a/debian/control b/debian/control
index 30cd7ae..167f7dd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-xkb-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), libxkbfile-dev (= 1:1.0.1), quilt
 # Reasons for build-depends:


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

x11-xkb-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 b553cc3b02947a13c2c4346f07468a419b55e898
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 38c3237..bf2d6df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-xkb-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:14 +
+
 x11-xkb-utils (7.5+1) unstable; urgency=low
 
   * xkbcomp 1.1.1.
diff --git a/debian/rules b/debian/rules
index a4b078c..8a49f6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,12 +47,12 @@ 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) \
CFLAGS=$(CFLAGS)
-   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   cd $*-build  $(MAKE)
$@
 
 clean: xsfclean
@@ -64,7 +64,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
 
@@ -75,7 +75,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-xkb-utils: Changes to 'debian-unstable'

2009-12-06 Thread Brice Goglin 
 debian/README.source   |   73 
 debian/changelog   |   13 
 debian/control |2 
 debian/patches/10_debian_add_xkbpath_env_variable.diff |   22 
 debian/xsfbs/repack.sh |   32 
 debian/xsfbs/xsfbs.mk  |   21 
 debian/xsfbs/xsfbs.sh  |  311 -
 xkbcomp/ChangeLog  |   21 
 xkbcomp/Makefile.in|   30 
 xkbcomp/aclocal.m4 | 1146 ++-
 xkbcomp/configure  |   69 
 xkbcomp/configure.ac   |2 
 xkbcomp/xkbcomp.c  |   12 
 xkbcomp/xkbparse.c |  663 +-
 xkbevd/ChangeLog   |  308 -
 xkbevd/INSTALL |  236 
 xkbevd/Makefile.am |   19 
 xkbevd/Makefile.in |  499 -
 xkbevd/README  |   24 
 xkbevd/aclocal.m4  | 1847 +++---
 xkbevd/cfgparse.c  |  855 +-
 xkbevd/cfgscan.c   |4 
 xkbevd/compile |  142 
 xkbevd/config.guess|  107 
 xkbevd/config.h.in |   39 
 xkbevd/config.sub  |  128 
 xkbevd/configure   | 4087 +
 xkbevd/configure.ac|   12 
 xkbevd/depcomp |  172 
 xkbevd/install-sh  |  517 +
 xkbevd/missing |  104 
 xkbevd/mkinstalldirs   |  158 
 xkbevd/utils.c |   43 
 xkbevd/utils.h |2 
 xkbevd/xkbevd.c|   32 
 xkbevd/xkbevd.cf   |7 
 xkbevd/xkbevd.man  |2 
 xkbevd/ylwrap  |  222 
 xkbprint/COPYING   |   51 
 xkbprint/ChangeLog |  256 
 xkbprint/INSTALL   |  236 
 xkbprint/Makefile.am   |   14 
 xkbprint/Makefile.in   |  419 -
 xkbprint/README|   26 
 xkbprint/aclocal.m4| 1847 +++---
 xkbprint/compile   |  142 
 xkbprint/config.guess  |  107 
 xkbprint/config.h.in   |   39 
 xkbprint/config.sub|  128 
 xkbprint/configure | 4984 -
 xkbprint/configure.ac  |   12 
 xkbprint/depcomp   |  172 
 xkbprint/install-sh|  517 +
 xkbprint/missing   |  104 
 xkbprint/mkinstalldirs |  158 
 xkbprint/psgeom.c  |   10 
 xkbprint/utils.c   |   44 
 xkbprint/utils.h   |2 
 xkbprint/xkbprint.c|6 
 xkbprint/xkbprint.man  |2 
 xkbutils/ChangeLog |  221 
 xkbutils/INSTALL   |  236 
 xkbutils/LED.c |6 
 xkbutils/Makefile.am   |   50 
 xkbutils/Makefile.in   |  508 +
 xkbutils/README|   31 
 xkbutils/aclocal.m4| 1526 +++--
 xkbutils/compile   |   17 
 xkbutils/config.guess  | 1561 +
 xkbutils/config.h.in   |   42 
 xkbutils/config.sub| 1686 +
 xkbutils/configure | 4596 ++-
 xkbutils/configure.ac  |   18 
 xkbutils/depcomp   |  172 
 xkbutils/install-sh|  517 +
 xkbutils/missing   |  104 
 xkbutils/mkinstalldirs

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

2009-07-21 Thread Brice Goglin 
 debian/changelog   |8 
 debian/patches/10_debian_add_xkbpath_env_variable.diff |   36 
 setxkbmap/ChangeLog|   52 
 setxkbmap/Makefile.am  |4 
 setxkbmap/Makefile.in  |   55 
 setxkbmap/aclocal.m4   |  700 +-
 setxkbmap/config.guess |   56 
 setxkbmap/config.h.in  |   30 
 setxkbmap/config.sub   |   66 
 setxkbmap/configure| 3420 ++---
 setxkbmap/configure.ac |   10 
 setxkbmap/depcomp  |   33 
 setxkbmap/install-sh   |  228 
 setxkbmap/setxkbmap.c  | 1307 ++-
 setxkbmap/setxkbmap.man|2 
 xkbcomp/ChangeLog  |  203 
 xkbcomp/Makefile.am|4 
 xkbcomp/Makefile.in|  235 
 xkbcomp/README |1 
 xkbcomp/README.config  |1 
 xkbcomp/README.enhancing   |1 
 xkbcomp/aclocal.m4 |  411 -
 xkbcomp/action.c   | 2196 +++---
 xkbcomp/action.h   |   47 
 xkbcomp/alias.c|  386 -
 xkbcomp/alias.h|   51 
 xkbcomp/compat.c   | 1318 ++-
 xkbcomp/compat.h   |1 
 xkbcomp/config.guess   |   28 
 xkbcomp/config.h.in|   36 
 xkbcomp/config.sub |   44 
 xkbcomp/configure  | 3488 ++
 xkbcomp/configure.ac   |   19 
 xkbcomp/expr.c | 1753 ++---
 xkbcomp/expr.h |  279 
 xkbcomp/geometry.c | 5907 +
 xkbcomp/indicators.c   |  848 +-
 xkbcomp/indicators.h   |   85 
 xkbcomp/keycodes.c | 1323 ++-
 xkbcomp/keycodes.h |   16 
 xkbcomp/keymap.c   |  247 
 xkbcomp/keytypes.c | 1906 ++---
 xkbcomp/listing.c  |  547 -
 xkbcomp/misc.c |  795 +-
 xkbcomp/misc.h |  171 
 xkbcomp/parseutils.c   | 1068 +--
 xkbcomp/parseutils.h   |  330 
 xkbcomp/symbols.c  | 3542 +-
 xkbcomp/tokens.h   |6 
 xkbcomp/utils.c|  335 
 xkbcomp/utils.h|  221 
 xkbcomp/vmod.c |  322 
 xkbcomp/vmod.h |   85 
 xkbcomp/xkbcomp.c  | 1802 ++---
 xkbcomp/xkbcomp.h  |  430 -
 xkbcomp/xkbcomp.man|9 
 xkbcomp/xkbparse.c |  386 -
 xkbcomp/xkbparse.y |8 
 xkbcomp/xkbpath.c  |  486 -
 xkbcomp/xkbpath.h  |   66 
 xkbcomp/xkbscan.c  |  971 +-
 61 files changed, 22044 insertions(+), 16377 deletions(-)

New commits:
commit 0e93bdebeadd7acf3a2feea49cd7bfd1980291f1
Author: Brice Goglin bgog...@debian.org
Date:   Tue Jul 21 19:22:49 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index ba6a79b..fae2980 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-x11-xkb-utils (7.4+3) UNRELEASED; urgency=low
+x11-xkb-utils (7.4+3) unstable; urgency=low
 
   * setxkbmap 1.1.0.
   * xkbcomp 1.1.0.
   * Refresh patch 10_debian_add_xkbpath_env_variable.diff
 
- -- Brice Goglin bgog...@debian.org  Tue, 21 Jul 2009 19:12:51 +0200
+ -- Brice Goglin bgog...@debian.org  Tue, 21 Jul 2009 19:22:37 +0200
 
 x11-xkb-utils (7.4+2) unstable; urgency=low
 

commit d19f6ab2991a561831b0ebc1c0d1debf16f10ae2
Author: Brice Goglin bgog...@debian.org
Date:   Tue Jul 21 19:13:14 2009 +0200

Refresh patch 10_debian_add_xkbpath_env_variable.diff

diff --git a/debian/changelog b/debian/changelog

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

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

New commits:
commit 048012f3fc3eb089074dea333d0ab98077a77841
Author: Julien Cristau jcris...@debian.org
Date:   Mon Feb 16 00:55:47 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 23f18a9..217893d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11-xkb-utils (7.4+2) UNRELEASED; urgency=low
+x11-xkb-utils (7.4+2) unstable; 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 jcris...@debian.org  Sun, 03 Aug 2008 01:20:23 +0200
+ -- Julien Cristau jcris...@debian.org  Mon, 16 Feb 2009 00:55:43 +0100
 
 x11-xkb-utils (7.4+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

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

2008-08-02 Thread Julien Cristau 
 debian/changelog  |7 
 debian/rules  |   33 ++--
 debian/xsfbs/xsfbs.mk |   47 +-
 debian/xsfbs/xsfbs.sh |  387 +++---
 4 files changed, 248 insertions(+), 226 deletions(-)

New commits:
commit f7b97efad65270de32048d7c92a2e3af8d65508b
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Aug 3 01:20:56 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 4bf6ea2..23f18a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-xkb-utils (7.4+2) 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:20:23 +0200
+
 x11-xkb-utils (7.4+1) unstable; urgency=low
 
   * xkbcomp 1.0.5.
diff --git a/debian/rules b/debian/rules
index 9cec41d..a4b078c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,15 +17,17 @@ include debian/xsfbs/xsfbs.mk
 # subdirectory explicitly so that the build system knows what to build
 XKB_SUBDIRS=setxkbmap xkbcomp xkbevd xkbprint xkbutils
 SUBDIRS=$(XKB_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,21 +40,20 @@ else
 endif
 
 
-build: genscripts patch build-stamp
-build-stamp:
-   dh_testdir
+build: build-stamp
+build-stamp: $(BUILD_STAMPS)
+   $@
 
-   for FILE in $(XKB_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) \
-CFLAGS=$(CFLAGS)  \
-   $(MAKE)) || exit 1; \
-   done
+$(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
+   dh_testdir
 
-   touch build-stamp
+   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) \
+   CFLAGS=$(CFLAGS)
+   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   $@
 
 clean: xsfclean
dh_testdir

commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Jul 17 15:44:45 2008 +0200

xsfbs.mk: make 'log' a separate target

'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
 .PHONY: prepare
 stampdir_targets+=prepare
 prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
-   mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
$@
 
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+   mkdir -p $(STAMP_DIR)/log
+
 # Apply all patches to the upstream source.
 .PHONY: patch
 stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
 
 # Revert all patches to the upstream source.
 .PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n Unapplying patches...; \
if $(QUILT) applied /dev/null 2/dev/null; then \

commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Wed Jul 16 18:42:14 2008 +0200

xsfbs.mk: update the list of releases, and drop some unused code

we haven't had a separate source tree since modularization.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 
's/^.://')
 BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo [EMAIL PROTECTED](cat 
/etc/mailname 2/dev/null))}})
 
 # Find out if this is

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

2008-05-09 Thread Julien Cristau 
 debian/changelog   |5 +++--
 debian/patches/10_debian_add_xkbpath_env_variable.diff |   17 -
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 168ac6ea664fca7c1adfaa9bf4972c04c7768f89
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri May 9 17:13:12 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 4e65fae..4bf6ea2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
+x11-xkb-utils (7.4+1) unstable; urgency=low
 
   * xkbcomp 1.0.5.
 + update/refresh patch 10_debian_add_xkbpath_env_variable.diff
@@ -8,7 +8,7 @@ x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.7.3 (no changes).
   * Drop the XS- prefix from Vcs-* debian/control fields.
 
- -- Julien Cristau [EMAIL PROTECTED]  Fri, 07 Mar 2008 20:10:33 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 09 May 2008 17:09:54 +0200
 
 x11-xkb-utils (7.3+1) unstable; urgency=low
 

commit e37d9259693e353ecf1ff6a00df8a3d767b78f0d
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri May 9 17:08:11 2008 +0200

update/refresh patch 10_debian_add_xkbpath_env_variable.diff

diff --git a/debian/changelog b/debian/changelog
index 6e1de20..4e65fae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
 
   * xkbcomp 1.0.5.
++ update/refresh patch 10_debian_add_xkbpath_env_variable.diff
   * Complete debian/copyright's information about xkbcomp from upstream's
 COPYING file.
   * Drop debian revisions from build-deps.
diff --git a/debian/patches/10_debian_add_xkbpath_env_variable.diff 
b/debian/patches/10_debian_add_xkbpath_env_variable.diff
index 4e39a9d..bce8372 100644
--- a/debian/patches/10_debian_add_xkbpath_env_variable.diff
+++ b/debian/patches/10_debian_add_xkbpath_env_variable.diff
@@ -11,9 +11,9 @@ This patch will not be submitted upstream.
 
 Index: setxkbmap/setxkbmap.c
 ===
 setxkbmap/setxkbmap.c.orig 2007-02-11 08:37:45.0 +0100
-+++ setxkbmap/setxkbmap.c  2007-02-11 08:38:02.0 +0100
-@@ -321,9 +321,13 @@
+--- setxkbmap/setxkbmap.c.orig
 setxkbmap/setxkbmap.c
+@@ -320,9 +320,13 @@
  int   i;
  Bool  ok;
  unsigned  present;
@@ -29,9 +29,9 @@ Index: setxkbmap/setxkbmap.c
if (argv[i][0]!='-') {
 Index: xkbcomp/xkbpath.c
 ===
 xkbcomp/xkbpath.c.orig 2007-02-11 08:37:45.0 +0100
-+++ xkbcomp/xkbpath.c  2007-02-11 08:38:02.0 +0100
-@@ -131,9 +131,14 @@
+--- xkbcomp/xkbpath.c.orig
 xkbcomp/xkbpath.c
+@@ -131,8 +131,13 @@
  void
  XkbAddDefaultDirectoriesToPath(void)
  {
@@ -39,7 +39,6 @@ Index: xkbcomp/xkbpath.c
 +
  if (noDefaultPath)
return;
- XkbAddDirectoryToPath(.);
 +xkbpath= (char *)getenv(XKBPATH);
 +if (xkbpath!=NULL)
 +  XkbAddDirectoryToPath(xkbpath);
@@ -48,8 +47,8 @@ Index: xkbcomp/xkbpath.c
  
 Index: xkbevd/xkbevd.c
 ===
 xkbevd/xkbevd.c.orig   2007-02-11 08:37:45.0 +0100
-+++ xkbevd/xkbevd.c2007-02-11 08:38:02.0 +0100
+--- xkbevd/xkbevd.c.orig
 xkbevd/xkbevd.c
 @@ -471,20 +471,28 @@
  else {
file= fopen(cfgFileName,r);


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

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

2008-05-07 Thread Julien Cristau 
 debian/changelog |2 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ---
 debian/xsfbs/xsfbs.mk|4 -
 xkbcomp/ChangeLog|   27 +++
 xkbcomp/aclocal.m4   |   28 +++
 xkbcomp/config.guess |   28 ++-
 xkbcomp/config.sub   |   44 +--
 xkbcomp/configure|   56 +++---
 xkbcomp/configure.ac |2 
 xkbcomp/xkbcomp.c|   11 ++
 xkbcomp/xkbpath.c|   12 ---
 11 files changed, 101 insertions(+), 263 deletions(-)

New commits:
commit 65ab4972d6253cee8378f6219d28a676cfb733ec
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu May 8 01:54:46 2008 +0200

xkbcomp 1.0.5

diff --git a/debian/changelog b/debian/changelog
index 499888d..6e1de20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
 
-  * xkbcomp 1.0.4.
+  * xkbcomp 1.0.5.
   * Complete debian/copyright's information about xkbcomp from upstream's
 COPYING file.
   * Drop debian revisions from build-deps.
diff --git a/xkbcomp/ChangeLog b/xkbcomp/ChangeLog
index 2e3b422..6bc06a8 100644
--- a/xkbcomp/ChangeLog
+++ b/xkbcomp/ChangeLog
@@ -1,3 +1,30 @@
+commit 1aecdffaa0db7bbf85bc0aae9043e9437b25c30d
+Author: Daniel Stone [EMAIL PROTECTED]
+Date:   Thu Apr 17 00:52:29 2008 +0300
+
+Don't scan paths which make NO SENSE WHATSOEVER TO SCAN
+
+Hey, I wonder if we have XKB files in our directory! I wonder if we
+haven't bothered with a structure, and let's try to open a file called
+'misc' in someone's home directory! What a surprise, it's not a valid
+XKB file! Let's fail miserably!
+
+SURPRISINGLY, THIS IS NOT USEFUL BEHAVIOUR.
+
+commit a3a05fd489a9a35942a4419c537634e796dbebd1
+Author: Daniel Stone [EMAIL PROTECTED]
+Date:   Thu Apr 17 00:50:07 2008 +0300
+
+xkbcomp: Take a device ID argument
+
+Allows the user to set maps (or whatever) on arbitrary devices.
+
+commit be084fbeba28312fc5102e98d64726464032c3e8
+Author: Adam Jackson [EMAIL PROTECTED]
+Date:   Thu Mar 6 17:13:42 2008 -0500
+
+xkbcomp 1.0.4
+
 commit c1cc023fc50ce3a4a23f4682ebefd2301fd13170
 Author: Adam Jackson [EMAIL PROTECTED]
 Date:   Fri Feb 29 15:30:34 2008 -0500
diff --git a/xkbcomp/aclocal.m4 b/xkbcomp/aclocal.m4
index e5b3eb6..c02a454 100644
--- a/xkbcomp/aclocal.m4
+++ b/xkbcomp/aclocal.m4
@@ -87,14 +87,16 @@ fi])
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # -
 m4_define([_PKG_CONFIG],
-[if test -n $$1; then
-pkg_cv_[]$1=$$1
- elif test -n $PKG_CONFIG; then
-PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 $3 2/dev/null`],
-[pkg_failed=yes])
- else
-pkg_failed=untried
+[if test -n $PKG_CONFIG; then
+if test -n $$1; then
+pkg_cv_[]$1=$$1
+else
+PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 $3 2/dev/null`],
+[pkg_failed=yes])
+fi
+else
+   pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -138,9 +140,9 @@ See the pkg-config man page for more details.])
 if test $pkg_failed = yes; then
 _PKG_SHORT_ERRORS_SUPPORTED
 if test $_pkg_short_errors_supported = yes; then
-   $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors $2 
21`
+   $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout 
--print-errors $2`
 else 
-   $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors $2 21`
+   $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors 
$2`
 fi
# Put the nasty error message in config.log where it belongs
echo $$1[]_PKG_ERRORS AS_MESSAGE_LOG_FD
@@ -222,7 +224,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 
's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 
's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least 
${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-   [XORG_MACROS_version=1.1.6
+   [XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' 
-e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -647,14 +649,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
-   PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
+   PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
if test x$PVM = x; then
PVM=0
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],

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

2008-03-07 Thread Julien Cristau 
 debian/changelog  |   11 +
 debian/control|   10 
 debian/copyright  |   67 ++
 debian/xsfbs/xsfbs.mk |  103 +-
 debian/xsfbs/xsfbs.sh |7 
 xkbcomp/COPYING   |   94 -
 xkbcomp/ChangeLog |  330 
 xkbcomp/INSTALL   |  236 --
 xkbcomp/Makefile.am   |   10 
 xkbcomp/Makefile.in   |  174 
 xkbcomp/aclocal.m4|  238 +--
 xkbcomp/action.c  |4 
 xkbcomp/compat.c  |3 
 xkbcomp/config.guess  |   56 +++--
 xkbcomp/config.h.in   |9 
 xkbcomp/config.sub|   78 ++-
 xkbcomp/configure |  216 -
 xkbcomp/configure.ac  |3 
 xkbcomp/depcomp   |   93 +++--
 xkbcomp/expr.h|2 
 xkbcomp/geometry.c|6 
 xkbcomp/install-sh|  514 ++
 xkbcomp/keycodes.c|4 
 xkbcomp/keytypes.c|2 
 xkbcomp/misc.c|9 
 xkbcomp/misc.h|   24 +-
 xkbcomp/missing   |   61 +++--
 xkbcomp/parseutils.h  |2 
 xkbcomp/symbols.c |2 
 xkbcomp/utils.c   |   18 -
 xkbcomp/utils.h   |   20 -
 xkbcomp/vmod.c|3 
 xkbcomp/xkbcomp.c |5 
 xkbcomp/xkbparse.c|  387 ++---
 xkbcomp/xkbparse.y|5 
 xkbcomp/xkbpath.c |2 
 xkbcomp/xkbpath.h |2 
 xkbcomp/xkbscan.c |2 
 xkbcomp/ylwrap|  223 +
 39 files changed, 1909 insertions(+), 1126 deletions(-)

New commits:
commit 2dd401d73b361d3fce04f66e16e520ef5d1ee78c
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 7 20:22:39 2008 +0100

debian/control updates

Drop debian revisions from build-deps.
Bump Standards-Version to 3.7.3 (no changes).
Drop the XS- prefix from Vcs-* debian/control fields.

diff --git a/debian/changelog b/debian/changelog
index 5fbf19e..499888d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
   * xkbcomp 1.0.4.
   * Complete debian/copyright's information about xkbcomp from upstream's
 COPYING file.
+  * Drop debian revisions from build-deps.
+  * Bump Standards-Version to 3.7.3 (no changes).
+  * Drop the XS- prefix from Vcs-* debian/control fields.
 
  -- Julien Cristau [EMAIL PROTECTED]  Fri, 07 Mar 2008 20:10:33 +0100
 
diff --git a/debian/control b/debian/control
index ab3ec0d..9a1410f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Julien Cristau [EMAIL 
PROTECTED], Brice Goglin [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 2:1.0.0-1),
- libxaw7-dev (= 1:1.0.1-1), libxkbfile-dev (= 1:1.0.1-1), quilt
+Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 2:1.0.0),
+ libxaw7-dev (= 1:1.0.1), libxkbfile-dev (= 1:1.0.1), quilt
 # Reasons for build-depends:
 # debhelper for the packaging, pkg-config needed by configure scripts
 # Individual apps:
@@ -13,9 +13,9 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev 
(= 2:1.0.0-1),
 # xkbevd: libx11-dev, libxkbfile-dev, (bison)
 # xkbprint: libx11-dev, libxkbfile-dev
 # xkbutils: libx11-dev, libxaw7-dev, libxkbfile-dev
-Standards-Version: 3.7.2.0
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xkb-utils
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xkb-utils.git
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xkb-utils
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xkb-utils.git
 
 Package: x11-xkb-utils
 Architecture: any

commit 611579495cefaf0b3489d152daea1f54d04cc188
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 7 20:14:37 2008 +0100

Complete debian/copyright's information about xkbcomp

Upstream has a COPYING file now, use that.

diff --git a/debian/changelog b/debian/changelog
index 46a5167..5fbf19e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
 
   * xkbcomp 1.0.4.
+  * Complete debian/copyright's information about xkbcomp from upstream's
+COPYING file.
 
  -- Julien Cristau [EMAIL PROTECTED]  Fri, 07 Mar 2008 20:10:33 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 688d7ba..0b76678 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -50,6 +50,73 @@ xkbcomp:
   OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
   THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+  Copyright 1988, 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
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above

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

2007-09-14 Thread Brice Goglin 
 debian/changelog|   19 
 debian/control  |4 
 debian/copyright|4 
 debian/patches/series   |2 
 setxkbmap/ChangeLog |  278 -
 setxkbmap/INSTALL   |  236 
 setxkbmap/Makefile.am   |   18 
 setxkbmap/Makefile.in   |  152 ++---
 setxkbmap/aclocal.m4| 1412 
 setxkbmap/compile   |  142 
 setxkbmap/config.h.in   |9 
 setxkbmap/config.sub|   14 
 setxkbmap/configure |  292 ++---
 setxkbmap/configure.ac  |5 
 setxkbmap/depcomp   |   64 ++
 setxkbmap/install-sh|  348 +--
 setxkbmap/missing   |   61 +-
 setxkbmap/setxkbmap.c   |6 
 setxkbmap/setxkbmap.man |   59 +-
 19 files changed, 1684 insertions(+), 1441 deletions(-)

New commits:
commit 89bdc73cc2b4538d6a70d4e60f0a580ce87e55bf
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Fri Sep 14 23:51:02 2007 +0200

Prepare changelog for upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 9a20a82..4cdbe31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-x11-xkb-utils (7.2+1) UNRELEASED; urgency=low
+x11-xkb-utils (7.3+1) unstable; urgency=low
 
+  [ Julien Cristau ]
   * setxkbmap 1.0.4.
 + includes man page improvements (closes: #252631)
   * Disable patch 11_xkb_documentation_updates.diff which doesn't apply
 cleanly.
   * Add upstream URL to debian/copyright.
 
- -- Julien Cristau [EMAIL PROTECTED]  Mon, 13 Aug 2007 14:41:37 +0200
+  [ Brice Goglin ]
+  * Add myself to Uploaders, and remove Branden with his permission.
+
+ -- Brice Goglin [EMAIL PROTECTED]  Fri, 14 Sep 2007 23:50:11 +0200
 
 x11-xkb-utils (0.1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 1197196..ab3ec0d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-xkb-utils
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
+Uploaders: David Nusinow [EMAIL PROTECTED], Julien Cristau [EMAIL 
PROTECTED], Brice Goglin [EMAIL PROTECTED]
 Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 2:1.0.0-1),
  libxaw7-dev (= 1:1.0.1-1), libxkbfile-dev (= 1:1.0.1-1), quilt
 # Reasons for build-depends:

commit 4cc45cf1694e0f4115a59f4be1e0a694ba313405
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Aug 13 14:42:12 2007 +0200

Improvements to debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index e1eb304..9a20a82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ x11-xkb-utils (7.2+1) UNRELEASED; urgency=low
 + includes man page improvements (closes: #252631)
   * Disable patch 11_xkb_documentation_updates.diff which doesn't apply
 cleanly.
+  * Add upstream URL to debian/copyright.
 
- -- Julien Cristau [EMAIL PROTECTED]  Mon, 13 Aug 2007 14:36:58 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 13 Aug 2007 14:41:37 +0200
 
 x11-xkb-utils (0.1) experimental; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 064a62a..688d7ba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,7 @@
+The contents of this package were downloaded from
+http://xorg.freedesktop.org/releases/individual/app/
+It contains the setxkbmap, xkbcomp, xkbevd, xkbprint and xkbutils applications.
+
 setxkbmap:
Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
   

commit addadc8047ab5841c1098392edefd18a94eb7e96
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Aug 13 14:38:23 2007 +0200

Disable patch 11_xkb_documentation_updates.diff

It doesn't apply cleanly, so disable it until someone manages to update it.

diff --git a/debian/changelog b/debian/changelog
index 4798650..e1eb304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ x11-xkb-utils (7.2+1) UNRELEASED; urgency=low
 
   * setxkbmap 1.0.4.
 + includes man page improvements (closes: #252631)
+  * Disable patch 11_xkb_documentation_updates.diff which doesn't apply
+cleanly.
 
- -- Julien Cristau [EMAIL PROTECTED]  Mon, 13 Aug 2007 14:33:02 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 13 Aug 2007 14:36:58 +0200
 
 x11-xkb-utils (0.1) experimental; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index d8501e9..dfe5c16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 10_debian_add_xkbpath_env_variable.diff -p0
-11_xkb_documentation_updates.diff -p0
+#11_xkb_documentation_updates.diff -p0

commit 20b9f334cbb60bca1068b9a0576644e3ae370484
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Aug 13 14:35:18 2007 +0200

setxkbmap 1.0.4.

diff --git a/debian/changelog b/debian/changelog
index b785a57..4798650 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-xkb-utils (7.2+1) UNRELEASED; urgency=low
+
+  * setxkbmap 1.0.4.
++

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

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

New commits:
commit 25a761236d54569e421b3fd5ccdc50e04b5d57f8
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Sat May 26 09:59:45 2007 +0300

Start versioning from 0.1

diff --git a/debian/changelog b/debian/changelog
index 2e90e19..d5a14ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (1) UNRELEASED; urgency=low
+x11-xkb-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]

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

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

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

Conflict with the ubuntu packages to force removal on upgrade.

diff --git a/debian/changelog b/debian/changelog
index e963c29..2e90e19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
 - Remove unnecessary Build-Deps.
 - Copy description from Ubuntu xkbutils-package.
 - Replaces: xbase-clients (= 1:7.2.ds2-3) 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.
@@ -21,7 +21,7 @@ x11-xkb-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:27:59 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 22 May 2007 12:40:12 +0300
 
 xbase-clients (1:7.2.ds2-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index aaa471c..7e856f9 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Package: x11-xkb-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (= 1:7.0.0)
+Conflicts: setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils
 Replaces: xbase-clients (= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd, 
xkbprint, xkbutils
 Description: X11 XKB utilities
  xkbutils contains a number of client-side utilities for XKB, the X11


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

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

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

New commits:
commit 9019e9079b7f2ec6cd1c8e17eb82003afa892799
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Sat May 19 14:08:52 2007 +0300

Remove Conflicts:, which shouldn't be necessary.

diff --git a/debian/changelog b/debian/changelog
index 4599ff7..e963c29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,9 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
 - Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Copy description from Ubuntu xkbutils-package.
-- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3) to make upgrades
-  smoother.
-- C/R: all the included packages to work around old Ubuntu packaging.
+- Replaces: xbase-clients (= 1:7.2.ds2-3) 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.
   * debian/x11-xkb-utils.{dirs,install}, rules: Edit to reflect new
diff --git a/debian/control b/debian/control
index 8f8ad0f..aaa471c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,6 @@ Package: x11-xkb-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), setxkbmap, xkbcomp, xkbevd, 
xkbprint, xkbutils
 Replaces: xbase-clients (= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd, 
xkbprint, xkbutils
 Description: X11 XKB utilities
  xkbutils contains a number of client-side utilities for XKB, the X11


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

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

2007-05-18 Thread Timo Aaltonen 
 debian/changelog |5 -
 debian/control   |5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 5227fac3918bdc9193c7b3401a64bef5cf07354d
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Sat May 19 01:32:29 2007 +0300

debian/control: add Conflicts/Replaces.

diff --git a/debian/changelog b/debian/changelog
index 8c6e808..4599ff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
 - Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Copy description from Ubuntu xkbutils-package.
+- Conflicts/Replaces: xbase-clients (= 1:7.2.ds2-3) 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.
   * debian/x11-xkb-utils.{dirs,install}, rules: Edit to reflect new
@@ -18,7 +21,7 @@ x11-xkb-utils (1) UNRELEASED; urgency=low
   * debian/local/: Remove.
   * debian/patches: Delete patches which do not relate to this package.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 16 May 2007 22:58:53 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED]  Sat, 19 May 2007 01:27:59 +0300
 
 xbase-clients (1:7.2.ds2-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6493148..8f8ad0f 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
 Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 2:1.0.0-1), 
libxaw7-dev (= 1:1.0.1-1), libxkbfile-dev (= 1:1.0.1-1), quilt
+Build-Depends: debhelper (= 5.0.0), pkg-config, libx11-dev (= 2:1.0.0-1),
+ libxaw7-dev (= 1:1.0.1-1), libxkbfile-dev (= 1:1.0.1-1), quilt
 # Reasons for build-depends:
 # debhelper for the packaging, pkg-config needed by configure scripts
 # Individual apps:
@@ -20,6 +21,8 @@ Package: x11-xkb-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), setxkbmap, xkbcomp, xkbevd, 
xkbprint, xkbutils
+Replaces: xbase-clients (= 1:7.2.ds2-3), setxkbmap, xkbcomp, xkbevd, 
xkbprint, xkbutils
 Description: X11 XKB utilities
  xkbutils contains a number of client-side utilities for XKB, the X11
  keyboard extension.


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

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

2007-05-16 Thread Timo Aaltonen 
New branch 'debian-unstable' available with the following commits:
commit 0dc97b8bf0704ace3e9b2cb39b2ff30297e929c1
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed May 16 23:06:48 2007 +0300

Split base-clients, rip xkb-related tools in 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