x11-apps: Changes to 'debian-unstable'

2016-08-21 Thread Julien Cristau 
 debian/changelog |6 ++
 debian/copyright |2 +-
 debian/copyright.head|2 +-
 debian/watch.bitmap  |2 +-
 debian/watch.ico |2 +-
 debian/watch.oclock  |2 +-
 debian/watch.rendercheck |2 +-
 debian/watch.transset|2 +-
 debian/watch.x11perf |2 +-
 debian/watch.xbiff   |2 +-
 debian/watch.xcalc   |2 +-
 debian/watch.xclipboard  |2 +-
 debian/watch.xclock  |2 +-
 debian/watch.xconsole|2 +-
 debian/watch.xcursorgen  |2 +-
 debian/watch.xditview|2 +-
 debian/watch.xedit   |2 +-
 debian/watch.xeyes   |2 +-
 debian/watch.xgc |2 +-
 debian/watch.xload   |2 +-
 debian/watch.xlogo   |2 +-
 debian/watch.xmag|2 +-
 debian/watch.xman|2 +-
 debian/watch.xmore   |2 +-
 debian/watch.xwd |2 +-
 debian/watch.xwud|2 +-
 26 files changed, 31 insertions(+), 25 deletions(-)

New commits:
commit 60af0f5e74c707a4a1d03c2b0a8e4c2403e29a41
Author: Julien Cristau 
Date:   Sun Aug 21 18:00:47 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 6b25056..ee04587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-apps (7.7+7) UNRELEASED; urgency=medium
+
+  * Switch all xorg.freedesktop.org URLs in packaging to https.
+
+ -- Julien Cristau   Sun, 21 Aug 2016 18:00:45 +0200
+
 x11-apps (7.7+6) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/copyright b/debian/copyright
index cb8a6a9..b0ae1ea 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 bitmap, ico, oclock, transset, x11perf, xbiff, xcalc,
 xclipboard, xclock, xcursorgen, xconsole, xditview, xedit, xeyes, xgc,
 xload, xlogo, xmag, xman, xmore, xmd, rendercheck, and xwd applications.
diff --git a/debian/copyright.head b/debian/copyright.head
index 944c1ed..db17b13 100644
--- a/debian/copyright.head
+++ b/debian/copyright.head
@@ -1,5 +1,5 @@
 The contents of this package were downloaded from
-http://xorg.freedesktop.org/releases/individual/app/
+https://xorg.freedesktop.org/releases/individual/app/
 It contains the bitmap, ico, oclock, transset, x11perf, xbiff, xcalc,
 xclipboard, xclock, xcursorgen, xconsole, xditview, xedit, xeyes, xgc,
 xload, xlogo, xmag, xman, xmore, xmd, rendercheck, and xwd applications.
diff --git a/debian/watch.bitmap b/debian/watch.bitmap
index cdecbda..83dd7ae 100644
--- a/debian/watch.bitmap
+++ b/debian/watch.bitmap
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/bitmap
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ bitmap-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ bitmap-(.*)\.tar\.gz
diff --git a/debian/watch.ico b/debian/watch.ico
index 9bbfc31..2bf49a6 100644
--- a/debian/watch.ico
+++ b/debian/watch.ico
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/ico
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ ico-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ ico-(.*)\.tar\.gz
diff --git a/debian/watch.oclock b/debian/watch.oclock
index f818204..0d7b7a8 100644
--- a/debian/watch.oclock
+++ b/debian/watch.oclock
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/oclock
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ oclock-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ oclock-(.*)\.tar\.gz
diff --git a/debian/watch.rendercheck b/debian/watch.rendercheck
index 9513399..29bf50e 100644
--- a/debian/watch.rendercheck
+++ b/debian/watch.rendercheck
@@ -1,4 +1,4 @@
 # Compulsory line, this is a version 3 file
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/archive/individual/app/rendercheck-(.*)\.tar\.gz
+https://xorg.freedesktop.org/archive/individual/app/rendercheck-(.*)\.tar\.gz
diff --git a/debian/watch.transset b/debian/watch.transset
index 67591be..7e08900 100644
--- a/debian/watch.transset
+++ b/debian/watch.transset
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/transset
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ transset-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ transset-(.*)\.tar\.gz
diff --git a/debian/watch.x11perf b/debian/watch.x11perf
index 88d0921..970e3ce 100644
--- a/debian/watch.x11perf
+++ b/debian/watch.x11perf
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/app/x11perf
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/

x11-apps: Changes to 'debian-unstable'

2016-05-13 Thread Julien Cristau 
 debian/changelog |   10 
 debian/control   |6 
 debian/copyright |   19 
 debian/upstream/signing-key.asc  |  111 
 rendercheck/COPYING  |   19 
 rendercheck/ChangeLog|  333 +
 rendercheck/INSTALL  |  121 
 rendercheck/Makefile.am  |3 
 rendercheck/Makefile.in  |  433 +-
 rendercheck/aclocal.m4   | 5004 
 rendercheck/config.guess |  561 +--
 rendercheck/config.sub   |  259 -
 rendercheck/configure| 6751 ---
 rendercheck/configure.ac |6 
 rendercheck/depcomp  |  531 +--
 rendercheck/doc/TODO |3 
 rendercheck/install-sh   |   35 
 rendercheck/main.c   |  118 
 rendercheck/man/Makefile.in  |  135 
 rendercheck/missing  |  461 --
 rendercheck/ops.c|8 
 rendercheck/rendercheck.h|   78 
 rendercheck/t_blend.c|  149 
 rendercheck/t_bug7366.c  |2 
 rendercheck/t_composite.c|  201 -
 rendercheck/t_dstcoords.c|   16 
 rendercheck/t_fill.c |   16 
 rendercheck/t_gradient.c |   13 
 rendercheck/t_gtk_argb_xbgr.c|  150 
 rendercheck/t_libreoffice_xrgb.c |  165 
 rendercheck/t_repeat.c   |   75 
 rendercheck/t_srccoords.c|   18 
 rendercheck/t_triangles.c|   82 
 rendercheck/t_tsrccoords.c   |   63 
 rendercheck/t_tsrccoords2.c  |   23 
 rendercheck/tests.c  |  363 +-
 36 files changed, 12226 insertions(+), 4115 deletions(-)

New commits:
commit 4b4c1b475a30de706165d8c410645af5ab2e4062
Author: Julien Cristau 
Date:   Fri May 13 13:37:13 2016 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 8fceac5..6b25056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-x11-apps (7.7+6) UNRELEASED; urgency=medium
+x11-apps (7.7+6) unstable; urgency=medium
 
+  * Team upload.
   * Add Dave Airlie's key to debian/upstream/signing-key.asc.
   * rendercheck 1.5.
   * Update Vcs-* control fields.
   * Bump Standards-Version to 3.9.8 (no changes needed).
 
- -- Julien Cristau   Fri, 13 May 2016 13:03:22 +0200
+ -- Julien Cristau   Fri, 13 May 2016 13:31:11 +0200
 
 x11-apps (7.7+5+nmu1) unstable; urgency=medium
 

commit 0e14b46cc541591af2e5e8b69650bf0337c0810d
Author: Julien Cristau 
Date:   Fri May 13 13:31:10 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index fa2344c..8fceac5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-apps (7.7+6) UNRELEASED; urgency=medium
   * Add Dave Airlie's key to debian/upstream/signing-key.asc.
   * rendercheck 1.5.
   * Update Vcs-* control fields.
+  * Bump Standards-Version to 3.9.8 (no changes needed).
 
  -- Julien Cristau   Fri, 13 May 2016 13:03:22 +0200
 
diff --git a/debian/control b/debian/control
index ffb2842..84dbd6a 100644
--- a/debian/control
+++ b/debian/control
@@ -51,7 +51,7 @@ Build-Depends:
 # xmore: libxaw7-dev, libxt-dev
 # xwd: libx11-dev, x11proto-core-dev
 # xwud: libx11-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/x11-apps.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/app/x11-apps.git
 

commit 7f18ec731736f7fbe558a117b56b8be6c4311fe0
Author: Julien Cristau 
Date:   Fri May 13 13:25:46 2016 +0200

Update Vcs-* control fields.

diff --git a/debian/changelog b/debian/changelog
index 0bcad2a..fa2344c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-apps (7.7+6) UNRELEASED; urgency=medium
 
   * Add Dave Airlie's key to debian/upstream/signing-key.asc.
   * rendercheck 1.5.
+  * Update Vcs-* control fields.
 
  -- Julien Cristau   Fri, 13 May 2016 13:03:22 +0200
 
diff --git a/debian/control b/debian/control
index 9955f04..ffb2842 100644
--- a/debian/control
+++ b/debian/control
@@ -52,8 +52,8 @@ Build-Depends:
 # xwd: libx11-dev, x11proto-core-dev
 # xwud: libx11-dev
 Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/x11-apps.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/app/x11-apps.git
 
 Package: x11-apps
 Architecture: any

commit 69bc2556b8de053bc0cca07a8132120fb1079c05
Author: Julien Cristau 
Date:   Fri May 13 13:14:24 2016 +0200

rendercheck 1.5.

diff --git a/debian/changelog b/debian/changelog
index 1cd1739..0bcad2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11-apps (7.7+6) UNRELEASED; urgency=medium
 
   * Add Dave Airlie's key to

x11-apps: Changes to 'debian-unstable'

2016-05-13 Thread Julien Cristau 
 debian/changelog |8 
 debian/control   |4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 2ba8e4fa337088851770e7cd1cb95b373bda98bf
Author: Julien Cristau 
Date:   Fri May 13 12:59:26 2016 +0200

Import x11-apps 7.7+5+nmu1

diff --git a/debian/changelog b/debian/changelog
index 09c2df0..d2fb4f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+x11-apps (7.7+5+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Change libpng12-dev build-dependency to libpng-dev, to ease libpng
+transition. (Closes: #662554)
+
+ -- Gianfranco Costamagna   Thu, 21 Jan 2016 
18:42:28 +0100
+
 x11-apps (7.7+5) unstable; urgency=medium
 
   * bitmap 1.0.8.
diff --git a/debian/control b/debian/control
index c863268..9955f04 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
 # XXX bison build-dep is to work around a bug in xgc's configure, remove as
 # soon as that's fixed.
  bison,
- libpng12-dev,
+ libpng-dev,
  libx11-dev (>= 2:1.0.0),
  libxaw7-dev (>= 1:1.0.1),
  libxcursor-dev (>= 1.1.5.2),
@@ -39,7 +39,7 @@ Build-Depends:
 # xclipboard: libxt-dev
 # xclock: libx11-dev, libxaw7-dev, libxft-dev, libxkbfile-dev, libxt-dev
 # xconsole: libxt-dev, libxaw7-dev
-# xcursorgen: libx11-dev, libxcursor-dev, libpng12-dev
+# xcursorgen: libx11-dev, libxcursor-dev, libpng-dev
 # xditview: libxaw7-dev, libxt-dev
 # xedit: libxaw7-dev, libxt-dev
 # xeyes: libx11-dev, libxt-dev, libxext-dev, libxmu-dev

x11-apps: Changes to 'debian-unstable'

2015-04-30 Thread Julien Cristau 
 bitmap/Bitmap.c |   30 
 bitmap/ChangeLog|  197 +
 bitmap/Graphics.c   |8 
 bitmap/INSTALL  |  121 
 bitmap/Makefile.in  |   60 
 bitmap/aclocal.m4   |  315 +
 bitmap/atobm.c  |   93 
 bitmap/autogen.sh   |5 
 bitmap/bmtoa.c  |8 
 bitmap/compile  |2 
 bitmap/config.guess |  321 -
 bitmap/config.h.in  |3 
 bitmap/config.sub   |   51 
 bitmap/configure|  836 ++---
 bitmap/configure.ac |8 
 bitmap/depcomp  |5 
 bitmap/install-sh   |  366 +-
 bitmap/man/Makefile.in  |   29 
 bitmap/man/bitmap.man   |   21 
 bitmap/missing  |6 
 debian/changelog|   15 
 debian/compat   |2 
 debian/control  |4 
 debian/rules|1 
 debian/upstream/signing-key.asc |   77 
 x11perf/ChangeLog   |  130 
 x11perf/INSTALL |  121 
 x11perf/Makefile.in |  495 +-
 x11perf/aclocal.m4  | 1510 ++---
 x11perf/bitmaps.c   |   19 
 x11perf/compile |  347 ++
 x11perf/config.guess|  566 +--
 x11perf/config.h.in |3 
 x11perf/config.sub  |  266 +
 x11perf/configure   | 6605 +---
 x11perf/configure.ac|7 
 x11perf/depcomp |  531 ++-
 x11perf/do_arcs.c   |   44 
 x11perf/do_blt.c|  131 
 x11perf/do_complex.c|8 
 x11perf/do_dots.c   |4 
 x11perf/do_lines.c  |   16 
 x11perf/do_movewin.c|   14 
 x11perf/do_rects.c  |6 
 x11perf/do_segs.c   |   16 
 x11perf/do_simple.c |   10 
 x11perf/do_tests.c  |   30 
 x11perf/do_text.c   |   20 
 x11perf/do_traps.c  |   12 
 x11perf/do_tris.c   |6 
 x11perf/do_valgc.c  |4 
 x11perf/do_windows.c|   20 
 x11perf/install-sh  |  385 +-
 x11perf/man/Makefile.in |  153 
 x11perf/missing |  461 --
 x11perf/perfboth|   21 
 x11perf/perfratio   |   19 
 x11perf/x11perf.c   |  167 -
 x11perf/x11perf.h   |  236 -
 xcalc/ChangeLog |  146 
 xcalc/INSTALL   |  121 
 xcalc/Makefile.in   |  434 +-
 xcalc/aclocal.m4|  815 ++--
 xcalc/actions.c |  169 -
 xcalc/compile   |  347 ++
 xcalc/config.guess  |  363 --
 xcalc/config.h.in   |3 
 xcalc/config.sub|  150 
 xcalc/configure | 1021 +++---
 xcalc/configure.ac  |7 
 xcalc/depcomp   |  487 +-
 xcalc/install-sh|  374 +-
 xcalc/man/Makefile.in   |  129 
 xcalc/math.c|  149 
 xcalc/missing   |  461 --
 xcalc/xcalc.h   |   17 
 xditview/ChangeLog  |  107 
 xditview/Dvi.c  |   25 
 xditview/Dvi.h  |5 
 xditview/DviChar.c  |   11 
 xditview/DviChar.h  |   19 
 xditview/DviP.h |   11 
 xditview/INSTALL|  121 
 xditview/Makefile.in|  442 +-
 xditview/Menu.h |4 
 xditview/XFontName.c|   72 
 xditview/XFontName.h|2 
 xditview/aclocal.m4 |  815 ++--
 xditview/compile|  347 ++
 xditview/config.guess   |  363 --
 xditview/config.sub |  150 
 xditview/configure  |  937 +++--
 xditview/configure.ac   |   12 
 xditview/depcomp|  487 +-
 xditview/draw.c |   28 
 xditview/font.c |   43 
 xditview/install-sh |  374 +-
 xditview/lex.c  |5 
 xditview/man/Makefile.in|  129 
 xditview/man/xditview.man   |3 
 xditview/missing|  461 --
 xditview/page.c |7 
 xditview/parse.c|2 
 xditview/xdit.bm|2 
 xditview/xdit_mask.bm   |2 
 xditview/xditview.c |   97 
 xedit/ChangeLog |  105 
 xedit/INSTALL   |  121 
 xedit/Makefile.in   | 1240 ---
 xedit/aclocal.m4| 5601 +
 xedit/ar-lib|  270 +
 xedit/commands.c|   19 
 xedit/compile   |  310 -
 xedit/config.guess  |  365 --
 xedit/config.h.in   |   10 
 xedit/config.sub|  152 
 xedit/configure | 1152 --
 xedit/configure.ac

x11-apps: Changes to 'debian-unstable'

2014-07-12 Thread Julien Cristau 
 debian/changelog|8 
 debian/upstream/signing-key.asc |   60 ++
 debian/watch.bitmap |1 
 debian/watch.ico|1 
 debian/watch.oclock |1 
 debian/watch.rendercheck|1 
 debian/watch.transset   |1 
 debian/watch.x11perf|1 
 debian/watch.xbiff  |1 
 debian/watch.xcalc  |1 
 debian/watch.xclipboard |1 
 debian/watch.xclock |1 
 debian/watch.xconsole   |1 
 debian/watch.xcursorgen |1 
 debian/watch.xditview   |1 
 debian/watch.xedit  |1 
 debian/watch.xeyes  |1 
 debian/watch.xgc|1 
 debian/watch.xload  |1 
 debian/watch.xlogo  |1 
 debian/watch.xmag   |1 
 debian/watch.xman   |1 
 debian/watch.xmore  |1 
 debian/watch.xwd|1 
 debian/watch.xwud   |1 
 xcursorgen/ChangeLog|   58 ++
 xcursorgen/INSTALL  |  121 -
 xcursorgen/Makefile.in  |  440 
 xcursorgen/aclocal.m4   |  777 +++-
 xcursorgen/compile  |  347 
 xcursorgen/config.guess |  407 ++
 xcursorgen/config.sub   |  237 ++-
 xcursorgen/configure|  857 +---
 xcursorgen/configure.ac |   10 
 xcursorgen/depcomp  |  531 
 xcursorgen/install-sh   |   35 -
 xcursorgen/man/Makefile.in  |  131 --
 xcursorgen/missing  |  461 +++--
 xcursorgen/xcursorgen.c |   60 +-
 39 files changed, 2928 insertions(+), 1635 deletions(-)

New commits:
commit 07f4f54ab5f111f87773cef74ce44e7cee2b7dac
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 12 18:13:43 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index a1f9132..a7cdbad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.7+3) UNRELEASED; urgency=medium
+x11-apps (7.7+3) unstable; urgency=medium
 
   * Delete debian/xsfbs/, not used anymore.
   * Update debian/copyright.
@@ -7,7 +7,7 @@ x11-apps (7.7+3) UNRELEASED; urgency=medium
 debian/upstream/signing-key.asc.
   * xcursorgen 1.0.6.
 
- -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 18:47:47 +0100
+ -- Julien Cristau jcris...@debian.org  Sat, 12 Jul 2014 18:13:40 +0200
 
 x11-apps (7.7+2) unstable; urgency=medium
 

commit fee081123e4fa8712045a800caf2e20f446e81e2
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 12 18:12:28 2014 +0200

xcursorgen 1.0.6.

diff --git a/debian/changelog b/debian/changelog
index 8871a69..a1f9132 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11-apps (7.7+3) UNRELEASED; urgency=medium
   * Allow uscan (through debian/rules get-tarballs) to verify tarball
 signatures by adding the pgpsigurlmangle option to watch files and shipping
 debian/upstream/signing-key.asc.
+  * xcursorgen 1.0.6.
 
  -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 18:47:47 +0100
 
diff --git a/xcursorgen/ChangeLog b/xcursorgen/ChangeLog
index 9db2363..9e9d78b 100644
--- a/xcursorgen/ChangeLog
+++ b/xcursorgen/ChangeLog
@@ -1,3 +1,61 @@
+commit 68939d23da457d4beeab73fca644b5c68224bdd3
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat May 31 16:33:07 2014 -0700
+
+xcursorgen 1.0.6
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit c21306ebf8cfa780d3d4fd31a41d1c7cac2e8dbb
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Tue Nov 26 22:22:30 2013 -0800
+
+Print which option was in error along with usage message
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 3c31233990f8c91b4f54b4ba7d4cd02f67c7812e
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat Feb 23 11:59:56 2013 -0800
+
+config: Add missing AC_CONFIG_SRCDIR
+
+Regroup AC statements under the Autoconf initialization section.
+Regroup AM statements under the Automake initialization section.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 7c50a1b8952baa8227908881858428f2ce971ed8
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat Feb 23 11:56:33 2013 -0800
+
+Combine usage message into single string/call
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 70d4855b4b313621cb250922712a1461dd742c3f
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat Feb 23 11:52:11 2013 -0800
+
+Use C99 struct initializer for ximage in check_image()
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit b0e174921ac5216fb4e21015a9b4bbb4b87b
+Author: Alan Coopersmith

x11-apps: Changes to 'debian-unstable'

2013-12-25 Thread Julien Cristau 
 debian/README.source   |   73 
 debian/changelog   |7 
 debian/copyright   |   22 -
 debian/xsfbs/repack.sh |   32 -
 debian/xsfbs/xsfbs.mk  |  293 
 debian/xsfbs/xsfbs.sh  |  853 -
 6 files changed, 7 insertions(+), 1273 deletions(-)

New commits:
commit 721688d0fac7f4f26de89cd2cb1f0b82f05b27c9
Author: Julien Cristau jcris...@debian.org
Date:   Wed Dec 25 18:48:58 2013 +0100

Update debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index 3f126b8..c754e14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11-apps (7.7+3) UNRELEASED; urgency=medium
 
   * Delete debian/xsfbs/, not used anymore.
+  * Update debian/copyright.
 
  -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 18:47:47 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 91eea29..dc32bf3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -942,28 +942,6 @@ xman:
   other dealings in this Software without prior written authorization
   from the X Consortium.
 
-  Copyright 2004 Roland Mainz roland.ma...@nrubsig.org
-
-  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 copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-  Except as contained in this notice, the name of The Open Group shall not be
-  used in advertising or otherwise to promote the sale, use or other dealings
-  in this Software without prior written authorization from The Open Group.
-
 xmore:
   This is a stub file.  This package has not yet had its complete licensing
   information compiled.  Please see the individual source files for details on

commit 6751003f8f14a8da011664df38404e66f0331525
Author: Julien Cristau jcris...@debian.org
Date:   Wed Dec 25 18:48:01 2013 +0100

Delete debian/xsfbs/, not used anymore.

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 34ab4bf..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 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

x11-apps: Changes to 'debian-unstable'

2013-08-13 Thread Julien Cristau 
 debian/changelog |   11 
 debian/control   |3 
 xconsole/ChangeLog   |   77 +
 xconsole/Makefile.in |  406 +-
 xconsole/aclocal.m4  |  704 ++---
 xconsole/compile |  347 
 xconsole/config.guess|  196 ++--
 xconsole/config.h.in |3 
 xconsole/config.sub  |  117 +-
 xconsole/configure   |  372 +++--
 xconsole/configure.ac|   11 
 xconsole/depcomp |  487 +++-
 xconsole/install-sh  |   14 
 xconsole/man/Makefile.in |  108 ++
 xconsole/missing |  461 +++
 xconsole/xconsole.c  |   58 -
 xload/ChangeLog  |  158 +++
 xload/Makefile.in|  458 ++-
 xload/aclocal.m4 |  705 ++---
 xload/compile|  347 
 xload/config.guess   |  407 +-
 xload/config.sub |  237 +++--
 xload/configure  |  574 +-
 xload/configure.ac   |2 
 xload/depcomp|  531 -
 xload/get_load.c |  628 ---
 xload/install-sh |   35 
 xload/man/Makefile.in|  131 ++-
 xload/man/xload.man  |   10 
 xload/missing|  461 +++
 xload/xload.c|   93 +-
 xwd/ChangeLog|  102 ++
 xwd/Makefile.am  |6 
 xwd/Makefile.in  |  445 ++-
 xwd/aclocal.m4   |  997 +++-
 xwd/clientwin.c  |4 
 xwd/compile  |  347 
 xwd/config.guess |  407 +-
 xwd/config.h.in  |3 
 xwd/config.sub   |  237 +++--
 xwd/configure| 1893 +++
 xwd/configure.ac |   18 
 xwd/depcomp  |  531 -
 xwd/dsimple.c|   19 
 xwd/dsimple.h|6 
 xwd/install-sh   |   35 
 xwd/list.c   |   14 
 xwd/list.h   |   20 
 xwd/man/Makefile.in  |  131 ++-
 xwd/missing  |  461 +++
 xwd/multiVis.c   |  184 ++--
 xwd/multiVis.h   |2 
 xwd/wsutils.h|2 
 xwd/xwd.c|   40 
 54 files changed, 8683 insertions(+), 5373 deletions(-)

New commits:
commit c84b43d12f1006ca9ae9aada4859b4f7524d71c2
Author: Julien Cristau jcris...@debian.org
Date:   Tue Aug 13 12:50:44 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index a366f6c..1f9183d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.7+1) UNRELEASED; urgency=low
+x11-apps (7.7+1) unstable; urgency=low
 
   [ Robert Hooker ]
   * Add transset to conflicts/replaces to fix upgrades.
@@ -22,7 +22,7 @@ x11-apps (7.7+1) UNRELEASED; urgency=low
   * xwd 1.0.6
   * Add build-dep on bison to make xgc's configure happy.
 
- -- Robert Hooker sarv...@ubuntu.com  Sat, 15 Dec 2012 18:36:39 -0500
+ -- Julien Cristau jcris...@debian.org  Tue, 13 Aug 2013 12:50:41 +0200
 
 x11-apps (7.7~2) unstable; urgency=low
 

commit 4ccff7182159357f5f0cbcb3bdec1e75dd1b7f50
Author: Julien Cristau jcris...@debian.org
Date:   Tue Aug 13 12:50:37 2013 +0200

Add build-dep on bison to make xgc's configure happy.

diff --git a/debian/changelog b/debian/changelog
index 5ccd8c9..a366f6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ x11-apps (7.7+1) UNRELEASED; urgency=low
   * xconsole 1.0.6.
   * xload 1.1.2.
   * xwd 1.0.6
+  * Add build-dep on bison to make xgc's configure happy.
 
  -- Robert Hooker sarv...@ubuntu.com  Sat, 15 Dec 2012 18:36:39 -0500
 
diff --git a/debian/control b/debian/control
index 53f74ea..9279007 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,9 @@ Uploaders: Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,
+# XXX bison build-dep is to work around a bug in xgc's configure, remove as
+# soon as that's fixed.
+ bison,
  libpng12-dev,
  libx11-dev (= 2:1.0.0),
  libxaw7-dev (= 1:1.0.1),

commit 02210438e837ea8d5a61619f1280d35a6f0d070e
Author: Julien Cristau jcris...@debian.org
Date:   Tue Aug 13 12:25:42 2013 +0200

xwd 1.0.6

diff --git a/debian/changelog b/debian/changelog
index bb1a4a6..5ccd8c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ x11-apps (7.7+1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * xconsole 1.0.6.
   * xload 1.1.2.
+  * xwd 1.0.6
 
  -- Robert Hooker sarv...@ubuntu.com  Sat, 15 Dec 2012 18:36:39 -0500
 
diff --git a/xwd/ChangeLog b/xwd/ChangeLog
index 71cab42..aa4ca8b 100644
--- a/xwd/ChangeLog
+++ b/xwd/ChangeLog
@@ -1,3 +1,105 @@
+commit b71cda30549b7259e337bd05d499c5921ed34f19
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Aug 8 21:12:15 2013 -0700
+
+xwd 1.0.6
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 02d3b987ad0007b2b6627d97056d0d77fb607039
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat Jul 20 00:08:51 2013 -0700
+
+Strip trailing

x11-apps: Changes to 'debian-unstable'

2013-05-20 Thread Robert Hooker 
 bitmap/Bitmap.c   |8 
 bitmap/ChangeLog  |   72 
 bitmap/Makefile.in|  565 ++--
 bitmap/aclocal.m4 |  675 +++--
 bitmap/atobm.c|   23 
 bitmap/bmtoa.c|   32 
 bitmap/compile|  232 +
 bitmap/config.guess   |  307 +-
 bitmap/config.sub |  237 +
 bitmap/configure  | 2650 +++--
 bitmap/configure.ac   |6 
 bitmap/depcomp|  530 ++--
 bitmap/install-sh |   35 
 bitmap/man/Makefile.in|  131 -
 bitmap/man/bitmap.man |8 
 bitmap/missing|  461 +--
 debian/changelog  |2 
 transset/ChangeLog|   88 
 transset/Makefile.in  |  355 +-
 transset/aclocal.m4   | 5553 +++---
 transset/config.guess |   60 
 transset/config.h.in  |3 
 transset/config.sub   |   95 
 transset/configure|  709 +++--
 transset/configure.ac |6 
 transset/depcomp  |  454 ++-
 transset/install-sh   |   14 
 transset/man/Makefile.in  |  103 
 transset/man/transset.man |  103 
 transset/missing  |  414 +--
 transset/transSet.c   |   65 
 31 files changed, 7532 insertions(+), 6464 deletions(-)

New commits:
commit 8167481058b543b9252ba73464785913f0d0e6cd
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon May 20 11:51:06 2013 -0400

Update transset to 1.0.1

diff --git a/debian/changelog b/debian/changelog
index 8dfc37d..01c3ed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x11-apps (7.7+1) UNRELEASED; urgency=low
   * xgc 1.0.4
   * xmag 1.0.5
   * bitmap 1.0.7
+  * transset 1.0.1
 
  -- Robert Hooker sarv...@ubuntu.com  Sat, 15 Dec 2012 18:36:39 -0500
 
diff --git a/transset/ChangeLog b/transset/ChangeLog
index 378a9c2..478399e 100644
--- a/transset/ChangeLog
+++ b/transset/ChangeLog
@@ -1,3 +1,91 @@
+commit 39db25e110cfedcec99394dfa7614ca248685c0d
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri May 17 17:47:14 2013 -0700
+
+transset 1.0.1
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit fc4bf3cda6d14cac9272f8399bb6dc614c1ef956
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Feb 22 22:05:39 2013 -0800
+
+Add the options to the man page (they were all missing before)
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit f59b8db649c1596a38ce20025417c4060d442d64
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Feb 22 21:33:25 2013 -0800
+
+Store min  max as doubles, not floats
+
+Since atof generates doubles, and we use them to compare/limit the values
+of the double d, might as well keep them in the same format instead of
+doing unnecessary conversions.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit e79903a50b0a9cba9d0e41fc2e389117f3ff42ef
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Feb 22 21:27:00 2013 -0800
+
+Typo fixes in verbose message  comment
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit da0682051e880faa2ef1accac388040bb52b46d8
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Feb 22 21:22:43 2013 -0800
+
+Use correct variable for printing current opacity
+
+Found by clang:
+transSet.c:303:30: warning: variable 'opacity' is uninitialized when used 
here
+  [-Wuninitialized]
+(double) opacity / OPAQUE);
+ ^~~
+
+When running transset -v, it prints the current opacity of a window
+before changing it, but was printing garbage - after this fix, correctly
+prints the value set by the previous run.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 65f010b8c4ef0e4fa5fc6a0679173f81c7a4b626
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Feb 22 21:17:59 2013 -0800
+
+Move release date from transset.c to configure.ac so we remember to update 
it
+
+Currently our 2012 release prints:
+   released: 2007-09-21
+when you run transset --version
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 6cd34b45c87717ae7901993e32b99a43652fa0f3
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Feb 22 21:14:09 2013 -0800
+
+Include PACKAGE_STRING in --version output
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 2b57aeb0ea616cfca8e6fcbd844960269af8c533
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Feb 22 21:11:04 2013 -0800
+
+Combine usage message into single string/call
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit a2485424bd0f184700dd0a4f0823fb4c4cf25f66
+Author: Arnaud Fontaine ar...@debian.org
+Date:   Thu Jun 7 19:33:28 2012 +0900
+
+Fix program name in usage information, transset instead of

x11-apps: Changes to 'debian-unstable'

2013-05-20 Thread Robert Hooker 
 debian/changelog  |3 
 debian/copyright  |  498 --
 debian/copyright.head |6 
 debian/rules  |   10 +
 4 files changed, 298 insertions(+), 219 deletions(-)

New commits:
commit de064411b7c759a63e3387541472a114e5bd6c91
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon May 20 16:25:55 2013 -0400

debian/copyright: refresh

diff --git a/debian/changelog b/debian/changelog
index 2f19786..7aea006 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x11-apps (7.7+1) UNRELEASED; urgency=low
   * transset 1.0.1
   * Add an update-copyright target to refresh debian/copyright using
 upstream's COPYING files, thanks to Julien Cristau.
+  * Refresh copyright.
 
  -- Robert Hooker sarv...@ubuntu.com  Sat, 15 Dec 2012 18:36:39 -0500
 
diff --git a/debian/copyright b/debian/copyright
index 5d290af..91eea29 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,20 +2,21 @@ The contents of this package were downloaded from
 http://xorg.freedesktop.org/releases/individual/app/
 It contains the bitmap, ico, oclock, transset, x11perf, xbiff, xcalc,
 xclipboard, xclock, xcursorgen, xconsole, xditview, xedit, xeyes, xgc,
-xload, xlogo, xmag, xman, xmore, xmd and xwd applications.
+xload, xlogo, xmag, xman, xmore, xmd, rendercheck, and xwd applications.
+
 
 bitmap:
   Copyright 1988, 1993, 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 copyright notice and this permission notice shall be included
   in all copies or substantial portions of the Software.
-  
+
   THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS
   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -23,7 +24,7 @@ bitmap:
   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   OTHER DEALINGS IN THE SOFTWARE.
-  
+
   Except as contained in this notice, the name of The Open Group shall
   not be used in advertising or otherwise to promote the sale, use or
   other dealings in this Software without prior written authorization
@@ -31,33 +32,33 @@ bitmap:
 
 ico:
   Copyright (c) 1987, 1994  X Consortium
-  
+
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the Software), to deal
   in the Software without restriction, including without limitation the rights
   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
   copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
-  
+
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
-  
+
   THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
   X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
   AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
+
   Except as contained in this notice, the name of the X Consortium shall not be
   used in advertising or otherwise to promote the sale, use or other dealings
   in this Software without prior written authorization from the X Consortium.
-  
-  
+
+
   Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-  
+
   All Rights Reserved
-  
+
   Permission to use, copy, modify, and distribute this software and its 
   documentation for any purpose and without fee is hereby granted, 
   provided that the above copyright notice appear in all copies and that
@@ -65,7 +66,7 @@ ico:
   supporting documentation, and that the name of Digital not be
   used in advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.  
-  
+
   DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
   ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
   DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
@@ -73,9 +74,9 @@ ico:
   WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
   ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
   SOFTWARE.
-  
+
   
--
-  
+

x11-apps: Changes to 'debian-unstable'

2013-05-17 Thread Robert Hooker 
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2b4d29bfa1c63103aec719ee167eedb56a1db65
Author: Robert Hooker sarv...@ubuntu.com
Date:   Fri May 17 10:39:39 2013 -0400

Fix version to 7.7+1.

diff --git a/debian/changelog b/debian/changelog
index 92994af..dac21ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.7-1) UNRELEASED; urgency=low
+x11-apps (7.7+1) UNRELEASED; urgency=low
 
   * Add transset to conflicts/replaces to fix upgrades.
   * Add rendercheck to x11-apps.


-- 
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/e1udlp6-00070k...@vasks.debian.org

x11-apps: Changes to 'debian-unstable'

2013-05-15 Thread Robert Hooker 
 debian/changelog   |9 
 debian/control |3 
 ico/ChangeLog  |   88 
 ico/Makefile.am|   18 
 ico/Makefile.in|  354 +-
 ico/aclocal.m4 | 1143 +--
 ico/config.guess   |  233 -
 ico/config.sub |  134 
 ico/configure  | 5896 -
 ico/configure.ac   |   11 
 ico/depcomp|   74 
 ico/ico.c  |   30 
 ico/ico.man|   90 
 ico/install-sh |   29 
 ico/man/Makefile.am|   12 
 ico/man/Makefile.in|  424 ++
 ico/man/ico.man|   90 
 xcalc/ChangeLog|   72 
 xcalc/Makefile.am  |   25 
 xcalc/Makefile.in  |  353 +-
 xcalc/aclocal.m4   | 1123 +--
 xcalc/actions.c|   32 
 xcalc/app-defaults/XCalc   |2 
 xcalc/autogen.sh   |   13 
 xcalc/config.guess |  233 -
 xcalc/config.sub   |  134 
 xcalc/configure| 5878 
 xcalc/configure.ac |   13 
 xcalc/depcomp  |   74 
 xcalc/install-sh   |   29 
 xcalc/man/Makefile.am  |   12 
 xcalc/man/Makefile.in  |  426 ++
 xcalc/man/xcalc.man|  445 ++
 xcalc/math.c   |   40 
 xcalc/xcalc.c  |   16 
 xcalc/xcalc.man|  437 --
 xconsole/ChangeLog |  151 
 xconsole/Makefile.am   |   23 
 xconsole/Makefile.in   |  355 +-
 xconsole/aclocal.m4| 1233 ++-
 xconsole/app-defaults/XConsole |7 
 xconsole/config.guess  |  233 -
 xconsole/config.sub|  134 
 xconsole/configure | 5850 
 xconsole/configure.ac  |   19 
 xconsole/depcomp   |   74 
 xconsole/install-sh|   29 
 xconsole/man/Makefile.am   |   12 
 xconsole/man/Makefile.in   |  426 ++
 xconsole/man/xconsole.man  |  113 
 xconsole/xconsole.c|   91 
 xconsole/xconsole.man  |  117 
 xditview/ChangeLog |   66 
 xditview/Makefile.am   |   17 
 xditview/Makefile.in   |  354 +-
 xditview/aclocal.m4| 1240 ++-
 xditview/config.guess  |  235 -
 xditview/config.sub|  184 -
 xditview/configure | 6519 ++---
 xditview/configure.ac  |   12 
 xditview/depcomp   |   74 
 xditview/install-sh|   29 
 xditview/man/Makefile.am   |   12 
 xditview/man/Makefile.in   |  426 ++
 xditview/man/xditview.man  |  177 +
 xditview/xditview.man  |  177 -
 xedit/AUTHORS  |2 
 xedit/COPYING  |   50 
 xedit/ChangeLog|  164 +
 xedit/Makefile.am  |   19 
 xedit/Makefile.in  |  867 ++---
 xedit/aclocal.m4   | 1143 +--
 xedit/compile  |  173 +
 xedit/config.guess |  233 -
 xedit/config.sub   |  134 
 xedit/configure| 5850 
 xedit/configure.ac |   13 
 xedit/depcomp  |   74 
 xedit/install-sh   |   29 
 xedit/lisp/core.c  |5 
 xedit/lisp/env.c   |  151 
 xedit/lisp/getenv.c|   81 
 xedit/lisp/lisp.c  |2 
 xedit/lisp/mathimp.c   |   37 
 xedit/lisp/mp/mp.c |   12 
 xedit/lisp/mp/mp.h |2 
 xedit/lisp/mp/mpi.c|8 
 xedit/lisp/re/re.c |2 
 xedit/lisp/read.c  |4 
 xedit/lisp/setenv.c|  178 +
 xedit/man/Makefile.am  |   12 
 xedit/man/Makefile.in  |  428 ++
 xedit/man/xedit.man|  476 ++
 xedit/realpath.c   |  306 -
 xedit/util.c   |2 
 xedit/xedit.man|  451 --
 xgc/ChangeLog  |   87 
 xgc/Makefile.am|   24 
 xgc/Makefile.in|  372 +-
 xgc/aclocal.m4 | 1143 +--
 xgc/config.guess   |  233 -
 xgc/config.sub |  134 
 xgc/configure  | 6108 +-
 xgc/configure.ac   |   22 
 xgc/depcomp|   74 
 xgc/install-sh |   29 
 xgc/man/Makefile.am|   12 
 xgc/man/Makefile.in|  430 ++
 xgc/man/xgc.man|  158 
 xgc/text.c |4 
 xgc/xgc.man|  158 
 xgc/ylwrap |   34 
 xmag/ChangeLog |   71 
 xmag/Makefile.am   |   23 
 xmag/Makefile.in   |  352 +-
 xmag/Scale.c   |   12 
 xmag/aclocal.m4| 1143

x11-apps: Changes to 'debian-unstable'

2013-01-10 Thread Timo Aaltonen 
 debian/changelog|1 
 debian/control  |4 
 debian/copyright|   21 
 debian/rules|2 
 debian/watch.rendercheck|3 
 rendercheck/AUTHORS |2 
 rendercheck/COPYING |   19 
 rendercheck/ChangeLog   |  743 
 rendercheck/INSTALL |  291 +
 rendercheck/Makefile.am |   39 
 rendercheck/Makefile.in |  847 +
 rendercheck/NEWS|   27 
 rendercheck/README  |   12 
 rendercheck/aclocal.m4  | 2371 +++
 rendercheck/autogen.sh  |   13 
 rendercheck/config.guess| 1505 +
 rendercheck/config.sub  | 1739 +++
 rendercheck/configure   | 6199 
 rendercheck/configure.ac|   31 
 rendercheck/depcomp |  630 
 rendercheck/doc/AddingNewTests  |9 
 rendercheck/doc/TODO|8 
 rendercheck/install-sh  |  520 +++
 rendercheck/main.c  |  313 ++
 rendercheck/man/Makefile.am |   38 
 rendercheck/man/Makefile.in |  434 ++
 rendercheck/man/rendercheck.man |   55 
 rendercheck/missing |  376 ++
 rendercheck/ops.c   |  243 +
 rendercheck/rendercheck.h   |  187 +
 rendercheck/t_blend.c   |   74 
 rendercheck/t_bug7366.c |  151 
 rendercheck/t_composite.c   |  104 
 rendercheck/t_dstcoords.c   |   69 
 rendercheck/t_fill.c|   44 
 rendercheck/t_gradient.c|  332 ++
 rendercheck/t_repeat.c  |  143 
 rendercheck/t_srccoords.c   |  151 
 rendercheck/t_triangles.c   |  240 +
 rendercheck/t_tsrccoords.c  |  157 +
 rendercheck/t_tsrccoords2.c |  173 +
 rendercheck/tests.c |  775 +
 42 files changed, 19093 insertions(+), 2 deletions(-)

New commits:
commit a7147f9cd3018b70a34aa04c1a938e287a091bc9
Author: Robert Hooker sarv...@ubuntu.com
Date:   Thu Aug 16 16:03:48 2012 -0400

Add rendercheck 1.4 to x11-apps.

diff --git a/debian/control b/debian/control
index 8db5440..71dcaae 100644
--- a/debian/control
+++ b/debian/control
@@ -69,6 +69,7 @@ Description: X applications
   - atobm, bitmap, and bmtoa, tools for manipulating bitmap images;
   - ico, a demo program animating polyhedrons;
   - oclock and xclock, graphical clocks;
+  - rendercheck, a program to test render extension implementations;
   - transset, a tool to set opacity property on a window;
   - xbiff, a tool which tells you when you have new email;
   - xcalc, a scientific calculator desktop accessory;
diff --git a/debian/copyright b/debian/copyright
index 2b785b4..5d290af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -143,6 +143,27 @@ oclock:
   ings in this Software without prior written authorization from the X Consor-
   ium.
 
+rendercheck:
+  Copyright 2004 Eric Anholt
+
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation, and that the name of Eric Anholt not be used in
+  advertising or publicity pertaining to distribution of the software without
+  specific, written prior permission.  Eric Anholt makes no
+  representations about the suitability of this software for any purpose.  It
+  is provided as is without express or implied warranty.
+
+  ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+
 transset:
   Copyright © 2003-2004 Matthew Hawn
   Copyright © 2003-2004 Andreas Kohn
diff --git a/debian/rules b/debian/rules
index 5d0dbc8..77dc4da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ include debian/xsfbs/xsfbs.mk
 
 # This package contains multiple modules as shipped by upstream. Each module 
is # contained in a subdirectory in the root dir of the package. You must list 
each
 # subdirectory explicitly so that the build system knows what to build
-DEF_SUBDIRS=bitmap ico oclock transset x11perf xbiff xcalc xclipboard xclock 
xconsole xcursorgen xditview xedit xeyes xgc xload xlogo xmag xman xmore xwd 
xwud
+DEF_SUBDIRS=bitmap ico oclock rendercheck transset x11perf xbiff xcalc 
xclipboard xclock xconsole xcursorgen xditview xedit xeyes xgc xload xlogo xmag 
xman xmore xwd xwud
 SUBDIRS=$(DEF_SUBDIRS)
 BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
 
diff --git a/debian/watch.rendercheck b/debian/watch.rendercheck

x11-apps: Changes to 'debian-unstable'

2012-12-15 Thread Robert Hooker 
 debian/changelog |6 ++
 debian/control   |4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 636a7fdb14993e8d0e8b77430dfc5cd81f197ff0
Author: Robert Hooker sarv...@ubuntu.com
Date:   Sat Dec 15 18:38:09 2012 -0500

debian/control: Add transset to conflicts/replaces to fix upgrades.

diff --git a/debian/changelog b/debian/changelog
index 8a3a160..bc749e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-apps (7.7~3) UNRELEASED; urgency=low
+
+  * Add transset to conflicts/replaces to fix upgrades.
+
+ -- Robert Hooker sarv...@ubuntu.com  Sat, 15 Dec 2012 18:36:39 -0500
+
 x11-apps (7.7~2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index dc10c9b..7cc6d27 100644
--- a/debian/control
+++ b/debian/control
@@ -58,10 +58,10 @@ Recommends: xbitmaps
 Suggests: mesa-utils
 Conflicts: bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole,
  xcursorgen, xditview, xeyes, xgc, xload, xlogo, xmag, xman, xmore, xwd,
- xwud
+ xwud, transset
 Replaces: xbase-clients (= 1:7.2.ds2-3), bitmap, oclock, x11perf, xbiff,
  xcalc, xclipboard, xclock, xconsole, xcursorgen, xditview, xeyes, xgc,
- xload, xlogo, xmag, xman, xmore, xwd, xwud
+ xload, xlogo, xmag, xman, xmore, xwd, xwud, transset
 Description: X applications
  This package provides a miscellaneous assortment of X applications
  that ship with the X Window System, including:


-- 
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/e1tk1jk-0003vg...@vasks.debian.org

x11-apps: Changes to 'debian-unstable'

2012-06-07 Thread Arnaud Fontaine 
 debian/changelog  |8 
 debian/control|4 
 debian/copyright  |   54 
 debian/rules  |2 
 debian/watch.transset |3 
 transset/COPYING  |   47 
 transset/ChangeLog|  350 +
 transset/INSTALL  |  291 +
 transset/Makefile.am  |   21 
 transset/Makefile.in  |  875 +++
 transset/README   |   32 
 transset/aclocal.m4   | 3081 +++
 transset/autogen.sh   |   13 
 transset/config.guess | 1530 +
 transset/config.h.in  |   64 
 transset/config.sub   | 1773 ++
 transset/configure|11966 ++
 transset/configure.ac |   25 
 transset/depcomp  |  708 ++
 transset/dsimple.c|  332 +
 transset/dsimple.h|   67 
 transset/install-sh   |  527 ++
 transset/man/Makefile.am  |   12 
 transset/man/Makefile.in  |  450 +
 transset/man/transset.man |   18 
 transset/missing  |  331 +
 transset/transSet.c   |  360 +
 27 files changed, 22939 insertions(+), 5 deletions(-)

New commits:
commit 8fd99b0dad11411274958d84ecbd31dfb8457581
Author: Arnaud Fontaine ar...@debian.org
Date:   Thu Jun 7 19:23:58 2012 +0900

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index d9aa8b2..8a3a160 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-x11-apps (7.7~2) UNRELEASED; urgency=low
+x11-apps (7.7~2) unstable; urgency=low
 
+  * Team upload.
   * Add transset 1.0.0
   * Bump Standards-Version to 3.9.3 (no changes).
 
- -- Arnaud Fontaine ar...@debian.org  Thu, 07 Jun 2012 19:07:14 +0900
+ -- Arnaud Fontaine ar...@debian.org  Thu, 07 Jun 2012 19:23:30 +0900
 
 x11-apps (7.7~1) unstable; urgency=low
 

commit 96b00cc43fd9273ca14a88ef7f3de9cb2309fca6
Author: Arnaud Fontaine ar...@debian.org
Date:   Thu Jun 7 19:16:28 2012 +0900

Bump Standards-Version to 3.9.3 (no changes).

diff --git a/debian/changelog b/debian/changelog
index b87111c..d9aa8b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11-apps (7.7~2) UNRELEASED; urgency=low
 
   * Add transset 1.0.0
+  * Bump Standards-Version to 3.9.3 (no changes).
 
  -- Arnaud Fontaine ar...@debian.org  Thu, 07 Jun 2012 19:07:14 +0900
 
diff --git a/debian/control b/debian/control
index 0b4b1c8..dc10c9b 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,7 @@ Build-Depends:
 # xmore: libxaw7-dev, libxt-dev
 # xwd: libx11-dev, x11proto-core-dev
 # xwud: libx11-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
 

commit 001d6542890c5820e70a0bb50fbf707536a4a0eb
Author: Arnaud Fontaine ar...@debian.org
Date:   Thu Jun 7 19:14:53 2012 +0900

Add transset 1.0.0

diff --git a/debian/changelog b/debian/changelog
index d7759be..b87111c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-apps (7.7~2) UNRELEASED; urgency=low
+
+  * Add transset 1.0.0
+
+ -- Arnaud Fontaine ar...@debian.org  Thu, 07 Jun 2012 19:07:14 +0900
+
 x11-apps (7.7~1) unstable; urgency=low
 
   [ Robert Hooker ]
diff --git a/debian/control b/debian/control
index 099d8f1..0b4b1c8 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Build-Depends:
 # bitmap: libx11-dev, libxmu-dev, xbitmaps, libxt-dev
 # ico: libx11-dev
 # oclock: libx11-dev, libxmu-dev, libxext-dev, libxkbfile-dev
+# transset: libx11-dev, x11proto-core-dev
 # x11perf: libx11-dev, libxmuu-dev, libxrender-dev, libxft-dev, libxext-dev
 # xbiff: xbitmaps, libxext-dev
 # xcalc: libxt-dev, libxaw7-dev
@@ -67,6 +68,7 @@ Description: X applications
   - atobm, bitmap, and bmtoa, tools for manipulating bitmap images;
   - ico, a demo program animating polyhedrons;
   - oclock and xclock, graphical clocks;
+  - transset, a tool to set opacity property on a window;
   - xbiff, a tool which tells you when you have new email;
   - xcalc, a scientific calculator desktop accessory;
   - xclipboard, a tool to manage cut-and-pasted text selections;
diff --git a/debian/copyright b/debian/copyright
index adec4d1..2b785b4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 The contents of this package were downloaded from
 http://xorg.freedesktop.org/releases/individual/app/
-It contains the bitmap, ico, oclock, x11perf, xbiff, xcalc, xclipboard,
-xclock, xcursorgen, xconsole, xditview, xedit, xeyes, xgc, xload, xlogo,
-xmag, xman, xmore, xmd and xwd applications.
+It contains the bitmap, ico, oclock, transset, x11perf, xbiff, xcalc,
+xclipboard, xclock, xcursorgen, xconsole, xditview, xedit, xeyes, xgc,
+xload, xlogo, xmag, xman, xmore, xmd and xwd applications.
 
 bitmap:
   Copyright 1988, 1993, 1998  The Open Group
@@ -143,6 +143,54 @@ oclock:
   ings in this Software without prior written authorization from the X Consor-
   ium.
 
+transset:
+  Copyright © 2003-2004 Matthew Hawn
+  Copyright © 2003-2004

x11-apps: Changes to 'debian-unstable'

2012-04-30 Thread Julien Cristau 
 debian/changelog |9 +++--
 debian/control   |   27 +++
 debian/rules |3 ---
 3 files changed, 26 insertions(+), 13 deletions(-)

New commits:
commit 056228dc33d007c2036a2455a8ec76c534ff6350
Author: Julien Cristau jcris...@debian.org
Date:   Mon Apr 30 16:35:41 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index c7593be..d7759be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.7~1) UNRELEASED; urgency=low
+x11-apps (7.7~1) unstable; urgency=low
 
   [ Robert Hooker ]
   * Fix recommends. Previously it was recommending xbitmap which didn't
@@ -19,7 +19,7 @@ x11-apps (7.7~1) UNRELEASED; urgency=low
   * Update build-dep list and comments.
   * Drop dh_testroot from debian/rules clean.
 
- -- Robert Hooker sarv...@ubuntu.com  Wed, 04 Apr 2012 14:24:17 -0400
+ -- Julien Cristau jcris...@debian.org  Mon, 30 Apr 2012 16:35:36 +0200
 
 x11-apps (7.6+5) unstable; urgency=low
 

commit 75d0b3e25f180652f12e22102db78c03cf322056
Author: Julien Cristau jcris...@debian.org
Date:   Mon Apr 30 16:35:34 2012 +0200

Drop dh_testroot from debian/rules clean.

diff --git a/debian/changelog b/debian/changelog
index 2cc42fe..c7593be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ x11-apps (7.7~1) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Update build-dep list and comments.
+  * Drop dh_testroot from debian/rules clean.
 
  -- Robert Hooker sarv...@ubuntu.com  Wed, 04 Apr 2012 14:24:17 -0400
 
diff --git a/debian/rules b/debian/rules
index 537a8ff..7933d68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,15 +55,12 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts 
$(STAMP_DIR)/patch
 
 clean: xsfclean
dh_testdir
-   dh_testroot
rm -f build-stamp
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
rm -rf *-build
-
dh_clean
 
 install: build

commit ad50454ad4f365c405cadc51a3cd825983bee1ff
Author: Julien Cristau jcris...@debian.org
Date:   Mon Apr 30 16:28:47 2012 +0200

Update build-dep list and comments.

diff --git a/debian/changelog b/debian/changelog
index b8d4d56..2cc42fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 x11-apps (7.7~1) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * Fix recommends. Previously it was recommending xbitmap which didn't
 exist, the package is xbitmaps.
   * oclock 1.0.3
@@ -14,6 +15,9 @@ x11-apps (7.7~1) UNRELEASED; urgency=low
   * xwud 1.0.4
   * Drop oclock-ftbfs.diff, upstream.
 
+  [ Julien Cristau ]
+  * Update build-dep list and comments.
+
  -- Robert Hooker sarv...@ubuntu.com  Wed, 04 Apr 2012 14:24:17 -0400
 
 x11-apps (7.6+5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d051c06..099d8f1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,23 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Cyril Brulebois k...@debian.org
-Build-Depends: debhelper (= 5.0.0), pkg-config, libpng12-dev,
- libx11-dev (= 2:1.0.0), libxaw7-dev (= 1:1.0.1),
- libxcursor-dev (= 1.1.5.2), libxext-dev (= 1:1.0.0),
- libxft-dev (= 2.1.8.2-6), libxkbfile-dev (= 1:1.0.1),
- libxmuu-dev (= 1:1.0.1), libxrender-dev (= 1:0.9.0.2-2),
- libxt-dev (= 1:1.0.0), xbitmaps, quilt, libxmu-dev,
+Build-Depends:
+ debhelper (= 5.0.0),
+ pkg-config,
+ libpng12-dev,
+ libx11-dev (= 2:1.0.0),
+ libxaw7-dev (= 1:1.0.1),
+ libxcursor-dev (= 1.1.5.2),
+ libxext-dev (= 1:1.0.0),
+ libxft-dev (= 2.1.8.2-6),
+ libxkbfile-dev (= 1:1.0.1),
+ libxmuu-dev (= 1:1.0.1),
+ libxrender-dev (= 1:0.9.0.2-2),
+ libxt-dev (= 1:1.1.0),
+ libxmu-dev,
+ xbitmaps,
+ x11proto-core-dev (= 7.0.17),
+ quilt,
  xutils-dev (= 1:7.5+4),
 # Reasons for build-depends:
 # debhelper for the packaging, pkg-config needed by configure scripts
@@ -16,7 +27,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libpng12-dev,
 # Individual apps:
 # bitmap: libx11-dev, libxmu-dev, xbitmaps, libxt-dev
 # ico: libx11-dev
-# oclock: libx11-dev, libxmu-dev, libxext-dev
+# oclock: libx11-dev, libxmu-dev, libxext-dev, libxkbfile-dev
 # x11perf: libx11-dev, libxmuu-dev, libxrender-dev, libxft-dev, libxext-dev
 # xbiff: xbitmaps, libxext-dev
 # xcalc: libxt-dev, libxaw7-dev
@@ -33,7 +44,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libpng12-dev,
 # xmag: libxaw7-dev, libxt-dev
 # xman: libxaw7-dev, libxt-dev
 # xmore: libxaw7-dev, libxt-dev
-# xwd: libx11-dev
+# xwd: libx11-dev, x11proto-core-dev
 # xwud: libx11-dev
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps


-- 
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/e1sorm4-00072c...@vasks.debian.org

x11-apps: Changes to 'debian-unstable'

2012-04-04 Thread Robert Hooker 
 debian/changelog |3 
 xwud/ChangeLog   |   67 
 xwud/Makefile.am |   18 
 xwud/Makefile.in |  354 ++-
 xwud/aclocal.m4  | 1131 +++--
 xwud/config.guess|  233 +-
 xwud/config.sub  |  134 -
 xwud/configure   | 5896 ++-
 xwud/configure.ac|9 
 xwud/depcomp |   74 
 xwud/install-sh  |   29 
 xwud/man/Makefile.am |   12 
 xwud/man/Makefile.in |  423 +++
 xwud/man/xwud.man|  154 +
 xwud/xwud.c  |6 
 xwud/xwud.man|  154 -
 16 files changed, 7932 insertions(+), 765 deletions(-)

New commits:
commit ba8ddabb52652566b01c45515a88726f32bf52a8
Author: Robert Hooker sarv...@ubuntu.com
Date:   Wed Apr 4 14:28:25 2012 -0400

xwud 1.0.4

diff --git a/debian/changelog b/debian/changelog
index ae8349a..b8d4d56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,10 @@ x11-apps (7.7~1) UNRELEASED; urgency=low
   * xcursorgen 1.0.5
   * xload 1.1.1
   * xlogo 1.0.4
+  * xwud 1.0.4
   * Drop oclock-ftbfs.diff, upstream.
 
- -- Robert Hooker sarv...@ubuntu.com  Fri, 23 Mar 2012 16:40:58 -0400
+ -- Robert Hooker sarv...@ubuntu.com  Wed, 04 Apr 2012 14:24:17 -0400
 
 x11-apps (7.6+5) unstable; urgency=low
 
diff --git a/xwud/ChangeLog b/xwud/ChangeLog
index c1d37c0..9c58a14 100644
--- a/xwud/ChangeLog
+++ b/xwud/ChangeLog
@@ -1,3 +1,70 @@
+commit 86d36843f3f087a6c1f3eb5a21385a116ae9e46a
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat Mar 31 17:04:56 2012 -0700
+
+xwud 1.0.4
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 2785ef0c967571977b78490eb501c5f9da91d48c
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jan 6 20:07:40 2012 -0800
+
+Replace malloc(strlen) + strcpy() with strdup()
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 05c9c12b6491708bc9ed9ea6b7a5321928d5ac93
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sun May 8 09:48:55 2011 -0700
+
+Mark Error as _X_NORETURN
+
+xwud.c:1031:6: warning: Array access (from variable 'pixels') results in a 
null pointer dereference
+pixels[i] = ~0L;
+^~
+xwud.c:1036:22: warning: Array access (from variable 'pixels') results in 
a null pointer dereference
+if ((color.pixel = pixels[pix]) == ~0L) {
+   ^~
+xwud.c:1101:6: warning: Array access (from variable 'rpixels') results in 
a null pointer dereference
+rpixels[i] = ~0L;
+^~~
+xwud.c:1100:6: warning: Array access (from variable 'pixels') results in a 
null pointer dereference
+pixels[i] = ~0L;
+^~
+
+Found-by: clang static analyzer
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit b7751c561e500e066273d618bfb9967b89767559
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jan 19 10:06:57 2011 -0500
+
+config: move man pages into their own directory
+
+Use services provided by XORG_MANPAGE_SECTIONS.
+Use standard Makefile for man pages.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 4e97b1da43664f99400dc3b66afc416fb25c3bb1
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Jan 13 17:15:37 2011 -0500
+
+man: replace hard coded man page section with substitution strings
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 70cc9502dc9757cffc165d73cfe8a29b1450df25
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Jan 13 11:15:48 2011 -0500
+
+man: remove trailing spaces and tabs
+
+Using s/[ \t]*$//
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
 commit 1693c1bba2c03acd151329fb8ecc3f5c267f9576
 Author: Alan Coopersmith alan.coopersm...@oracle.com
 Date:   Sun Nov 7 10:40:46 2010 -0800
diff --git a/xwud/Makefile.am b/xwud/Makefile.am
index e2eb5b0..73942aa 100644
--- a/xwud/Makefile.am
+++ b/xwud/Makefile.am
@@ -19,6 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
+SUBDIRS = man
 bin_PROGRAMS = xwud
 
 AM_CFLAGS = $(CWARNFLAGS) $(XWUD_CFLAGS)
@@ -27,24 +28,7 @@ xwud_LDADD = $(XWUD_LIBS)
 xwud_SOURCES = \
 xwud.c
 
-appman_PRE = \
-xwud.man
-
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE)
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
-   $(AM_V_GEN)$(SED) $(MAN_SUBSTS)  $  $@
-
 
 .PHONY: ChangeLog INSTALL
 
diff --git a/xwud/Makefile.in b/xwud/Makefile.in
index 8068882..01a71c1 100644
--- a/xwud/Makefile.in
+++ b/xwud/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake

x11-apps: Changes to 'debian-unstable'

2012-03-23 Thread Robert Hooker 
 bitmap/BitEdit.c  |  255 
 bitmap/Bitmap.c   |  613 +-
 bitmap/Bitmap.h   |   18 
 bitmap/BitmapP.h  |   16 
 bitmap/ChangeLog  |  187 
 bitmap/CutPaste.c |   40 
 bitmap/Dialog.c   |   52 
 bitmap/Graphics.c |  478 -
 bitmap/Handlers.c |  302 -
 bitmap/Makefile.am|   10 
 bitmap/Makefile.in|   19 
 bitmap/ReqMach.c  |   68 
 bitmap/Requests.h |   10 
 bitmap/aclocal.m4 | 1127 +++-
 bitmap/app-defaults/Bitmap|6 
 bitmap/app-defaults/Bitmap-nocase |6 
 bitmap/atobm.c|   36 
 bitmap/bmtoa.c|   39 
 bitmap/config.h.in|9 
 bitmap/configure  | 6472 ++--
 bitmap/configure.ac   |   36 
 bitmap/man/Makefile.in|3 
 bitmap/man/bitmap.man |2 
 debian/changelog  |8 
 xcursorgen/ChangeLog  |   72 
 xcursorgen/Makefile.am|   15 
 xcursorgen/Makefile.in|  293 -
 xcursorgen/aclocal.m4 | 1168 +++-
 xcursorgen/autogen.sh |   13 
 xcursorgen/configure  | 5873 ++
 xcursorgen/configure.ac   |   11 
 xcursorgen/man/Makefile.am|   12 
 xcursorgen/man/Makefile.in|  414 +
 xcursorgen/man/xcursorgen.man |   64 
 xcursorgen/xcursorgen.c   |   22 
 xcursorgen/xcursorgen.man |   64 
 xload/ChangeLog   |  186 
 xload/Makefile.am |   20 
 xload/Makefile.in |  285 -
 xload/aclocal.m4  | 1168 +++-
 xload/config.h.in |   41 
 xload/configure   | 9987 ++
 xload/configure.ac|   24 
 xload/get_load.c  |  339 -
 xload/get_rload.c |1 
 xload/man/Makefile.am |   12 
 xload/man/Makefile.in |  419 +
 xload/man/xload.man   |  109 
 xload/mkinstalldirs   |  111 
 xload/xload.c |6 
 xload/xload.h |1 
 xload/xload.man   |  113 
 xlogo/ChangeLog   |   67 
 xlogo/Makefile.am |   24 
 xlogo/Makefile.in |  300 -
 xlogo/RenderLogo.c|4 
 xlogo/aclocal.m4  | 1078 +++-
 xlogo/configure   | 6103 ++-
 xlogo/configure.ac|   16 
 xlogo/man/Makefile.am |   12 
 xlogo/man/Makefile.in |  417 +
 xlogo/man/xlogo.man   |   90 
 xlogo/xlogo.man   |   90 
 63 files changed, 32892 insertions(+), 5964 deletions(-)

New commits:
commit fb1173c9222bf6feecd5893e95a91018c1474d4b
Author: Robert Hooker sarv...@ubuntu.com
Date:   Fri Mar 23 16:41:17 2012 -0400

xlogo 1.0.4

diff --git a/debian/changelog b/debian/changelog
index 37205ef..ae8349a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,9 +10,10 @@ x11-apps (7.7~1) UNRELEASED; urgency=low
   * bitmap 1.0.6
   * xcursorgen 1.0.5
   * xload 1.1.1
+  * xlogo 1.0.4
   * Drop oclock-ftbfs.diff, upstream.
 
- -- Robert Hooker sarv...@ubuntu.com  Fri, 23 Mar 2012 16:39:31 -0400
+ -- Robert Hooker sarv...@ubuntu.com  Fri, 23 Mar 2012 16:40:58 -0400
 
 x11-apps (7.6+5) unstable; urgency=low
 
diff --git a/xlogo/ChangeLog b/xlogo/ChangeLog
index 9eda074..6a8b287 100644
--- a/xlogo/ChangeLog
+++ b/xlogo/ChangeLog
@@ -1,3 +1,70 @@
+commit 81f58b56464520fde4e64c0764bc58d5d197b849
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Mar 22 22:49:50 2012 -0700
+
+xlogo 1.0.4
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 18e61546798d20b7b1c15a2ff5d554bee7ec6bdf
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sun Sep 25 00:53:50 2011 -0700
+
+Require xt = 1.0 for appdefaultdir
+
+https://bugs.freedesktop.org/show_bug.cgi?id=7237
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 0e96450836cc876d213e02491394da3f6fa7575d
+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 7c7b2beb9b94790f9f08049163b85a37d253f0f6
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Jan 13 17:15:36 2011 -0500
+
+man: replace hard coded man page section with substitution strings
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 7a21422aa690f4734da047ee03ea49723acda342
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jan 12 16:28:02 2011 -0500
+
+config: replace

x11-apps: Changes to 'debian-unstable'

2012-02-23 Thread Robert Hooker 
 debian/changelog|3 
 xwd/ChangeLog   |  100 
 xwd/Makefile.am |   18 
 xwd/Makefile.in |  296 +-
 xwd/aclocal.m4  |  972 +++--
 xwd/configure   | 5507 +++-
 xwd/configure.ac|9 
 xwd/dsimple.c   |   24 
 xwd/dsimple.h   |8 
 xwd/man/Makefile.am |   12 
 xwd/man/Makefile.in |  414 +++
 xwd/man/xwd.man |  130 +
 xwd/multiVis.c  |   21 
 xwd/wsutils.h   |4 
 xwd/xwd.c   |   28 
 xwd/xwd.man |  130 -
 16 files changed, 7121 insertions(+), 555 deletions(-)

New commits:
commit ff273035d76ec98766e6a508cf78f1ee71a97cf2
Author: Robert Hooker sarv...@ubuntu.com
Date:   Thu Feb 23 11:02:19 2012 -0500

xwd 1.0.5

diff --git a/debian/changelog b/debian/changelog
index f95799b..6e3e615 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,10 @@ x11-apps (7.6+6) UNRELEASED; urgency=low
   * x11perf 1.5.4
   * xclipboard 1.1.2
   * xclock 1.0.6
+  * xwd 1.0.5
   * Drop oclock-ftbfs.diff, upstream.
 
- -- Robert Hooker sarv...@ubuntu.com  Sat, 11 Feb 2012 14:22:27 -0500
+ -- Robert Hooker sarv...@ubuntu.com  Thu, 23 Feb 2012 11:01:47 -0500
 
 x11-apps (7.6+5) unstable; urgency=low
 
diff --git a/xwd/ChangeLog b/xwd/ChangeLog
index 8b7d030..71cab42 100644
--- a/xwd/ChangeLog
+++ b/xwd/ChangeLog
@@ -1,3 +1,103 @@
+commit 431918bd9644dd5db2216e8ab61959e9a4b74bc0
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Feb 22 20:19:03 2012 -0800
+
+xwd 1.0.5
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 61fcdc321919a362bd46853537c136140421d746
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Tue Dec 13 15:56:47 2011 -0800
+
+Silence -Wshadow warnings
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 48ef3b5604dbe05d67c0f6e01d38cb718085b9b6
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Tue Dec 13 15:54:13 2011 -0800
+
+Mark usage as _X_NORETURN
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 8376c9c6098b69a47fc37817ecf9f57302d992fc
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Tue Dec 13 15:53:02 2011 -0800
+
+Dead code removal
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 7d88d8ab44b17247753f7225a1d8133d55d8423e
+Author: Pär Lidberg par.lidb...@elekta.com
+Date:   Mon Oct 3 00:24:06 2011 -0700
+
+Fix LP64 bug
+
+https://bugs.freedesktop.org/show_bug.cgi?id=14321
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 95315108d25d0a17aef488e2bd4df8e98415d5d7
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Jun 9 20:27:46 2011 -0700
+
+Replace local checks for gcc with _X_NORETURN from xproto 7.0.17
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 6d83294bae9ba7394716f62abb08cfb8b89ed373
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sun May 8 10:02:16 2011 -0700
+
+Rewrite parse_long to not fail -Wformat-nonliteral
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 97085ba43fcd752271a9356c435d28b95211644d
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sun May 8 09:52:49 2011 -0700
+
+Dead code removal
+
+xwd.c:298:5: warning: Value stored to 'bw' is never read
+bw = 0;
+^~
+
+Found-by: clang static analyzer
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 4a148f172d83d5e7f0ace6f28d4b8894b5e10442
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Jan 19 10:06:57 2011 -0500
+
+config: move man pages into their own directory
+
+Use services provided by XORG_MANPAGE_SECTIONS.
+Use standard Makefile for man pages.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 00bdfc48c8249d989282aeb4d14edac49df63a3a
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Jan 13 17:15:37 2011 -0500
+
+man: replace hard coded man page section with substitution strings
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 1560946f78332c86e51f5298500bad94d9130181
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Jan 13 11:15:48 2011 -0500
+
+man: remove trailing spaces and tabs
+
+Using s/[ \t]*$//
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
 commit d58fa4c8f990abbb12df3cca34ed413683604470
 Author: Alan Coopersmith alan.coopersm...@oracle.com
 Date:   Sun Nov 7 10:17:48 2010 -0800
diff --git a/xwd/Makefile.am b/xwd/Makefile.am
index 311425b..497be4a 100644
--- a/xwd/Makefile.am
+++ b/xwd/Makefile.am
@@ -19,6 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
+SUBDIRS = man
 bin_PROGRAMS = xwd
 
 AM_CFLAGS = $(CWARNFLAGS) $(XWD_CFLAGS)
@@ -36,24 +37,7 @@ xwd_SOURCES =\
 wsutils.h \
 xwd.c
 
-appman_PRE = \
-xwd.man
-
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA =

x11-apps: Changes to 'debian-unstable'

2012-02-11 Thread Robert Hooker 
 debian/changelog   |9 
 debian/patches/oclock-ftbfs.diff   |   57 
 debian/patches/series  |1 
 oclock/ChangeLog   |   97 
 oclock/Clock.c |   35 
 oclock/Clock.h |2 
 oclock/ClockP.h|4 
 oclock/Makefile.am |   23 
 oclock/Makefile.in |  288 +
 oclock/aclocal.m4  | 1074 -
 oclock/app-defaults/Clock-color|1 
 oclock/config.guess|   18 
 oclock/config.h.in |3 
 oclock/config.sub  |   76 
 oclock/configure   | 5768 ++-
 oclock/configure.ac|   28 
 oclock/man/Makefile.am |   12 
 oclock/man/Makefile.in |  415 ++
 oclock/man/oclock.man  |  102 
 oclock/oclock.c|   36 
 oclock/oclock.man  |  104 
 oclock/transform.c |6 
 oclock/transform.h |   14 
 x11perf/ChangeLog  |  137 
 x11perf/Makefile.am|   45 
 x11perf/Makefile.in|  292 +
 x11perf/Xmark.man  |   66 
 x11perf/aclocal.m4 |  390 ++
 x11perf/configure  |  151 
 x11perf/configure.ac   |   13 
 x11perf/do_blt.c   |   58 
 x11perf/do_tests.c |   24 
 x11perf/man/Makefile.am|   12 
 x11perf/man/Makefile.in|  421 ++
 x11perf/man/Xmark.man  |   66 
 x11perf/man/x11perf.man| 1016 +
 x11perf/man/x11perfcomp.man|   80 
 x11perf/x11pcomp.cpp   |  103 
 x11perf/x11perf.h  |3 
 x11perf/x11perf.man| 1016 -
 x11perf/x11perfcomp.in |  108 
 x11perf/x11perfcomp.man|   80 
 xclipboard/ChangeLog   |   78 
 xclipboard/Makefile.am |   21 
 xclipboard/Makefile.in |  282 +
 xclipboard/aclocal.m4  |  972 -
 xclipboard/app-defaults/XClipboard |   17 
 xclipboard/configure   | 5507 +-
 xclipboard/configure.ac|   11 
 xclipboard/man/Makefile.am |   12 
 xclipboard/man/Makefile.in |  417 ++
 xclipboard/man/xclipboard.man  |  151 
 xclipboard/man/xcutsel.man |  106 
 xclipboard/xclipboard.c|5 
 xclipboard/xclipboard.man  |  151 
 xclipboard/xcutsel.c   |8 
 xclipboard/xcutsel.man |  106 
 xclock/ChangeLog   |  124 
 xclock/Clock.c |4 
 xclock/Makefile.am |   20 
 xclock/Makefile.in |  287 +
 xclock/aclocal.m4  | 2492 +++--
 xclock/config.h.in |5 
 xclock/config.rpath|  666 +++
 xclock/configure   | 6790 +
 xclock/configure.ac|   23 
 xclock/man/Makefile.am |   12 
 xclock/man/Makefile.in |  423 ++
 xclock/man/xclock.man  |  273 +
 xclock/xclock.man  |  273 -
 70 files changed, 27051 insertions(+), 4439 deletions(-)

New commits:
commit 9393f2bddaaa42b32cfea22ec1dab7a8bc1b021f
Author: Robert Hooker sarv...@ubuntu.com
Date:   Sat Feb 11 14:24:01 2012 -0500

Drop oclock-ftbfs.diff, upstream.

diff --git a/debian/changelog b/debian/changelog
index 2e3b4d2..f95799b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ x11-apps (7.6+6) UNRELEASED; urgency=low
   * x11perf 1.5.4
   * xclipboard 1.1.2
   * xclock 1.0.6
+  * Drop oclock-ftbfs.diff, upstream.
 
- -- Robert Hooker sarv...@ubuntu.com  Sat, 11 Feb 2012 14:19:05 -0500
+ -- Robert Hooker sarv...@ubuntu.com  Sat, 11 Feb 2012 14:22:27 -0500
 
 x11-apps (7.6+5) unstable; urgency=low
 
diff --git a/debian/patches/oclock-ftbfs.diff b/debian/patches/oclock-ftbfs.diff
deleted file mode 100644
index edc8b7d..000
--- a/debian/patches/oclock-ftbfs.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/oclock/configure b/oclock/configure
-index e3f9cc5..9ad7c3a 100755
 a/oclock/configure
-+++ b/oclock/configure
-@@ -4603,11 +4603,11 @@ if test -n $OCLOCK_CFLAGS; then
-  elif test -n $PKG_CONFIG; then
- if test -n $PKG_CONFIG  \
- { { $as_echo $as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists 
--print-errors \x11 xmu xext\; } 5
--  ($PKG_CONFIG --exists --print-errors x11 xmu xext) 25
-+  ($PKG_CONFIG --exists --print-errors x11 xmu xext xt) 25
-   ac_status=$?
-   $as_echo $as_me:${as_lineno-$LINENO}: \$? = $ac_status 5
-   test $ac_status = 0; }; then
--  pkg_cv_OCLOCK_CFLAGS=`$PKG_CONFIG --cflags x11 xmu xext 2/dev/null`
-+  pkg_cv_OCLOCK_CFLAGS=`$PKG_CONFIG --cflags x11 xmu xext xt 2/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -4619,11 +4619,11 @@ if test -n $OCLOCK_LIBS; then
-  elif test -n $PKG_CONFIG; then
-

x11-apps: Changes to 'debian-unstable'

2012-02-10 Thread Robert Hooker 
 debian/changelog |7 +++
 debian/control   |2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit aa4ee16fcca0716f766ffd7c63c298943c3829d1
Author: Robert Hooker sarv...@ubuntu.com
Date:   Fri Feb 10 16:43:34 2012 -0500

debian/control: Fix recommends, xbitmap is xbitmaps.

diff --git a/debian/changelog b/debian/changelog
index b5f7085..d4672db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-apps (7.6+6) UNRELEASED; urgency=low
+
+  * Fix recommends, previous it was recommending xbitmap which didn't
+exist, the package is xbitmaps.
+
+ -- Robert Hooker sarv...@ubuntu.com  Fri, 10 Feb 2012 16:42:32 -0500
+
 x11-apps (7.6+5) unstable; urgency=low
 
   [ Julien Viard de Galbert ]
diff --git a/debian/control b/debian/control
index ac8caa9..d051c06 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
 Package: x11-apps
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
-Recommends: xbitmap
+Recommends: xbitmaps
 Suggests: mesa-utils
 Conflicts: bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole,
  xcursorgen, xditview, xeyes, xgc, xload, xlogo, xmag, xman, xmore, xwd,


-- 
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/e1rvyg5-qb...@vasks.debian.org

x11-apps: Changes to 'debian-unstable'

2011-07-02 Thread Cyril Brulebois 
 debian/changelog |   10 --
 debian/control   |2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 6b06a57f8c85b8df8345f9ceeb650adf6d9cad1d
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jul 2 20:20:09 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index daac58d..b5f7085 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.6+5) UNRELEASED; urgency=low
+x11-apps (7.6+5) unstable; urgency=low
 
   [ Julien Viard de Galbert ]
   * Fix oclock build by linking against against libXt explicitly.
@@ -8,7 +8,7 @@ x11-apps (7.6+5) UNRELEASED; urgency=low
   * xman 1.1.2
   * Bump Standards-Version to 3.9.2 (no changes).
 
- -- Cyril Brulebois k...@debian.org  Thu, 30 Jun 2011 15:59:20 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 02 Jul 2011 20:19:56 +0200
 
 x11-apps (7.6+4) unstable; urgency=low
 

commit 49e803b389d110964eb01ee1f127c6d7b243a1c9
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jul 2 20:19:01 2011 +0200

Bump Standards-Version to 3.9.2 (no changes).

diff --git a/debian/changelog b/debian/changelog
index 2d8ef8f..daac58d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x11-apps (7.6+5) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * xman 1.1.2
+  * Bump Standards-Version to 3.9.2 (no changes).
 
  -- Cyril Brulebois k...@debian.org  Thu, 30 Jun 2011 15:59:20 +0200
 
diff --git a/debian/control b/debian/control
index 5b67811..ac8caa9 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libpng12-dev,
 # xmore: libxaw7-dev, libxt-dev
 # xwd: libx11-dev
 # xwud: libx11-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
 

commit 962f8ec7baab23763b66152594b7b44e2938c12f
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jul 2 20:18:46 2011 +0200

Add changelog entries for Julien's work.

diff --git a/debian/changelog b/debian/changelog
index 0c8dc4d..2d8ef8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 x11-apps (7.6+5) UNRELEASED; urgency=low
 
+  [ Julien Viard de Galbert ]
+  * Fix oclock build by linking against against libXt explicitly.
+  * Updating package description  recommends (#550308).
+
+  [ Cyril Brulebois ]
   * xman 1.1.2
 
  -- Cyril Brulebois k...@debian.org  Thu, 30 Jun 2011 15:59:20 +0200


-- 
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/e1qd4tc-0002v8...@vasks.debian.org

x11-apps: Changes to 'debian-unstable'

2011-06-30 Thread Cyril Brulebois 
 debian/changelog |6 
 xman/ChangeLog   |  116 +
 xman/Makefile.am |   17 --
 xman/Makefile.in |  281 -
 xman/ScrollByL.c |4 
 xman/aclocal.m4  |  424 +--
 xman/buttons.c   |7 
 xman/configure   |  122 +-
 xman/configure.ac|   22 +-
 xman/handler.c   |   30 +--
 xman/main.c  |6 
 xman/man.h   |2 
 xman/man/Makefile.am |   12 +
 xman/man/Makefile.in |  417 ++
 xman/man/xman.man|  387 ++
 xman/misc.c  |   69 +++-
 xman/vendor.c|6 
 xman/xman.man|  387 --
 18 files changed, 1668 insertions(+), 647 deletions(-)

New commits:
commit 1cf93275dad9ba25040619b9420e0208cb570839
Author: Cyril Brulebois k...@debian.org
Date:   Thu Jun 30 15:59:24 2011 +0200

xman 1.1.2

diff --git a/debian/changelog b/debian/changelog
index d361c50..0c8dc4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-apps (7.6+5) UNRELEASED; urgency=low
+
+  * xman 1.1.2
+
+ -- Cyril Brulebois k...@debian.org  Thu, 30 Jun 2011 15:59:20 +0200
+
 x11-apps (7.6+4) unstable; urgency=low
 
   * debian/rules::get-tarballs: pass --destdir . to uscan
diff --git a/xman/ChangeLog b/xman/ChangeLog
index 71330dd..06e5d8a 100644
--- a/xman/ChangeLog
+++ b/xman/ChangeLog
@@ -1,3 +1,119 @@
+commit 0824a8ce82e053723b661bf1c2864e52eebac917
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Jun 29 20:53:53 2011 -0700
+
+xman 1.1.2
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit b8e4ebb00593d8b58815921cf5eb2d1e8a3738a7
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Mar 4 18:16:48 2011 -0800
+
+Remove xmu dependency by inlining AssignMax macro
+
+No calls from libXmu were used, just one instance of one simple macro
+that made the code harder to understand, so stop requiring it and
+linking directly to it.   (Of course, libXaw still depends on it, so
+it will still be loaded indirectly.)
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Matt Turner matts...@gmail.com
+
+commit ca7ff690136a35b8dad90271db5966cc9614b1c1
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jan 28 23:10:22 2011 -0800
+
+Use snprintf to PATH_MAX sized buffers to construct filenames
+
+Simpler than trying to calculate the size to malloc.
+
+Could have used XtAsprintf() but didn't seem worth the dependency
+for two simple calls with a standard, well-known maximum size.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Dirk Wallenstein hals...@t-online.de
+
+commit 48709d1ed5002255fa322cb3f0c4b8d5a5a7f3de
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jan 28 22:38:08 2011 -0800
+
+Convert more sprintf calls to snprintf
+
+Previous conversion seems to have missed many calls right next to ones
+that were converted to snprintf already
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Dirk Wallenstein hals...@t-online.de
+
+commit 35265840bba5aa4098b2f12522ef4c80b17c604a
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jan 28 22:35:35 2011 -0800
+
+Don't need to copy static strings to a buffer before calling PopupWarning
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Dirk Wallenstein hals...@t-online.de
+
+commit 72817de248a160ae84532662268b380b701908e8
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri Jan 28 22:24:47 2011 -0800
+
+Mark string argument to PopupWarning as a const char *
+
+PopupWarning just copies the string into the message it displays,
+via snprintf, and never writes to it.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Dirk Wallenstein hals...@t-online.de
+
+commit 382d261e50ac976001376c3a660fba0a55faad6d
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Jan 13 14:18:09 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 461b7068c522a9a3a92cd64ac1b664d079803807
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Jan 13 14:12:46 2011 -0500
+
+man: replace hard coded man page section with substitution strings
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit d7cb024227f8df08840937335ddf3f6f1bc95bef
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Jan 13 11:15:47 2011 -0500
+
+man: remove trailing spaces and tabs
+
+Using s/[ \t]*$//
+
+

Re: x11-apps: Changes to 'debian-unstable'

2011-05-01 Thread Julien Viard de Galbert 
On Tue, Apr 26, 2011 at 06:50:50PM +0200, Julien Cristau wrote:
 On Tue, Apr 26, 2011 at 18:42:54 +0200, Julien Cristau wrote:
 
  Pretty much.  The third (and probably best) option is to get the patch
  applied upstream and in a new tarball and update the package to that.
  
 I've done the first part now.

Thanks, How do I proceed from here ? Wait until oclock tarball is
released ?

On Tue, Apr 26, 2011 at 06:42:54PM +0200, Julien Cristau wrote:
  Looks like I've been a little too quick in pushing those changes...
  I forgot the patch description, I will fix that.
  
 Thanks.
 
I guess the fix now is to remove the patch...

 Yup, the app bundles are native packages since they're not just one
 upstream tarball but a bunch of different ones with different versions.
 So the debian package version is basically
 $current_xorg_katamari_version + $debian_revision, as an approximation
 of something sort of meaningful.  The katamari version (7.x) changes
 roughly once a year, the debian revision whenever the bundle gets
 updated.

OK, that means if I do packaging changes only, the full tarball will
have to be uploaded anyway, so I guess It's better to do most changes
upstream instead of applying patches.
That probably means I should join upstream, but I'm really not sure I
have enough time for that...

However I basically know the supposed next version and can write the
d/changelog entry (the final uploader will have to fix the version if 
$current_xorg_katamari_version changes). That would be x11-apps_7.6+5
as I won't update the tarballs now.

I hope I'm not waisting more time than helping here...

Regards,

-- 
Julien Viard de Galbertjul...@vdg.blogsite.org
http://silicone.homelinux.org/   jul...@silicone.homelinux.org
GPG Key ID: D00E52B6  Published on: hkp://keys.gnupg.net
Key Fingerprint: E312 A31D BEC3 74CC C49E  6D69 8B30 6538 D00E 52B6


signature.asc
Description: Digital signature

Re: x11-apps: Changes to 'debian-unstable'

2011-04-26 Thread Julien Cristau 
On Thu, Apr 14, 2011 at 11:05:59 +, Julien Viard de Galbert wrote:

 diff --git a/debian/patches/oclock-ftbfs.diff 
 b/debian/patches/oclock-ftbfs.diff
 new file mode 100644
 index 000..edc8b7d
 --- /dev/null
 +++ b/debian/patches/oclock-ftbfs.diff
 @@ -0,0 +1,57 @@
 +diff --git a/oclock/configure b/oclock/configure
 +index e3f9cc5..9ad7c3a 100755
 +--- a/oclock/configure
  b/oclock/configure
 +@@ -4603,11 +4603,11 @@ if test -n $OCLOCK_CFLAGS; then
 +  elif test -n $PKG_CONFIG; then
 + if test -n $PKG_CONFIG  \
 + { { $as_echo $as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists 
 --print-errors \x11 xmu xext\; } 5
 +-  ($PKG_CONFIG --exists --print-errors x11 xmu xext) 25
 ++  ($PKG_CONFIG --exists --print-errors x11 xmu xext xt) 25
 +   ac_status=$?
 +   $as_echo $as_me:${as_lineno-$LINENO}: \$? = $ac_status 5
 +   test $ac_status = 0; }; then
 +-  pkg_cv_OCLOCK_CFLAGS=`$PKG_CONFIG --cflags x11 xmu xext 2/dev/null`
 ++  pkg_cv_OCLOCK_CFLAGS=`$PKG_CONFIG --cflags x11 xmu xext xt 2/dev/null`
 + else
 +   pkg_failed=yes
 + fi
 +@@ -4619,11 +4619,11 @@ if test -n $OCLOCK_LIBS; then
 +  elif test -n $PKG_CONFIG; then
 + if test -n $PKG_CONFIG  \
 + { { $as_echo $as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists 
 --print-errors \x11 xmu xext\; } 5
 +-  ($PKG_CONFIG --exists --print-errors x11 xmu xext) 25
 ++  ($PKG_CONFIG --exists --print-errors x11 xmu xext xt) 25
 +   ac_status=$?
 +   $as_echo $as_me:${as_lineno-$LINENO}: \$? = $ac_status 5
 +   test $ac_status = 0; }; then
 +-  pkg_cv_OCLOCK_LIBS=`$PKG_CONFIG --libs x11 xmu xext 2/dev/null`
 ++  pkg_cv_OCLOCK_LIBS=`$PKG_CONFIG --libs x11 xmu xext xt 2/dev/null`
 + else
 +   pkg_failed=yes
 + fi
 +@@ -4641,9 +4641,9 @@ else
 + _pkg_short_errors_supported=no
 + fi
 + if test $_pkg_short_errors_supported = yes; then
 +-OCLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors 
 x11 xmu xext 21`
 ++OCLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors 
 x11 xmu xext xt 21`
 + else
 +-OCLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors x11 xmu xext 
 21`
 ++OCLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors x11 xmu xext xt 
 21`
 + fi
 + # Put the nasty error message in config.log where it belongs
 + echo $OCLOCK_PKG_ERRORS 5

Please don't include generated files in quilt patches.  Either patch
directly or run the scripts on package build.

Cheers,
Julien


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110426093227.gs2...@radis.liafa.jussieu.fr

Re: x11-apps: Changes to 'debian-unstable'

2011-04-26 Thread Julien Cristau 
On Thu, Apr 14, 2011 at 11:05:59 +, Julien Viard de Galbert wrote:

  debian/control   |5 ++-
  debian/patches/oclock-ftbfs.diff |   57 
 +++
  debian/patches/series|1 
  3 files changed, 61 insertions(+), 2 deletions(-)
 
Also this is missing patch description and debian/changelog entries.

Cheers,
Julien


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110426093311.gt2...@radis.liafa.jussieu.fr

Re: x11-apps: Changes to 'debian-unstable'

2011-04-26 Thread Julien Viard de Galbert 
On Tue, Apr 26, 2011 at 11:32:28AM +0200, Julien Cristau wrote:
 Please don't include generated files in quilt patches.  Either patch
 directly or run the scripts on package build.
 

To be sure I got it right:
 Choice 1: I apply that patch directly to the git repos and that's it.
 Choice 2: The patch should not change the configure but the package
   should use autoreconf (or similar tool) to regenerate the
   configure file.

On Tue, Apr 26, 2011 at 11:33:11AM +0200, Julien Cristau wrote:
 On Thu, Apr 14, 2011 at 11:05:59 +, Julien Viard de Galbert wrote:
 
   debian/control   |5 ++-
   debian/patches/oclock-ftbfs.diff |   57 
  +++
   debian/patches/series|1 
   3 files changed, 61 insertions(+), 2 deletions(-)
  
 Also this is missing patch description and debian/changelog entries.

Looks like I've been a little too quick in pushing those changes...
I forgot the patch description, I will fix that.

About the debian/changelog I remeber having trouble with it about how to
name the next version... this package appears to be a native one, and
I'm not used to it.
Changing the version means uploading the full tarball while just the
packaging changed, but native does not allow that if I understood
correctly. So I didn't really know what to do.

 
 Cheers,
 Julien
 
Thanks for your help,


-- 
Julien Viard de Galbertjul...@vdg.blogsite.org
http://silicone.homelinux.org/   jul...@silicone.homelinux.org
GPG Key ID: D00E52B6  Published on: hkp://keys.gnupg.net
Key Fingerprint: E312 A31D BEC3 74CC C49E  6D69 8B30 6538 D00E 52B6


signature.asc
Description: Digital signature

Re: x11-apps: Changes to 'debian-unstable'

2011-04-26 Thread Julien Cristau 
On Tue, Apr 26, 2011 at 16:53:43 +0200, Julien Viard de Galbert wrote:

 On Tue, Apr 26, 2011 at 11:32:28AM +0200, Julien Cristau wrote:
  Please don't include generated files in quilt patches.  Either patch
  directly or run the scripts on package build.
  
 
 To be sure I got it right:
  Choice 1: I apply that patch directly to the git repos and that's it.
  Choice 2: The patch should not change the configure but the package
should use autoreconf (or similar tool) to regenerate the
configure file.
 
Pretty much.  The third (and probably best) option is to get the patch
applied upstream and in a new tarball and update the package to that.

 On Tue, Apr 26, 2011 at 11:33:11AM +0200, Julien Cristau wrote:
  On Thu, Apr 14, 2011 at 11:05:59 +, Julien Viard de Galbert wrote:
  
debian/control   |5 ++-
debian/patches/oclock-ftbfs.diff |   57 
   +++
debian/patches/series|1 
3 files changed, 61 insertions(+), 2 deletions(-)
   
  Also this is missing patch description and debian/changelog entries.
 
 Looks like I've been a little too quick in pushing those changes...
 I forgot the patch description, I will fix that.
 
Thanks.

 About the debian/changelog I remeber having trouble with it about how to
 name the next version... this package appears to be a native one, and
 I'm not used to it.
 Changing the version means uploading the full tarball while just the
 packaging changed, but native does not allow that if I understood
 correctly. So I didn't really know what to do.
 
Yup, the app bundles are native packages since they're not just one
upstream tarball but a bunch of different ones with different versions.
So the debian package version is basically
$current_xorg_katamari_version + $debian_revision, as an approximation
of something sort of meaningful.  The katamari version (7.x) changes
roughly once a year, the debian revision whenever the bundle gets
updated.

Cheers,
Julien


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110426164254.gc2...@radis.liafa.jussieu.fr

Re: x11-apps: Changes to 'debian-unstable'

2011-04-26 Thread Julien Cristau 
On Tue, Apr 26, 2011 at 18:42:54 +0200, Julien Cristau wrote:

 Pretty much.  The third (and probably best) option is to get the patch
 applied upstream and in a new tarball and update the package to that.
 
I've done the first part now.

Cheers,
Julien


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110426165050.gd2...@radis.liafa.jussieu.fr

x11-apps: Changes to 'debian-unstable'

2011-04-14 Thread Julien Viard de Galbert 
 debian/control   |5 ++-
 debian/patches/oclock-ftbfs.diff |   57 +++
 debian/patches/series|1 
 3 files changed, 61 insertions(+), 2 deletions(-)

New commits:
commit b4b88500a8f655004da76ff546f6507b3b0998bb
Author: Julien Viard de Galbert jul...@vdg.blogsite.org
Date:   Thu Apr 14 11:24:12 2011 +0200

Updating package description  recommends (#550308)

diff --git a/debian/control b/debian/control
index 305a1c4..5b67811 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
 Package: x11-apps
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
+Recommends: xbitmap
 Suggests: mesa-utils
 Conflicts: bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole,
  xcursorgen, xditview, xeyes, xgc, xload, xlogo, xmag, xman, xmore, xwd,
@@ -74,5 +75,5 @@ Description: X applications
   - Xmark, x11perf, and x11perfcomp, tools for benchmarking graphical
 operations under the X Window System;
  .
- The xbiff, xcalc, xconsole and xman programs use bitmap images provided
- by the xbitmaps package.
+ The xbiff, xcalc, xconsole, xedit and xman programs use bitmap images
+ provided by the xbitmaps package.

commit 9f51dfb6b75f3e948fb8c1d7145787846406cac7
Author: Julien Viard de Galbert jul...@vdg.blogsite.org
Date:   Thu Apr 14 11:16:30 2011 +0200

Fix oclock build

diff --git a/debian/patches/oclock-ftbfs.diff b/debian/patches/oclock-ftbfs.diff
new file mode 100644
index 000..edc8b7d
--- /dev/null
+++ b/debian/patches/oclock-ftbfs.diff
@@ -0,0 +1,57 @@
+diff --git a/oclock/configure b/oclock/configure
+index e3f9cc5..9ad7c3a 100755
+--- a/oclock/configure
 b/oclock/configure
+@@ -4603,11 +4603,11 @@ if test -n $OCLOCK_CFLAGS; then
+  elif test -n $PKG_CONFIG; then
+ if test -n $PKG_CONFIG  \
+ { { $as_echo $as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists 
--print-errors \x11 xmu xext\; } 5
+-  ($PKG_CONFIG --exists --print-errors x11 xmu xext) 25
++  ($PKG_CONFIG --exists --print-errors x11 xmu xext xt) 25
+   ac_status=$?
+   $as_echo $as_me:${as_lineno-$LINENO}: \$? = $ac_status 5
+   test $ac_status = 0; }; then
+-  pkg_cv_OCLOCK_CFLAGS=`$PKG_CONFIG --cflags x11 xmu xext 2/dev/null`
++  pkg_cv_OCLOCK_CFLAGS=`$PKG_CONFIG --cflags x11 xmu xext xt 2/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -4619,11 +4619,11 @@ if test -n $OCLOCK_LIBS; then
+  elif test -n $PKG_CONFIG; then
+ if test -n $PKG_CONFIG  \
+ { { $as_echo $as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists 
--print-errors \x11 xmu xext\; } 5
+-  ($PKG_CONFIG --exists --print-errors x11 xmu xext) 25
++  ($PKG_CONFIG --exists --print-errors x11 xmu xext xt) 25
+   ac_status=$?
+   $as_echo $as_me:${as_lineno-$LINENO}: \$? = $ac_status 5
+   test $ac_status = 0; }; then
+-  pkg_cv_OCLOCK_LIBS=`$PKG_CONFIG --libs x11 xmu xext 2/dev/null`
++  pkg_cv_OCLOCK_LIBS=`$PKG_CONFIG --libs x11 xmu xext xt 2/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -4641,9 +4641,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+-  OCLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors 
x11 xmu xext 21`
++  OCLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors 
x11 xmu xext xt 21`
+ else
+-  OCLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors x11 xmu xext 
21`
++  OCLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors x11 xmu xext xt 
21`
+ fi
+   # Put the nasty error message in config.log where it belongs
+   echo $OCLOCK_PKG_ERRORS 5
+diff --git a/oclock/configure.ac b/oclock/configure.ac
+index ab542a7..df176d8 100644
+--- a/oclock/configure.ac
 b/oclock/configure.ac
+@@ -38,7 +38,7 @@ XORG_DEFAULT_OPTIONS
+ AM_CONFIG_HEADER(config.h)
+ 
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(OCLOCK, x11 xmu xext)
++PKG_CHECK_MODULES(OCLOCK, x11 xmu xext xt)
+ 
+ PKG_CHECK_MODULES(APPDEFS, xt)
+ xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..0010293 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+oclock-ftbfs.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qakn5-0003nw...@alioth.debian.org

x11-apps: Changes to 'debian-unstable'

2011-02-09 Thread Julien Cristau 
 bitmap/ChangeLog|  176 
 bitmap/INSTALL  |  291 
 bitmap/Makefile.am  |   96 
 bitmap/Makefile.in  |  386 
 bitmap/aclocal.m4   |  833 +
 bitmap/bitmap.icon  |   14 
 bitmap/bitmap.man   |  654 -
 bitmap/compile  |6 
 bitmap/config.guess |  210 
 bitmap/config.h.in  |3 
 bitmap/config.sub   |  115 
 bitmap/configure| 5222 
 bitmap/configure.ac |   41 
 bitmap/man/Makefile.am  |   38 
 bitmap/man/Makefile.in  |  443 
 bitmap/man/atobm.man|1 
 bitmap/man/bitmap.man   |  654 +
 bitmap/man/bmtoa.man|1 
 debian/changelog|   65 
 debian/control  |9 
 debian/copyright|  268 
 debian/patches/01_xedit_mkdir_races.diff| 2588 
 debian/patches/02_xedit_manpage_typos.diff  |   22 
 debian/patches/03_xconsole_implicit_pointer_conversion.diff |   16 
 debian/patches/05_xmore_fix_segv_without_xprint.diff|   34 
 debian/patches/series   |4 
 debian/rules|5 
 ico/ChangeLog   |  160 
 ico/INSTALL |  291 
 ico/Makefile.am |   37 
 ico/Makefile.in |  322 
 ico/README  |   28 
 ico/aclocal.m4  | 1378 +-
 ico/config.guess|  299 
 ico/config.h.in |   33 
 ico/config.sub  |  211 
 ico/configure   | 5402 +---
 ico/configure.ac|   21 
 ico/depcomp |  116 
 ico/ico.c   |   67 
 ico/ico.man |2 
 ico/install-sh  |  231 
 ico/missing |   49 
 ico/polyinfo.h  |1 
 oclock/COPYING  |   49 
 oclock/ChangeLog|  366 
 oclock/Clock-color.ad   |6 
 oclock/Clock.c  |   72 
 oclock/INSTALL  |  143 
 oclock/Makefile.am  |   56 
 oclock/Makefile.in  |  515 
 oclock/README   |   26 
 oclock/aclocal.m4   | 2446 ++--
 oclock/app-defaults/Clock-color |6 
 oclock/compile  |  142 
 oclock/config.guess |  291 
 oclock/config.h.in  |   42 
 oclock/config.sub   |  161 
 oclock/configure| 5715 +
 oclock/configure.ac |   28 
 oclock/depcomp  |  172 
 oclock/install-sh   |  517 
 oclock/missing  |  104 
 oclock/mkinstalldirs|  158 
 oclock/oclock.c |   16 
 oclock/transform.c  |   39 
 x11perf/COPYING |   35 
 x11perf/ChangeLog   |  232 
 x11perf/INSTALL |  291 
 x11perf/Makefile.am |   28 
 x11perf/Makefile.in |   62 
 x11perf/Xmark

x11-apps: Changes to 'debian-unstable'

2010-03-21 Thread Brice Goglin 
 debian/changelog |9 
 debian/control   |2 
 debian/patches/01_xedit_mkdir_races.diff | 2512 ++-
 3 files changed, 2507 insertions(+), 16 deletions(-)

New commits:
commit 6aeafec94362f648721f9848ca955e6139700635
Author: Brice Goglin bgog...@debian.org
Date:   Sun Mar 21 10:18:55 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index a8afa90..5bf0c3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.5+5) UNRELEASED; urgency=low
+x11-apps (7.5+5) unstable; urgency=low
 
   [ Julien Cristau ]
   * Autoreconf xedit with the patch from 7.5+3 applied.
@@ -8,7 +8,7 @@ x11-apps (7.5+5) UNRELEASED; urgency=low
   * Add missing file renames to 01_xedit_mkdir_races.diff.
   * Bump Standards-Version to 3.8.4, no changes.
 
- -- Julien Cristau jcris...@debian.org  Sat, 20 Mar 2010 12:13:17 +0100
+ -- Brice Goglin bgog...@debian.org  Sun, 21 Mar 2010 10:18:52 +0100
 
 x11-apps (7.5+4) unstable; urgency=low
 

commit 44684fb0ec4b54f77b0502616b72c3295d019f15
Author: Brice Goglin bgog...@debian.org
Date:   Sun Mar 21 10:18:50 2010 +0100

Bump Standards-Version to 3.8.4

diff --git a/debian/changelog b/debian/changelog
index d0ded69..a8afa90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x11-apps (7.5+5) UNRELEASED; urgency=low
 
   [ Brice Goglin ]
   * Add missing file renames to 01_xedit_mkdir_races.diff.
+  * Bump Standards-Version to 3.8.4, no changes.
 
  -- Julien Cristau jcris...@debian.org  Sat, 20 Mar 2010 12:13:17 +0100
 
diff --git a/debian/control b/debian/control
index dc61ee4..2371575 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libpng12-dev,
 # xmore: libxaw7-dev, libxt-dev
 # xwd: libx11-dev
 # xwud: libx11-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
 

commit 61134f81e46fc473140e09fc50bbf781d8d5a6ff
Author: Brice Goglin bgog...@debian.org
Date:   Sun Mar 21 10:10:12 2010 +0100

Add missing file renames to 01_xedit_mkdir_races.diff

diff --git a/debian/changelog b/debian/changelog
index fe234db..d0ded69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 x11-apps (7.5+5) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Autoreconf xedit with the patch from 7.5+3 applied.
 Really closes: #569430.
 
+  [ Brice Goglin ]
+  * Add missing file renames to 01_xedit_mkdir_races.diff.
+
  -- Julien Cristau jcris...@debian.org  Sat, 20 Mar 2010 12:13:17 +0100
 
 x11-apps (7.5+4) unstable; urgency=low
diff --git a/debian/patches/01_xedit_mkdir_races.diff 
b/debian/patches/01_xedit_mkdir_races.diff
index cf8935f..4a012ca 100644
--- a/debian/patches/01_xedit_mkdir_races.diff
+++ b/debian/patches/01_xedit_mkdir_races.diff
@@ -11,11 +11,11 @@ Date: Tue, 11 Nov 2008 09:52:18 +
 Subject: reorganize app default files
 
 
-diff --git a/xedit/Makefile.am b/xedit/Makefile.am
-index 1a32798..0fad032 100644
 a/xedit/Makefile.am
-+++ b/xedit/Makefile.am
-@@ -161,33 +161,13 @@ lisp_re_tests_LDADD = -L. -lre
+Index: x11-apps/xedit/Makefile.am
+===
+--- x11-apps.orig/xedit/Makefile.am2010-03-21 10:04:31.0 +0100
 x11-apps/xedit/Makefile.am 2010-03-21 10:04:42.0 +0100
+@@ -161,33 +161,13 @@
  lisp_re_tests_SOURCES = lisp/re/tests.c
  
  
@@ -52,7 +52,7 @@ index 1a32798..0fad032 100644
  lispdir = $(LISPDIR)
  dist_lisp_DATA = ${srcdir}/lisp/modules/lisp.lsp \
${srcdir}/lisp/modules/xedit.lsp \
-@@ -216,9 +196,9 @@ dist_progmodes_DATA = \
+@@ -216,9 +196,9 @@
  appman_PRE = xedit.man
  
  EXTRA_DIST = \
@@ -65,7 +65,7 @@ index 1a32798..0fad032 100644
app-defaults/Xedit-sample \
lisp/README \
lisp/TODO \
-@@ -246,7 +226,7 @@ appmandir = $(APP_MAN_DIR)
+@@ -246,7 +226,7 @@
  appman_DATA = $(appman_PRE:m...@app_man_suffix@)
  
  EXTRA_DIST += $(appman_PRE)
@@ -74,7 +74,7 @@ index 1a32798..0fad032 100644
  
  SED = sed
  
-@@ -267,7 +247,7 @@ MAN_SUBSTS = \
+@@ -267,7 +247,7 @@
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
  
@@ -83,11 +83,11 @@ index 1a32798..0fad032 100644
  
  .man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS)  $  $@
-diff --git a/xedit/configure.ac b/xedit/configure.ac
-index 64fc0b1..dc3a947 100644
 a/xedit/configure.ac
-+++ b/xedit/configure.ac
-@@ -41,9 +41,12 @@ AC_ARG_ENABLE(xprint,
+Index: x11-apps/xedit/configure.ac
+===
+--- x11-apps.orig/xedit/configure.ac   2010-03-21 10:04:31.0 +0100
 x11-apps/xedit/configure.ac2010-03-21 10:04:42.0 +0100
+@@ -41,9 +41,12 @@
  AM_CONDITIONAL(USE_XPRINT, test x$enable_xprint =

x11-apps: Changes to 'debian-unstable'

2010-03-12 Thread Steve Langasek 
 debian/changelog|7 +++
 debian/x11-apps.postinst.in |   20 
 debian/x11-apps.postrm.in   |   20 
 debian/x11-apps.preinst.in  |   20 
 4 files changed, 7 insertions(+), 60 deletions(-)

New commits:
commit 8bac5db6f3ce382f1ed5cfb80003ddefa1c71043
Author: Steve Langasek vor...@debian.org
Date:   Fri Mar 12 11:36:50 2010 -0800

Since we have xedit again, drop the conffile removal handling from the 
maintainer scripts.  LP: #518045.

diff --git a/debian/changelog b/debian/changelog
index dde49c4..47d661a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-apps (7.5+4) UNRELEASED; urgency=low
+
+  * Since we have xedit again, drop the conffile removal handling from the
+maintainer scripts.  LP: #518045.
+
+ -- Steve Langasek vor...@debian.org  Fri, 12 Mar 2010 11:32:04 -0800
+
 x11-apps (7.5+3) unstable; urgency=low
 
   * Add 01_xedit_mkdir_races.diff to fix FTBFS, closes: #569430.
diff --git a/debian/x11-apps.postinst.in b/debian/x11-apps.postinst.in
deleted file mode 100644
index a984869..000
--- a/debian/x11-apps.postinst.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=x11-apps
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-case $1 in
-  configure)
-  if dpkg --compare-versions $2 lt-nl 7.3+4; then
-remove_conffile_commit /etc/X11/app-defaults/Xedit
-remove_conffile_commit /etc/X11/app-defaults/Xedit-color
-  fi
-esac
-
-#DEBHELPER#
-
-# vim:set ai et sts=2 sw=2 tw=0:
diff --git a/debian/x11-apps.postrm.in b/debian/x11-apps.postrm.in
deleted file mode 100644
index 2344983..000
--- a/debian/x11-apps.postrm.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=x11-apps
-THIS_SCRIPT=postrm
-
-#INCLUDE_SHELL_LIB#
-
-case $1 in
-  abort-install|abort-upgrade)
-  if dpkg --compare-versions $2 lt-nl 7.3+4; then
-remove_conffile_rollback /etc/X11/app-defaults/Xedit
-remove_conffile_rollback /etc/X11/app-defaults/Xedit-color
-  fi
-esac
-
-#DEBHELPER#
-
-# vim:set ai et sts=2 sw=2 tw=0:
diff --git a/debian/x11-apps.preinst.in b/debian/x11-apps.preinst.in
deleted file mode 100644
index 86ad37e..000
--- a/debian/x11-apps.preinst.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=x11-apps
-THIS_SCRIPT=preinst
-
-#INCLUDE_SHELL_LIB#
-
-case $1 in
-  install|upgrade)
-  if dpkg --compare-versions $2 lt-nl 7.3+4; then
-remove_conffile_lookup $THIS_PACKAGE /etc/X11/app-defaults/Xedit
-remove_conffile_lookup $THIS_PACKAGE /etc/X11/app-defaults/Xedit-color
-  fi
-esac
-
-#DEBHELPER#
-
-# vim:set ai et sts=2 sw=2 tw=0:


-- 
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/e1nqagp-0006ue...@alioth.debian.org

x11-apps: Changes to 'debian-unstable'

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

New commits:
commit 6ac9fe7a6f5702d85c4479f0a74e468a5245cffc
Author: Julien Cristau jcris...@debian.org
Date:   Sat Mar 13 00:25:53 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 47d661a..b32651f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-x11-apps (7.5+4) UNRELEASED; urgency=low
+x11-apps (7.5+4) unstable; urgency=low
 
+  [ Steve Langasek ]
   * Since we have xedit again, drop the conffile removal handling from the
 maintainer scripts.  LP: #518045.
 
- -- Steve Langasek vor...@debian.org  Fri, 12 Mar 2010 11:32:04 -0800
+ -- Julien Cristau jcris...@debian.org  Sat, 13 Mar 2010 00:25:15 +0100
 
 x11-apps (7.5+3) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nqejm-0003c0...@alioth.debian.org

x11-apps: Changes to 'debian-unstable'

2010-02-23 Thread Brice Goglin 
 debian/changelog |6 +
 debian/patches/01_xedit_mkdir_races.diff |  102 +++
 debian/patches/series|1 
 3 files changed, 109 insertions(+)

New commits:
commit cbb9ec36e0d7db0493833248bfc2ccd98c42
Author: Brice Goglin bgog...@debian.org
Date:   Tue Feb 23 21:51:46 2010 +0100

Prepare Changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 401965c..dde49c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-x11-apps (7.5+3) UNRELEASED; urgency=low
+x11-apps (7.5+3) unstable; urgency=low
 
   * Add 01_xedit_mkdir_races.diff to fix FTBFS, closes: #569430.
 
- -- Brice Goglin bgog...@debian.org  Tue, 23 Feb 2010 21:50:09 +0100
+ -- Brice Goglin bgog...@debian.org  Tue, 23 Feb 2010 21:51:06 +0100
 
 x11-apps (7.5+2) unstable; urgency=low
 

commit 0724efeb47e7c78f0c9a86aef57ca872e286c489
Author: Brice Goglin bgog...@debian.org
Date:   Tue Feb 23 21:51:04 2010 +0100

Add 01_xedit_mkdir_races.diff to fix FTBFS

diff --git a/debian/changelog b/debian/changelog
index bf2c05e..401965c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-apps (7.5+3) UNRELEASED; urgency=low
+
+  * Add 01_xedit_mkdir_races.diff to fix FTBFS, closes: #569430.
+
+ -- Brice Goglin bgog...@debian.org  Tue, 23 Feb 2010 21:50:09 +0100
+
 x11-apps (7.5+2) unstable; urgency=low
 
   [ Brice Goglin ]
diff --git a/debian/patches/01_xedit_mkdir_races.diff 
b/debian/patches/01_xedit_mkdir_races.diff
new file mode 100644
index 000..cf8935f
--- /dev/null
+++ b/debian/patches/01_xedit_mkdir_races.diff
@@ -0,0 +1,102 @@
+Combination of two upstream patches (post 1.1.2) to fix #569430
+
+From 0ab2815743d89b1cd283abaf4d2cb77fed4a2df4 Mon Sep 17 00:00:00 2001
+From: Peter Breitenlohner p...@mppmu.mpg.de
+Date: Sun, 09 Nov 2008 13:24:10 +
+Subject: avoid race condition for parallel jobs
+
+From cfc78a1c2452362a5e7c88ed239c9d7ef0240a4d Mon Sep 17 00:00:00 2001
+From: Peter Breitenlohner p...@mppmu.mpg.de
+Date: Tue, 11 Nov 2008 09:52:18 +
+Subject: reorganize app default files
+
+
+diff --git a/xedit/Makefile.am b/xedit/Makefile.am
+index 1a32798..0fad032 100644
+--- a/xedit/Makefile.am
 b/xedit/Makefile.am
+@@ -161,33 +161,13 @@ lisp_re_tests_LDADD = -L. -lre
+ lisp_re_tests_SOURCES = lisp/re/tests.c
+ 
+ 
+-# App default files  (*.ad)
++# App default files
+ 
+-APPDEFAULTFILES = \
++appdefaultdir = @appdefaultdir@
++appdefault_DATA = \
+ app-defaults/Xedit-color \
+   app-defaults/Xedit
+ 
+-if USE_XPRINT
+-app-defaults/Xedit.ad: 
+-  test -d app-defaults || mkdir app-defaults
+-  cp $(top_srcdir)/app-defaults/Xedit-xprint.ad app-defaults/Xedit.ad
+-else
+-app-defaults/Xedit.ad:
+-  test -d app-defaults || mkdir app-defaults
+-  cp $(top_srcdir)/app-defaults/Xedit-noxprint.ad app-defaults/Xedit.ad
+-endif
+-
+-SUFFIXES = .ad 
+-
+-.ad:
+-  test -d app-defaults || mkdir app-defaults
+-  cp $ $@
+-
+-appdefaultdir = @appdefaultdir@
+-appdefault_DATA = $(APPDEFAULTFILES)
+-
+-CLEANFILES = $(APPDEFAULTFILES) app-defaults/Xedit.ad
+-
+ lispdir = $(LISPDIR)
+ dist_lisp_DATA = ${srcdir}/lisp/modules/lisp.lsp \
+   ${srcdir}/lisp/modules/xedit.lsp \
+@@ -216,9 +196,9 @@ dist_progmodes_DATA = \
+ appman_PRE = xedit.man
+ 
+ EXTRA_DIST = \
+-  app-defaults/Xedit-color.ad \
+-  app-defaults/Xedit-xprint.ad \
+-  app-defaults/Xedit-noxprint.ad \
++  app-defaults/Xedit-color \
++  app-defaults/Xedit-xprint \
++  app-defaults/Xedit-noxprint \
+   app-defaults/Xedit-sample \
+   lisp/README \
+   lisp/TODO \
+@@ -246,7 +226,7 @@ appmandir = $(APP_MAN_DIR)
+ appman_DATA = $(appman_PRE:m...@app_man_suffix@)
+ 
+ EXTRA_DIST += $(appman_PRE)
+-CLEANFILES += $(appman_DATA)
++CLEANFILES = $(appman_DATA)
+ 
+ SED = sed
+ 
+@@ -267,7 +247,7 @@ MAN_SUBSTS = \
+   -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+   -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+ 
+-SUFFIXES += .$(APP_MAN_SUFFIX) .man
++SUFFIXES = .$(APP_MAN_SUFFIX) .man
+ 
+ .man.$(APP_MAN_SUFFIX):
+   sed $(MAN_SUBSTS)  $  $@
+diff --git a/xedit/configure.ac b/xedit/configure.ac
+index 64fc0b1..dc3a947 100644
+--- a/xedit/configure.ac
 b/xedit/configure.ac
+@@ -41,9 +41,12 @@ AC_ARG_ENABLE(xprint,
+ AM_CONDITIONAL(USE_XPRINT, test x$enable_xprint = xyes)
+ if test x$enable_xprint = xyes; then
+PKG_CHECK_MODULES(PKGDEPS, xprintutil xp xaw8)
++   print_noprint=xprint
+ else
+PKG_CHECK_MODULES(PKGDEPS, xaw7)
++   print_noprint=noxprint
+ fi
++AC_CONFIG_LINKS([app-defaults/Xedit:app-defaults/Xedit-$print_noprint])
+ 
+ AC_ARG_WITH(lispdir, AS_HELP_STRING([--with-lispdir=PATH],
+   [Directory to install lisp files (default: 
$libdir/X11/xedit/lisp)]),
diff --git a/debian/patches/series b/debian/patches/series
index a77af23..e94bd24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+01_xedit_mkdir_races.diff

x11-apps: Changes to 'debian-unstable'

2010-02-07 Thread Brice Goglin 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9aa2ae8bf23d0bae637ae807aff705e2628b751c
Author: Brice Goglin bgog...@debian.org
Date:   Sun Feb 7 11:23:06 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 4b411b6..bf2c05e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.5+2) UNRELEASED; urgency=low
+x11-apps (7.5+2) unstable; urgency=low
 
   [ Brice Goglin ]
   * Update debian/copyright and package description according
@@ -14,7 +14,7 @@ x11-apps (7.5+2) UNRELEASED; urgency=low
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
 
- -- Brice Goglin bgog...@debian.org  Sun, 06 Dec 2009 20:54:44 +0100
+ -- Brice Goglin bgog...@debian.org  Sun, 07 Feb 2010 11:22:59 +0100
 
 x11-apps (7.5+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-apps: Changes to 'debian-unstable'

2010-02-07 Thread Julien Cristau 
 debian/watch.bitmap |2 +-
 debian/watch.ico|2 ++
 debian/watch.oclock |2 +-
 debian/watch.x11perf|2 +-
 debian/watch.xbiff  |2 +-
 debian/watch.xcalc  |2 +-
 debian/watch.xclipboard |2 +-
 debian/watch.xclock |2 +-
 debian/watch.xconsole   |2 +-
 debian/watch.xcursorgen |2 +-
 debian/watch.xditview   |2 +-
 debian/watch.xedit  |2 +-
 debian/watch.xeyes  |2 +-
 debian/watch.xgc|2 +-
 debian/watch.xload  |2 +-
 debian/watch.xlogo  |2 +-
 debian/watch.xmag   |2 +-
 debian/watch.xman   |2 +-
 debian/watch.xmore  |2 +-
 debian/watch.xwd|2 +-
 debian/watch.xwud   |2 +-
 21 files changed, 22 insertions(+), 20 deletions(-)

New commits:
commit 730851c61acc8f6b8a3943c609b7508baf57cdc9
Author: Julien Cristau jcris...@debian.org
Date:   Sun Feb 7 11:46:25 2010 +0100

add debian/watch.ico

diff --git a/debian/watch.ico b/debian/watch.ico
new file mode 100644
index 000..78dbdd3
--- /dev/null
+++ b/debian/watch.ico
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/app/ ico-(.*)\.tar\.gz

commit 7de956f2d3970d4ca4e209a9fb21269cc95af932
Author: Julien Cristau jcris...@debian.org
Date:   Sun Feb 7 11:43:57 2010 +0100

debian/watch.*: drop broken filenamemangle rule

diff --git a/debian/watch.bitmap b/debian/watch.bitmap
index c810e1d..c1ae0f1 100644
--- a/debian/watch.bitmap
+++ b/debian/watch.bitmap
@@ -1,2 +1,2 @@
 version=3
-opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ bitmap-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/app/ bitmap-(.*)\.tar\.gz
diff --git a/debian/watch.oclock b/debian/watch.oclock
index 5c55e9a..1650bce 100644
--- a/debian/watch.oclock
+++ b/debian/watch.oclock
@@ -1,2 +1,2 @@
 version=3
-opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ oclock-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/app/ oclock-(.*)\.tar\.gz
diff --git a/debian/watch.x11perf b/debian/watch.x11perf
index fff9220..5d1af0d 100644
--- a/debian/watch.x11perf
+++ b/debian/watch.x11perf
@@ -1,2 +1,2 @@
 version=3
-opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ x11perf-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/app/ x11perf-(.*)\.tar\.gz
diff --git a/debian/watch.xbiff b/debian/watch.xbiff
index 5f7890d..cf308fc 100644
--- a/debian/watch.xbiff
+++ b/debian/watch.xbiff
@@ -1,2 +1,2 @@
 version=3
-opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xbiff-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/app/ xbiff-(.*)\.tar\.gz
diff --git a/debian/watch.xcalc b/debian/watch.xcalc
index 58efc51..c201a3c 100644
--- a/debian/watch.xcalc
+++ b/debian/watch.xcalc
@@ -1,2 +1,2 @@
 version=3
-opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xcalc-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/app/ xcalc-(.*)\.tar\.gz
diff --git a/debian/watch.xclipboard b/debian/watch.xclipboard
index f502c13..8e2a393 100644
--- a/debian/watch.xclipboard
+++ b/debian/watch.xclipboard
@@ -1,2 +1,2 @@
 version=3
-opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xclipboard-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/app/ xclipboard-(.*)\.tar\.gz
diff --git a/debian/watch.xclock b/debian/watch.xclock
index 52cb9ef..19c04c6 100644
--- a/debian/watch.xclock
+++ b/debian/watch.xclock
@@ -1,2 +1,2 @@
 version=3
-opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xclock-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/app/ xclock-(.*)\.tar\.gz
diff --git a/debian/watch.xconsole b/debian/watch.xconsole
index 3e4eeaa..5f3dec2 100644
--- a/debian/watch.xconsole
+++ b/debian/watch.xconsole
@@ -1,2 +1,2 @@
 version=3
-opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xconsole-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/app/ xconsole-(.*)\.tar\.gz
diff --git a/debian/watch.xcursorgen b/debian/watch.xcursorgen
index b17135e..e0924df 100644
--- a/debian/watch.xcursorgen
+++ b/debian/watch.xcursorgen
@@ -1,2 +1,2 @@
 version=3
-opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xcursorgen-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/app/ xcursorgen-(.*)\.tar\.gz
diff --git a/debian/watch.xditview b/debian/watch.xditview
index b58e836..d8a1548 100644
--- a/debian/watch.xditview
+++ b/debian/watch.xditview
@@ -1,2 +1,2 @@
 version=3
-opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/

x11-apps: 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 d7ccfb784c7e0ae6667d05a0bbbd1ba862b93836
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 23 01:46:26 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index 8a6da24..4b411b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11-apps (7.5+2) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Brice Goglin bgog...@debian.org  Sun, 06 Dec 2009 20:54:44 +0100
 
diff --git a/debian/control b/debian/control
index 2bbcd85..dc61ee4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-apps
 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, libpng12-dev,
  libx11-dev (= 2:1.0.0), libxaw7-dev (= 1:1.0.1),
  libxcursor-dev (= 1.1.5.2), libxext-dev (= 1:1.0.0),


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

x11-apps: Changes to 'debian-unstable'

2010-01-16 Thread Julien Cristau 
 debian/rules|7 +++
 debian/watch.bitmap |2 ++
 debian/watch.oclock |2 ++
 debian/watch.x11perf|2 ++
 debian/watch.xbiff  |2 ++
 debian/watch.xcalc  |2 ++
 debian/watch.xclipboard |2 ++
 debian/watch.xclock |2 ++
 debian/watch.xconsole   |2 ++
 debian/watch.xcursorgen |2 ++
 debian/watch.xditview   |2 ++
 debian/watch.xedit  |2 ++
 debian/watch.xeyes  |2 ++
 debian/watch.xgc|2 ++
 debian/watch.xload  |2 ++
 debian/watch.xlogo  |2 ++
 debian/watch.xmag   |2 ++
 debian/watch.xman   |2 ++
 debian/watch.xmore  |2 ++
 debian/watch.xwd|2 ++
 debian/watch.xwud   |2 ++
 21 files changed, 47 insertions(+)

New commits:
commit 15be96b3b51b7c8ef5d431df34a1522fd36ffc47
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 16 16:07:31 2010 +

Add watch files and rule to download tarballs

diff --git a/debian/rules b/debian/rules
index 3708ce7..140904f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,3 +105,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.bitmap b/debian/watch.bitmap
new file mode 100644
index 000..c810e1d
--- /dev/null
+++ b/debian/watch.bitmap
@@ -0,0 +1,2 @@
+version=3
+opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ bitmap-(.*)\.tar\.gz
diff --git a/debian/watch.oclock b/debian/watch.oclock
new file mode 100644
index 000..5c55e9a
--- /dev/null
+++ b/debian/watch.oclock
@@ -0,0 +1,2 @@
+version=3
+opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ oclock-(.*)\.tar\.gz
diff --git a/debian/watch.x11perf b/debian/watch.x11perf
new file mode 100644
index 000..fff9220
--- /dev/null
+++ b/debian/watch.x11perf
@@ -0,0 +1,2 @@
+version=3
+opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ x11perf-(.*)\.tar\.gz
diff --git a/debian/watch.xbiff b/debian/watch.xbiff
new file mode 100644
index 000..5f7890d
--- /dev/null
+++ b/debian/watch.xbiff
@@ -0,0 +1,2 @@
+version=3
+opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xbiff-(.*)\.tar\.gz
diff --git a/debian/watch.xcalc b/debian/watch.xcalc
new file mode 100644
index 000..58efc51
--- /dev/null
+++ b/debian/watch.xcalc
@@ -0,0 +1,2 @@
+version=3
+opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xcalc-(.*)\.tar\.gz
diff --git a/debian/watch.xclipboard b/debian/watch.xclipboard
new file mode 100644
index 000..f502c13
--- /dev/null
+++ b/debian/watch.xclipboard
@@ -0,0 +1,2 @@
+version=3
+opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xclipboard-(.*)\.tar\.gz
diff --git a/debian/watch.xclock b/debian/watch.xclock
new file mode 100644
index 000..52cb9ef
--- /dev/null
+++ b/debian/watch.xclock
@@ -0,0 +1,2 @@
+version=3
+opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xclock-(.*)\.tar\.gz
diff --git a/debian/watch.xconsole b/debian/watch.xconsole
new file mode 100644
index 000..3e4eeaa
--- /dev/null
+++ b/debian/watch.xconsole
@@ -0,0 +1,2 @@
+version=3
+opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xconsole-(.*)\.tar\.gz
diff --git a/debian/watch.xcursorgen b/debian/watch.xcursorgen
new file mode 100644
index 000..b17135e
--- /dev/null
+++ b/debian/watch.xcursorgen
@@ -0,0 +1,2 @@
+version=3
+opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xcursorgen-(.*)\.tar\.gz
diff --git a/debian/watch.xditview b/debian/watch.xditview
new file mode 100644
index 000..b58e836
--- /dev/null
+++ b/debian/watch.xditview
@@ -0,0 +1,2 @@
+version=3
+opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xditview-(.*)\.tar\.gz
diff --git a/debian/watch.xedit b/debian/watch.xedit
new file mode 100644
index 000..756cd67
--- /dev/null
+++ b/debian/watch.xedit
@@ -0,0 +1,2 @@
+version=3
+opts=filenamemangle=s/^/x11-apps_$pkg_version.orig-/ 
http://xorg.freedesktop.org/releases/individual/app/ xedit-(.*)\.tar\.gz
diff --git a/debian/watch.xeyes b/debian/watch.xeyes
new file mode 100644
index 000..f81d4f8
--- /dev/null
+++ b/debian/watch.xeyes
@@ -0,0 +1,2 @@
+version=3

x11-apps: Changes to 'debian-unstable'

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

New commits:
commit c1ab07389db87d39bca3a70cd0f39a3eb132dc99
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 16 16:48:37 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 c6c6d60..8a6da24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 x11-apps (7.5+2) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * Update debian/copyright and package description according
 to ico and xedit additions.
   * x11pref 1.5.1.
@@ -8,6 +9,10 @@ x11-apps (7.5+2) UNRELEASED; urgency=low
   * xeyes 1.1.0.
   * xlogo 1.0.2.
 
+  [ Julien Cristau ]
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
  -- Brice Goglin bgog...@debian.org  Sun, 06 Dec 2009 20:54:44 +0100
 
 x11-apps (7.5+1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 140904f..677a153 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,9 +43,9 @@ build-stamp: $(BUILD_STAMPS)
$@
 
 $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
-   mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE)
+   mkdir -p $*-build
 
-   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  \
+   cd $*-build  \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
  --infodir=\$${prefix}/share/info $(confflags) \
  --disable-xprint \
@@ -53,7 +53,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts 
$(STAMP_DIR)/patch
  CFLAGS=$(CFLAGS) \
  RSH=rsh \
  MANCONF=/etc/manpath.config
-   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   cd $*-build  $(MAKE)
$@
 
 clean: xsfclean
@@ -65,7 +65,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
-   rm -rf *-obj-*
+   rm -rf *-build
 
dh_clean
 
@@ -76,7 +76,7 @@ install: build
dh_installdirs
 
for FILE in $(SUBDIRS); do \
-   cd $$FILE-obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) 
DESTDIR=$(CURDIR)/debian/tmp install ; \
+   cd $$FILE-build  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install ; \
cd ..; \
done
 


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

x11-apps: Changes to 'debian-unstable'

2009-12-20 Thread Brice Goglin 
 debian/changelog   |3 
 xbiff/COPYING  |   29 
 xbiff/ChangeLog|  291 +
 xbiff/INSTALL  |  143 
 xbiff/Mailbox.c|  107 
 xbiff/Makefile.am  |   16 
 xbiff/Makefile.in  |  416 +-
 xbiff/README   |   27 
 xbiff/aclocal.m4   | 1931 ++--
 xbiff/compile  |  142 
 xbiff/config.guess |  291 -
 xbiff/config.h.in  |   42 
 xbiff/config.sub   |  161 -
 xbiff/configure| 5424 +++
 xbiff/configure.ac |   18 
 xbiff/depcomp  |  172 -
 xbiff/install-sh   |  517 ++-
 xbiff/missing  |  104 
 xbiff/mkinstalldirs|  158 -
 xbiff/xbiff.c  |   14 
 xcalc/ChangeLog|  123 
 xcalc/INSTALL  |  143 
 xcalc/Makefile.am  |   38 
 xcalc/Makefile.in  |  440 +-
 xcalc/README   |   26 
 xcalc/XCalc-color.ad   |  225 -
 xcalc/XCalc.ad |  530 ---
 xcalc/aclocal.m4   | 1949 ++--
 xcalc/actions.c|  347 --
 xcalc/actions.h|   94 
 xcalc/app-defaults/XCalc   |  530 +++
 xcalc/app-defaults/XCalc-color |  225 +
 xcalc/autogen.sh   |   13 
 xcalc/config.guess |  271 -
 xcalc/config.h.in  |   33 
 xcalc/config.sub   |  139 
 xcalc/configure| 6298 -
 xcalc/configure.ac |   22 
 xcalc/depcomp  |  172 -
 xcalc/install-sh   |  517 ++-
 xcalc/math.c   |  119 
 xcalc/missing  |  104 
 xcalc/xcalc.c  |   79 
 xcalc/xcalc.h  |   42 
 xeyes/ChangeLog|   79 
 xeyes/Makefile.am  |   10 
 xeyes/Makefile.in  |   26 
 xeyes/aclocal.m4   |   25 
 xeyes/config.guess |   88 
 xeyes/config.sub   |   28 
 xeyes/configure| 1269 ++--
 xeyes/configure.ac |9 
 52 files changed, 14187 insertions(+), 9832 deletions(-)

New commits:
commit 384ec30ba0c7b57a9626c6dd6ee113a0a8f70aa9
Author: Brice Goglin bgog...@debian.org
Date:   Sun Dec 20 09:43:59 2009 +0100

xbiff 1.0.2

diff --git a/debian/changelog b/debian/changelog
index 1eb9cda..c6c6d60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-apps (7.5+2) UNRELEASED; urgency=low
   * Update debian/copyright and package description according
 to ico and xedit additions.
   * x11pref 1.5.1.
+  * xbiff 1.0.2.
   * xcalc 1.0.3.
   * xeyes 1.1.0.
   * xlogo 1.0.2.
diff --git a/xbiff/AUTHORS b/xbiff/AUTHORS
deleted file mode 100644
index e69de29..000
diff --git a/xbiff/COPYING b/xbiff/COPYING
index 7f33cbf..2836b5a 100644
--- a/xbiff/COPYING
+++ b/xbiff/COPYING
@@ -1,12 +1,25 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 1988  X Consortium
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+Software), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
 
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
 
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of the X Consortium shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from the X Consortium.
diff --git a/xbiff/ChangeLog b/xbiff/ChangeLog
index c7a87f5..9cf2a39 100644
--- a/xbiff/ChangeLog
+++ b/xbiff/ChangeLog
@@ -1,30 +1,285 @@
-2005-12-20  Kevin E. Martin  kem-at-freedesktop-dot-org
+commit

x11-apps: Changes to 'debian-unstable'

2009-12-06 Thread Brice Goglin 
 bitmap/AUTHORS   |2 
 bitmap/BitEdit.c |   46 
 bitmap/Bitmap-color.ad   |   19 
 bitmap/Bitmap-nocase.ad  |  233 
 bitmap/Bitmap.ad |  229 
 bitmap/Bitmap.c  |4 
 bitmap/Bitmap.h  |2 
 bitmap/BitmapP.h |4 
 bitmap/COPYING   |   27 
 bitmap/ChangeLog |   94 
 bitmap/CutPaste.c|3 
 bitmap/Dialog.c  |2 
 bitmap/Dialog.h  |2 
 bitmap/Graphics.c|2 
 bitmap/Handlers.c|3 
 bitmap/Makefile.am   |   36 
 bitmap/Makefile.in   |  562 -
 bitmap/README|   25 
 bitmap/ReqMach.c |3 
 bitmap/Requests.h|2 
 bitmap/aclocal.m4|  798 -
 bitmap/app-defaults/Bitmap   |  228 
 bitmap/app-defaults/Bitmap-color |   18 
 bitmap/app-defaults/Bitmap-nocase|  231 
 bitmap/atobm.c   |4 
 bitmap/bitmap.man|4 
 bitmap/bmtoa.c   |5 
 bitmap/compile   |   17 
 bitmap/config.guess  |  101 
 bitmap/config.h.in   |   35 
 bitmap/config.sub|  109 
 bitmap/configure | 5179 
++
 bitmap/configure.ac  |   24 
 bitmap/depcomp   |  172 
 bitmap/install-sh|  517 
 bitmap/missing   |  104 
 debian/changelog |   17 
 debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff |   26 
 debian/patches/03_xconsole_implicit_pointer_conversion.diff  |   16 
 debian/patches/05_xmore_fix_segv_without_xprint.diff |   15 
 debian/patches/06_xclock_geometry.diff   |   92 
 debian/patches/series|2 
 xclipboard/ChangeLog |  325 
 xclipboard/INSTALL   |  236 
 xclipboard/Makefile.am   |   40 
 xclipboard/Makefile.in   |  472 
 xclipboard/README|   28 
 xclipboard/XClipboard.ad |  126 
 xclipboard/aclocal.m4| 1913 ++-
 xclipboard/app-defaults/XClipboard   |  126 
 xclipboard/compile   |  142 
 xclipboard/config.guess  |  107 
 xclipboard/config.h.in   |   42 
 xclipboard/config.sub|  128 
 xclipboard/configure | 4337 
+---
 xclipboard/configure.ac  |   22 
 xclipboard/depcomp   |  172 
 xclipboard/install-sh|  517 
 xclipboard/missing   |  104 
 xclipboard/mkinstalldirs |  158 
 xclipboard/xclipboard.c  |  131 
 xclipboard/xcutsel.c |2 
 xclock/COPYING   |   82 
 xclock/ChangeLog |   97 
 xclock/Clock.c   |  442 
 xclock/Clock.h   |   14 
 xclock/ClockP.h  |   12 
 xclock/INSTALL

x11-apps: Changes to 'debian-unstable'

2009-12-06 Thread Brice Goglin 
 debian/changelog |5 
 debian/control   |1 
 debian/rules |2 
 ico/COPYING  |   65 
 ico/ChangeLog|  217 ++
 ico/Makefile.am  |   79 
 ico/Makefile.in  |  674 +++
 ico/aclocal.m4   | 1519 
 ico/allobjs.h|5 
 ico/config.guess | 1500 +++
 ico/config.h.in  |   31 
 ico/config.sub   | 1616 +
 ico/configure| 5207 +++
 ico/configure.ac |   44 
 ico/depcomp  |  584 ++
 ico/ico.c| 1330 ++
 ico/ico.man  |   92 
 ico/install-sh   |  507 +
 ico/missing  |  367 +++
 ico/objcube.h|   29 
 ico/objico.h |   45 
 ico/objocta.h|   29 
 ico/objplane.h   |   20 
 ico/objpyr.h |   30 
 ico/polyinfo.h   |   31 
 25 files changed, 14026 insertions(+), 3 deletions(-)

New commits:
commit f2b782b5aab0c06961af590dcbf8935803edd5cf
Author: Brice Goglin bgog...@debian.org
Date:   Sun Dec 6 12:18:11 2009 +0100

Prepare Changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 0747100..366cc6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.5+1) UNRELEASED; urgency=low
+x11-apps (7.5+1) unstable; urgency=low
 
   [ Julien Cristau ]
   * Update xload config.{guess,sub}, adding avr32 support (closes: #536410)

commit aef1a09a05bdf0ccc37c3c45d2620a67c20d4b6f
Author: Brice Goglin bgog...@debian.org
Date:   Sun Dec 6 12:23:26 2009 +0100

Add ico, version 1.0.2

diff --git a/debian/changelog b/debian/changelog
index 00a57bf..0747100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x11-apps (7.5+1) UNRELEASED; urgency=low
 #549457).  Thanks!
 
   [ Brice Goglin ]
+  * Add ico 1.0.2, closes: #518383.
   * bitmap 1.0.4.
   * xclipboard 1.1.0.
 + Add UTF8 support, closes: #489998.
@@ -21,7 +22,7 @@ x11-apps (7.5+1) UNRELEASED; urgency=low
   * xwud 1.0.2.
   * Refresh patches.
 
- -- Brice Goglin bgog...@debian.org  Sun, 06 Dec 2009 12:09:46 +0100
+ -- Brice Goglin bgog...@debian.org  Sun, 06 Dec 2009 12:23:46 +0100
 
 x11-apps (7.4+2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4575e29..8725b7a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libpng12-dev,
 # debhelper for the packaging, pkg-config needed by configure scripts
 # Individual apps:
 # bitmap: libx11-dev, libxmu-dev, xbitmaps, libxt-dev
+# ico: libx11-dev
 # oclock: libx11-dev, libxmu-dev, libxext-dev
 # x11perf: libx11-dev, libxmuu-dev, libxrender-dev, libxft-dev, libxext-dev
 # xbiff: xbitmaps, libxext-dev
diff --git a/debian/rules b/debian/rules
index a524e8b..3708ce7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ include debian/xsfbs/xsfbs.mk
 
 # This package contains multiple modules as shipped by upstream. Each module 
is # contained in a subdirectory in the root dir of the package. You must list 
each
 # subdirectory explicitly so that the build system knows what to build
-DEF_SUBDIRS=bitmap oclock x11perf xbiff xcalc xclipboard xclock xconsole 
xcursorgen xditview xedit xeyes xgc xload xlogo xmag xman xmore xwd xwud
+DEF_SUBDIRS=bitmap ico oclock x11perf xbiff xcalc xclipboard xclock xconsole 
xcursorgen xditview xedit xeyes xgc xload xlogo xmag xman xmore xwd xwud
 SUBDIRS=$(DEF_SUBDIRS)
 BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
 
diff --git a/ico/AUTHORS b/ico/AUTHORS
new file mode 100644
index 000..e69de29
diff --git a/ico/COPYING b/ico/COPYING
new file mode 100644
index 000..15697a8
--- /dev/null
+++ b/ico/COPYING
@@ -0,0 +1,65 @@
+Copyright (c) 1987, 1994  X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the Software), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the X Consortium.
+
+
+Copyright 1987 by Digital Equipment Corporation,

x11-apps: Changes to 'debian-unstable'

2009-12-06 Thread Brice Goglin 
 debian/changelog |7 +++
 debian/control   |1 +
 debian/copyright |6 +++---
 3 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 3ba1ef1815fe8d0f48234610e7adfc8655d0aca6
Author: Brice Goglin bgog...@debian.org
Date:   Sun Dec 6 12:45:00 2009 +0100

Update debian/copyright and package description

diff --git a/debian/changelog b/debian/changelog
index 366cc6f..d192a02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-apps (7.5+2) UNRELEASED; urgency=low
+
+  * Update debian/copyright and package description according
+to ico and xedit additions.
+
+ -- Brice Goglin bgog...@debian.org  Sun, 06 Dec 2009 12:43:38 +0100
+
 x11-apps (7.5+1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 8725b7a..2bbcd85 100644
--- a/debian/control
+++ b/debian/control
@@ -52,6 +52,7 @@ Description: X applications
  This package provides a miscellaneous assortment of X applications
  that ship with the X Window System, including:
   - atobm, bitmap, and bmtoa, tools for manipulating bitmap images;
+  - ico, a demo program animating polyhedrons;
   - oclock and xclock, graphical clocks;
   - xbiff, a tool which tells you when you have new email;
   - xcalc, a scientific calculator desktop accessory;
diff --git a/debian/copyright b/debian/copyright
index a0a8577..7b5059c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 The contents of this package were downloaded from
 http://xorg.freedesktop.org/releases/individual/app/
-It contains the bitmap, x11perf, xcalc, xclock, xcursorgen, xload, xmag,
-xmore, xwud, oclock, xbiff, xclipboard, xconsole, xditview, xeyes, xgc, xlogo,
-xman and xwd applications.
+It contains the bitmap, ico, oclock, x11perf, xbiff, xcalc, xclipboard,
+xclock, xcursorgen, xconsole, xditview, xedit, xeyes, xgc, xload, xlogo,
+xmag, xman, xmore, xmd and xwd applications.
 
 bitmap:
   Copyright 1988, 1993, 1998  The Open Group


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

x11-apps: Changes to 'debian-unstable'

2009-12-06 Thread Julien Cristau 
 debian/copyright |  229 +++
 1 file changed, 229 insertions(+)

New commits:
commit 6e1bd571ad862ca34b003731627b3acfd6221ccf
Author: Julien Cristau jcris...@debian.org
Date:   Sun Dec 6 15:50:28 2009 +0100

Add copyright notices and licenses for xedit

diff --git a/debian/copyright b/debian/copyright
index e310e67..909ee70 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -336,6 +336,168 @@ xditview:
   other dealings in this Software without prior written authorization
   from the X Consortium.
 
+xedit:
+  Copyright (c) 1987, 1993
+   The Regents of the University of California.  All rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+  3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+   This product includes software developed by the University of
+   California, Berkeley and its contributors.
+  4. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+  
+  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+  
+  
+  Copyright (c) 1994
+   The Regents of the University of California.  All rights reserved.
+  
+  This code is derived from software contributed to Berkeley by
+  Jan-Simon Pendry.
+  
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+  3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+   This product includes software developed by the University of
+   California, Berkeley and its contributors.
+  4. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+  
+  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+  
+  
+ COPYRIGHT 1987
+  DIGITAL EQUIPMENT CORPORATION
+  MAYNARD, MASSACHUSETTS
+   ALL RIGHTS RESERVED.
+  
+  THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
+  SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
+  DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE FOR
+  ANY PURPOSE.  IT IS SUPPLIED AS IS WITHOUT EXPRESS OR IMPLIED WARRANTY.
+  
+  IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT RIGHTS,
+  APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN

x11-apps: Changes to 'debian-unstable'

2009-12-06 Thread Brice Goglin 
 debian/changelog |3 
 x11perf/ChangeLog|   33 
 x11perf/Makefile.am  |   10 
 x11perf/Makefile.in  |  355 ++--
 x11perf/README   |   24 
 x11perf/aclocal.m4   | 1735 +++--
 x11perf/bitmaps.c|4 
 x11perf/config.guess |   55 
 x11perf/config.h.in  |   30 
 x11perf/config.sub   |   54 
 x11perf/configure| 4155 ++-
 x11perf/configure.ac |   12 
 x11perf/depcomp  |   87 -
 x11perf/do_blt.c |   21 
 x11perf/do_text.c|4 
 x11perf/do_traps.c   |   14 
 x11perf/install-sh   |5 
 x11perf/missing  |   49 
 x11perf/x11perf.c|   12 
 19 files changed, 4293 insertions(+), 2369 deletions(-)

New commits:
commit 55aacfe12f17dbbc57b508da94ecd58ba23aef5d
Author: Brice Goglin bgog...@debian.org
Date:   Sun Dec 6 20:54:58 2009 +0100

x11perf 1.5.1

diff --git a/debian/changelog b/debian/changelog
index d192a02..04a1112 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ x11-apps (7.5+2) UNRELEASED; urgency=low
 
   * Update debian/copyright and package description according
 to ico and xedit additions.
+  * x11pref 1.5.1.
 
- -- Brice Goglin bgog...@debian.org  Sun, 06 Dec 2009 12:43:38 +0100
+ -- Brice Goglin bgog...@debian.org  Sun, 06 Dec 2009 20:54:44 +0100
 
 x11-apps (7.5+1) unstable; urgency=low
 
diff --git a/x11perf/ChangeLog b/x11perf/ChangeLog
index 14bf773..26d382a 100644
--- a/x11perf/ChangeLog
+++ b/x11perf/ChangeLog
@@ -1,3 +1,36 @@
+commit 98ca2c35b05a2d248063047c50770a018e35e810
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Fri Oct 16 17:19:36 2009 -0700
+
+x11perf 1.5.1
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
+
+commit 266da0b9c176cf0dc615005bb0ad4aa585892bd8
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Fri Oct 16 17:17:41 2009 -0700
+
+Migrate to xorg macros 1.3  XORG_DEFAULT_OPTIONS
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
+
+commit 9851abff574fe041f4e3f45b39c61d943e3a7f86
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Thu Oct 1 14:54:20 2009 -0700
+
+Add README with pointers to mailing lists, bugzilla,  git
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
+
+commit c7f3c6652e9507e4303fd9ed913c593afb7447f0
+Author: Paulo Cesar Pereira de Andrade p...@mandriva.com.br
+Date:   Tue Jan 13 18:55:51 2009 -0200
+
+Ansification and compile warning fixes.
+
+  This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, and corrects
+make distcheck.
+
 commit 828c0323450eadaf040749c010918679f5e4fe53
 Author: Adam Jackson a...@redhat.com
 Date:   Fri Mar 7 16:51:53 2008 -0500
diff --git a/x11perf/Makefile.am b/x11perf/Makefile.am
index b820545..883dad3 100644
--- a/x11perf/Makefile.am
+++ b/x11perf/Makefile.am
@@ -28,7 +28,7 @@ LIBPATH = $(libdir)/X11/x11perfcomp
 x11perfcompdir = $(LIBPATH)
 dist_x11perfcomp_SCRIPTS = fillblnk perfboth perfratio Xmark
 
-AM_CFLAGS = $(XEXT_CFLAGS) $(XFT_CFLAGS) $(XRENDER_CFLAGS) $(X11PERF_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XEXT_CFLAGS) $(XFT_CFLAGS) $(XRENDER_CFLAGS) 
$(X11PERF_CFLAGS)
 x11perf_LDADD = $(XEXT_LIBS) $(XFT_LIBS) $(XRENDER_LIBS) $(X11PERF_LIBS) -lm
 
 x11perf_SOURCES =  \
@@ -58,7 +58,7 @@ appman_PRE = \
 Xmark.man
 
 x11perfcomp: x11pcomp.cpp
-   $(SED) s/LIBPATH/`echo $(LIBPATH) | sed -e s///\//g`/  
$(srcdir)/x11pcomp.cpp | \
+   $(AM_V_GEN)$(SED) s/LIBPATH/`echo $(LIBPATH) | sed -e 
s///\//g`/  $(srcdir)/x11pcomp.cpp | \
$(SED) s/XCOMM/\#/  $@
 
 
@@ -73,8 +73,6 @@ appman_DATA = $(appman_PRE:m...@app_man_suffix@)
 EXTRA_DIST += $(appman_PRE)
 CLEANFILES += $(appman_DATA)
 
-SED = sed
-
 # Strings to replace in man pages
 XORGRELSTRING = @PACKAGE_STRING@
   XORGMANNAME = X Version 11
@@ -95,7 +93,7 @@ MAN_SUBSTS = \
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 .man.$(APP_MAN_SUFFIX):
-   sed $(MAN_SUBSTS)  $  $@
+   $(AM_V_GEN)$(SED) $(MAN_SUBSTS)  $  $@
 
 EXTRA_DIST += ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
@@ -103,6 +101,6 @@ MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-   (GIT_DIR=$(top_srcdir)/.git git-log  .changelog.tmp  mv 
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git 
directory not found: installing possibly empty changelog.' 2)
+   $(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/x11perf/Makefile.in b/x11perf/Makefile.in
index 43b5bb0..71b033c 100644
--- a/x11perf/Makefile.in
+++ b/x11perf/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software

x11-apps: Changes to 'debian-unstable'

2009-10-03 Thread Julien Cristau 
 debian/changelog |2 ++
 debian/control   |   10 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit e8f3415228bfcace060ea6d1709ee1da2dcd2674
Author: Julien Cristau jcris...@debian.org
Date:   Sat Oct 3 17:09:29 2009 +0200

Fix long description using patch from Justin B Rye

diff --git a/debian/changelog b/debian/changelog
index 7f73d08..6c633e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ x11-apps (7.4+3) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Update xload config.{guess,sub}, adding avr32 support (closes: #536410)
+  * Improve the long description using patch from Justin B Rye (closes:
+#549457).  Thanks!
 
   [ Brice Goglin ]
   * xmag 1.0.3.
diff --git a/debian/control b/debian/control
index c0b234e..4575e29 100644
--- a/debian/control
+++ b/debian/control
@@ -48,19 +48,15 @@ Replaces: xbase-clients (= 1:7.2.ds2-3), bitmap, oclock, 
x11perf, xbiff,
  xcalc, xclipboard, xclock, xconsole, xcursorgen, xditview, xeyes, xgc,
  xload, xlogo, xmag, xman, xmore, xwd, xwud
 Description: X applications
- An X client is a program that interfaces with an X server (almost always via
- the X libraries), and thus with some input and output hardware like a
- graphics card, monitor, keyboard, and pointing device (such as a mouse).
- .
  This package provides a miscellaneous assortment of X applications
  that ship with the X Window System, including:
-  - bitmap, 
+  - atobm, bitmap, and bmtoa, tools for manipulating bitmap images;
   - oclock and xclock, graphical clocks;
   - xbiff, a tool which tells you when you have new email;
   - xcalc, a scientific calculator desktop accessory;
   - xclipboard, a tool to manage cut-and-pasted text selections;
   - xconsole, which monitors system console messages;
-  - xcursorgen;
+  - xcursorgen, a tool for creating X cursor files from PNGs;
   - xditview, a viewer for ditroff output;
   - xedit, a simple text editor for X;
   - xeyes, a demo program in which a pair of eyes track the pointer;
@@ -69,7 +65,7 @@ Description: X applications
   - xlogo, a demo program that displays the X logo;
   - xmag, which magnifies parts of the X screen;
   - xman, a manual page browser;
-  - xmore;
+  - xmore, a text pager;
   - xwd, a utility for taking window dumps (screenshots) of the X session;
   - xwud, a viewer for window dumps created by xwd;
   - Xmark, x11perf, and x11perfcomp, tools for benchmarking graphical


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

x11-apps: Changes to 'debian-unstable'

2009-09-04 Thread Brice Goglin 
 debian/changelog   |6 
 xmag/ChangeLog |   46 ++
 xmag/Makefile.am   |   26 -
 xmag/Makefile.in   |  112 ++---
 xmag/Xmag.ad   |   27 -
 xmag/aclocal.m4|  695 +-
 xmag/app-defaults/Xmag |   27 +
 xmag/config.h.in   |   30 +
 xmag/configure | 1001 ++---
 xmag/configure.ac  |   18 
 xmag/xmag.c|  110 +++--
 11 files changed, 1727 insertions(+), 371 deletions(-)

New commits:
commit c893f974277359b6fe930822013f2bbbe6fb7b2e
Author: Brice Goglin bgog...@debian.org
Date:   Fri Sep 4 13:42:42 2009 +0200

xmag 1.0.3

diff --git a/debian/changelog b/debian/changelog
index 4b48835..7f73d08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 x11-apps (7.4+3) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Update xload config.{guess,sub}, adding avr32 support (closes: #536410)
 
- -- Julien Cristau jcris...@debian.org  Sun, 02 Aug 2009 16:10:47 +0200
+  [ Brice Goglin ]
+  * xmag 1.0.3.
+
+ -- Brice Goglin bgog...@debian.org  Fri, 04 Sep 2009 13:41:15 +0200
 
 x11-apps (7.4+2) unstable; urgency=low
 
diff --git a/xmag/ChangeLog b/xmag/ChangeLog
index 206be17..aeb1411 100644
--- a/xmag/ChangeLog
+++ b/xmag/ChangeLog
@@ -1,3 +1,49 @@
+commit f1f2af7a65d6531814a06b292a28bdc46580e590
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Mon Aug 3 11:19:07 2009 -0700
+
+Version bump: 1.0.3
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
+
+commit 90ccae7efc5fca9c0f4e45b84806df01332dd869
+Author: Paulo Cesar Pereira de Andrade p...@mandriva.com.br
+Date:   Mon Jan 12 20:41:14 2009 -0200
+
+Correct problems in make distcheck.
+
+commit ae94046d8654b9f65df871502de0f08a36aa5d38
+Author: Julien Cristau jcris...@debian.org
+Date:   Tue Aug 19 01:04:40 2008 +0200
+
+xaw8 is gone, use xaw7
+
+commit 7ac72ce2e262bf78cb2e8ff50ef932d29e4b65f7
+Author: Julien Cristau jcris...@debian.org
+Date:   Tue Aug 19 01:04:27 2008 +0200
+
+allow build outside of source tree
+
+commit a3e1a9b4cb732b86b84375013e3fa531395b45cf
+Author: Paulo Cesar Pereira de Andrade p...@mandriva.com.br
+Date:   Tue Jul 29 14:18:10 2008 -0300
+
+Properly handle multiple depth windows.
+
+This patch will not cause X Errors when magnifying windows with portions
+offscreen, or windows with a dimension smaller than the default 64x64.
+
+A common case where this patch is required is when Composite is enabled,
+the default depth has a value other than 24, and some application is
+using the Composite argb visual; example is WindowMaker, that will choose
+the best available visual, unless the visual-id option is used.
+
+commit cb21acd94353c82c4b49a7ddef99309b31b07500
+Author: Jeremy Huddleston jerem...@freedesktop.org
+Date:   Thu Mar 27 20:08:04 2008 -0700
+
+Build fix for file systems that are not case sensitive
+
 commit a6b0036a082a947b89bdbb27128e20079799857c
 Author: Alan Coopersmith alan.coopersm...@sun.com
 Date:   Wed Aug 15 18:04:12 2007 -0700
diff --git a/xmag/Makefile.am b/xmag/Makefile.am
index 83c4dad..39de39e 100644
--- a/xmag/Makefile.am
+++ b/xmag/Makefile.am
@@ -40,25 +40,15 @@ appman_PRE = \
 
 # App default files  (*.ad)
 
-appdefaultdir = @appdefaultdir@
-
-
-APPDEFAULTFILES = \
-Xmag
-
-SUFFIXES = .ad
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
 
-.ad:
-   cp $ $@
-
-appdefault_DATA = $(APPDEFAULTFILES)
-
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
+appdefaultdir = @appdefaultdir@
 
-CLEANFILES = $(APPDEFAULTFILES)
+dist_appdefault_DATA = \
+app-defaults/Xmag
 
 # Developer documentation for Scale widget in Scale.c
-EXTRA_DIST += Scale.txt
+EXTRA_DIST = Scale.txt
 
 EXTRA_DIST += xmag.icon
 
@@ -67,7 +57,7 @@ appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:m...@app_man_suffix@)
 
 EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+CLEANFILES = $(appman_DATA)
 
 SED = sed
 
@@ -88,7 +78,7 @@ MAN_SUBSTS = \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 
-SUFFIXES += .$(APP_MAN_SUFFIX) .man
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 .man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS)  $  $@
@@ -99,6 +89,6 @@ MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-   (GIT_DIR=$(top_srcdir)/.git git-log  .changelog.tmp  mv 
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git 
directory not found: installing possibly empty changelog.' 2)
+   $(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/xmag/Makefile.in b/xmag/Makefile.in
index a8b555e..8fa0953 100644
--- a/xmag/Makefile.in
+++ b/xmag/Makefile.in
@@ -56,10 +56,11 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = xmag$(EXEEXT)
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-   $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-

x11-apps: Changes to 'debian-unstable'

2009-08-02 Thread Julien Cristau 
 debian/changelog   |6 
 xload/config.guess |  712 ++---
 xload/config.sub   |  275 +++-
 3 files changed, 614 insertions(+), 379 deletions(-)

New commits:
commit 2118d96ac9914d044fadbeab52e554778b466808
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 2 16:11:25 2009 +0200

Update xload config.{guess,sub}, adding avr32 support (closes: #536410)

diff --git a/debian/changelog b/debian/changelog
index 0ca6aa7..4b48835 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-apps (7.4+3) UNRELEASED; urgency=low
+
+  * Update xload config.{guess,sub}, adding avr32 support (closes: #536410)
+
+ -- Julien Cristau jcris...@debian.org  Sun, 02 Aug 2009 16:10:47 +0200
+
 x11-apps (7.4+2) unstable; urgency=low
 
   * Add xedit 1.1.2, closes: #499085, #505064.
diff --git a/xload/config.guess b/xload/config.guess
index 1e6f50b..da83314 100755
--- a/xload/config.guess
+++ b/xload/config.guess
@@ -1,12 +1,10 @@
 #! /bin/sh
-#
-# $NetBSD: config.guess,v 1.8 2004/08/14 19:13:55 schmonz Exp $
-#
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2004-06-11'
+timestamp='2009-04-27'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -20,13 +18,15 @@ timestamp='2004-06-11'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner p...@bothner.com.
 # Please send patches to config-patc...@gnu.org.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -56,8 +56,8 @@ version=\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -69,11 +69,11 @@ Try \`$me --help' for more information.
 while test $# -gt 0 ; do
   case $1 in
 --time-stamp | --time* | -t )
-   echo $timestamp ; exit 0 ;;
+   echo $timestamp ; exit ;;
 --version | -v )
-   echo $version ; exit 0 ;;
+   echo $version ; exit ;;
 --help | --h* | -h )
-   echo $usage; exit 0 ;;
+   echo $usage; exit ;;
 -- ) # Stop option processing
shift; break ;;
 - )# Use stdin as input.
@@ -107,7 +107,7 @@ set_cc_for_build='
 trap exitcode=\$?; (rm -f \$tmpfiles 2/dev/null; rmdir \$tmp 2/dev/null)  
exit \$exitcode 0 ;
 trap rm -f \$tmpfiles 2/dev/null; rmdir \$tmp 2/dev/null; exit 1 1 2 13 15 
;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077  mktemp -d -q $TMPDIR/cgXX) 2/dev/null`  test -n 
$tmp  test -d $tmp ; } ||
+ { tmp=`(umask 077  mktemp -d $TMPDIR/cgXX) 2/dev/null`  test -n 
$tmp  test -d $tmp ; } ||
  { test -n $RANDOM  tmp=$TMPDIR/cg$$-$RANDOM  (umask 077  mkdir $tmp) 
; } ||
  { tmp=$TMPDIR/cg-$$  (umask 077  mkdir $tmp)  echo Warning: creating 
insecure temp directory 2 ; } ||
  { echo $me: cannot create a temporary directory in $TMPDIR 2 ; exit 1 ; } 
;
@@ -126,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (gh...@noc.rutgers.edu 1994-08-24)
@@ -200,64 +200,23 @@ case 
${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION} in
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo ${machine}-${os}${release}
-   exit 0 ;;
-amd64:OpenBSD:*:*)
-   echo x86_64-unknown-openbsd${UNAME_RELEASE}
-   exit 0 ;;
-amiga:OpenBSD:*:*)
-   echo m68k-unknown-openbsd${UNAME_RELEASE}
-   exit 0 ;;
-arc:OpenBSD:*:*)
-   echo mipsel-unknown-openbsd${UNAME_RELEASE}
-   exit 0 ;;
-cats:OpenBSD:*:*)
-   echo arm-unknown-openbsd${UNAME_RELEASE}
-   exit 0 ;;
-hp300:OpenBSD:*:*)
-   echo

x11-apps: Changes to 'debian-unstable'

2009-07-27 Thread Brice Goglin 
 debian/changelog|7 
 debian/control  |4 
 debian/rules|2 
 debian/x11-apps.install |1 
 debian/x11-apps.menu|6 
 xedit/AUTHORS   |  143 
 xedit/COPYING   |  176 
 xedit/ChangeLog |  796 +++
 xedit/Makefile.am   |  283 +
 xedit/Makefile.in   | 1640 +++
 xedit/README|  604 ++
 xedit/aclocal.m4| 1587 +++
 xedit/app-defaults/Xedit-color.ad   |  195 
 xedit/app-defaults/Xedit-noxprint.ad|  468 ++
 xedit/app-defaults/Xedit-sample |  233 +
 xedit/app-defaults/Xedit-xprint.ad  |  565 ++
 xedit/commands.c| 1196 +
 xedit/compile   |  142 
 xedit/config.guess  | 1526 ++
 xedit/config.h.in   |   34 
 xedit/config.sub| 1658 +++
 xedit/configure | 6237 
 xedit/configure.ac  |   72 
 xedit/depcomp   |  589 ++
 xedit/hash.c|  322 +
 xedit/hook.c| 1265 +
 xedit/install-sh|  519 ++
 xedit/ispell.c  | 2229 ++
 xedit/lisp.c|  274 +
 xedit/lisp/README   |  195 
 xedit/lisp/TODO |   81 
 xedit/lisp/bytecode.c   | 3696 
 xedit/lisp/bytecode.h   |  268 +
 xedit/lisp/compile.c| 2224 ++
 xedit/lisp/core.c   | 7024 
 xedit/lisp/core.h   |  221 +
 xedit/lisp/debugger.c   |  828 +++
 xedit/lisp/debugger.h   |   72 
 xedit/lisp/env.c|  151 
 xedit/lisp/format.c | 2121 +
 xedit/lisp/format.h |   42 
 xedit/lisp/hash.c   |  659 +++
 xedit/lisp/hash.h   |   71 
 xedit/lisp/helper.c | 1126 +
 xedit/lisp/helper.h |  115 
 xedit/lisp/internal.h   |  800 +++
 xedit/lisp/io.c |  717 +++
 xedit/lisp/io.h |  115 
 xedit/lisp/lisp.c   | 5491 +
 xedit/lisp/lisp.h   |   44 
 xedit/lisp/lsp.c|   79 
 xedit/lisp/math.c   | 1477 ++
 xedit/lisp/math.h   |  100 
 xedit/lisp/mathimp.c| 5223 +++
 xedit/lisp/modules/indent.lsp   | 1426 ++
 xedit/lisp/modules/lisp.lsp |  174 
 xedit/lisp/modules/progmodes/auto.lsp   |  110 
 xedit/lisp/modules/progmodes/c.lsp  | 1140 +
 xedit/lisp/modules/progmodes/html.lsp   |  327 +
 xedit/lisp/modules/progmodes/imake.lsp  |  188 
 xedit/lisp/modules/progmodes/lisp.lsp   |  384 +
 xedit/lisp/modules/progmodes/make.lsp   |  135 
 xedit/lisp/modules/progmodes/man.lsp|  160 
 xedit/lisp/modules/progmodes/patch.lsp  |   55 
 xedit/lisp/modules/progmodes/perl.lsp   |  507 ++
 xedit/lisp/modules/progmodes/python.lsp |  306 +
 xedit/lisp/modules/progmodes/rpm.lsp|  166 
 xedit/lisp/modules/progmodes/sgml.lsp   |  428 +
 xedit/lisp/modules/progmodes/sh.lsp |  113 
 xedit/lisp/modules/progmodes/xconf.lsp  |   68 
 xedit/lisp/modules/progmodes/xlog.lsp   |  102 
 xedit/lisp/modules/progmodes/xrdb.lsp   |  115 
 xedit/lisp/modules/psql.c   |  983 
 xedit/lisp/modules/syntax.lsp   | 1452 ++
 xedit/lisp/modules/x11.c|  666 +++
 xedit/lisp/modules/xaw.c|  664 +++
 xedit/lisp/modules/xedit.lsp|  569 ++
 xedit/lisp/modules/xt.c | 1799 
 xedit/lisp/mp/mp.c  |  822 +++
 xedit/lisp/mp/mp.h  |  435 +
 xedit/lisp/mp/mpi.c | 1660 +++
 xedit/lisp/mp/mpr.c |  436 +
 xedit/lisp/package.c|  849 +++
 xedit/lisp/package.h|   62 
 xedit/lisp/pathname.c   | 1096 
 xedit/lisp/pathname.h   |   78 
 xedit/lisp/private.h|  537 ++
 xedit/lisp/re/README|  121 
 xedit/lisp/re/re.c  | 2649 
 xedit/lisp/re/re.h  |  123 
 xedit/lisp/re/rec.c | 1015 
 xedit/lisp/re/reo.c |  685 +++
 xedit/lisp/re/rep.h |  369 +
 xedit/lisp/re/tests.c   |  199 
 xedit/lisp/re/tests.txt |  470 ++
 xedit/lisp/read.c

x11-apps: Changes to 'debian-unstable'

2009-06-10 Thread Julien Cristau 
 debian/README.source |   73 
+
 debian/changelog |6 
 debian/control   |4 
 debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff |4 
 debian/patches/05_xmore_fix_segv_without_xprint.diff |6 
 debian/patches/series|4 
 debian/xsfbs/repack.sh   |   32 
 debian/xsfbs/xsfbs.sh|   78 
--
 8 files changed, 118 insertions(+), 89 deletions(-)

New commits:
commit d707de5dc059aeef50929604f9b153c55b6c80bb
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jun 10 15:30:59 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 51a0b8c..0c0c6a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.4+1) UNRELEASED; urgency=low
+x11-apps (7.4+1) unstable; urgency=low
 
   [ Brice Goglin ]
   * xwd 1.0.2.
@@ -11,7 +11,7 @@ x11-apps (7.4+1) UNRELEASED; urgency=low
   * Add README.source, bump Standards-Version to 3.8.1.
   * Fix patches to apply with -p1; silences lintian.
 
- -- Brice Goglin bgog...@debian.org  Tue, 01 Jul 2008 20:37:59 +0200
+ -- Julien Cristau jcris...@debian.org  Wed, 10 Jun 2009 15:30:56 +0200
 
 x11-apps (7.3+4) unstable; urgency=low
 

commit 897f5f5089dc774a1f64a1b5b4c5f3dfda496b74
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jun 10 15:29:58 2009 +0200

Document that xwd doesn't need xmuu anymore

diff --git a/debian/control b/debian/control
index 169086e..4855682 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libpng12-dev,
 # xmag: libxaw7-dev, libxt-dev
 # xman: libxaw7-dev, libxt-dev
 # xmore: libxaw7-dev, libxt-dev
-# xwd: libxmuu-dev, libx11-dev
+# xwd: libx11-dev
 # xwud: libx11-dev
 Standards-Version: 3.8.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps

commit 0435cd45a3b15eef111f03b0c14daaa400d28316
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jun 10 15:23:26 2009 +0200

Fix patches to apply with -p1; silences lintian.

diff --git a/debian/changelog b/debian/changelog
index 47f6770..51a0b8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11-apps (7.4+1) UNRELEASED; urgency=low
   * xload 1.0.2
 + drop patch 04_SECURITY_setuid.diff, included upstream.
   * Add README.source, bump Standards-Version to 3.8.1.
+  * Fix patches to apply with -p1; silences lintian.
 
  -- Brice Goglin bgog...@debian.org  Tue, 01 Jul 2008 20:37:59 +0200
 
diff --git a/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff 
b/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
index f67abc4..1678de2 100644
--- a/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
+++ b/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
@@ -12,8 +12,8 @@ Not submitted upstream to XFree86 or X.Org.
 
 Index: xwd/dsimple.c
 ===
 xwd/dsimple.c.orig 2007-02-11 08:15:57.0 +0100
-+++ xwd/dsimple.c  2007-02-11 08:16:10.0 +0100
+--- a/xwd/dsimple.c.orig   2007-02-11 08:15:57.0 +0100
 b/xwd/dsimple.c2007-02-11 08:16:10.0 +0100
 @@ -188,8 +188,7 @@
if (d == NULL) {
fprintf (stderr, %s:  unable to open display '%s'\n,
diff --git a/debian/patches/05_xmore_fix_segv_without_xprint.diff 
b/debian/patches/05_xmore_fix_segv_without_xprint.diff
index 9fd1cd9..ea9afd2 100644
--- a/debian/patches/05_xmore_fix_segv_without_xprint.diff
+++ b/debian/patches/05_xmore_fix_segv_without_xprint.diff
@@ -1,8 +1,8 @@
 This patch by Eugene Konev.
 
-diff -u a/xbase-clients/xmore/xmore.c b/xbase-clients/xmore/xmore.c
 a/xbase-clients/xmore/xmore.c  Sun Apr 30 13:40:29 2006 +0800
-+++ b/app/xbase-clients/xmore/xmore.c  Sun Apr 30 13:40:40 2006 +0800
+diff -u a/xmore/xmore.c b/xmore/xmore.c
+--- a/xmore/xmore.cSun Apr 30 13:40:29 2006 +0800
 b/xmore/xmore.cSun Apr 30 13:40:40 2006 +0800
 @@ -150,7 +150,9 @@ static void
  static void
  printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData)
diff --git a/debian/patches/series b/debian/patches/series
index 67ee9ed..7a16eb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-01_xwd_do_not_spew_usage_on_connection_error.diff -p0
+01_xwd_do_not_spew_usage_on_connection_error.diff
 #02_xedit_manpage_typos.diff
 03_xconsole_implicit_pointer_conversion.diff
-05_xmore_fix_segv_without_xprint.diff -p2
+05_xmore_fix_segv_without_xprint.diff
 06_xclock_geometry.diff

commit 9eb4742668b0a2ebfcd8280ff63f6b75327f2474
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jun 10 15:08:27 2009 +0200

Bump Standards-Version

diff --git

x11-apps: Changes to 'debian-unstable'

2008-11-16 Thread Julien Cristau 
 debian/changelog   |   10 
 debian/control |8 
 debian/copyright   |   26 
 debian/patches/04_SECURITY_setuid.diff |   32 
 debian/patches/series  |3 
 debian/rules   |2 
 debian/x11-apps.install|1 
 debian/x11-apps.menu   |7 
 debian/x11-apps.postinst.in|   20 
 debian/x11-apps.postrm.in  |   20 
 debian/x11-apps.preinst.in |   20 
 xedit/COPYING  |   12 
 xedit/ChangeLog|   65 
 xedit/INSTALL  |  236 -
 xedit/Makefile.am  |  235 -
 xedit/Makefile.in  | 1491 ---
 xedit/Xedit-color.ad   |  195 
 xedit/Xedit-noxprint.ad|  462 --
 xedit/Xedit-sample |  233 -
 xedit/Xedit-xprint.ad  |  562 --
 xedit/aclocal.m4   | 1581 ---
 xedit/commands.c   | 1185 -
 xedit/compile  |  142 
 xedit/config.guess | 1500 ---
 xedit/config.h.in  |   22 
 xedit/config.sub   | 1608 ---
 xedit/configure| 5632 --
 xedit/configure.ac |   54 
 xedit/depcomp  |  530 --
 xedit/hook.c   | 1236 -
 xedit/install-sh   |  323 -
 xedit/ispell.c | 2207 --
 xedit/lisp.c   |  274 -
 xedit/lisp/README  |  195 
 xedit/lisp/TODO|   81 
 xedit/lisp/bytecode.c  | 3693 -
 xedit/lisp/bytecode.h  |  268 -
 xedit/lisp/compile.c   | 2224 --
 xedit/lisp/core.c  | 7022 -
 xedit/lisp/core.h  |  221 -
 xedit/lisp/debugger.c  |  828 ---
 xedit/lisp/debugger.h  |   72 
 xedit/lisp/env.c   |  151 
 xedit/lisp/format.c| 2121 -
 xedit/lisp/format.h|   42 
 xedit/lisp/hash.c  |  661 ---
 xedit/lisp/hash.h  |   71 
 xedit/lisp/helper.c| 1126 -
 xedit/lisp/helper.h|  115 
 xedit/lisp/internal.h  |  798 ---
 xedit/lisp/io.c|  709 ---
 xedit/lisp/io.h|  115 
 xedit/lisp/lisp.c  | 5511 -
 xedit/lisp/lisp.h  |   44 
 xedit/lisp/lsp.c   |   79 
 xedit/lisp/math.c  | 1477 --
 xedit/lisp/math.h  |  100 
 xedit/lisp/mathimp.c   | 5223 
 xedit/lisp/modules/indent.lsp  | 1420 --
 xedit/lisp/modules/lisp.lsp|  174 
 xedit/lisp/modules/progmodes/c.lsp | 1116 -
 xedit/lisp/modules/progmodes/html.lsp  |  327 -
 xedit/lisp/modules/progmodes/imake.lsp |  188 
 xedit/lisp/modules/progmodes/lisp.lsp  |  384 -
 xedit/lisp/modules/progmodes/make.lsp  |  135 
 xedit/lisp/modules/progmodes/man.lsp   |  160 
 xedit/lisp/modules/progmodes/patch.lsp |   55 
 xedit/lisp/modules/progmodes/rpm.lsp   |  166 
 xedit/lisp/modules/progmodes/sgml.lsp  |  428 --
 xedit/lisp/modules/progmodes/sh.lsp|  113 
 xedit/lisp/modules/progmodes/xconf.lsp |   68 
 xedit/lisp/modules/progmodes/xlog.lsp  |  102 
 xedit/lisp/modules/progmodes/xrdb.lsp  |  115 
 xedit/lisp/modules/psql.c  |  983 
 xedit/lisp/modules/syntax.lsp  | 1452 --
 xedit/lisp/modules/x11.c   |  666 ---
 xedit/lisp/modules/xaw.c   |  664 ---
 xedit/lisp/modules/xedit.lsp   |  563 --
 xedit/lisp/modules/xt.c| 1799 
 xedit/lisp/mp/mp.c |  822 ---
 xedit/lisp/mp/mp.h |  435 --
 xedit/lisp/mp/mpi.c| 1660 ---
 xedit/lisp/mp/mpr.c|  436 --
 xedit/lisp/package.c   |  865 
 xedit/lisp/package.h   |   62 
 xedit/lisp/pathname.c  | 1096 -
 xedit/lisp/pathname.h  |   78 
 xedit/lisp/private.h   |  544 --
 xedit/lisp/re/README   |  121 
 xedit/lisp/re/re.c | 2648 
 xedit/lisp/re/re.h |  123 
 xedit/lisp/re/rec.c| 1015 
 xedit/lisp/re/reo.c|  685 ---
 xedit/lisp/re/rep.h|  369 -
 xedit/lisp/re/tests.c  |  199 
 xedit/lisp/re/tests.txt|  461 --
 xedit/lisp/read.c  | 2057 -

x11-apps: Changes to 'debian-unstable'

2008-08-02 Thread Julien Cristau 
 debian/changelog   |   12 
 debian/patches/06_xclock_geometry.diff |   92 +
 debian/patches/series  |1 
 debian/rules   |   44 +++
 debian/xsfbs/xsfbs.mk  |   29 +++---
 5 files changed, 138 insertions(+), 40 deletions(-)

New commits:
commit 39f9578dda821bd25de49e4501ad80c3ad103936
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Aug 3 00:25:39 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 aac04c7..4a95877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 x11-apps (7.4+1) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * xwd 1.0.2.
 
+  [ Julien Cristau ]
+  * Add support for parallel=n in DEB_BUILD_OPTIONS, and for actually building
+the apps in parallel.  Install is still sequential, at least for now.
+
  -- Brice Goglin [EMAIL PROTECTED]  Tue, 01 Jul 2008 20:37:59 +0200
 
 x11-apps (7.3+3) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 166e18d..a524e8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,15 +16,17 @@ include debian/xsfbs/xsfbs.mk
 # subdirectory explicitly so that the build system knows what to build
 DEF_SUBDIRS=bitmap oclock x11perf xbiff xcalc xclipboard xclock xconsole 
xcursorgen xditview xedit xeyes xgc xload xlogo xmag xman xmore xwd xwud
 SUBDIRS=$(DEF_SUBDIRS)
+BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
 else
CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+   NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
+   MAKEFLAGS += -j$(NUMJOBS)
 endif
 
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -36,25 +38,23 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-
 build: build-stamp
-build-stamp: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
-   dh_testdir
-   for FILE in $(DEF_SUBDIRS); do \
-   echo $$FILE ; \
-   mkdir $$FILE-obj-$(DEB_BUILD_GNU_TYPE); \
-   (cd $$FILE-obj-$(DEB_BUILD_GNU_TYPE)  \
-   ../$$FILE/configure --prefix=/usr 
--mandir=\$${prefix}/share/man \
---infodir=\$${prefix}/share/info $(confflags) \
---disable-xprint \
-
--with-sysmanpath=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man:/usr/X11R6/man:/opt/man
 \
-CFLAGS=$(CFLAGS) \
-RSH=rsh \
-MANCONF=/etc/manpath.config  \
-   $(MAKE)) || exit 1; \
-   done
-
-   touch build-stamp
+build-stamp: $(BUILD_STAMPS)
+   $@
+
+$(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
+   mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE)
+
+   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  \
+   ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(confflags) \
+ --disable-xprint \
+ 
--with-sysmanpath=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man:/usr/X11R6/man:/opt/man
 \
+ CFLAGS=$(CFLAGS) \
+ RSH=rsh \
+ MANCONF=/etc/manpath.config
+   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   $@
 
 clean: xsfclean
dh_testdir

commit 783e192321607a27c3958635c9bbcb24b376c0e8
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Aug 2 18:51:42 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index c42d4a0..b0c8ed5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11-apps (7.3+3) UNRELEASED; urgency=low
+x11-apps (7.3+3) unstable; urgency=low
 
   * xclock: Fix geometry computation (closes: #443227).
   * debian/rules, xsfbs: fix rules dependencies.
 
- -- Julien Cristau [EMAIL PROTECTED]  Sat, 02 Aug 2008 18:23:52 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Sat, 02 Aug 2008 18:45:33 +0200
 
 x11-apps (7.3+2) unstable; urgency=low
 

commit 14e9a4d5f9fe2b8a2c843a95d21ddbe70011776e
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Aug 2 18:45:12 2008 +0200

debian/rules, xsfbs: fix rules dependencies.

diff --git a/debian/changelog b/debian/changelog
index a801cc3..c42d4a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11-apps (7.3+3) UNRELEASED; urgency=low
 
   * xclock: Fix geometry computation (closes: #443227).
+  * debian/rules, xsfbs: fix rules dependencies.
 
  -- Julien Cristau [EMAIL PROTECTED]  Sat,

x11-apps: Changes to 'debian-unstable'

2008-07-01 Thread Brice Goglin 
 debian/changelog  |6 
 xwd/ChangeLog |  226 +
 xwd/INSTALL   |  236 -
 xwd/Makefile.am   |   12 
 xwd/Makefile.in   |  210 +++--
 xwd/aclocal.m4|  273 --
 xwd/clientwin.c   |  214 +
 xwd/clientwin.h   |   29 
 xwd/config.guess  |  133 ++-
 xwd/config.h.in   |   12 
 xwd/config.sub|  102 ++
 xwd/configure | 2218 +++---
 xwd/configure.ac  |5 
 xwd/depcomp   |   93 +-
 xwd/dsimple.c |  320 ---
 xwd/dsimple.h |   22 
 xwd/install-sh|  514 
 xwd/missing   |   61 -
 xwd/mkinstalldirs |  158 ---
 xwd/xwd.c |   19 
 xwd/xwd.man   |2 
 21 files changed, 2739 insertions(+), 2126 deletions(-)

New commits:
commit 6b0b02d0079e0eec8f4e8107d7f3ba8b745b2035
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Tue Jul 1 20:39:26 2008 +0200

xwd 1.0.2

diff --git a/debian/changelog b/debian/changelog
index b9d5f50..2f2e847 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-apps (7.4+1) UNRELEASED; urgency=low
+
+  * xwd 1.0.2.
+
+ -- Brice Goglin [EMAIL PROTECTED]  Tue, 01 Jul 2008 20:37:59 +0200
+
 x11-apps (7.3+2) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/xwd/ChangeLog b/xwd/ChangeLog
index a7722ec..d56ee23 100644
--- a/xwd/ChangeLog
+++ b/xwd/ChangeLog
@@ -1,31 +1,219 @@
-2005-12-20  Kevin E. Martin  kem-at-freedesktop-dot-org
+commit 37401df6799722d16bc02c52b241cf2ef5070b7d
+Author: James Cloos [EMAIL PROTECTED]
+Date:   Sun Jun 29 10:46:59 2008 -0400
 
-   * configure.ac:
-   Update package version for X11R7 release.
+xwd 1.0.2
 
-2005-12-14  Kevin E. Martin  kem-at-freedesktop-dot-org
+commit f9725928e875035bd2a96621aa8f861160e85dd7
+Author: Kim Woelders [EMAIL PROTECTED]
+Date:   Sun Jun 22 01:16:49 2008 -0400
 
-   * configure.ac:
-   Update package version number for final X11R7 release candidate.
+Remove unused code, ANSIfy, add const.
+
+Signed-off-by: James Cloos [EMAIL PROTECTED]
 
-2005-12-06  Kevin E. Martin  kem-at-freedesktop-dot-org
+commit 3dcc66bbbc74c41c2b4509a785c3688fd75387a1
+Author: Kim Woelders [EMAIL PROTECTED]
+Date:   Sun Jun 22 01:16:08 2008 -0400
 
-   * Makefile.am:
-   Change *man_SOURCES == *man_PRE to fix autotools warnings.
+Fix window selection by pointer.
+
+This should fix things in WM’s using virtual roots as well as in tabbing 
WM’s.
+
+Signed-off-by: James Cloos [EMAIL PROTECTED]
 
-2005-12-03  Kevin E. Martin  kem-at-freedesktop-dot-org
+commit 23b60f871f76878572b2acec59dd6c47e3acd0e0
+Author: Jeremy Huddleston [EMAIL PROTECTED]
+Date:   Sun Apr 13 22:30:21 2008 -0700
 
-   * configure.ac:
-   Update package version number for X11R7 RC3 release.
+Added missing AM_PROG_CC_C_O
 
-2005-11-20  Alan Coopersmith  [EMAIL PROTECTED]
+commit f686dfebf0816630664d5fe024fae3710ac8c103
+Author: Niveditha Rau [EMAIL PROTECTED]
+Date:   Fri Feb 15 16:41:10 2008 -0800
 
-   * configure.ac:
-   Change dependency from xmu to xmuu since the full xmu
-   (with all its baggage like Xt) is not needed here.
+Add -silent to options in man page synopsis
 
-2005-10-18  Kevin E. Martin  kem-at-freedesktop-dot-org
+commit 2e522aa858ded39209036ebb956c9ea3257d3668
+Author: James Cloos [EMAIL PROTECTED]
+Date:   Thu Dec 6 16:37:11 2007 -0500
 
-   * configure.ac:
-   Update package version number for RC1 release.
+Replace static ChangeLog with dist-hook to generate from git log
 
+commit e5d381ba7a3d06090c5352bd5c39601ec1abcfbe
+Author: James Cloos [EMAIL PROTECTED]
+Date:   Mon Sep 3 05:51:34 2007 -0400
+
+Add *~ to .gitignore to skip patch/emacs droppings
+
+commit a905f2d72bc3b09a4a2eb3046771dc4331b920c9
+Author: James Cloos [EMAIL PROTECTED]
+Date:   Thu Aug 23 19:24:53 2007 -0400
+
+Rename .cvsignore to .gitignore
+
+commit 1a6550aebfd3c675c0d75c8a23aaa94baca6761a
+Author: Kevin E Martin [EMAIL PROTECTED]
+Date:   Wed Dec 21 02:29:32 2005 +
+
+Update package version for X11R7 release.
+
+commit b840d879c0e514728da5f6aad94723c87e17f294
+Author: Adam Jackson [EMAIL PROTECTED]
+Date:   Mon Dec 19 16:22:25 2005 +
+
+Stub COPYING files
+
+commit 9023b24530ccaf71c2375dc1031baf743f1610c2
+Author: Kevin E Martin [EMAIL PROTECTED]
+Date:   Thu Dec 15 00:23:50 2005 +
+
+Update package version number for final X11R7 release candidate.
+
+commit 7e0ff968e8dab09792ff802b1433c68d4e3f6d2d
+Author: Kevin E Martin [EMAIL PROTECTED]
+Date:   Tue Dec 6 22:48:05 2005 +
+
+Change *man_SOURCES == *man_PRE to fix autotools warnings.
+
+commit e63fca21475fc1a9993733868f3d61edfc9d
+Author: Kevin E Martin [EMAIL PROTECTED]
+Date:   Sat Dec 3 05:49:07 2005 +
+
+Update package version number for X11R7 RC3 release.
+
+commit 750b3f6469c060a3c2826530714183667992d61f
+Author: Alan Coopersmith [EMAIL PROTECTED]
+Date:   Mon Nov 28 22:01:26 2005 +
+
+Change *mandir targets to use new *_MAN_DIR

x11-apps: Changes to 'debian-unstable'

2008-06-10 Thread Julien Cristau 
 debian/changelog |8 
 debian/control   |   16 -
 debian/rules |1 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 --
 debian/xsfbs/xsfbs.mk|  121 ++-
 debian/xsfbs/xsfbs.sh|  394 ---
 6 files changed, 244 insertions(+), 446 deletions(-)

New commits:
commit 5cfbe6321562042b9a82d46221ab156638ba6055
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Jun 10 16:35:26 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 0b8e40f..b9d5f50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.3+2) UNRELEASED; urgency=low
+x11-apps (7.3+2) unstable; urgency=low
 
   [ Julien Cristau ]
   * Re-add bitmap (closes: #445097).
@@ -11,7 +11,7 @@ x11-apps (7.3+2) UNRELEASED; urgency=low
   [ Brice Goglin ]
   * Re-add xgc (closes: #460453).
 
- -- Brice Goglin [EMAIL PROTECTED]  Sun, 13 Jan 2008 16:45:47 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Tue, 10 Jun 2008 16:35:24 +0200
 
 x11-apps (7.3+1) unstable; urgency=low
 

commit 4e3ba59185881333e68f77dc33b1e0b3b96aa412
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Jun 10 15:32:42 2008 +0200

various cleanup

* drop -1 debian revisions from build-deps
* bump Standards-Version to 3.7.3
* don't call dh_makeshlibs
* drop XS- prefix from Vcs-* control fields

diff --git a/debian/changelog b/debian/changelog
index 30395ba..0b8e40f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ x11-apps (7.3+2) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Re-add bitmap (closes: #445097).
   * x11perf 1.5
+  * drop -1 debian revisions from build-deps
+  * bump Standards-Version to 3.7.3
+  * don't call dh_makeshlibs
+  * drop XS- prefix from Vcs-* control fields
 
   [ Brice Goglin ]
   * Re-add xgc (closes: #460453).
diff --git a/debian/control b/debian/control
index 5d144b5..a784cc3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,11 @@ 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, libpng12-dev,
- libx11-dev (= 2:1.0.0-1), libxaw7-dev (= 1:1.0.1-1),
- libxcursor-dev (= 1.1.5.2-1), libxext-dev (= 1:1.0.0-1),
- libxft-dev (= 2.1.8.2-6), libxkbfile-dev (= 1:1.0.1-1),
- libxmuu-dev (= 1:1.0.1-1), libxrender-dev (= 1:0.9.0.2-2),
- libxt-dev (= 1:1.0.0-1), xbitmaps, quilt, libxmu-dev
+ libx11-dev (= 2:1.0.0), libxaw7-dev (= 1:1.0.1),
+ libxcursor-dev (= 1.1.5.2), libxext-dev (= 1:1.0.0),
+ libxft-dev (= 2.1.8.2-6), libxkbfile-dev (= 1:1.0.1),
+ libxmuu-dev (= 1:1.0.1), libxrender-dev (= 1:0.9.0.2-2),
+ libxt-dev (= 1:1.0.0), xbitmaps, quilt, libxmu-dev
 # Reasons for build-depends:
 # debhelper for the packaging, pkg-config needed by configure scripts
 # Individual apps:
@@ -32,9 +32,9 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libpng12-dev,
 # xmore: libxaw7-dev, libxt-dev
 # xwd: libxmuu-dev, libx11-dev
 # xwud: libx11-dev
-Standards-Version: 3.7.2.0
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
 
 Package: x11-apps
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 44fdcfb..c062727 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,7 +95,6 @@ binary-arch: build install
dh_fixperms
dh_installdeb
dh_shlibdeps
-   dh_makeshlibs
dh_gencontrol
dh_md5sums
dh_builddeb

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

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

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

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index c11923f..b871b3b 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,10 +21,8 @@
 # Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
 export DH_OPTIONS
 
-# force quilt to not use ~/.quiltrc
-QUILT = quilt --quiltrc /dev/null
-# force QUILT_PATCHES to the default in case it is exported in the environment
-QUILT_PATCHES = patches/
+# force quilt to not use ~/.quiltrc and to use debian/patches
+QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
 
 # Set up parameters for the upstream build environment.
 
@@ -121,19 +119,11 @@ $(STAMP_DIR)/stampdir:
 # Set up the package build directory as quilt expects to find it.
 .PHONY: prepare
 stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches

x11-apps: Changes to 'debian-unstable'

2008-03-07 Thread Julien Cristau 
 debian/changelog  |1 
 debian/copyright  |   58 +
 x11perf/ChangeLog |  334 +---
 x11perf/INSTALL   |  236 --
 x11perf/Makefile.am   |   10 
 x11perf/Makefile.in   |  164 +--
 x11perf/Xmark.man |   10 
 x11perf/aclocal.m4|  238 +--
 x11perf/config.guess  |   56 +++--
 x11perf/config.h.in   |9 
 x11perf/config.sub|   78 ++-
 x11perf/configure |  312 --
 x11perf/configure.ac  |3 
 x11perf/depcomp   |   93 +++--
 x11perf/do_blt.c  |  114 +++
 x11perf/do_tests.c|   24 ++
 x11perf/install-sh|  514 ++
 x11perf/missing   |   61 +++--
 x11perf/mkinstalldirs |  158 ---
 x11perf/x11perf.c |  167 +++-
 x11perf/x11perf.h |   37 +++
 x11perf/x11perf.man   |4 
 22 files changed, 1687 insertions(+), 994 deletions(-)

New commits:
commit 8e186d947600ae5c5c532d7fc890e83de7ab027b
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Mar 8 01:39:35 2008 +0100

Add bitmap and xgc copyright information.

diff --git a/debian/copyright b/debian/copyright
index ce99a9a..70081cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,33 @@
 The contents of this package were downloaded from
 http://xorg.freedesktop.org/releases/individual/app/
-It contains the x11perf, xcalc, xclock, xcursorgen, xedit, xload,
-xmag, xmore, xwud, oclock, xbiff, xclipboard, xconsole, xditview,
-xeyes, xlogo, xman and xwd applications.
+It contains the bitmap, x11perf, xcalc, xclock, xcursorgen, xedit, xload, xmag,
+xmore, xwud, oclock, xbiff, xclipboard, xconsole, xditview, xeyes, xgc, xlogo,
+xman and xwd applications.
+
+bitmap:
+  Copyright 1988, 1993, 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 copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of The Open Group shall
+  not be used in advertising or otherwise to promote the sale, use or
+  other dealings in this Software without prior written authorization
+  from The Open Group.
 
 oclock:
   Copyright 1989, 1998  The Open Group
@@ -295,6 +320,33 @@ xeyes:
   other dealings in this Software without prior written authorization
   from the X Consortium.
 
+xgc:
+  Copyright (c) 1991  X Consortium
+  
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  Software), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+  
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of the X Consortium shall
+  not be used in advertising or otherwise to promote the sale, use or
+  other dealings in this Software without prior written authorization
+  from the X Consortium.
+
 xload:
   Copyright (c) 1989  X Consortium
   

commit fe6109ce071a959a7d151f221d8402cdc09d3263
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Mar 8 01:32:29 2008 +0100

x11perf 1.5

diff --git a/debian/changelog b/debian/changelog
index e6a5152..30395ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-apps (7.3+2) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Re-add bitmap (closes: #445097).
+  * x11perf 1.5
 
   [

x11-apps: Changes to 'debian-unstable'

2008-01-13 Thread Brice Goglin 
 debian/changelog|6 
 debian/control  |9 
 debian/rules|2 
 xgc/Bugs|   11 
 xgc/COPYING |   12 
 xgc/ChangeLog   |   42 
 xgc/INSTALL |  236 +
 xgc/Makefile.am |  110 
 xgc/Makefile.in |  927 ++
 xgc/Written/FilledRects |   93 
 xgc/Written/Interface   |9 
 xgc/Written/Jim |  255 +
 xgc/Written/Notes   |  296 ++
 xgc/Written/Notes2  |   68 
 xgc/Written/Outline |  191 +
 xgc/Written/Widget  |   26 
 xgc/Xgc.ad  |2 
 xgc/aclocal.m4  | 1599 +++
 xgc/choice.c|  268 +
 xgc/compile |  142 +
 xgc/config.guess| 1516 +++
 xgc/config.h.in |   35 
 xgc/config.sub  | 1626 
 xgc/configure   | 6487 
 xgc/configure.ac|   48 
 xgc/constants.h |   76 
 xgc/dashlist.c  |  177 +
 xgc/depcomp |  530 +++
 xgc/getfile.c   |  155 +
 xgc/gram.c  | 1410 ++
 xgc/gram.h  |  110 
 xgc/gram.y  |   97 
 xgc/install-sh  |  323 ++
 xgc/interpret.c |  348 ++
 xgc/lex.c   | 2174 
 xgc/lex.l   |  170 +
 xgc/main.c  |  486 +++
 xgc/main.h  |  148 +
 xgc/missing |  360 ++
 xgc/mkinstalldirs   |  158 +
 xgc/planemask.c |  186 +
 xgc/record.c|  278 ++
 xgc/testfrac.c  |  190 +
 xgc/tests.c |  642 
 xgc/text.c  |  200 +
 xgc/tile|   17 
 xgc/xgc.h   |  168 +
 xgc/xgc.man |   38 
 48 files changed, 22452 insertions(+), 5 deletions(-)

New commits:
commit 178dd07b698b086333e177d4a8c1dd0fd37d670f
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sun Jan 13 16:56:46 2008 +0100

Re-add xgc

diff --git a/debian/changelog b/debian/changelog
index 384fef1..e6a5152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 x11-apps (7.3+2) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Re-add bitmap (closes: #445097).
 
- -- Julien Cristau [EMAIL PROTECTED]  Sun, 06 Jan 2008 18:46:00 +0100
+  [ Brice Goglin ]
+  * Re-add xgc (closes: #460453).
+
+ -- Brice Goglin [EMAIL PROTECTED]  Sun, 13 Jan 2008 16:45:47 +0100
 
 x11-apps (7.3+1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b4cd8c0..5d144b5 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: debhelper (= 5.0.0), pkg-config, libpng12-dev,
 # xditview: libxaw7-dev, libxt-dev
 # xedit: libxaw7-dev, libxt-dev
 # xeyes: libx11-dev, libxt-dev, libxext-dev, libxmu-dev
+# xgc: libxt-dev, libxmu-dev
 # xload: libxaw7-dev, libxt-dev
 # xlogo: libxaw7-dev, libxrender-dev, libxft-dev, libxext-dev, libxt-dev
 # xmag: libxaw7-dev, libxt-dev
@@ -41,10 +42,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (= 1:7.0.0)
 Suggests: mesa-utils
 Conflicts: bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole,
- xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, xman, xmore, xwd, xwud
+ xcursorgen, xditview, xedit, xeyes, xgc, xload, xlogo, xmag, xman, xmore, xwd,
+ xwud
 Replaces: xbase-clients (= 1:7.2.ds2-3), bitmap, oclock, x11perf, xbiff,
- xcalc, xclipboard, xclock, xconsole, xcursorgen, xditview, xedit, xeyes, 
xload,
- xlogo, xmag, xman, xmore, xwd, xwud
+ xcalc, xclipboard, xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xgc,
+ xload, xlogo, xmag, xman, xmore, xwd, xwud
 Description: X applications
  An X client is a program that interfaces with an X server (almost always via
  the X libraries), and thus with some input and output hardware like a
@@ -62,6 +64,7 @@ Description: X applications
   - xditview, a viewer for ditroff output;
   - xedit, a text editor;
   - xeyes, a demo program in which a pair of eyes track the pointer;
+  - xgc, a graphics demo;
   - xload, a monitor for the system load average;
   - xlogo, a demo program that displays the X logo;
   - xmag, which magnifies parts of the X screen;
diff --git a/debian/rules b/debian/rules
index 14ae548..44fdcfb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ include debian/xsfbs/xsfbs.mk
 
 # This package contains multiple modules as shipped by upstream. Each module 
is # contained in a subdirectory in the root dir of the package. You must list 
each
 # subdirectory explicitly so that the build system knows what to build
-DEF_SUBDIRS=bitmap oclock x11perf xbiff xcalc xclipboard xclock xconsole 
xcursorgen xditview xedit xeyes xload xlogo xmag xman xmore xwd xwud
+DEF_SUBDIRS=bitmap oclock x11perf xbiff xcalc xclipboard xclock xconsole 
xcursorgen xditview xedit xeyes xgc xload xlogo xmag xman xmore xwd xwud
 SUBDIRS=$(DEF_SUBDIRS)
 
 CFLAGS = -Wall -g
diff --git a/xgc/AUTHORS b/xgc/AUTHORS
new file mode 100644
index 000..e69de29
diff --git

x11-apps: Changes to 'debian-unstable'

2008-01-06 Thread Julien Cristau 
 bitmap/BitEdit.c| 1128 +
 bitmap/Bitmap-color.ad  |   19 
 bitmap/Bitmap-nocase.ad |  233 +
 bitmap/Bitmap.ad|  229 +
 bitmap/Bitmap.c | 1950 
 bitmap/Bitmap.h |  286 ++
 bitmap/BitmapP.h|  211 +
 bitmap/COPYING  |   12 
 bitmap/ChangeLog|  267 ++
 bitmap/CutPaste.c   |  207 +
 bitmap/Dashes   |4 
 bitmap/Dialog.c |  202 +
 bitmap/Dialog.h |   57 
 bitmap/Down |   13 
 bitmap/Excl |   17 
 bitmap/FlipHoriz|   13 
 bitmap/FlipVert |   13 
 bitmap/Fold |   13 
 bitmap/Graphics.c   | 1575 +
 bitmap/Handlers.c   |  678 +
 bitmap/Left |   13 
 bitmap/Makefile.am  |  151 +
 bitmap/Makefile.in  |  933 +++
 bitmap/ReqMach.c|  263 ++
 bitmap/Requests.h   |   87 
 bitmap/Right|   13 
 bitmap/RotateLeft   |   13 
 bitmap/RotateRight  |   13 
 bitmap/Stipple  |4 
 bitmap/Term |   14 
 bitmap/Up   |   13 
 bitmap/aclocal.m4   | 1573 +
 bitmap/atobm.c  |  296 ++
 bitmap/autogen.sh   |   13 
 bitmap/bitmap.icon  |   14 
 bitmap/bitmap.man   |  656 +
 bitmap/bmtoa.c  |  216 +
 bitmap/compile  |  142 +
 bitmap/config.guess | 1510 
 bitmap/config.h.in  |   34 
 bitmap/config.sub   | 1619 +
 bitmap/configure| 5807 
 bitmap/configure.ac |   66 
 bitmap/depcomp  |  530 
 bitmap/install-sh   |  323 ++
 bitmap/missing  |  360 ++
 debian/changelog|6 
 debian/control  |   23 
 debian/rules|   12 
 49 files changed, 21823 insertions(+), 21 deletions(-)

New commits:
commit a17e1be1339a477ef7b41e9ae5deca81d0ea2432
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Jan 6 18:46:30 2008 +0100

* Re-add bitmap (closes: #445097).

diff --git a/bitmap/AUTHORS b/bitmap/AUTHORS
new file mode 100644
index 000..e69de29
diff --git a/bitmap/BitEdit.c b/bitmap/BitEdit.c
new file mode 100644
index 000..ee850d8
--- /dev/null
+++ b/bitmap/BitEdit.c
@@ -0,0 +1,1128 @@
+/* $Xorg: BitEdit.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */
+/*
+
+Copyright 1989, 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 copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+*/
+/* $XFree86: xc/programs/bitmap/BitEdit.c,v 1.6tsi Exp $ */
+
+/*
+ * Author:  Davor Matic, MIT X Consortium
+ */
+
+
+
+
+#include stdio.h
+#include stdlib.h
+#include X11/Intrinsic.h
+#include X11/StringDefs.h
+#include X11/Xaw/Paned.h
+#include X11/Xaw/Form.h
+#include X11/Xaw/Box.h
+#include X11/Xaw/Command.h
+#include X11/Xaw/Toggle.h
+#include X11/Xaw/MenuButton.h
+#include X11/Xaw/SimpleMenu.h
+#include X11/Xaw/SmeLine.h
+#include X11/Xaw/SmeBSB.h
+#include X11/Xmu/SysUtil.h
+#include Bitmap.h
+
+#include X11/bitmaps/xlogo16
+
+static char *usage = [-options ...] filename\n\
+\n\
+where options include all standard toolkit options plus:\n\
+ -size WIDTHxHEIGHT\n\
+ -sw dimension\n\
+ -sh dimension\n\
+ -gt dimension\n\
+ -grid, +grid\n\
+ -axes, +axes\n\
+ -dashed, +dashed\n\
+ -stippled, +stippled\n\
+ -proportional, +proportional\n\
+ -basename basename\n\
+ -dashes filename\n\
+ -stipple filename\n\
+ -hl color\n\
+ -fr color\n\
+\n\
+The default WIDTHxHEIGHT is 16x16.\n;
+
+static XrmOptionDescRec options[] = {
+  { -axes,   *bitmap.axes, XrmoptionNoArg, True},
+  { +axes,   *bitmap.axes, XrmoptionNoArg, False},
+  { -basename,*bitmap.basename,XrmoptionSepArg,NULL},
+  { -dashed, *bitmap.dashed,   XrmoptionNoArg, True},
+  { +dashed, *bitmap.dashed,   XrmoptionNoArg, False},
+  { -dashes, *bitmap.dashes,   XrmoptionSepArg,NULL},
+

x11-apps: Changes to 'debian-unstable'

2007-09-14 Thread Brice Goglin 
 debian/changelog  |   27 
 debian/control|4 
 debian/copyright  |6 
 debian/rules  |2 
 debian/x11-apps.menu  |   98 ++
 xcalc/COPYING |   51 +
 xcalc/ChangeLog   |  245 ++-
 xcalc/Makefile.am |   14 
 xcalc/Makefile.in |   74 --
 xcalc/XCalc-color.ad  |  157 
 xcalc/aclocal.m4  |   24 
 xcalc/compile |  142 
 xcalc/config.guess|   32 
 xcalc/config.h.in |9 
 xcalc/config.sub  |   28 
 xcalc/configure   |   47 +
 xcalc/configure.ac|2 
 xcalc/mkinstalldirs   |  158 
 xclock/ChangeLog  |  347 +-
 xclock/Clock.c|  105 +++
 xclock/INSTALL|  236 ---
 xclock/Makefile.am|   14 
 xclock/Makefile.in|  167 ++--
 xclock/aclocal.m4 | 1544 +++--
 xclock/compile|  142 
 xclock/config.h.in|   15 
 xclock/config.sub |   14 
 xclock/configure  |  558 +++-
 xclock/configure.ac   |7 
 xclock/depcomp|   64 +
 xclock/install-sh |  348 +++---
 xclock/missing|   61 +
 xclock/mkinstalldirs  |  158 
 xclock/xclock.c   |   17 
 xclock/xclock.man |   19 
 xconsole/ChangeLog|  407 +++-
 xconsole/Makefile.am  |9 
 xconsole/Makefile.in  |   37 -
 xconsole/aclocal.m4   |   24 
 xconsole/compile  |  142 
 xconsole/config.guess |   32 
 xconsole/config.h.in  |   48 +
 xconsole/config.sub   |   28 
 xconsole/configure| 1060 ++-
 xconsole/configure.ac |   10 
 xconsole/mkinstalldirs|  158 
 xconsole/xconsole.c   |   19 
 xcursorgen/ChangeLog  |  248 ++-
 xcursorgen/Makefile.am|   21 
 xcursorgen/Makefile.in|   48 -
 xcursorgen/aclocal.m4 |   24 
 xcursorgen/compile|  142 
 xcursorgen/config.guess   |   32 
 xcursorgen/config.h.in|   10 
 xcursorgen/config.sub |   28 
 xcursorgen/configure  |  106 +--
 xcursorgen/configure.ac   |4 
 xcursorgen/mkinstalldirs  |  158 
 xcursorgen/xcursorgen.c   |   16 
 xcursorgen/xcursorgen.man |   30 
 xmag/ChangeLog|  280 +++-
 xmag/INSTALL  |  236 ---
 xmag/Makefile.am  |   12 
 xmag/Makefile.in  |  199 ++---
 xmag/aclocal.m4   | 1548 +++---
 xmag/compile  |  142 
 xmag/config.h.in  |   18 
 xmag/config.sub   |   14 
 xmag/configure|  383 ++-
 xmag/configure.ac |4 
 xmag/depcomp  |   64 +
 xmag/install-sh   |  348 +++---
 xmag/missing  |   61 +
 xmag/mkinstalldirs|  158 
 xmag/xmag.c   |   36 -
 xmag/xmag.man |2 
 xman/INSTALL  |  236 ---
 xman/Makefile.in  |  221 +++---
 xman/aclocal.m4   |  196 +++--
 xman/compile  |  142 
 xman/config.h.in  |9 
 xman/config.sub   |   14 
 xman/configure|  171 +++--
 xman/configure.ac |2 
 xman/depcomp  |   64 +
 xman/install-sh   |  348 +++---
 xman/main.c   |2 
 xman/man.c|2 
 xman/man.h|2 
 xman/misc.c   |2 
 xman/missing  |   61 +
 xman/mkinstalldirs|  158 
 xman/vendor.c |2 
 xman/vendor.h |   10 
 94 files changed, 7159 insertions(+), 5765 deletions(-)

New commits:
commit a4c07f2f911b0b651dbb05369e6337e0b69b88e4
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Fri Sep 14 23:17:55 2007 +0200

Prepare changelog for upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 6f2cc0b..46565c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.2+1) UNRELEASED; urgency=low
+x11-apps (7.3+1) unstable; urgency=low
 
   [ Julien Cristau ]
   * xclock 1.0.3.
@@ -16,8 +16,9 @@ x11-apps (7.2+1) UNRELEASED; urgency=low
   * xcalc 1.0.2.
   * xconsole 1.0.3.
   * xcursorgen 1.0.2.
+  * Add myself to Uploaders, and remove Branden with his permission.
 
- -- Brice Goglin [EMAIL PROTECTED]  Fri, 17 Aug 2007 09:59:26 +0200
+ -- Brice Goglin [EMAIL PROTECTED]  Fri, 14 Sep 2007 23:14:57 +0200
 
 x11-apps (0.1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index c90759d..1c7f0d6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-apps
 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]

x11-apps: Changes to 'debian-unstable'

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

New commits:
commit 0f4d1a969898ff6599db578fa96f5516361f45d1
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Sat May 26 09:55:32 2007 +0300

Start versioning from 0.1

diff --git a/debian/changelog b/debian/changelog
index 46d1e65..56e1ae4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (1) UNRELEASED; urgency=low
+x11-apps (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-apps: Changes to 'debian-unstable'

2007-05-22 Thread Timo Aaltonen 
 debian/changelog |   10 +-
 debian/control   |3 
 debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff |   42 
--
 3 files changed, 10 insertions(+), 45 deletions(-)

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

Conflict with the ubuntu packages to force removal on upgrade.

diff --git a/debian/changelog b/debian/changelog
index 9464f9e..46d1e65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,7 +26,7 @@ x11-apps (1) UNRELEASED; urgency=low
 - Split the Build-Dep line into multiple lines
 - Clean up the description.
 - 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 affect this package.
   * debian/x11-apps.dirs: Remove.
@@ -37,7 +37,7 @@ x11-apps (1) UNRELEASED; urgency=low
 - Edit 01_xwd_do_not_spew_usage_on_connection_error.diff to patch only
   xwd.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 22 May 2007 10:25:20 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 22 May 2007 12:27:16 +0300
 
 xbase-clients (1:7.2.ds2-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 87fb751..5c0404a 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,9 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (= 1:7.0.0)
 Suggests: mesa-utils
+Conflicts: oclock, x11perf, xbiff, xcalc, xclipboard,
+ xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, 
xman,
+ xmore, xwd, xwud
 Replaces: xbase-clients (= 1:7.2.ds2-3), oclock, x11perf, xbiff, xcalc, 
xclipboard,
  xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, 
xman,
  xmore, xwd, xwud

commit 12f2f69d85364d568f7e76bbe4a9abe22d75da7b
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Tue May 22 10:33:16 2007 +0300

Edit 01_xwd_do_not_spew_usage_on_connection_error.diff to patch only xwd.

Fix the changelog too.

diff --git a/debian/changelog b/debian/changelog
index bf93220..9464f9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,14 +26,18 @@ x11-apps (1) UNRELEASED; urgency=low
 - Split the Build-Dep line into multiple lines
 - Clean up the description.
 - Replaces: xbase-clients (= 1:7.2.ds2-3) to make upgrades smoother.
-- Replaces: all the included packages to work around old Ubuntu 
packaging.
+- Replaces: all the included packages to work around old Ubuntu
+  packaging.
   * debian/copyright: Leave only copyright notices that affect this package.
   * debian/x11-apps.dirs: Remove.
   * debian/x11-apps.install, rules: Edit to reflect new packaging.
   * debian/local/: Remove.
-  * debian/patches: Delete patches which do not concern this package.
+  * debian/patches:
+- Delete patches which do not concern this package.
+- Edit 01_xwd_do_not_spew_usage_on_connection_error.diff to patch only
+  xwd.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Sat, 19 May 2007 00:57:31 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED]  Tue, 22 May 2007 10:25:20 +0300
 
 xbase-clients (1:7.2.ds2-3) unstable; urgency=low
 
diff --git a/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff 
b/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
index 622fcdd..f67abc4 100644
--- a/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
+++ b/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
@@ -10,34 +10,6 @@ The user should only be shown a usage messages when:
 
 Not submitted upstream to XFree86 or X.Org.
 
-Index: xlsfonts/dsimple.c
-===
 xlsfonts/dsimple.c.orig2006-07-11 04:53:33.0 +0200
-+++ xlsfonts/dsimple.c 2007-02-11 08:14:45.0 +0100
-@@ -188,8 +188,7 @@
-   if (d == NULL) {
-   fprintf (stderr, %s:  unable to open display '%s'\n,
-program_name, XDisplayName (display_name));
--  usage ();
--  /* doesn't return */
-+  exit (1);
-   }
- 
-   return(d);
-Index: xprop/dsimple.c
-===
 xprop/dsimple.c.orig   2007-02-11 08:15:17.0 +0100
-+++ xprop/dsimple.c2007-02-11 08:15:40.0 +0100
-@@ -188,8 +188,7 @@
-   if (d == NULL) {
-   fprintf (stderr, %s:  unable to open display '%s'\n,
-program_name, XDisplayName (display_name));
--  usage ();
--  /* doesn't return */
-+  exit(1);
-   }
- 
-   return(d);
 Index: xwd/dsimple.c
 ===
 ---

x11-apps: Changes to 'debian-unstable'

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

New commits:
commit 13a7a180651337a5ab119f8f90546f962f529903
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Sat May 19 14:02:09 2007 +0300

Remove Conflicts:, which shouldn't be necessary.

diff --git a/debian/changelog b/debian/changelog
index b778d2c..bf93220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,9 +25,8 @@ x11-apps (1) UNRELEASED; urgency=low
 - Remove unnecessary Build-Deps.
 - Split the Build-Dep line into multiple lines
 - Clean up the description.
-- 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 affect this package.
   * debian/x11-apps.dirs: Remove.
   * debian/x11-apps.install, rules: Edit to reflect new packaging.
diff --git a/debian/control b/debian/control
index 6913d19..87fb751 100644
--- a/debian/control
+++ b/debian/control
@@ -37,9 +37,6 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (= 1:7.0.0)
 Suggests: mesa-utils
-Conflicts: xbase-clients (= 1:7.2.ds2-3), oclock, x11perf, xbiff, xcalc, 
xclipboard,
- xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, 
xman,
- xmore, xwd, xwud
 Replaces: xbase-clients (= 1:7.2.ds2-3), oclock, x11perf, xbiff, xcalc, 
xclipboard,
  xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, 
xman,
  xmore, xwd, xwud


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

x11-apps: Changes to 'debian-unstable'

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

New commits:
commit f2d0f8737829013aad941c6543700351685288f9
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Sat May 19 01:13:51 2007 +0300

debian/control: add Conflicts/Replaces, edit description.

diff --git a/debian/changelog b/debian/changelog
index 547c79e..b778d2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,40 @@
 x11-apps (1) UNRELEASED; urgency=low
 
   * Split xbase-clients, new versioning.
+  * Included packages:
+- oclock 1.0.1
+- x11perf 1.4.1
+- xbiff 1.0.1
+- xcalc 1.0.1
+- xclipboard 1.0.1
+- xclock 1.0.2
+- xconsole 1.0.2
+- xcursorgen 1.0.1
+- xditview 1.0.1
+- xedit 1.0.2
+- xeyes 1.0.1
+- xload 1.0.1
+- xlogo 1.0.1
+- xmag 1.0.1
+- xman 1.0.2
+- xmore 1.0.1
+- xwd 1.0.1
+- xwud 1.0.1
   * debian/control:
 - Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Split the Build-Dep line into multiple lines
 - Clean up the description.
+- 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 affect this package.
   * debian/x11-apps.dirs: Remove.
   * debian/x11-apps.install, rules: Edit to reflect new packaging.
   * debian/local/: Remove.
   * debian/patches: Delete patches which do not concern this package.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 16 May 2007 18:52:19 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED]  Sat, 19 May 2007 00:57:31 +0300
 
 xbase-clients (1:7.2.ds2-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 797e83f..6913d19 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,10 @@ 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, libpng12-dev, libx11-dev (= 
2:1.0.0-1), libxaw7-dev (= 1:1.0.1-1),
- libxcursor-dev (= 1.1.5.2-1), libxext-dev (= 1:1.0.0-1), libxft-dev (= 
2.1.8.2-6), libxkbfile-dev (= 1:1.0.1-1),
- libxmuu-dev (= 1:1.0.1-1), libxrender-dev (= 1:0.9.0.2-2), libxt-dev (= 
1:1.0.0-1), xbitmaps, quilt
+Build-Depends: debhelper (= 5.0.0), pkg-config, libpng12-dev, libx11-dev (= 
2:1.0.0-1),
+ libxaw7-dev (= 1:1.0.1-1), libxcursor-dev (= 1.1.5.2-1), libxext-dev (= 
1:1.0.0-1),
+ libxft-dev (= 2.1.8.2-6), libxkbfile-dev (= 1:1.0.1-1), libxmuu-dev (= 
1:1.0.1-1),
+ libxrender-dev (= 1:0.9.0.2-2), libxt-dev (= 1:1.0.0-1), xbitmaps, quilt
 # Reasons for build-depends:
 # debhelper for the packaging, pkg-config needed by configure scripts
 # Individual apps:
@@ -36,26 +37,33 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Pre-Depends: x11-common (= 1:7.0.0)
 Suggests: mesa-utils
-Description: miscellaneous X applications
+Conflicts: xbase-clients (= 1:7.2.ds2-3), oclock, x11perf, xbiff, xcalc, 
xclipboard,
+ xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, 
xman,
+ xmore, xwd, xwud
+Replaces: xbase-clients (= 1:7.2.ds2-3), oclock, x11perf, xbiff, xcalc, 
xclipboard,
+ xclock, xconsole, xcursorgen, xditview, xedit, xeyes, xload, xlogo, xmag, 
xman,
+ xmore, xwd, xwud
+Description: X applications
  An X client is a program that interfaces with an X server (almost always via
  the X libraries), and thus with some input and output hardware like a
  graphics card, monitor, keyboard, and pointing device (such as a mouse).
  .
- This package provides a miscellaneous assortment of several dozen X clients
+ This package provides a miscellaneous assortment of X applications
  that ship with the X Window System, including:
   - oclock and xclock, graphical clocks;
-  - xedit, a text editor;
   - xbiff, a tool which tells you when you have new email;
   - xcalc, a scientific calculator desktop accessory;
   - xclipboard, a tool to manage cut-and-pasted text selections;
-  - xcutsel, which exchanges selection and cut buffer contents;
   - xconsole, which monitors system console messages;
+  - xcursorgen;
+  - xditview, a viewer for ditroff output;
+  - xedit, a text editor;
   - xeyes, a demo program in which a pair of eyes track the pointer;
-  - xfd, a tool that displays all the glyphs in a given X font;
   - xload, a monitor for the system load average;
   - xlogo, a demo program that displays the X logo;
   - xmag, which magnifies parts of the X screen;
   - xman, a manual page browser;
+  - xmore;
   - xwd, a utility for taking window dumps (screenshots) of the X session;
   - xwud, a viewer for window dumps created by xwd;
   - Xmark, x11perf, and x11perfcomp, tools for benchmarking graphical


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a

x11-apps: Changes to 'debian-unstable'

2007-05-16 Thread Timo Aaltonen 
New branch 'debian-unstable' available with the following commits:
commit 5375e21abc8e9626241b08d4664080f53dec92d7
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed May 16 18:31:07 2007 +0300

  * Split xbase-clients, new versioning.
  * debian/control:
- Remove unnecessary Build-Deps.
- Split the Build-Dep line into multiple lines
- Clean up the description.
  * debian/copyright: Leave only copyright notices that affect this package.
  * debian/x11-apps.dirs: Remove.
  * debian/x11-apps.install, rules: Edit to reflect new packaging.
  * debian/local/: Remove.
  * debian/patches: Delete patches which do not concern this package.

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

x11-apps: Changes to 'debian-unstable'

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

New commits:
commit e1fc5aa61489ab01a95263122dedd494b2a8
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed May 16 18:52:50 2007 +0300

debian/control: rename Source.

diff --git a/debian/changelog b/debian/changelog
index 1750b8b..547c79e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-apps (1) UNRELEASED; urgency=low
 
   * Split xbase-clients, new versioning.
   * debian/control:
+- Rename Package and Source.
 - Remove unnecessary Build-Deps.
 - Split the Build-Dep line into multiple lines
 - Clean up the description.
@@ -11,7 +12,7 @@ x11-apps (1) UNRELEASED; urgency=low
   * debian/local/: Remove.
   * debian/patches: Delete patches which do not concern this package.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 16 May 2007 18:10:27 +0300
+ -- Timo Aaltonen [EMAIL PROTECTED]  Wed, 16 May 2007 18:52:19 +0300
 
 xbase-clients (1:7.2.ds2-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e01c2fb..81ca5e4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: xbase-clients
+Source: x11-apps
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org


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

x11-apps: Changes to 'debian-unstable'

2007-05-16 Thread Timo Aaltonen 
 debian/control |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4cf1be47f8a2ae44e14e28315f62441e644fdfdb
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed May 16 18:55:05 2007 +0300

re-add quilt as build-dep.

diff --git a/debian/control b/debian/control
index 81ca5e4..065ea05 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ 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, libpng12-dev, libx11-dev (= 
2:1.0.0-1), libxaw7-dev (= 1:1.0.1-1),
  libxcursor-dev (= 1.1.5.2-1), libxext-dev (= 1:1.0.0-1), libxft-dev (= 
2.1.8.2-6), libxmuu-dev (= 1:1.0.1-1),
- libxrender-dev (= 1:0.9.0.2-2), libxt-dev (= 1:1.0.0-1), xbitmaps
+ libxrender-dev (= 1:0.9.0.2-2), libxt-dev (= 1:1.0.0-1), xbitmaps, quilt
 # Reasons for build-depends:
-# debhelper for the packaging, pkg-config needed by configure scripts
+# debhelper for the packaging, pkg-config needed by configure scripts
 # Individual apps:
 # oclock: libx11-dev, libxmu-dev, libxext-dev
 # x11perf: libx11-dev, libxmuu-dev, libxrender-dev, libxft-dev, libxext-dev


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

x11-apps: Changes to 'debian-unstable'

2007-05-16 Thread Timo Aaltonen 
 debian/control |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 79228a62518981ecf99bbac7fc1513e0dfbbb95b
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Wed May 16 19:08:34 2007 +0300

debian/control: re-add build-dep on libxkbfile-dev

diff --git a/debian/control b/debian/control
index 065ea05..797e83f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ 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, libpng12-dev, libx11-dev (= 
2:1.0.0-1), libxaw7-dev (= 1:1.0.1-1),
- libxcursor-dev (= 1.1.5.2-1), libxext-dev (= 1:1.0.0-1), libxft-dev (= 
2.1.8.2-6), libxmuu-dev (= 1:1.0.1-1),
- libxrender-dev (= 1:0.9.0.2-2), libxt-dev (= 1:1.0.0-1), xbitmaps, quilt
+ libxcursor-dev (= 1.1.5.2-1), libxext-dev (= 1:1.0.0-1), libxft-dev (= 
2.1.8.2-6), libxkbfile-dev (= 1:1.0.1-1),
+ libxmuu-dev (= 1:1.0.1-1), libxrender-dev (= 1:0.9.0.2-2), libxt-dev (= 
1:1.0.0-1), xbitmaps, quilt
 # Reasons for build-depends:
 # debhelper for the packaging, pkg-config needed by configure scripts
 # Individual apps:


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