xutils-dev: Changes to 'debian-unstable'

2017-08-31 Thread Timo Aaltonen 
Rebased ref, commits from common ancestor:

xutils-dev: Changes to 'debian-unstable'

2017-08-31 Thread Timo Aaltonen 
 debian/changelog  |4 
 debian/rules  |4 
 debian/xutils-dev.install |4 
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 8c5926d0c3cdfa7819ced10761066ed4e8ccad5e
Author: Timo Aaltonen 
Date:   Thu Aug 31 20:15:38 2017 +0300

install: Drop imake, xmkmf. (Closes: #873764)

diff --git a/debian/changelog b/debian/changelog
index bae71cb..a4f5102 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 xutils-dev (1:7.7+6) UNRELEASED; urgency=medium
 
+  [ Julien Cristau ]
   * Switch all xorg.freedesktop.org URLs in packaging to https.
 
+  [ Timo Aaltonen ]
+  * install: Drop imake, xmkmf. (Closes: #873764)
+
  -- Julien Cristau   Sun, 21 Aug 2016 17:52:24 +0200
 
 xutils-dev (1:7.7+5) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 7740113..61a6883 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,10 @@ override_dh_auto_install:
set -e; for FILE in $(SUBDIRS); do \
$(MAKE) -C $${FILE}-build DESTDIR=$(CURDIR)/debian/tmp install; 
\
done
+   rm -f debian/tmp/usr/bin/imake \
+   debian/tmp/usr/bin/xmkmf \
+   debian/tmp/usr/share/man/man1/imake.1 \
+   debian/tmp/usr/share/man/man1/xmkmf.1
 
 override_dh_installdocs:
dh_installdocs debian/versions
diff --git a/debian/xutils-dev.install b/debian/xutils-dev.install
index b855549..f4aed3b 100644
--- a/debian/xutils-dev.install
+++ b/debian/xutils-dev.install
@@ -1,7 +1,5 @@
 usr/share/man/man1/gccmakedep.1
-usr/share/man/man1/imake.1
 usr/share/man/man1/makeg.1
-usr/share/man/man1/xmkmf.1
 usr/share/man/man1/mergelib.1
 usr/share/man/man1/revpath.1
 usr/share/man/man1/mkdirhier.1
@@ -11,10 +9,8 @@ usr/share/man/man1/lndir.1
 usr/share/man/man1/makedepend.1
 usr/share/aclocal/xorg-macros.m4
 usr/bin/gccmakedep
-usr/bin/imake
 usr/bin/revpath
 usr/bin/makeg
-usr/bin/xmkmf
 usr/bin/mergelib
 usr/bin/mkdirhier
 usr/bin/cleanlinks

xutils-dev: Changes to 'debian-unstable'

2016-08-21 Thread Julien Cristau 
 debian/changelog   |6 ++
 debian/watch.gccmakedep|2 +-
 debian/watch.imake |2 +-
 debian/watch.lndir |2 +-
 debian/watch.makedepend|2 +-
 debian/watch.util-macros   |2 +-
 debian/watch.xorg-cf-files |2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 36f1fb076771e0bd9dd123ec55154cd9290e525d
Author: Julien Cristau 
Date:   Sun Aug 21 17:53:05 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 53c3950..bae71cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xutils-dev (1:7.7+6) UNRELEASED; urgency=medium
+
+  * Switch all xorg.freedesktop.org URLs in packaging to https.
+
+ -- Julien Cristau   Sun, 21 Aug 2016 17:52:24 +0200
+
 xutils-dev (1:7.7+5) unstable; urgency=medium
 
   [ Andreas Boll ]
diff --git a/debian/watch.gccmakedep b/debian/watch.gccmakedep
index d9e0548..6c3ef90 100644
--- a/debian/watch.gccmakedep
+++ b/debian/watch.gccmakedep
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/util/gccmakedep
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/util/ gccmakedep-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/util/ gccmakedep-(.*)\.tar\.gz
diff --git a/debian/watch.imake b/debian/watch.imake
index ae68c93..28810ec 100644
--- a/debian/watch.imake
+++ b/debian/watch.imake
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/util/imake
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/util/ imake-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/util/ imake-(.*)\.tar\.gz
diff --git a/debian/watch.lndir b/debian/watch.lndir
index fa76e35..c6c2137 100644
--- a/debian/watch.lndir
+++ b/debian/watch.lndir
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/util/lndir
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/util/ lndir-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/util/ lndir-(.*)\.tar\.gz
diff --git a/debian/watch.makedepend b/debian/watch.makedepend
index 1764c7b..4252dfd 100644
--- a/debian/watch.makedepend
+++ b/debian/watch.makedepend
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/util/makedepend
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/util/ makedepend-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/util/ makedepend-(.*)\.tar\.gz
diff --git a/debian/watch.util-macros b/debian/watch.util-macros
index afe8e0e..7d319b2 100644
--- a/debian/watch.util-macros
+++ b/debian/watch.util-macros
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/util/macros
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/util/ util-macros-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/util/ 
util-macros-(.*)\.tar\.gz
diff --git a/debian/watch.xorg-cf-files b/debian/watch.xorg-cf-files
index 2345b3f..b3a5bb0 100644
--- a/debian/watch.xorg-cf-files
+++ b/debian/watch.xorg-cf-files
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/util/cf
 version=3
 opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/util/ 
xorg-cf-files-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/util/ 
xorg-cf-files-(.*)\.tar\.gz

xutils-dev: Changes to 'debian-unstable'

2016-01-26 Thread Andreas Boll 
 debian/README.source |   24 
 debian/changelog |   13 
 debian/control   |2 
 debian/patches/04_xutils-dev-debian.diff |  293 -
 debian/versions  |5 
 debian/xutils-dev.lintian-overrides  |1 
 xorg-cf-files/ChangeLog  |  160 
 xorg-cf-files/INSTALL|  121 
 xorg-cf-files/Imake.cf   |   13 
 xorg-cf-files/Imake.tmpl |2 
 xorg-cf-files/Makefile.am|1 
 xorg-cf-files/Makefile.in|   53 
 xorg-cf-files/NetBSD.cf  |   11 
 xorg-cf-files/README |7 
 xorg-cf-files/aclocal.m4 |  206 -
 xorg-cf-files/compile|2 
 xorg-cf-files/config.guess   |  201 -
 xorg-cf-files/config.sub |   51 
 xorg-cf-files/configure  |  621 +--
 xorg-cf-files/configure.ac   |3 
 xorg-cf-files/install-sh |  366 +-
 xorg-cf-files/linux.cf   |9 
 xorg-cf-files/missing|6 
 xorg-cf-files/os2def.db  | 5095 ---
 xorg-cf-files/sun.cf |   42 
 xorg-cf-files/xfree86.cf |6 
 xorg-cf-files/xorg.cf|   12 
 27 files changed, 1211 insertions(+), 6115 deletions(-)

New commits:
commit d082ea34a5b94702f0abd3016fba0755fad1cadd
Author: Andreas Boll 
Date:   Tue Jan 26 11:55:35 2016 +0100

Add a lintian override for extra-license-file usr/lib/X11/config/bsd.cf.

diff --git a/debian/changelog b/debian/changelog
index bfd461b..b11affe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xutils-dev (1:7.7+5) UNRELEASED; urgency=medium
   * Update 04_xutils-dev-debian.diff for new xorg-cf-files.
   * Remove reference to xsfbs in README.source.
   * Bump Standards-Version to 3.9.6 (no changes).
+  * Add a lintian override for extra-license-file
+usr/lib/X11/config/bsd.cf.
 
  -- Andreas Boll   Tue, 26 Jan 2016 11:02:24 +0100
 
diff --git a/debian/xutils-dev.lintian-overrides 
b/debian/xutils-dev.lintian-overrides
new file mode 100644
index 000..13c51c0
--- /dev/null
+++ b/debian/xutils-dev.lintian-overrides
@@ -0,0 +1 @@
+extra-license-file usr/lib/X11/config/bsd.cf

commit b38d1db1cc03e296a7e167a4836dcd2765c1c60c
Author: Andreas Boll 
Date:   Tue Jan 26 11:37:06 2016 +0100

Bump Standards-Version to 3.9.6 (no changes).

diff --git a/debian/changelog b/debian/changelog
index b5642af..bfd461b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xutils-dev (1:7.7+5) UNRELEASED; urgency=medium
 - Uses gzip -n to not save the timestamps. (Closes: #789964).
   * Update 04_xutils-dev-debian.diff for new xorg-cf-files.
   * Remove reference to xsfbs in README.source.
+  * Bump Standards-Version to 3.9.6 (no changes).
 
  -- Andreas Boll   Tue, 26 Jan 2016 11:02:24 +0100
 
diff --git a/debian/control b/debian/control
index 2d1759b..d660a95 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  quilt,
  x11proto-core-dev (>= 7.0.17),
  autoconf,
-Standards-Version: 3.9.2
+Standards-Version: 3.9.6
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xutils-dev.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xutils-dev.git
 

commit 2904bf35cb44b915cf95df44db6a78f558118417
Author: Andreas Boll 
Date:   Tue Jan 26 11:32:28 2016 +0100

Remove reference to xsfbs in README.source.

diff --git a/debian/README.source b/debian/README.source
index b09a1ab..4ecd5e6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -47,27 +47,3 @@ are involved:
   case, it appears directly in the .diff.gz.
 * Otherwise, the patch is added to debian/patches/ which is managed
   with quilt as documented in /usr/share/doc/quilt/README.source.
-
-quilt is actually invoked by the Debian X packaging through a larger
-set of scripts called XSFBS. XSFBS brings some other X specific
-features such as managing dependencies and conflicts due to the video
-and input driver ABIs.
-XSFBS itself is maintained in a separate repository at
-  git://git.debian.org/pkg-xorg/xsfbs.git
-and it is pulled inside the other Debian X repositories when needed.
-
-The XSFBS patching system requires a build dependency on quilt. Also
-a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
-so that the XSFBS patching occurs before the actual build. So the
-very first target of the build (likely the one running autoreconf)
-should depend on $(STAMP_DIR)/patch. It should also not depend on
-anything so that parallel builds are correctly supported (nothing
-should probably run while patching is being done). And finally, the
-clean target should depend on the

xutils-dev: Changes to 'debian-unstable'

2016-01-26 Thread Timo Aaltonen 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6159187bbec3e8caf024c1e338bdd51baee41f67
Author: Timo Aaltonen 
Date:   Tue Jan 26 15:42:16 2016 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index b11affe..53c3950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xutils-dev (1:7.7+5) UNRELEASED; urgency=medium
+xutils-dev (1:7.7+5) unstable; urgency=medium
 
+  [ Andreas Boll ]
   * xorg-cf-files 1.0.6.
 - Adds support for OpenRISC 1000 (or1k) (Closes: #760419).
 - Uses gzip -n to not save the timestamps. (Closes: #789964).
@@ -9,7 +10,7 @@ xutils-dev (1:7.7+5) UNRELEASED; urgency=medium
   * Add a lintian override for extra-license-file
 usr/lib/X11/config/bsd.cf.
 
- -- Andreas Boll   Tue, 26 Jan 2016 11:02:24 +0100
+ -- Timo Aaltonen   Tue, 26 Jan 2016 15:17:46 +0200
 
 xutils-dev (1:7.7+4) unstable; urgency=medium

xutils-dev: Changes to 'debian-unstable'

2016-01-20 Thread Julien Cristau 
 debian/changelog   |9 
 debian/compat  |2 
 debian/control |2 
 debian/patches/08_xorg_with_xmlto.diff |   46 ++
 debian/rules   |  104 +
 debian/upstream/signing-key.asc|   60 +++
 debian/watch.gccmakedep|1 
 debian/watch.imake |1 
 debian/watch.lndir |1 
 debian/watch.makedepend|1 
 debian/watch.util-macros   |1 
 debian/watch.xorg-cf-files |1 
 debian/xsfbs/repack.sh |   32 -
 debian/xsfbs/xsfbs.mk  |  285 ---
 debian/xsfbs/xsfbs.sh  |  622 -
 15 files changed, 148 insertions(+), 1020 deletions(-)

New commits:
commit aedee332d2e41bd68e51ca7a2a273bce3e0a4cc3
Author: Julien Cristau 
Date:   Wed Jan 20 23:07:08 2016 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 4a5efe4..6cd1c49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.7+4) UNRELEASED; urgency=medium
+xutils-dev (1:7.7+4) unstable; urgency=medium
 
   [ Andreas Boll ]
   * [util-macros] Add patch from upstream git to fix macro
@@ -10,7 +10,7 @@ xutils-dev (1:7.7+4) UNRELEASED; urgency=medium
   * Use dh, drop xsfbs.
   * Let uscan verify tarball signatures.
 
- -- Andreas Boll   Tue, 19 Jan 2016 15:42:51 +0100
+ -- Julien Cristau   Wed, 20 Jan 2016 23:06:52 +0100
 
 xutils-dev (1:7.7+3) unstable; urgency=medium
 

commit 619206d5f9abc871496c203f79f9c45887aca193
Author: Julien Cristau 
Date:   Sat May 2 19:41:32 2015 +0200

Let uscan verify tarball signatures.

diff --git a/debian/changelog b/debian/changelog
index 3178664..4a5efe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xutils-dev (1:7.7+4) UNRELEASED; urgency=medium
 
   [ Julien Cristau ]
   * Use dh, drop xsfbs.
+  * Let uscan verify tarball signatures.
 
  -- Andreas Boll   Tue, 19 Jan 2016 15:42:51 +0100
 
diff --git a/debian/rules b/debian/rules
index 48b4997..7740113 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,11 +67,4 @@ get-tarballs: $(addprefix get-tarball-,$(SUBDIRS))
 get-tarball-%:
uscan --no-conf --download --no-symlink --destdir . --package $* 
--upstream-version $(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }' < 
$*/configure || echo 0) --watchfile debian/watch.$* || test $$? = 1
 
-debian/watch.%:
-   echo version=3 > $@
-   echo 'http://xorg.freedesktop.org/releases/individual/util/ 
$*-(.*)\.tar\.gz' >> $@
-
-.PHONY: watchfiles
-watchfiles: $(addprefix debian/watch.,$(SUBDIRS))
-
 # vim:set ai noet sw=8 ts=8 tw=80:
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 000..863981f
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,60 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n
+Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g
+EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE
+a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9
+8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV
+Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ
+xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG
+CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE
+TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQoQWxhbiBDb29w
+ZXJzbWl0aCA8YWxhbmNAZnJlZWRlc2t0b3Aub3JnPohoBBMRAgAoAhsDBgsJCAcD
+AgYVCAIJCgsEFgIDAQIeAQIXgAUCUXnRYgUJFEPYeAAKCRCi+54IHy0TDonxAKCP
+cAgXNojuujUg5Wqi6v0RBFVSUgCggq1SsVEdq9NDWvXvkeGyNaBivSK0K0FsYW4g
+Q29vcGVyc21pdGggPGFsYW4uY29vcGVyc21pdGhAc3VuLmNvbT6IZgQTEQIAJgIb
+AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJRedFiBQkUQ9h4AAoJEKL7nggfLRMO
+6sUAn0jl3h9rY4OJ13Lu7nsKclyhDpOqAKCFgTmaDGRuDRxloLg9jftrn7a7vrQu
+QWxhbiBDb29wZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPohr
+BBMRAgArAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCUXnRYgUJFEPY
+eAAKCRCi+54IHy0TDtBZAJ9IgVVNoFIPRjTsNjcSFaLznuDRJgCcC/WgV312IrxS
+Q8PRAyEgozSB9Ke5Ag0ERpv6bxAIAJp5aUlho5rUhpS6ik7spsAQFPRuycPKMNu0
+J4F0v/OoPz085soV8ytLj4HqCGk2Zamh1jSgliZwuk9m7V7Wgxx+nBJawpWDX/eK
+LObErfDwQ4dfOFvjbXLQMmNnQNaUGIWLPP3l8GuBOHMq60Bu+TPgh627vUntL5RE
+QEQqTXIzWC6U10QsDblLwIvdOVSdGF5xl/N1myXzSKvrsZwWtoFc8G9v9hcCjhtN
+1sm9b7Ojc51iZXvcetcvPy5RA6AUW3yEExaedUdLnvIF9sjFYIfJWFVYh2AgavnG
+re6fF+NV2v3zfx3wRT7H9//m4YIDYJmgZgyQccXegTwfGBIq3osAAwYH/1FiMUMM
+ES5Ilz2nDqId+DCWECAU6wgvIFRcXrZWxDxB+ZrnmTCXoAD0xedpfOkRHp8XTVc/
+9MU+wQ+lZRx2OQ6MJW0XGuFvHm94KZF/8HzWA2Ah7U4n0+3sLpk6zWceZq2zZNF0
+yVTjwD98+xNK1Q9sP8aOKdtg8yMH3hisKR6rdW+mfX5q0Q8Gol2hZsFH/qyIhnPz
+hXDknuOh8E5iMkzrejVXUEn++Yzj23XjP59SObLznVkyxI+kBI9qvVEPfFBDybjH

xutils-dev: Changes to 'debian-unstable'

2016-01-19 Thread Andreas Boll 
 debian/changelog   |8 
 debian/compat  |2 
 debian/control |6 
 debian/patches/08_xorg_with_xmlto.diff |   28 +
 debian/patches/series  |1 
 debian/rules   |  103 -
 debian/watch.gccmakedep|1 
 debian/watch.imake |1 
 debian/watch.lndir |1 
 debian/watch.makedepend|1 
 debian/watch.util-macros   |1 
 debian/watch.xorg-cf-files |1 
 debian/xsfbs/repack.sh |   32 +
 debian/xsfbs/xsfbs.mk  |  285 +++
 debian/xsfbs/xsfbs.sh  |  622 +
 15 files changed, 1053 insertions(+), 40 deletions(-)

New commits:
commit f48feb795bd9423e87f39468075f137b5cf69e17
Author: Andreas Boll 
Date:   Tue Jan 19 15:59:32 2016 +0100

Update Vcs-* fields.

diff --git a/debian/changelog b/debian/changelog
index 1a9ca21..aa6ebb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xutils-dev (1:7.7+4) UNRELEASED; urgency=medium
   * [util-macros] Add patch from upstream git to fix macro
 XORG_WITH_XMLTO (Closes: #613674).  Thanks, Peter Pearse, Helmut
 Grohne and Gaetan Nadon!
+  * Update Vcs-* fields.
 
  -- Andreas Boll   Tue, 19 Jan 2016 15:42:51 +0100
 
diff --git a/debian/control b/debian/control
index 6c9a931..d8ecc6c 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends:
  x11proto-core-dev (>= 7.0.17),
  autoconf,
 Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xutils-dev.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xutils-dev.git
 
 Package: xutils-dev
 Architecture: any

commit 0f7b70c3fb5e07352c0858200ba82ec6caeb0883
Author: Andreas Boll 
Date:   Tue Jan 19 15:44:03 2016 +0100

[util-macros] Add patch from upstream git to fix macro XORG_WITH_XMLTO 
(Closes: #613674).

Thanks, Peter Pearse, Helmut Grohne and Gaetan Nadon!

diff --git a/debian/changelog b/debian/changelog
index 7d8aa3d..1a9ca21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xutils-dev (1:7.7+4) UNRELEASED; urgency=medium
+
+  * [util-macros] Add patch from upstream git to fix macro
+XORG_WITH_XMLTO (Closes: #613674).  Thanks, Peter Pearse, Helmut
+Grohne and Gaetan Nadon!
+
+ -- Andreas Boll   Tue, 19 Jan 2016 15:42:51 +0100
+
 xutils-dev (1:7.7+3) unstable; urgency=medium
 
   * gccmakedep 1.0.3.
diff --git a/debian/patches/08_xorg_with_xmlto.diff 
b/debian/patches/08_xorg_with_xmlto.diff
new file mode 100644
index 000..961cb72
--- /dev/null
+++ b/debian/patches/08_xorg_with_xmlto.diff
@@ -0,0 +1,28 @@
+--- a/util-macros/xorg-macros.m4.in
 b/util-macros/xorg-macros.m4.in
+@@ -422,13 +422,24 @@
+ fi])
+ 
+ # Test for the ability of xmlto to generate a text target
++#
++# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the
++# following test for empty XML docbook files.
++# For compatibility reasons use the following empty XML docbook file and if
++# it fails try it again with a non-empty XML file.
+ have_xmlto_text=no
+ cat > conftest.xml << "EOF"
+ EOF
+ AS_IF([test "$have_xmlto" = yes],
+   [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
+  [have_xmlto_text=yes],
+- [AC_MSG_WARN([xmlto cannot generate text format, this format 
skipped])])])
++ [# Try it again with a non-empty XML file.
++  cat > conftest.xml << "EOF"
++
++EOF
++  AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 
2>&1],
++[have_xmlto_text=yes],
++[AC_MSG_WARN([xmlto cannot generate text format, this 
format skipped])])])])
+ rm -f conftest.xml
+ AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
+ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
diff --git a/debian/patches/series b/debian/patches/series
index 0be66ef..c91cb22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 05_xaw_without_xp.diff
 06_font_path.diff
 07_gnu_manpath.diff
+08_xorg_with_xmlto.diff

commit 7de40d70e7b5ba89e5e97dd74f163ff65b696b1a
Author: Andreas Boll 
Date:   Tue Jan 19 15:13:46 2016 +0100

Revert "Use dh, drop xsfbs."

This reverts commit 9d7cd40dc94b95090295497a04cfa3fe1bb1bc13.

diff --git a/debian/changelog b/debian/changelog
index 79cac06..7d8aa3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-xutils-dev (1:7.7+4) UNRELEASED; urgency=medium
-
-  * Use dh, drop xsfbs.
-
- -- Julien Cristau   Sat, 02 May 2015

xutils-dev: Changes to 'debian-unstable'

2015-05-02 Thread Julien Cristau 
 debian/changelog   |7 
 debian/compat  |2 
 debian/control |2 
 debian/rules   |  103 +--
 debian/watch.gccmakedep|1 
 debian/watch.imake |1 
 debian/watch.lndir |1 
 debian/watch.makedepend|1 
 debian/watch.util-macros   |1 
 debian/watch.xorg-cf-files |1 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 
 debian/xsfbs/xsfbs.sh  |  622 -
 13 files changed, 42 insertions(+), 1017 deletions(-)

New commits:
commit a505e3eab7f831c7f010c419b7030b083407f61a
Author: Julien Cristau jcris...@debian.org
Date:   Sat May 2 19:41:32 2015 +0200

Let uscan verify tarball signatures.

diff --git a/debian/changelog b/debian/changelog
index 79cac06..5c20a58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xutils-dev (1:7.7+4) UNRELEASED; urgency=medium
 
   * Use dh, drop xsfbs.
+  * Let uscan verify tarball signatures.
 
  -- Julien Cristau jcris...@debian.org  Sat, 02 May 2015 19:35:56 +0200
 
diff --git a/debian/rules b/debian/rules
index 12b52e5..a68785c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,11 +66,4 @@ get-tarballs: $(addprefix get-tarball-,$(SUBDIRS))
 get-tarball-%:
uscan --no-conf --download --no-symlink --destdir . --package $* 
--upstream-version $(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }'  
$*/configure || echo 0) --watchfile debian/watch.$* || test $$? = 1
 
-debian/watch.%:
-   echo version=3  $@
-   echo 'http://xorg.freedesktop.org/releases/individual/util/ 
$*-(.*)\.tar\.gz'  $@
-
-.PHONY: watchfiles
-watchfiles: $(addprefix debian/watch.,$(SUBDIRS))
-
 # vim:set ai noet sw=8 ts=8 tw=80:
diff --git a/debian/watch.gccmakedep b/debian/watch.gccmakedep
index cbe12be..d9e0548 100644
--- a/debian/watch.gccmakedep
+++ b/debian/watch.gccmakedep
@@ -1,3 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/util/gccmakedep
 version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
 http://xorg.freedesktop.org/releases/individual/util/ gccmakedep-(.*)\.tar\.gz
diff --git a/debian/watch.imake b/debian/watch.imake
index 74c3e79..ae68c93 100644
--- a/debian/watch.imake
+++ b/debian/watch.imake
@@ -1,3 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/util/imake
 version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
 http://xorg.freedesktop.org/releases/individual/util/ imake-(.*)\.tar\.gz
diff --git a/debian/watch.lndir b/debian/watch.lndir
index 08a0413..fa76e35 100644
--- a/debian/watch.lndir
+++ b/debian/watch.lndir
@@ -1,3 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/util/lndir
 version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
 http://xorg.freedesktop.org/releases/individual/util/ lndir-(.*)\.tar\.gz
diff --git a/debian/watch.makedepend b/debian/watch.makedepend
index b56ee42..1764c7b 100644
--- a/debian/watch.makedepend
+++ b/debian/watch.makedepend
@@ -1,3 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/util/makedepend
 version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
 http://xorg.freedesktop.org/releases/individual/util/ makedepend-(.*)\.tar\.gz
diff --git a/debian/watch.util-macros b/debian/watch.util-macros
index ce79e59..afe8e0e 100644
--- a/debian/watch.util-macros
+++ b/debian/watch.util-macros
@@ -1,3 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/util/macros
 version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
 http://xorg.freedesktop.org/releases/individual/util/ util-macros-(.*)\.tar\.gz
diff --git a/debian/watch.xorg-cf-files b/debian/watch.xorg-cf-files
index bf0465c..2345b3f 100644
--- a/debian/watch.xorg-cf-files
+++ b/debian/watch.xorg-cf-files
@@ -1,3 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/util/cf
 version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
 http://xorg.freedesktop.org/releases/individual/util/ 
xorg-cf-files-(.*)\.tar\.gz

commit 9d7cd40dc94b95090295497a04cfa3fe1bb1bc13
Author: Julien Cristau jcris...@debian.org
Date:   Sat May 2 19:36:12 2015 +0200

Use dh, drop xsfbs.

diff --git a/debian/changelog b/debian/changelog
index 7d8aa3d..79cac06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xutils-dev (1:7.7+4) UNRELEASED; urgency=medium
+
+  * Use dh, drop xsfbs.
+
+ -- Julien Cristau jcris...@debian.org  Sat, 02 May 2015 19:35:56 +0200
+
 xutils-dev (1:7.7+3) unstable; urgency=medium
 
   * gccmakedep 1.0.3.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 6c9a931..3effd5e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Build-Depends:
  dpkg-dev (= 1.16.1),
- debhelper (= 7),
+ debhelper (= 9),
  autotools-dev,
  pkg-config,
  quilt,
diff --git a/debian/rules b/debian/rules
index 2b3fe77..12b52e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,6 @@
 # set this to the name of the main shlib's binary

xutils-dev: Changes to 'debian-unstable'

2014-05-21 Thread Julien Cristau 
 debian/changelog|   15 
 debian/control  |3 
 debian/patches/Replace-fprintf-with-fputs.patch |   31 
 debian/patches/series   |1 
 debian/rules|3 
 debian/xutils-dev.install   |2 
 gccmakedep/ChangeLog|  203 
 gccmakedep/Makefile.am  |   40 
 gccmakedep/Makefile.in  |  541 
 gccmakedep/aclocal.m4   | 2870 
 gccmakedep/compile  |  347 
 gccmakedep/config.guess |  616 -
 gccmakedep/config.sub   |  391 
 gccmakedep/configure|14179 +---
 gccmakedep/configure.ac |   25 
 gccmakedep/cpprules.in  |   26 
 gccmakedep/gccmakedep.in|  130 
 gccmakedep/gccmdep.cpp  |  126 
 gccmakedep/install-sh   |  538 
 gccmakedep/missing  |  453 
 gccmakedep/mkinstalldirs|  158 
 imake/ChangeLog |   34 
 imake/Makefile.am   |6 
 imake/Makefile.in   |   13 
 imake/aclocal.m4| 5817 -
 imake/config.sub|   13 
 imake/configure |  627 -
 imake/configure.ac  |3 
 imake/imake.c   |2 
 imake/missing   |4 
 util-macros/ChangeLog   |   85 
 util-macros/INSTALL |  121 
 util-macros/configure   |   20 
 util-macros/configure.ac|4 
 util-macros/xorg-macros.m4.in   |   27 
 35 files changed, 18536 insertions(+), 8938 deletions(-)

New commits:
commit f890c0b20f4b8b35ef72403ff1bb333dddbfa250
Author: Julien Cristau jcris...@debian.org
Date:   Wed May 21 21:46:40 2014 +0200

Remove Cyril from Uploaders.

diff --git a/debian/changelog b/debian/changelog
index e1f8060..7d8aa3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xutils-dev (1:7.7+3) unstable; urgency=medium
   * Disable ccmakedep because it's actually not fixed with the new imake
 release, and nothing in Debian seems to use it.  Incidentally, this
 closes: #693129.
+  * Remove Cyril from Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Wed, 21 May 2014 21:43:34 +0200
 
diff --git a/debian/control b/debian/control
index b7a8d4a..6c9a931 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xutils-dev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Cyril Brulebois k...@debian.org
 Build-Depends:
  dpkg-dev (= 1.16.1),
  debhelper (= 7),

commit d6fe842f041cb7d2cb3f43dc94000b63c11937ea
Author: Julien Cristau jcris...@debian.org
Date:   Wed May 21 21:46:06 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index b61ab04..e1f8060 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.7+3) UNRELEASED; urgency=medium
+xutils-dev (1:7.7+3) unstable; urgency=medium
 
   * gccmakedep 1.0.3.
   * util-macros 1.19.0.
@@ -7,9 +7,10 @@ xutils-dev (1:7.7+3) UNRELEASED; urgency=medium
   * The new upstream releases allow us to go back to default cpp version
 (closes: #742436)
   * Disable ccmakedep because it's actually not fixed with the new imake
-release, and nothing in Debian seems to use it.
+release, and nothing in Debian seems to use it.  Incidentally, this
+closes: #693129.
 
- -- Julien Cristau jcris...@debian.org  Wed, 21 May 2014 20:44:14 +0200
+ -- Julien Cristau jcris...@debian.org  Wed, 21 May 2014 21:43:34 +0200
 
 xutils-dev (1:7.7+2) unstable; urgency=medium
 

commit cb2e59fc686ed0dd86010158e3bf63e623c18b1e
Author: Julien Cristau jcris...@debian.org
Date:   Wed May 21 21:38:55 2014 +0200

Disable ccmakedep

It's actually not fixed with the new imake release (continuation lines
are broken), and nothing in Debian seems to use it.

diff --git a/debian/changelog b/debian/changelog
index 59f7383..b61ab04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xutils-dev (1:7.7+3) UNRELEASED; urgency=medium
 + drop -Werror=format-security FTBFS patch, applied upstream
   * The new upstream releases allow us to go back to default cpp version
 (closes: #742436)
+  * Disable ccmakedep because it's actually not fixed with the new imake
+release, and nothing in Debian seems to use it.
 
  -- Julien Cristau jcris...@debian.org  Wed, 21 May 2014 20:44:14 +0200
 
diff --git a/debian/control

xutils-dev: Changes to 'debian-unstable'

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

New commits:
commit 7205ea1eadfb97ba568083a98f8d6c7514d0f116
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 12 19:10:20 2014 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 25eb23d..4ffd49a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.7+2) UNRELEASED; urgency=medium
+xutils-dev (1:7.7+2) unstable; urgency=medium
 
   [ Julien Cristau ]
   * util-macros 1.18.0.
@@ -6,7 +6,7 @@ xutils-dev (1:7.7+2) UNRELEASED; urgency=medium
   [ Wookey ]
   * Add missing AArch64/arm64 default C options (closes: #734944)
 
- -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 12:57:11 +0100
+ -- Julien Cristau jcris...@debian.org  Sun, 12 Jan 2014 19:10:02 +0100
 
 xutils-dev (1:7.7+1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1w2rwm-0002ny...@moszumanska.debian.org

xutils-dev: Changes to 'debian-unstable'

2014-01-11 Thread Julien Cristau 
 debian/changelog |4 
 debian/patches/04_xutils-dev-debian.diff |   11 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 26dd7f01645b6e67ce82ef7bab0d0ae043cb9b6f
Author: Wookey woo...@debian.org
Date:   Sat Jan 11 11:54:51 2014 +0100

Add missing AArch64/arm64 default C options

diff --git a/debian/changelog b/debian/changelog
index c215185..25eb23d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 xutils-dev (1:7.7+2) UNRELEASED; urgency=medium
 
+  [ Julien Cristau ]
   * util-macros 1.18.0.
 
+  [ Wookey ]
+  * Add missing AArch64/arm64 default C options (closes: #734944)
+
  -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 12:57:11 +0100
 
 xutils-dev (1:7.7+1) unstable; urgency=low
diff --git a/debian/patches/04_xutils-dev-debian.diff 
b/debian/patches/04_xutils-dev-debian.diff
index d59cbb9..c8731a3 100644
--- a/debian/patches/04_xutils-dev-debian.diff
+++ b/debian/patches/04_xutils-dev-debian.diff
@@ -1717,7 +1717,16 @@ Index: xutils-dev/xorg-cf-files/linux.cf
  # endif
  # define LinuxMachineDefines   -D__amd64__
  # define ServerOSDefines  XFree86ServerOSDefines -DDDXTIME
-@@ -1032,26 +1136,6 @@ InstallNamedTargetNoClobber(install,file
+@@ -991,7 +1095,7 @@
+ 
+ #ifdef AArch64Architecture
+ # ifndef OptimizedCDebugFlags
+-#  define OptimizedCDebugFlags DefaultGcc2AArch64Opt
++#  define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt 
GccAliasingArgs
+ # endif
+ # define LinuxMachineDefines   -D__aarch64__
+ # define ServerOSDefines   XFree86ServerOSDefines -DDDXTIME
+@@ -1032,26 +1136,6 @@
  # define ConnectionFlags  -DUNIXCONN -DTCPCONN
  #endif
  


-- 
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/e1w1wfm-0007xj...@moszumanska.debian.org

xutils-dev: Changes to 'debian-unstable'

2013-12-25 Thread Julien Cristau 
 debian/changelog  |6 
 util-macros/ChangeLog |   87 ++
 util-macros/Makefile.in   |  176 -
 util-macros/aclocal.m4|  530 --
 util-macros/configure |  212 +++-
 util-macros/configure.ac  |2 
 util-macros/install-sh|   14 -
 util-macros/missing   |  414 +---
 util-macros/xorg-macros.m4.in |   31 +-
 9 files changed, 692 insertions(+), 780 deletions(-)

New commits:
commit 6b0f2d824e9a84757ba8cbc496c8af1d24587d14
Author: Julien Cristau jcris...@debian.org
Date:   Wed Dec 25 12:57:47 2013 +0100

util-macros 1.18.0.

diff --git a/debian/changelog b/debian/changelog
index 20d5b3c..c215185 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xutils-dev (1:7.7+2) UNRELEASED; urgency=medium
+
+  * util-macros 1.18.0.
+
+ -- Julien Cristau jcris...@debian.org  Wed, 25 Dec 2013 12:57:11 +0100
+
 xutils-dev (1:7.7+1) unstable; urgency=low
 
   * xorg-cf-files: Debian GNU/Hurd uses /usr as ProjectRoot and /usr/share/man
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index 600f7b2..2c16e1b 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,90 @@
+commit 9bc8e154e53ee0ff8d09cc621ba762486f3e93fa
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Mon Dec 2 18:43:36 2013 -0500
+
+Version bump: 1.18.0
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit fae36763f91f38dc9c4c388f267532889bb428ff
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Mon Dec 2 18:12:39 2013 -0500
+
+XORG_TESTSET_CFLAG: add -fd which is the SUNCC -Wold-style-definition
+
+Seen in the XCB configuration and found missing in xorg.
+
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 71dc85d04b67dc9579de47ec9e51c3ae6dde91ce
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sun Dec 1 17:05:47 2013 -0500
+
+XORG_WITH_DOXYGEN: check for the dot graphics utility
+
+It is part of the graphviz package and it may be used by doxygen if
+the HAVE_DOT is set to yes in the doxygen configuration file.
+
+The calling module handles if the tool is mandatory or not.
+Doxygen will work fine without it, but no fancy graphics.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 4846869cce5aafb0d2d2980f508ae320b599ac92
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sun Dec 1 10:07:50 2013 -0500
+
+CWARNFLAGS: comment out -Wcast-qual
+
+On a full X build, this warning accounts for the 5,888 warnings on a total
+of 12,042. The line is moved to the noisy section of warnings.
+
+There is a discussion about the pros and cons here:
+http://lists.x.org/archives/xorg-devel/2013-November/039069.html
+
+Reviewed-by: Keith Packard kei...@keithp.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 72fdc868b56fe2b7bdc9a69872651baeca728fb6
+Author: Ross Burton ross.bur...@intel.com
+Date:   Thu Oct 10 17:23:04 2013 +0100
+
+xorg-macros.m4.in: use the autoconf cache for XORG_CHECK_MALLOC_ZERO
+
+Improve configure speed by checking the autoconf cache before compiling and
+running the test.
+
+As this means cross-compilation environments can trivially seed this cache 
as
+appropriate, remove the cross-compiling value (which for embedded systems 
using
+uclibc is wrong).
+
+Reviewed-by: Gaetan Nadon mems...@videotron.ca
+Signed-off-by: Ross Burton ross.bur...@intel.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 52ed34418492c1538b8022a830a79fbc50ba3605
+Author: Bart Massey b...@cs.pdx.edu
+Date:   Thu Sep 12 01:33:25 2013 -0700
+
+Revert Interleaved C code and declarations is no longer a portability 
issue.
+
+This reverts commit 689ea0ec5d8b7594ba2fa9e27b2458cea8a58724.
+
+Community consensus is that, while this style is no longer a
+portability issue, it's a style issue.
+
+commit 689ea0ec5d8b7594ba2fa9e27b2458cea8a58724
+Author: Arnaud Fontaine ar...@debian.org
+Date:   Thu Aug 29 11:06:14 2013 +0900
+
+Interleaved C code and declarations is no longer a portability issue.
+
+This was only supported from GCC 3.0 and OpenBSD was still using GCC 2.95
+until recently.
+
+Signed-off-by: Arnaud Fontaine ar...@debian.org
+
 commit 052fa1dc1779de34ba69f68b7dc32b3c733c823e
 Author: Alan Coopersmith alan.coopersm...@oracle.com
 Date:   Fri Sep 6 23:34:33 2013 -0700
diff --git a/util-macros/Makefile.in b/util-macros/Makefile.in
index 6feb24a..d288f9b 100644
--- a/util-macros/Makefile.in
+++ b/util-macros/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994,

xutils-dev: Changes to 'debian-unstable'

2013-09-09 Thread Julien Cristau 
 debian/changelog|   19 
 debian/compat   |2 
 debian/control  |5 
 debian/patches/04_xutils-dev-debian.diff|   27 
 debian/patches/05_xaw_without_xp.diff   |   18 
 debian/patches/Replace-fprintf-with-fputs.patch |   31 
 debian/patches/series   |1 
 debian/rules|   26 
 debian/versions |   12 
 imake/ChangeLog |   84 
 imake/Makefile.in   |  352 -
 imake/aclocal.m4|  796 +--
 imake/compile   |  347 +
 imake/config.guess  |  407 -
 imake/config.sub|  237 
 imake/configure | 2723 +-
 imake/configure.ac  |9 
 imake/depcomp   |  531 +-
 imake/imake.c   |   22 
 imake/imake.man |  108 
 imake/imakemdep.h   |   24 
 imake/install-sh|   35 
 imake/missing   |  461 -
 makedepend/ChangeLog|  221 
 makedepend/Makefile.am  |3 
 makedepend/Makefile.in  |  760 ++
 makedepend/aclocal.m4   |  774 +-
 makedepend/autogen.sh   |4 
 makedepend/compile  |  347 +
 makedepend/config.guess |  407 -
 makedepend/config.sub   |  237 
 makedepend/configure| 2880 +-
 makedepend/configure.ac |   18 
 makedepend/cppsetup.c   |2 
 makedepend/def.h|7 
 makedepend/depcomp  |  531 +-
 makedepend/imakemdep.h  |6 
 makedepend/include.c|   14 
 makedepend/install-sh   |   35 
 makedepend/main.c   |  127 
 makedepend/makedepend-config.h.in   |3 
 makedepend/missing  |  461 -
 makedepend/parse.c  |   13 
 makedepend/pr.c |4 
 makedepend/test-driver  |  127 
 util-macros/ChangeLog   |   71 
 util-macros/Makefile.in |  245 
 util-macros/README  |2 
 util-macros/aclocal.m4  |  604 +-
 util-macros/configure   |  236 
 util-macros/configure.ac|3 
 util-macros/install-sh  |   35 
 util-macros/missing |  461 -
 util-macros/xorg-macros.m4.in   |   12 
 util-macros/xorgversion.m4  |2 
 xorg-cf-files/Amoeba.cf |4 
 xorg-cf-files/ChangeLog |   73 
 xorg-cf-files/DGUX.cf   |6 
 xorg-cf-files/FreeBSD.cf|   36 
 xorg-cf-files/Imake.cf  |   28 
 xorg-cf-files/Makefile.am   |3 
 xorg-cf-files/Makefile.in   |  220 
 xorg-cf-files/Mips.cf   |2 
 xorg-cf-files/Motif.rules   |8 
 xorg-cf-files/Motif.tmpl|   14 
 xorg-cf-files/NetBSD.cf |   32 
 xorg-cf-files/OpenBSD.cf|   42 
 xorg-cf-files/OpenBSDLib.tmpl   |4 
 xorg-cf-files/QNX4.cf   |8 
 xorg-cf-files/QNX4.rules|4 
 xorg-cf-files/Server.tmpl   |2 
 xorg-cf-files/Threads.tmpl  |2 
 xorg-cf-files/Win32.cf  |4 
 xorg-cf-files/X11.rules |   10 
 xorg-cf-files/X11.tmpl  |   20 
 xorg-cf-files/aclocal.m4| 2039 +--
 xorg-cf-files/bsdLib.rules  |4 
 xorg-cf-files/cde.rules |6 
 xorg-cf-files/compile   |  347 +
 xorg-cf-files/config.guess  |  407 -
 xorg-cf-files/config.sub|  237 
 xorg-cf-files/configure | 6294 +++-
 xorg-cf-files/configure.ac  |2 
 xorg-cf-files/convex.cf |6 
 xorg-cf-files/cross.def |2 
 xorg-cf-files/cygwin.cf |   22

xutils-dev: Changes to 'debian-unstable'

2012-05-28 Thread Julien Cristau 
 debian/changelog   |7 +++
 debian/patches/07_gnu_manpath.diff |   18 ++
 debian/patches/series  |1 +
 3 files changed, 26 insertions(+)

New commits:
commit e2184c7a8401148215986b03d1737a7d82024bd9
Author: Julien Cristau jcris...@debian.org
Date:   Mon May 28 12:10:20 2012 +0200

Add comment for hurd patch

diff --git a/debian/patches/07_gnu_manpath.diff 
b/debian/patches/07_gnu_manpath.diff
index dfe56da..7343ace 100644
--- a/debian/patches/07_gnu_manpath.diff
+++ b/debian/patches/07_gnu_manpath.diff
@@ -1,3 +1,5 @@
+This patch is Debian-specific, see bugs.debian.org/638016
+
 --- xutils-dev-7.6+5/xorg-cf-files/gnu.cf  2011-08-16 16:06:57.0 
+0200
 +++ xutils-dev-7.6+5/xorg-cf-files/gnu.cf.new  2011-08-16 16:09:58.0 
+0200
 @@ -29,6 +29,13 @@

commit c1adae40bf1a7309fe4048c5255b8fd66fb3f2d9
Author: Julien Cristau jcris...@debian.org
Date:   Mon May 28 12:06:10 2012 +0200

Debian GNU/Hurd uses /usr as ProjectRoot and /usr/share/man for manpages

Closes: #638016.
Thanks, Svante Signell.

diff --git a/debian/changelog b/debian/changelog
index ebee21b..a20de19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xutils-dev (1:7.7~2) UNRELEASED; urgency=low
+
+  * xorg-cf-files: Debian GNU/Hurd uses /usr as ProjectRoot and /usr/share/man
+for manpages (closes: #638016).  Thanks, Svante Signell.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 28 May 2012 12:05:05 +0200
+
 xutils-dev (1:7.7~1) unstable; urgency=low
 
   [ Robert Hooker ]
diff --git a/debian/patches/07_gnu_manpath.diff 
b/debian/patches/07_gnu_manpath.diff
new file mode 100644
index 000..dfe56da
--- /dev/null
+++ b/debian/patches/07_gnu_manpath.diff
@@ -0,0 +1,16 @@
+--- xutils-dev-7.6+5/xorg-cf-files/gnu.cf  2011-08-16 16:06:57.0 
+0200
 xutils-dev-7.6+5/xorg-cf-files/gnu.cf.new  2011-08-16 16:09:58.0 
+0200
+@@ -29,6 +29,13 @@
+ # define GnuBinUtilsMajorVersion  DefaultGnuBinUtilsMajorVersion
+ #endif
+ 
++#ifndef ProjectRoot
++# define ProjectRoot   /usr
++#endif
++#ifndef ManDirectoryRoot
++# define ManDirectoryRoot  /usr/share/man
++#endif
++
+ XCOMM operating system:  OSName 
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
+ XCOMM libc:   
(GnuCLibMajorVersion./**/GnuCLibMinorVersion./**/GnuCLibTeenyVersion)
+ XCOMM binutils:   (GnuBinUtilsMajorVersion)
diff --git a/debian/patches/series b/debian/patches/series
index 86f6aba..0be66ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 04_xutils-dev-debian.diff
 05_xaw_without_xp.diff
 06_font_path.diff
+07_gnu_manpath.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/e1sywui-0004ee...@vasks.debian.org

xutils-dev: Changes to 'debian-unstable'

2012-03-14 Thread Julien Cristau 
 debian/changelog |   13 +
 debian/control   |1 +
 debian/rules |1 -
 3 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit a7a7548fe64147bf4bc612169d73ea7496484437
Author: Julien Cristau jcris...@debian.org
Date:   Wed Mar 14 19:16:06 2012 +0100

Bump version and upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 4f6bbc1..ebee21b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.6+7) UNRELEASED; urgency=low
+xutils-dev (1:7.7~1) unstable; urgency=low
 
   [ Robert Hooker ]
   * imake 1.0.5
@@ -12,8 +12,9 @@ xutils-dev (1:7.6+7) UNRELEASED; urgency=low
   * Don't require (fake)root for debian/rules clean.
   * Build-Depend on autoconf to work around lack of AM_MAINTAINER_MODE in
 makedepend's configure.ac.
+  * Bump version number as we're nearing X.Org X11R7.7.
 
- -- Robert Hooker sarv...@ubuntu.com  Tue, 13 Mar 2012 20:26:24 -0400
+ -- Julien Cristau jcris...@debian.org  Wed, 14 Mar 2012 20:07:57 +0100
 
 xutils-dev (1:7.6+6) unstable; urgency=low
 

commit 4beb5876d8b0d6495d82a3fc155702174902fea7
Author: Julien Cristau jcris...@debian.org
Date:   Wed Mar 14 20:07:40 2012 +0100

Don't require (fake)root for debian/rules clean.

diff --git a/debian/changelog b/debian/changelog
index 69b3159..4f6bbc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xutils-dev (1:7.6+7) UNRELEASED; urgency=low
   * util-macros 1.17.0
 
   [ Julien Cristau ]
+  * Don't require (fake)root for debian/rules clean.
   * Build-Depend on autoconf to work around lack of AM_MAINTAINER_MODE in
 makedepend's configure.ac.
 
diff --git a/debian/rules b/debian/rules
index 2fb60ab..3340737 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,6 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/patch
 
 clean: xsfclean
dh_testdir
-   dh_testroot
rm -f build-stamp
 
rm -f config.cache config.log config.status

commit e14284317c3ea4d7c7976128f223f82a59365d15
Author: Julien Cristau jcris...@debian.org
Date:   Wed Mar 14 19:52:01 2012 +0100

Build-Depend on autoconf

Works around lack of AM_MAINTAINER_MODE in makedepend/configure.ac.

diff --git a/debian/changelog b/debian/changelog
index 1d888a1..69b3159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xutils-dev (1:7.6+7) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * imake 1.0.5
   * makedepend 1.0.4
   * lndir 1.0.3
@@ -7,6 +8,10 @@ xutils-dev (1:7.6+7) UNRELEASED; urgency=low
 update.
   * util-macros 1.17.0
 
+  [ Julien Cristau ]
+  * Build-Depend on autoconf to work around lack of AM_MAINTAINER_MODE in
+makedepend's configure.ac.
+
  -- Robert Hooker sarv...@ubuntu.com  Tue, 13 Mar 2012 20:26:24 -0400
 
 xutils-dev (1:7.6+6) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a0fcc9a..ae9085e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends:
  pkg-config,
  quilt,
  x11proto-core-dev (= 7.0.17),
+ autoconf,
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git

commit 470bc31ef06f29bb157e553549416ebd2b835a66
Author: Julien Cristau jcris...@debian.org
Date:   Wed Mar 14 19:11:57 2012 +0100

Drop superseded util-macros versions from the changelog

diff --git a/debian/changelog b/debian/changelog
index 6351d3c..1d888a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,5 @@
 xutils-dev (1:7.6+7) UNRELEASED; urgency=low
 
-  * util-macros 1.16.0 (superseded)
-  * util-macros 1.16.2 (superseded)
   * imake 1.0.5
   * makedepend 1.0.4
   * lndir 1.0.3


-- 
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/e1s7tbp-0007sd...@vasks.debian.org

xutils-dev: Changes to 'debian-unstable'

2012-03-13 Thread Robert Hooker 
 debian/changelog  |5 +-
 debian/versions   |2 -
 util-macros/ChangeLog |   73 ++
 util-macros/configure |   20 +-
 util-macros/configure.ac  |2 -
 util-macros/xorg-macros.m4.in |   79 +++---
 6 files changed, 148 insertions(+), 33 deletions(-)

New commits:
commit a723c9a64810d2f5ee1102cb770175446d5e2637
Author: Robert Hooker sarv...@ubuntu.com
Date:   Tue Mar 13 20:27:12 2012 -0400

util-macros 1.17.0

diff --git a/debian/changelog b/debian/changelog
index 7f09e24..6351d3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
 xutils-dev (1:7.6+7) UNRELEASED; urgency=low
 
   * util-macros 1.16.0 (superseded)
-  * util-macros 1.16.2
+  * util-macros 1.16.2 (superseded)
   * imake 1.0.5
   * makedepend 1.0.4
   * lndir 1.0.3
   * Bump x11proto-core-dev build dep version, required by the lndir
 update.
+  * util-macros 1.17.0
 
- -- Robert Hooker sarv...@ubuntu.com  Thu, 08 Mar 2012 16:19:15 -0500
+ -- Robert Hooker sarv...@ubuntu.com  Tue, 13 Mar 2012 20:26:24 -0400
 
 xutils-dev (1:7.6+6) unstable; urgency=low
 
diff --git a/debian/versions b/debian/versions
index 9cdef11..619f4df 100644
--- a/debian/versions
+++ b/debian/versions
@@ -9,7 +9,7 @@ squeeze. As the most useful, util-macros comes first.
 
 util-macros   | Debian
 
-1.16.2| 1:7.6+7
+1.17.0| 1:7.6+7
 1.15.0| 1:7.6+5
 1.14.0| 1:7.6+4
 1.13.0| 1:7.6+3
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index 1bad117..b55ec7a 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,76 @@
+commit c0c42057e0d357c144e7933ee413b522950a0f17
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Mar 13 19:45:12 2012 -0400
+
+Version bump: 1.17
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 51f69514e65637f575df901ef942515e70314f6a
+Author: Chase Douglas chase.doug...@canonical.com
+Date:   Mon Mar 12 11:49:28 2012 -0700
+
+Separate unknown warning options by language
+
+If XORG_COMPILER_FLAGS is called more than once with separate languages,
+the unknown warning options used internally for unknown warning checking
+will be set the first time and then the cached value will be used for
+subsequent languages. This is a problem if the compilers differ between
+the languages.
+
+This change ensures that the unknown warning options are namespaced so
+multiple XORG_COMPILER_FLAGS calls with different languages are checked
+separately.
+
+Signed-off-by: Chase Douglas chase.doug...@canonical.com
+Reviewed-by: Gaetan Nadonmems...@videotron.ca
+
+commit a1fec11ca3de6774fb70052f5f5ab167bf658690
+Author: Chase Douglas chase.doug...@canonical.com
+Date:   Mon Mar 12 10:59:55 2012 -0700
+
+Fix cflag test compiler message and cache ids
+
+When the language is C++, the flag checking message references $CC
+instead of $CXX. The cache id is also xorg_cv_cc_* instead of
+xorg_cv_cxx_*. This change fixes both issues.
+
+Signed-off-by: Chase Douglas chase.doug...@canonical.com
+Reviewed-by: Gaetan Nadonmems...@videotron.ca
+
+commit a02a9048a1b831d13d32413e2af429ac8d7a5c2b
+Author: Jon TURNEY jon.tur...@dronecode.org.uk
+Date:   Sat Mar 10 15:04:28 2012 +
+
+Don't use AS_ECHO in XORG_TESTSET_CFLAG
+
+Further to commit 52ef6f6, since AS_ECHO isn't supported in autoconf 2.61 
either,
+rewrite use of cache variable in XORG_TESTSET_CFLAG so 'echo' isn't needed 
at all.
+
+Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Reviewed-by: Gaetan Nadonmems...@videotron.ca
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+Signed-off-by: Chase Douglas chase.doug...@canonical.com
+
+commit 299ae797eff46900e7d5914ff4502662f97f2062
+Author: Chase Douglas chase.doug...@canonical.com
+Date:   Fri Mar 9 14:46:00 2012 -0800
+
+Add XORG_ENABLE_INTEGRATION_TESTS
+
+This macro enables a builder to enable/disable integration testing
+It makes no assumption about the test cases' implementation
+Test cases may or may not use Automake Support for test suites
+
+Unit test support usually requires less dependencies and may be built
+and run under less stringent environments than integration tests. Thus,
+two separate options for unit and integration testing is desirable.
+
+Copied from XORG_ENABLE_UNIT_TESTS.
+
+Signed-off-by: Chase Douglas chase.doug...@canonical.com
+Reviewed-by: Gaetan Nadonmems...@videotron.ca
+
 commit db238c632bb7136e3e44345820d514106e317420
 Author: Gaetan Nadon mems...@videotron.ca
 Date:   Mon Mar 5 09:39:17 2012 -0500
diff --git a/util-macros/configure b/util-macros/configure
index f9d69bd..b731e0f 100755
--- a/util-macros/configure
+++ b/util-macros/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for

xutils-dev: Changes to 'debian-unstable'

2012-03-08 Thread Robert Hooker 
 debian/changelog  |7 
 debian/control|2 
 debian/versions   |4 
 imake/ChangeLog   |   87 
 imake/Makefile.am |6 
 imake/Makefile.in |8 
 imake/aclocal.m4  | 1025 +++
 imake/cleanlinks  |4 
 imake/cleanlinks.man  |4 
 imake/configure   | 5732 +
 imake/configure.ac|6 
 imake/imake.c |  201 
 imake/imake.man   |   30 
 imake/imakemdep.h |2 
 imake/makeg.man   |8 
 imake/mdepend.cpp |6 
 imake/mergelib.cpp|   16 
 imake/mkdirhier.man   |   22 
 imake/mkhtmlindex.man |4 
 imake/xmkmf.cpp   |6 
 imake/xmkmf.man   |   45 
 lndir/ChangeLog   |   62 
 lndir/Makefile.in |2 
 lndir/aclocal.m4  | 1134 +++-
 lndir/config.guess|   18 
 lndir/config.sub  |   76 
 lndir/configure   | 9904 ++
 lndir/configure.ac|   17 
 lndir/lndir.c |   43 
 makedepend/ChangeLog  |   79 
 makedepend/Makefile.in|4 
 makedepend/README |   25 
 makedepend/aclocal.m4 | 1025 +++
 makedepend/config.guess   |   18 
 makedepend/config.sub |   76 
 makedepend/configure  | 5732 +
 makedepend/configure.ac   |2 
 makedepend/def.h  |   49 
 makedepend/ifparser.c |   26 
 makedepend/ifparser.h |   26 
 makedepend/imakemdep.h|4 
 makedepend/include.c  |   16 
 makedepend/main.c |   20 
 makedepend/makedepend.man |   32 
 makedepend/parse.c|   62 
 makedepend/pr.c   |   11 
 makedepend/tests/28045/makedep.sh |2 
 47 files changed, 22448 insertions(+), 3242 deletions(-)

New commits:
commit e798d5051cd30bdcac925cc8c77e117a42f481a3
Author: Robert Hooker sarv...@ubuntu.com
Date:   Thu Mar 8 16:21:22 2012 -0500

debian/control: bump x11proto-core-dev build dep as required by the new 
lndir update.

diff --git a/debian/changelog b/debian/changelog
index 898e694..7f09e24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ xutils-dev (1:7.6+7) UNRELEASED; urgency=low
   * imake 1.0.5
   * makedepend 1.0.4
   * lndir 1.0.3
+  * Bump x11proto-core-dev build dep version, required by the lndir
+update.
 
- -- Robert Hooker sarv...@ubuntu.com  Thu, 08 Mar 2012 16:15:29 -0500
+ -- Robert Hooker sarv...@ubuntu.com  Thu, 08 Mar 2012 16:19:15 -0500
 
 xutils-dev (1:7.6+6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a44c461..a0fcc9a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,
  quilt,
- x11proto-core-dev,
+ x11proto-core-dev (= 7.0.17),
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git

commit 08d910057bd30e53a6c116498bc8608882bfaeea
Author: Robert Hooker sarv...@ubuntu.com
Date:   Thu Mar 8 16:17:56 2012 -0500

lndir 1.0.3

diff --git a/debian/changelog b/debian/changelog
index 6160871..898e694 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xutils-dev (1:7.6+7) UNRELEASED; urgency=low
   * util-macros 1.16.2
   * imake 1.0.5
   * makedepend 1.0.4
+  * lndir 1.0.3
 
- -- Robert Hooker sarv...@ubuntu.com  Thu, 08 Mar 2012 16:13:52 -0500
+ -- Robert Hooker sarv...@ubuntu.com  Thu, 08 Mar 2012 16:15:29 -0500
 
 xutils-dev (1:7.6+6) unstable; urgency=low
 
diff --git a/debian/versions b/debian/versions
index b38287b..9cdef11 100644
--- a/debian/versions
+++ b/debian/versions
@@ -30,6 +30,7 @@ imake | Debian
 
 lndir | Debian
 
+1.0.3 | 1:7.6+7
 1.0.2 | 1:7.5+5
 
 
diff --git a/lndir/ChangeLog b/lndir/ChangeLog
index 38e5bb6..0505b8e 100644
--- a/lndir/ChangeLog
+++ b/lndir/ChangeLog
@@ -1,3 +1,65 @@
+commit 70ac3aeac918c916fffb6b2ee09514f50beb0ce9
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Mar 7 21:50:44 2012 -0800
+
+lndir 1.0.3
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit cc807bb858287537da97be0051318f15bf712a76
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Sep 28 14:46:18 2011 -0700
+
+Add printf  noreturn attributes for static analysis
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 966e58a5522c56ad5144ad5fe51273f24e9e729e
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Sep 28 14:43:27 2011 -0700
+
+Add const

xutils-dev: Changes to 'debian-unstable'

2012-03-05 Thread Robert Hooker 
 debian/changelog  |5 
 debian/versions   |2 
 util-macros/ChangeLog |  110 ++
 util-macros/configure |   20 +--
 util-macros/configure.ac  |2 
 util-macros/xorg-macros.m4.in |  244 +++---
 6 files changed, 285 insertions(+), 98 deletions(-)

New commits:
commit 9105f4dd8de384ac8f58011993f0214b242d7773
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Mar 5 10:56:14 2012 -0500

util-macros 1.16.2

Also bump util-macros version mentioned in debian/versions

diff --git a/debian/changelog b/debian/changelog
index b68358c..2db8073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xutils-dev (1:7.6+7) UNRELEASED; urgency=low
 
-  * util-macros 1.16.0
+  * util-macros 1.16.0 (superseded)
+  * util-macros 1.16.2
 
- -- Robert Hooker sarv...@ubuntu.com  Thu, 08 Dec 2011 16:19:45 -0500
+ -- Robert Hooker sarv...@ubuntu.com  Mon, 05 Mar 2012 10:52:03 -0500
 
 xutils-dev (1:7.6+6) unstable; urgency=low
 
diff --git a/debian/versions b/debian/versions
index eee105b..23f0213 100644
--- a/debian/versions
+++ b/debian/versions
@@ -9,7 +9,7 @@ squeeze. As the most useful, util-macros comes first.
 
 util-macros   | Debian
 
-1.16.0| 1:7.6+7
+1.16.2| 1:7.6+7
 1.15.0| 1:7.6+5
 1.14.0| 1:7.6+4
 1.13.0| 1:7.6+3
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index 339ec60..1bad117 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,113 @@
+commit db238c632bb7136e3e44345820d514106e317420
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Mon Mar 5 09:39:17 2012 -0500
+
+Version bump: 1.16.2
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 44aa8e75c8e54c5bc09d0cbff2f7207abe80c980
+Author: Chase Douglas chase.doug...@canonical.com
+Date:   Wed Feb 29 12:18:51 2012 -0800
+
+Define BASE_CXXFLAGS when C++ is the chosen language
+
+You can use this functionality by setting the language to C++ before
+calling XORG_DEFAULT_OPTIONS. This can accomplished with AC_LANG(C++).
+
+Signed-off-by: Chase Douglas chase.doug...@canonical.com
+Reviewed-by: Gaetan Nadon mems...@videotron.ca
+
+commit 543ce698747dc998ca0ed987ef1ab0c35fb501b1
+Author: Chase Douglas chase.doug...@canonical.com
+Date:   Wed Feb 29 09:51:02 2012 -0800
+
+Make XORG_TESTSET_CFLAG work for multiple languages
+
+Signed-off-by: Chase Douglas chase.doug...@canonical.com
+Reviewed-by: Gaetan Nadonmems...@videotron.ca
+
+commit 52ef6f666a4fb46b693c81dc7a44612e6b78239d
+Author: Jon TURNEY jon.tur...@dronecode.org.uk
+Date:   Tue Feb 14 21:59:38 2012 +
+
+Use AS_ECHO rather than AS_ECHO_N in XORG_TESTSET_CFLAG
+
+The AS_ECHO_N macro was only introduced in autoconf 2.62.
+Backticks remove trailing newlines, so we don't need to use echo -n
+
+Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Reviewed-by: Gaetan Nadon mems...@videotron.ca
+
+commit a1809fde56e45639556a44fd3c3ef9213204c5a9
+Author: Jon TURNEY jon.tur...@dronecode.org.uk
+Date:   Mon Jan 2 19:42:10 2012 +
+
+Cache the results of checking compiler flag support in XORG_TESTSET_CFLAG
+
+Since checking all those warning flags takes an amount of time I find 
irritating,
+here is an attempt at caching the results of checking compiler warning 
flag support
+
+A couple of aspects which need definitely need review or testing:
+
+* I've tried to get things right when not the first flag in the list of 
alternates is
+supported, but this really needs testing with a compiler other than gcc
+
+* The cache variable naming policy is a bit opaque me, so the names used 
may need corecting
+
+* I've tried to be careful, but who knows what portability sins I have 
committed :-)
+
+This change reduces the time to run the ./configure script produced from a 
configure.ac
+containing just
+
+AC_INIT([test], 1.0)
+XORG_COMPILER_FLAGS
+XORG_CWARNFLAGS
+XORG_STRICT_OPTION
+AC_OUTPUT()
+
+from ~60s to ~20s on my cygwin machine, and from ~15s to ~9s on a linux VM 
running on the
+same hardware
+
+v2: AS_TR_SH transforms characters which are invalid in shell variable 
names, so we don't
+have to use sed to transform spaces ourself
+
+Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Reviewed-by: Gaetan Nadon mems...@videotron.ca
+
+commit 214132d470ef98b5d3cdc71662cb586025746bb5
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Fri Jan 20 23:46:56 2012 -0800
+
+Version bump: 1.16.1
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 088c848e74ac47bbd84eac70ef18a3d2abe96936
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sun Dec 18 15:57:43 2011 -0800
+
+Provide a configure option to turn off the selective -Werror=... CFLAGS
+
+

xutils-dev: Changes to 'debian-unstable'

2011-12-11 Thread Cyril Brulebois 
 debian/versions |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6d9ee78d97016516b1eb985f7e20b79e9f077183
Author: Cyril Brulebois k...@debian.org
Date:   Sun Dec 11 12:06:00 2011 +0100

Mention util-macros 1.16.0 in debian/versions.

diff --git a/debian/versions b/debian/versions
index 098bb03..eee105b 100644
--- a/debian/versions
+++ b/debian/versions
@@ -9,6 +9,7 @@ squeeze. As the most useful, util-macros comes first.
 
 util-macros   | Debian
 
+1.16.0| 1:7.6+7
 1.15.0| 1:7.6+5
 1.14.0| 1:7.6+4
 1.13.0| 1:7.6+3


-- 
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/e1rzhei-0004nb...@vasks.debian.org

xutils-dev: Changes to 'debian-unstable'

2011-12-08 Thread Robert Hooker 
 debian/changelog  |6 
 util-macros/ChangeLog |  133 +
 util-macros/configure |   20 +--
 util-macros/configure.ac  |2 
 util-macros/xorg-macros.m4.in |  265 +++---
 5 files changed, 376 insertions(+), 50 deletions(-)

New commits:
commit 101233a902bb08166bdd05094532f88945863c51
Author: Robert Hooker sarv...@ubuntu.com
Date:   Thu Dec 8 16:21:47 2011 -0500

util-macros 1.16.0

diff --git a/debian/changelog b/debian/changelog
index 0d9d94b..b68358c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xutils-dev (1:7.6+7) UNRELEASED; urgency=low
+
+  * util-macros 1.16.0
+
+ -- Robert Hooker sarv...@ubuntu.com  Thu, 08 Dec 2011 16:19:45 -0500
+
 xutils-dev (1:7.6+6) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index 2290e90..339ec60 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,136 @@
+commit a8f51b6864c65ab226f2febd7322354fb00b9444
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Dec 7 15:15:54 2011 -0500
+
+Version bump: 1.16.0
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 87340dcccf97c3e1f0ab918bb6740abf47d65558
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Dec 1 13:12:59 2011 -0800
+
+XORG_TESTSET_CFLAG: Try to both compile  link with the flags
+
+Catches build problems caused by compilers that ignore unknown flags
+at compile time and pass them to the linker at link time, when the
+linker considers unknown flags to be fatal errors.
+
+Reviewed-by: Gaetan Nadon mems...@videotron.ca
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 2d4a7a4cf645c9cb586cf2f77f8d3f61d6c71883
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Thu Nov 10 23:45:57 2011 -0800
+
+XORG_TESTSET_CFLAG: Add support fot -Werror=unused-command-line-argument
+
+This warning was was added to clang in r144365
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 9d8a1e5809b4dd397efe2e62bbf2c8a6c4deb795
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Nov 3 18:14:15 2011 -0700
+
+Add XORG_MEMORY_CHECK_FLAGS and require it in XORG_ENABLE_UNIT_TESTS
+
+Based on the checks already in libXt/configure.ac and proposed for
+xserver/configure.ac - makes a common implementation before we make
+more copies.
+
+Callers should be able to just add
+   TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
+
+If built with an older xorg-macros, then the tests will simply be
+less stringent, matching what happens on platforms without any
+simple malloc debugging facilities available.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit 9b4a8bae3528950bdb87df095c212d646e15dbdb
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Nov 3 17:41:24 2011 -0700
+
+Define __wrap_exit in test program source for XORG_LD_WRAP
+
+Otherwise the test fails on Solaris releases that actually have support
+for ld -wrap because the linker instead returns an error that __wrap_exit
+is an undefined symbol.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit 0295ee03ab45c55771581664d6c903c6d2f87e53
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Nov 3 15:54:25 2011 -0700
+
+Add an optional argument to XORG_LD_WRAP
+
+Allows specifying if ld -wrap support is 'required' or 'optional' for
+unit tests, so that builds like the xserver which only need ld -wrap
+for some tests can allow users to enable the others when ld -wrap is
+not available.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit b8a13e531db208a7c4c9a43b74b196104e7c66ed
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Tue Nov 1 12:59:55 2011 -0700
+
+Add additional flags to XORG_COMPILER_FLAGS
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 08877399839f5a30a5edd2167fb4275d3dd9d473
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Tue Nov 1 12:44:48 2011 -0700
+
+Update XORG_CWARNFLAGS to use XORG_COMPILER_FLAGS
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit b406f730d64dfb8b699631ffb3ee5f3a1f0db8c4
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Tue Nov 1 12:19:24 2011 -0700
+
+Add XORG_COMPILER_FLAGS to replace XORG_CWARNFLAGS
+
+See: https://bugs.freedesktop.org/show_bug.cgi?id=31238
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit b175fe0e07fce86cf029695e9e93b573ada54b0c
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Tue Nov 1 11:53:44 2011 -0700
+
+Use XORG_TESTSET_CFLAG

xutils-dev: Changes to 'debian-unstable'

2011-11-08 Thread Steve Langasek 
 debian/changelog |8 ++--
 debian/control   |1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit e90db80240019fd4c2faf027aeaafe58a13124e4
Author: Steve Langasek steve.langa...@ubuntu.com
Date:   Tue Nov 8 19:00:30 2011 -0800

release 1:7.6+6

diff --git a/debian/changelog b/debian/changelog
index addbce0..0d9d94b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.6+6) UNRELEASED; urgency=low
+xutils-dev (1:7.6+6) unstable; urgency=low
 
   [ Julien Cristau ]
   * Change library directory from /usr/lib64 to /usr/lib on s390x as well
@@ -7,7 +7,7 @@ xutils-dev (1:7.6+6) UNRELEASED; urgency=low
   [ Steve Langasek ]
   * Mark xutils-dev Multi-Arch: foreign.
 
- -- Julien Cristau jcris...@debian.org  Mon, 15 Aug 2011 20:25:51 +0200
+ -- Steve Langasek vor...@debian.org  Tue, 08 Nov 2011 19:00:21 -0800
 
 xutils-dev (1:7.6+5) unstable; urgency=low
 

commit f8c72f03f6da079c80fe746f71f3db86acc03aeb
Author: Steve Langasek steve.langa...@ubuntu.com
Date:   Tue Nov 8 19:00:17 2011 -0800

Mark xutils-dev Multi-Arch: foreign.

diff --git a/debian/changelog b/debian/changelog
index 57b892a..addbce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xutils-dev (1:7.6+6) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Change library directory from /usr/lib64 to /usr/lib on s390x as well
 (closes: #637903).  Thanks, Aurélien Jarno!
 
+  [ Steve Langasek ]
+  * Mark xutils-dev Multi-Arch: foreign.
+
  -- Julien Cristau jcris...@debian.org  Mon, 15 Aug 2011 20:25:51 +0200
 
 xutils-dev (1:7.6+5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6f32ff2..a44c461 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
 
 Package: xutils-dev
 Architecture: any
+Multi-Arch: foreign
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},


-- 
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/e1rnyqm-0005lz...@vasks.debian.org

xutils-dev: Changes to 'debian-unstable'

2011-08-15 Thread Julien Cristau 
 debian/changelog |7 +
 debian/patches/04_xutils-dev-debian.diff |  131 +++
 2 files changed, 88 insertions(+), 50 deletions(-)

New commits:
commit af7f3eda7ef00ecc5353f20876c9bff3d560aa98
Author: Julien Cristau jcris...@debian.org
Date:   Mon Aug 15 20:26:55 2011 +0200

Change library directory from /usr/lib64 to /usr/lib on s390x as well

Closes: #637903
Thanks, Aurélien Jarno!

diff --git a/debian/changelog b/debian/changelog
index 863c65c..57b892a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xutils-dev (1:7.6+6) UNRELEASED; urgency=low
+
+  * Change library directory from /usr/lib64 to /usr/lib on s390x as well
+(closes: #637903).  Thanks, Aurélien Jarno!
+
+ -- Julien Cristau jcris...@debian.org  Mon, 15 Aug 2011 20:25:51 +0200
+
 xutils-dev (1:7.6+5) unstable; urgency=low
 
   * util-macros 1.15.0
diff --git a/debian/patches/04_xutils-dev-debian.diff 
b/debian/patches/04_xutils-dev-debian.diff
index 2be732e..907ff1d 100644
--- a/debian/patches/04_xutils-dev-debian.diff
+++ b/debian/patches/04_xutils-dev-debian.diff
@@ -1,5 +1,7 @@
 a/xorg-cf-files/bsdLib.rules
-+++ b/xorg-cf-files/bsdLib.rules
+Index: xutils-dev/xorg-cf-files/bsdLib.rules
+===
+--- xutils-dev.orig/xorg-cf-files/bsdLib.rules
 xutils-dev/xorg-cf-files/bsdLib.rules
 @@ -13,6 +13,12 @@ XCOMM $XFree86: xc/config/cf/bsdLib.rule
  #define UseElfFormat NO
  #endif
@@ -48,8 +50,10 @@
  #ifndef SharedDepModuleTarget
  #define SharedDepModuleTarget(name,deps,solist)   
@@\
  AllTarget(name)   
@@\
 a/xorg-cf-files/gnu.cf
-+++ b/xorg-cf-files/gnu.cf
+Index: xutils-dev/xorg-cf-files/gnu.cf
+===
+--- xutils-dev.orig/xorg-cf-files/gnu.cf
 xutils-dev/xorg-cf-files/gnu.cf
 @@ -17,16 +17,231 @@ XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.
  #ifndef OSTeenyVersion
  #define OSTeenyVersionDefaultOSTeenyVersion
@@ -611,8 +615,10 @@
 +#ifndef XFree86ServerOSDefines
 +# define XFree86ServerOSDefines
 +#endif
 a/xorg-cf-files/gnuLib.rules
-+++ b/xorg-cf-files/gnuLib.rules
+Index: xutils-dev/xorg-cf-files/gnuLib.rules
+===
+--- xutils-dev.orig/xorg-cf-files/gnuLib.rules
 xutils-dev/xorg-cf-files/gnuLib.rules
 @@ -17,7 +17,6 @@
  #define ForceNormalLib NO
  #endif
@@ -811,8 +817,10 @@
  /*
   * SharedLibraryDataTarget - generate rules to create shlib data file;
   */
 a/xorg-cf-files/gnuLib.tmpl
-+++ b/xorg-cf-files/gnuLib.tmpl
+Index: xutils-dev/xorg-cf-files/gnuLib.tmpl
+===
+--- xutils-dev.orig/xorg-cf-files/gnuLib.tmpl
 xutils-dev/xorg-cf-files/gnuLib.tmpl
 @@ -1,8 +1,9 @@
 -XCOMM
 -XCOMM  GNU Hurd shared library template
@@ -902,8 +910,10 @@
 +#endif
 +
 +#define NoMessageCatalog
 a/xorg-cf-files/Imake.rules
-+++ b/xorg-cf-files/Imake.rules
+Index: xutils-dev/xorg-cf-files/Imake.rules
+===
+--- xutils-dev.orig/xorg-cf-files/Imake.rules
 xutils-dev/xorg-cf-files/Imake.rules
 @@ -2722,6 +2722,20 @@ LibraryTargetName(libname): objlist1 obj
  
  
@@ -925,8 +935,10 @@
   * SubdirLibraryRule -
   */
  #ifndef SubdirLibraryRule
 a/xorg-cf-files/Imake.tmpl
-+++ b/xorg-cf-files/Imake.tmpl
+Index: xutils-dev/xorg-cf-files/Imake.tmpl
+===
+--- xutils-dev.orig/xorg-cf-files/Imake.tmpl
 xutils-dev/xorg-cf-files/Imake.tmpl
 @@ -902,37 +902,82 @@ TCLIBDIR = TclLibDir
  #define ManSourcePath $(MANPATH)/man
  #endif
@@ -1161,8 +1173,10 @@
  
 COMPRESSMANCMD = CompressManCmd
  
 a/xorg-cf-files/Library.tmpl
-+++ b/xorg-cf-files/Library.tmpl
+Index: xutils-dev/xorg-cf-files/Library.tmpl
+===
+--- xutils-dev.orig/xorg-cf-files/Library.tmpl
 xutils-dev/xorg-cf-files/Library.tmpl
 @@ -37,6 +37,14 @@ XCOMM $XFree86: xc/config/cf/Library.tmp
  #define DoExtraLib NO
  #endif
@@ -1270,8 +1284,10 @@
  #  if DoExtraLib  defined(ExtraLibRules)
  ExtraLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRAUNSHAREDOBJS))
  #   if !defined(LibInstall) || LibInstall
 a/xorg-cf-files/linux.cf
-+++ b/xorg-cf-files/linux.cf
+Index: xutils-dev/xorg-cf-files/linux.cf
+===
+--- xutils-dev.orig/xorg-cf-files/linux.cf
 xutils-dev/xorg-cf-files/linux.cf
 @@ -107,31 +107,48 @@ XCOMM operating system:  OSName (OSMajor
  XCOMM libc:   
(LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
  XCOMM binutils:   (LinuxBinUtilsMajorVersion)
@@ -1521,16 +1537,19 @@
  # endif /* DebianMaintainer */
  #endif /*

xutils-dev: Changes to 'debian-unstable'

2011-06-24 Thread Cyril Brulebois 
 debian/changelog  |   10 
 debian/control|9 ++--
 debian/versions   |1 
 util-macros/ChangeLog |   70 
 util-macros/configure |   20 -
 util-macros/configure.ac  |2 
 util-macros/xorg-macros.m4.in |   91 --
 7 files changed, 178 insertions(+), 25 deletions(-)

New commits:
commit d013926129f71505ef308b5b9c82dfc9df52e7b2
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 24 11:36:31 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index c6de6bc..863c65c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.6+5) UNRELEASED; urgency=low
+xutils-dev (1:7.6+5) unstable; urgency=low
 
   * util-macros 1.15.0
   * Update versions file accordingly.
@@ -6,7 +6,7 @@ xutils-dev (1:7.6+5) UNRELEASED; urgency=low
   * Update Uploaders list. Thanks, David, Andres  Brice!
   * Wrap Depends.
 
- -- Cyril Brulebois k...@debian.org  Fri, 24 Jun 2011 11:18:51 +0200
+ -- Cyril Brulebois k...@debian.org  Fri, 24 Jun 2011 11:36:28 +0200
 
 xutils-dev (1:7.6+4) unstable; urgency=low
 

commit 896574c3a7eeebd92b38de667a42c12cd78643b6
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 24 11:36:25 2011 +0200

Wrap Depends.

diff --git a/debian/changelog b/debian/changelog
index 468ab60..c6de6bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xutils-dev (1:7.6+5) UNRELEASED; urgency=low
   * Update versions file accordingly.
   * Bump Standards-Version to 3.9.2 (no changes).
   * Update Uploaders list. Thanks, David, Andres  Brice!
+  * Wrap Depends.
 
  -- Cyril Brulebois k...@debian.org  Fri, 24 Jun 2011 11:18:51 +0200
 
diff --git a/debian/control b/debian/control
index ac12209..6f32ff2 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,10 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
 
 Package: xutils-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ cpp,
 Description: X Window System utility programs for development
  xutils-dev provides a set of utility programs shipped with the X Window System
  that do not require the X libraries; many of these programs are useful

commit 25876fd10d22a70b11bea6a8a619ae3bafc36763
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 24 11:35:31 2011 +0200

Update Uploaders list. Thanks, David, Andres  Brice!

diff --git a/debian/changelog b/debian/changelog
index 7e78ee7..468ab60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xutils-dev (1:7.6+5) UNRELEASED; urgency=low
   * util-macros 1.15.0
   * Update versions file accordingly.
   * Bump Standards-Version to 3.9.2 (no changes).
+  * Update Uploaders list. Thanks, David, Andres  Brice!
 
  -- Cyril Brulebois k...@debian.org  Fri, 24 Jun 2011 11:18:51 +0200
 
diff --git a/debian/control b/debian/control
index 3bd83ee..ac12209 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xutils-dev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Andres Salomon 
dilin...@debian.org, Brice Goglin bgog...@debian.org, Cyril Brulebois 
k...@debian.org
+Uploaders: Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,

commit e7b7ae230cf8f3ad52b5f4cbdebe442f846f67cb
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 24 11:31:37 2011 +0200

Bump Standards-Version to 3.9.2 (no changes).

diff --git a/debian/changelog b/debian/changelog
index bd48a74..7e78ee7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xutils-dev (1:7.6+5) UNRELEASED; urgency=low
 
   * util-macros 1.15.0
   * Update versions file accordingly.
+  * Bump Standards-Version to 3.9.2 (no changes).
 
  -- Cyril Brulebois k...@debian.org  Fri, 24 Jun 2011 11:18:51 +0200
 
diff --git a/debian/control b/debian/control
index 7f505fe..3bd83ee 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  pkg-config,
  quilt,
  x11proto-core-dev,
-Standards-Version: 3.9.0
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
 

commit 22821b05b9bc6f3d5d8bbbc465d7bd6387f16d30
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 24 11:20:22 2011 +0200

Update versions file accordingly.

diff --git a/debian/changelog b/debian/changelog
index a6f4275..bd48a74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xutils-dev (1:7.6+5) UNRELEASED; urgency=low
 
   * util-macros 1.15.0
+  * Update versions file accordingly.
 
  -- Cyril Brulebois k...@debian.org  Fri, 24 Jun 2011 11:18:51 +0200
 
diff --git a/debian/versions b/debian/versions
index 2540cf2..098bb03 100644
--- a/debian/versions
+++

xutils-dev: Changes to 'debian-unstable'

2011-03-26 Thread Cyril Brulebois 
 debian/changelog |   10 --
 debian/rules |2 +-
 debian/versions  |   42 ++
 3 files changed, 51 insertions(+), 3 deletions(-)

New commits:
commit b152a9381eb8fb7b00e908a11812a42c66ef7744
Author: Cyril Brulebois k...@debian.org
Date:   Sun Mar 27 06:23:05 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 296f01a..fef41b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.6+3) UNRELEASED; urgency=low
+xutils-dev (1:7.6+3) unstable; urgency=low
 
   [ Robert Hooker ]
   * util-macros 1.13.0
@@ -8,7 +8,7 @@ xutils-dev (1:7.6+3) UNRELEASED; urgency=low
 to ease lookups.
   * Install that file through dh_installdocs.
 
- -- Robert Hooker sarv...@ubuntu.com  Tue, 15 Mar 2011 17:09:52 -0400
+ -- Cyril Brulebois k...@debian.org  Sun, 27 Mar 2011 06:23:02 +0200
 
 xutils-dev (1:7.6+2) unstable; urgency=low
 

commit 2be8569c88d7741ecece450b10aabcc8e773e80c
Author: Cyril Brulebois k...@debian.org
Date:   Sun Mar 27 06:22:57 2011 +0200

Install that file through dh_installdocs.

diff --git a/debian/changelog b/debian/changelog
index 0d4c206..296f01a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xutils-dev (1:7.6+3) UNRELEASED; urgency=low
   [ Cyril Brulebois ]
   * Add debian/versions, containing upstream to Debian version mappings,
 to ease lookups.
+  * Install that file through dh_installdocs.
 
  -- Robert Hooker sarv...@ubuntu.com  Tue, 15 Mar 2011 17:09:52 -0400
 
diff --git a/debian/rules b/debian/rules
index cd1a896..2fb60ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ binary-arch: build install
dh_testdir
dh_testroot
 
-   dh_installdocs
+   dh_installdocs debian/versions
dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs
dh_link

commit b3793bdf1f285c024ec31ce9f5c3dfeb407fd6d3
Author: Cyril Brulebois k...@debian.org
Date:   Sun Mar 27 06:18:34 2011 +0200

Add debian/versions, containing upstream to Debian version mappings, to 
ease lookups.

diff --git a/debian/changelog b/debian/changelog
index b150c7e..0d4c206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 xutils-dev (1:7.6+3) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * util-macros 1.13.0
 
+  [ Cyril Brulebois ]
+  * Add debian/versions, containing upstream to Debian version mappings,
+to ease lookups.
+
  -- Robert Hooker sarv...@ubuntu.com  Tue, 15 Mar 2011 17:09:52 -0400
 
 xutils-dev (1:7.6+2) unstable; urgency=low
diff --git a/debian/versions b/debian/versions
new file mode 100644
index 000..44c5af8
--- /dev/null
+++ b/debian/versions
@@ -0,0 +1,42 @@
+Version tables
+==
+
+The idea is to ease version lookup by providing an upstream to Debian
+version mapping, for each individual package. For conciseness, Debian
+versions are mentioned starting with the revision available in
+squeeze. As the most useful, util-macros comes first.
+
+
+util-macros   | Debian
+
+1.13.0| 1:7.6+3
+1.12.0| 1:7.6+2
+1.10.1| 1:7.6+1
+1.10.0| 1:7.5+4
+
+
+gccmakedep| Debian
+
+1.0.2 | 1:7.5+4
+
+
+imake | Debian
+
+1.0.4 | 1:7.5+5
+
+
+lndir | Debian
+
+1.0.2 | 1:7.5+5
+
+
+makedepend| Debian
+
+1.0.3 | 1:7.5+5
+1.0.2 | 1:7.5+4
+
+
+xorg-cf-files | Debian
+
+1.0.4 | 1:7.6+1
+1.0.3 | 1:7.5+4


-- 
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/e1q3ha6-0004dy...@alioth.debian.org

xutils-dev: Changes to 'debian-unstable'

2011-03-15 Thread Robert Hooker 
 debian/changelog  |6 +
 util-macros/ChangeLog |   63 ++
 util-macros/configure |   20 ++--
 util-macros/configure.ac  |2 
 util-macros/xorg-macros.m4.in |  188 ++
 5 files changed, 268 insertions(+), 11 deletions(-)

New commits:
commit 59013f6ce33699a90981d3a8aea6a454ce5883af
Author: Robert Hooker robert.hoo...@canonical.com
Date:   Tue Mar 15 17:11:14 2011 -0400

util-macros 1.13.0

diff --git a/debian/changelog b/debian/changelog
index ae02c0a..b150c7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xutils-dev (1:7.6+3) UNRELEASED; urgency=low
+
+  * util-macros 1.13.0
+
+ -- Robert Hooker sarv...@ubuntu.com  Tue, 15 Mar 2011 17:09:52 -0400
+
 xutils-dev (1:7.6+2) unstable; urgency=low
 
   * Drop xutils-dev build-dep (Closes: #616033). This introduces
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index f686ccf..54e9eaf 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,66 @@
+commit 5bb0cddcc5359d764015299021718f42b0a4055c
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Mon Mar 14 20:12:36 2011 -0400
+
+Version bump: 1.13.0
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 700ecdc16426c14e649439138e8e40cdc41fe1c1
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Mar 9 18:53:43 2011 -0500
+
+XORG_LD_WRAP: check if linker supports -wrap
+
+Used mainly by test cases using a wrapper function.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 380074140f7b1e3f8ea006a4b1d928d23706b81d
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Mar 9 10:53:49 2011 -0500
+
+XORG_WITH_GLIB: check for the GLib package
+
+XORG_WITH_GLIB([MIN-VERSION], [DEFAULT])
+ 
+ Minimum version: 1.13.0
+
+ GLib is a library which provides advanced data structures and functions.
+ This macro enables a module to test for the presence of Glib.
+
+ When used in conjunction with XORG_ENABLE_UNIT_TESTS, use both 
AM_CONDITIONAL
+ ENABLE_UNIT_TESTS and HAVE_GLIB.
+ Glib may be used for purpose other than testing
+
+ Package builders should use --without-glib to ensure it does not get 
pulled in.
+ Unit tests may or may not use GLib.
+
+ Developers should use --with-glib to error out if GLib is missing.
+
+ Interface to module:
+ HAVE_GLIB: used in makefiles to conditionally build targets
+ with_glib: used in configure.ac to know if GLib has been found
+ --with-glib:  'yes' user instructs the module to use glib
+   'no' user instructs the module not to use glib
+
+Reviewed-by: Dan Nicholson dbn.li...@gmail.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 78af2b882e01b17e38d1361a4a58b7768bb59bec
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed Mar 9 07:10:18 2011 -0500
+
+XORG_ENABLE_UNIT_TESTS: add support for unit testing
+
+This macro enables a builder to enable/disable unit testing
+It makes no assumption about the test cases implementation
+Test cases may or may not use Automake Support for test suites
+They may or may not use the software utility library GLib
+
+Reviewed-by: Dan Nicholson dbn.li...@gmail.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
 commit 1218d7e6ed064e0c534a01caf013cff666cb44bf
 Author: Gaetan Nadon mems...@videotron.ca
 Date:   Fri Feb 25 16:58:10 2011 -0500
diff --git a/util-macros/configure b/util-macros/configure
index c103fb7..cd64b52 100755
--- a/util-macros/configure
+++ b/util-macros/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for util-macros 1.12.0.
+# Generated by GNU Autoconf 2.63 for util-macros 1.13.0.
 #
 # Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
 #
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='util-macros'
 PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.12.0'
-PACKAGE_STRING='util-macros 1.12.0'
+PACKAGE_VERSION='1.13.0'
+PACKAGE_STRING='util-macros 1.13.0'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file=Makefile.am
@@ -1227,7 +1227,7 @@ if test $ac_init_help = long; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat _ACEOF
-\`configure' configures util-macros 1.12.0 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.13.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1293,7 +1293,7 @@ fi
 
 if test -n $ac_init_help; then
   case $ac_init_help in
- short | recursive ) echo Configuration of util-macros 1.12.0:;;
+ short | recursive ) echo Configuration of util-macros

xutils-dev: Changes to 'debian-unstable'

2011-03-07 Thread Cyril Brulebois 
 debian/changelog  |   10 
 debian/control|1 
 util-macros/ChangeLog |   64 +
 util-macros/Makefile.in   |  195 +---
 util-macros/aclocal.m4|  149 +--
 util-macros/configure | 1836 +-
 util-macros/configure.ac  |2 
 util-macros/install-sh|5 
 util-macros/missing   |   49 -
 util-macros/xorg-macros.m4.in |   85 +
 10 files changed, 1243 insertions(+), 1153 deletions(-)

New commits:
commit ef96a5c3b66c65c6664e099a00c6f2ebdd1fd818
Author: Cyril Brulebois k...@debian.org
Date:   Mon Mar 7 23:57:57 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index d56121a..ae02c0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.6+2) UNRELEASED; urgency=low
+xutils-dev (1:7.6+2) unstable; urgency=low
 
   * Drop xutils-dev build-dep (Closes: #616033). This introduces
 bootstrapping issues, and its absence seems to only trigger a “Package
@@ -6,7 +6,7 @@ xutils-dev (1:7.6+2) UNRELEASED; urgency=low
 added back later if it becomes really required.
   * util-macros 1.12.0.
 
- -- Cyril Brulebois k...@debian.org  Mon, 07 Mar 2011 23:50:05 +0100
+ -- Cyril Brulebois k...@debian.org  Mon, 07 Mar 2011 23:57:50 +0100
 
 xutils-dev (1:7.6+1) unstable; urgency=low
 

commit b13b48f7146bdcb5c8e0695392c3af025cbaf945
Author: Cyril Brulebois k...@debian.org
Date:   Mon Mar 7 23:56:22 2011 +0100

util-macros 1.12.0.

diff --git a/debian/changelog b/debian/changelog
index dc2d6ae..d56121a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xutils-dev (1:7.6+2) UNRELEASED; urgency=low
 bootstrapping issues, and its absence seems to only trigger a “Package
 xorg-macros was not found” message at configure time. It can easily be
 added back later if it becomes really required.
+  * util-macros 1.12.0.
 
  -- Cyril Brulebois k...@debian.org  Mon, 07 Mar 2011 23:50:05 +0100
 
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index 04b8a52..f686ccf 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,67 @@
+commit 1218d7e6ed064e0c534a01caf013cff666cb44bf
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Fri Feb 25 16:58:10 2011 -0500
+
+Version bump: 1.12.0
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit b22ce580bcc8343b880f19cc7f1c6bea176c8f13
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sat Jan 29 16:17:09 2011 -0500
+
+XORG_WITH_XSLTPROC: add XSLT processor command line tool
+
+The primary use will be for DocBook/XML cross links database generation.
+
+XSLT (Extensible Stylesheet Language Transformations) is a declarative,
+XML-based language used for the transformation of XML documents.
+The xsltproc command line tool is for applying XSLT stylesheets
+to XML documents.
+
+It is used under the cover by xmlto to generate html files from 
DocBook/XML.
+The XSLT processor is often used as a standalone tool for transformations.
+It should not be assumed that it is used only to work with documnetation.
+
+Tested-by: Matt Dew mar...@osource.org
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 7370b0b3f0308aec2a32012eddb2f0761d5fe399
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sun Dec 5 01:25:11 2010 -0800
+
+Use AC_LANG_PROGRAM in XORG_CHECK_MALLOC_ZERO to clear autoconf-2.68 
warnings
+
+configure.ac:126: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call 
detected in body
+../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
+../../lib/autoconf/general.m4:2730: _AC_RUN_IFELSE is expanded from...
+../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
+../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from...
+aclocal.m4:1952: XORG_CHECK_MALLOC_ZERO is expanded from...
+configure.ac:126: the top level
+
+Also, calloc() takes two arguments; and all of them return void *,
+not char *; as the compiler points out when you #include stdlib.h
+instead of faking it badly.   (And sometimes when you don't, due to
+compiler builtin versions of the functions.)
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Matt Turner matts...@gmail.com
+Reviewed-by: Dan Nicholson dbn.li...@gmail.com
+Reviewed-by: Gaetan Nadon mems...@videotron.ca
+
+commit 04030cbca37c04c48161debc0cade6db00cb347b
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sat Nov 6 20:50:06 2010 -0400
+
+XORG_ENABLE_DOCS: Fix Enable building the documentation (yes: yes)
+
+The quoting did not prevent the m4 defined variable default
+to replace the text string default in the help text.
+
+Reviewed-by: Dan Nicholson dbn.li...@gmail.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
 commit ce32345589050b17b23b18157f95f060f4c776a3
 Author: Alan

xutils-dev: Changes to 'debian-unstable'

2011-01-08 Thread Cyril Brulebois 
 debian/changelog |8 
 debian/copyright |   72 
 debian/patches/04_xutils-dev-debian.diff |  293 +-
 xorg-cf-files/COPYING|   74 
 xorg-cf-files/ChangeLog  |  101 
 xorg-cf-files/INSTALL|  291 ++
 xorg-cf-files/Imake.cf   |4 
 xorg-cf-files/Makefile.am|7 
 xorg-cf-files/Makefile.in|   32 
 xorg-cf-files/README |   47 
 xorg-cf-files/X11.tmpl   |   21 
 xorg-cf-files/aclocal.m4 | 1384 ++-
 xorg-cf-files/config.guess   |  210 -
 xorg-cf-files/config.sub |  115 
 xorg-cf-files/configure  | 3606 ++-
 xorg-cf-files/configure.ac   |   26 
 xorg-cf-files/cygwin.cf  |   21 
 xorg-cf-files/cygwin.rules   |   13 
 xorg-cf-files/cygwin.tmpl|9 
 xorg-cf-files/darwin.cf  |   11 
 xorg-cf-files/site.def   |8 
 xorg-cf-files/site.def.in|8 
 xorg-cf-files/xorgversion.def|   10 
 23 files changed, 3951 insertions(+), 2420 deletions(-)

New commits:
commit 8d493330a05b9e51d0e70b513855cdd919704c15
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jan 8 22:50:28 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 78fbe84..58e6ab4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xutils-dev (1:7.6+1) UNRELEASED; urgency=low
+xutils-dev (1:7.6+1) unstable; urgency=low
 
   * xorg-cf-files 1.0.4.
   * Update debian/copyright with xorg-cf-files/COPYING.
   * Refresh 04_xutils-dev-debian.diff
 
- -- Cyril Brulebois k...@debian.org  Sat, 08 Jan 2011 20:39:39 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 08 Jan 2011 22:50:19 +0100
 
 xutils-dev (1:7.5+5) unstable; urgency=low
 

commit af856770cbad4325de51ed83527a1e981d14d3fe
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jan 8 20:50:13 2011 +0100

Refresh patch to get offsets updated.

diff --git a/debian/patches/04_xutils-dev-debian.diff 
b/debian/patches/04_xutils-dev-debian.diff
index 71ff208..2be732e 100644
--- a/debian/patches/04_xutils-dev-debian.diff
+++ b/debian/patches/04_xutils-dev-debian.diff
@@ -1,8 +1,6 @@
-Index: xutils-dev/xorg-cf-files/bsdLib.rules
-===
 xutils-dev.orig/xorg-cf-files/bsdLib.rules
-+++ xutils-dev/xorg-cf-files/bsdLib.rules
-@@ -13,6 +13,12 @@
+--- a/xorg-cf-files/bsdLib.rules
 b/xorg-cf-files/bsdLib.rules
+@@ -13,6 +13,12 @@ XCOMM $XFree86: xc/config/cf/bsdLib.rule
  #define UseElfFormat NO
  #endif
  
@@ -15,7 +13,7 @@ Index: xutils-dev/xorg-cf-files/bsdLib.rules
  #if !UseElfFormat
  /* a.out shared libs */
  #ifndef HasSharedLibraries
-@@ -91,6 +97,34 @@
+@@ -91,6 +97,34 @@ clean:: 
@@\
  
  #endif /* SharedDepLibraryTarget */
  
@@ -50,11 +48,9 @@ Index: xutils-dev/xorg-cf-files/bsdLib.rules
  #ifndef SharedDepModuleTarget
  #define SharedDepModuleTarget(name,deps,solist)   
@@\
  AllTarget(name)   
@@\
-Index: xutils-dev/xorg-cf-files/gnu.cf
-===
 xutils-dev.orig/xorg-cf-files/gnu.cf
-+++ xutils-dev/xorg-cf-files/gnu.cf
-@@ -17,16 +17,231 @@
+--- a/xorg-cf-files/gnu.cf
 b/xorg-cf-files/gnu.cf
+@@ -17,16 +17,231 @@ XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.
  #ifndef OSTeenyVersion
  #define OSTeenyVersionDefaultOSTeenyVersion
  #endif
@@ -292,7 +288,7 @@ Index: xutils-dev/xorg-cf-files/gnu.cf
  #define HasPosixThreads YES
  #define ThreadedX   YES
  #define HasThreadSafeAPIYES
-@@ -36,35 +251,132 @@
+@@ -36,35 +251,132 @@ XCOMM XXXMB: What about _GNU_SOURCE, see
  #ifndef HasLibCrypt
  #define HasLibCrypt YES
  #endif
@@ -428,7 +424,7 @@ Index: xutils-dev/xorg-cf-files/gnu.cf
  #define AvoidNullMakeCommand  YES
  #ifndef DebuggableLibraries
  #define DebuggableLibraries   NO
-@@ -84,32 +396,64 @@
+@@ -84,32 +396,64 @@ XCOMM Not implemented and will always fa
  #define UseStaticTermcapLib   NO
  #endif
  
@@ -501,7 +497,7 @@ Index: xutils-dev/xorg-cf-files/gnu.cf
  #define YaccCmd   bison -y
  #define LexCmdflex -l
  #define HasFlex   YES
-@@ -125,50 +469,68 @@
+@@ -125,50 +469,68 @@ XCOMM Not implemented and will always fa
  #define StandardCppDefinesStandardDefines
  
  #define HasVarRun YES
@@ -593,7 +589,7 @@ Index: xutils-dev/xorg-cf-files/gnu.cf
  #define HasGnuMakeYES
  
  #define MakeNamedTargetSubdir(dir,flags,subname)\
-@@ -176,12 +538,16 @@
+@@ -176,12 +538,16 @@ XCOMM i386Architecture
  
  #define

xutils-dev: Changes to 'debian-unstable'

2010-10-31 Thread Cyril Brulebois 
 debian/changelog |   17 
 debian/control   |9 
 debian/patches/02_mkdirhier_rewrite.diff |  314 --
 debian/patches/series|1 
 debian/rules |6 
 imake/ChangeLog  |  122 
 imake/Makefile.am|   23 
 imake/Makefile.in|   27 
 imake/aclocal.m4 |  426 ++-
 imake/cleanlinks |1 
 imake/config.guess   |   18 
 imake/config.h.in|6 
 imake/config.sub |   76 
 imake/configure  | 1749 
 imake/configure.ac   |   19 
 imake/imake.c|   12 
 imake/imake.man  |3 
 imake/imakemdep.h|3 
 imake/makeg  |1 
 imake/makeg.man  |3 
 imake/mdepend.cpp|5 
 imake/mergelib.cpp   |2 
 imake/mergelib.man   |1 
 imake/mkdirhier  |   36 
 imake/mkdirhier.man  |3 
 imake/mkhtmlindex.pl |2 
 imake/mkhtmlindex.sh |2 
 imake/revpath.c  |1 
 imake/revpath.man|1 
 imake/xmkmf.cpp  |4 
 imake/xmkmf.man  |3 
 makedepend/ChangeLog |   54 
 makedepend/Makefile.am   |   40 
 makedepend/Makefile.in   |  167 -
 makedepend/aclocal.m4|  851 +-
 makedepend/config.guess  |  196 -
 makedepend/config.sub|   43 
 makedepend/configure | 4287 +--
 makedepend/configure.ac  |   11 
 makedepend/include.c |6 
 makedepend/makedepend-config.h.in|3 
 makedepend/tests/28045/foo.cpp   |2 
 makedepend/tests/28045/makedep.sh|   28 
 util-macros/ChangeLog|   37 
 util-macros/Makefile.in  |  195 -
 util-macros/aclocal.m4   |  149 -
 util-macros/configure| 1836 ++---
 util-macros/configure.ac |2 
 util-macros/install-sh   |5 
 util-macros/missing  |   49 
 util-macros/xorg-macros.m4.in|  102 
 51 files changed, 5342 insertions(+), 5617 deletions(-)

New commits:
commit 212621367cb74fc23f447f691d936a424767347f
Author: Cyril Brulebois k...@debian.org
Date:   Sun Oct 31 16:35:32 2010 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index d2fc088..c2cf390 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.5+5) UNRELEASED; urgency=low
+xutils-dev (1:7.5+5) unstable; urgency=low
 
   [ Julien Cristau ]
   * lndir 1.0.2.
@@ -17,7 +17,7 @@ xutils-dev (1:7.5+5) UNRELEASED; urgency=low
 just calls mkdir -p.
   * Add myself to Uploaders.
 
- -- Julien Cristau jcris...@debian.org  Sat, 16 Oct 2010 22:27:22 +0200
+ -- Cyril Brulebois k...@debian.org  Sun, 31 Oct 2010 16:35:25 +0100
 
 xutils-dev (1:7.5+4) unstable; urgency=low
 

commit 31972ed763a406ac56a81e8d4af43c13aae739ff
Author: Cyril Brulebois k...@debian.org
Date:   Sun Oct 31 16:35:13 2010 +0100

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index a6b52a2..d2fc088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ xutils-dev (1:7.5+5) UNRELEASED; urgency=low
   * imake 1.0.4.
   * Drop 02_mkdirhier_rewrite.diff, no longer needed since upstream now
 just calls mkdir -p.
+  * Add myself to Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Oct 2010 22:27:22 +0200
 
diff --git a/debian/control b/debian/control
index edd2af0..43dec2a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xutils-dev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Andres Salomon 
dilin...@debian.org, Brice Goglin bgog...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Andres Salomon 
dilin...@debian.org, Brice Goglin bgog...@debian.org, Cyril Brulebois 
k...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,

commit 89be00c169717bd5b334c8be5b0b3e1e19c8ab07
Author: Cyril Brulebois k...@debian.org
Date:   Sun Oct 31 16:31:39 2010 +0100

Drop 02_mkdirhier_rewrite.diff, no longer needed since upstream now just 
calls mkdir -p.

diff --git a/debian/changelog b/debian/changelog
index 59e40e1..a6b52a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ xutils-dev (1:7.5+5) UNRELEASED; urgency=low
   * Introduce

xutils-dev: Changes to 'debian-unstable'

2010-10-16 Thread Julien Cristau 
 debian/changelog  |8 
 debian/copyright  |   29 
 lndir/COPYING |   25 
 lndir/ChangeLog   |  242 +
 lndir/INSTALL |  291 ++
 lndir/Makefile.am |   20 
 lndir/Makefile.in |  405 +-
 lndir/README  |   25 
 lndir/aclocal.m4  | 2445 -
 lndir/compile |  142 -
 lndir/config.guess|  291 +-
 lndir/config.h.in |   80 
 lndir/config.sub  |  161 -
 lndir/configure   | 5752 +-
 lndir/configure.ac|   20 
 lndir/depcomp |  172 -
 lndir/install-sh  |  517 ++-
 lndir/lndir.c |   54 
 lndir/lndir.man   |   12 
 lndir/missing |  104 
 lndir/mkinstalldirs   |  158 -
 util-macros/COPYING   |2 
 util-macros/ChangeLog |   27 
 util-macros/configure |   20 
 util-macros/configure.ac  |2 
 util-macros/xorg-macros.m4.in |3 
 26 files changed, 6998 insertions(+), 4009 deletions(-)

New commits:
commit 627eb36172a09f790fa56c4680dfff94f09beb70
Author: Julien Cristau jcris...@debian.org
Date:   Sat Oct 16 22:33:13 2010 +0200

Update debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index 516e46d..a65326f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xutils-dev (1:7.5+5) UNRELEASED; urgency=low
 
   * lndir 1.0.2.
   * util-macros 1.10.1.
+  * Update debian/copyright from upstream COPYING.
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Oct 2010 22:27:22 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 0cfd573..f662371 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,4 @@
 gccmakedep:
-
   XFree86 code without an explicit copyright is covered by the following copy-
   right/license:
   
@@ -78,31 +77,29 @@ imake:
   XFree86 Project.
 
 lndir:
+  Copyright (c) 1990, 1993, 1994, 1998 The Open Group
 
-  Copyright (c) 1990, 1998 The Open Group
-  
   Permission to use, copy, modify, distribute, and sell this software and its
   documentation for any purpose is hereby granted without fee, provided that
   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.
 
-makedpend:
-
+makedepend:
   Copyright (c) 1993, 1994, 1998 The Open Group
   
   Permission to use, copy, modify, distribute, and sell this software and its
@@ -127,7 +124,7 @@ makedpend:
 
 util-macros:
   Copyright 2005 Red Hat, Inc.
-  
+
   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
@@ -138,7 +135,7 @@ util-macros:
   Hat makes no representations about the suitability of this software
   for any purpose.  It is provided as is without express or implied
   warranty.
-  
+
   RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
   INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
   NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -146,22 +143,22 @@ util-macros:
   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.
-  
+
   
-  
-  Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
-  
+
+  Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+
   Permission is hereby granted, free of charge, to any person obtaining a
   copy of this software and associated documentation files (the Software),
   to 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

xutils-dev: Changes to 'debian-unstable'

2010-07-11 Thread Julien Cristau 
 debian/README.source  |2 +-
 debian/changelog  |   11 +--
 debian/control|5 +
 debian/xsfbs/xsfbs.mk |   35 ++-
 4 files changed, 33 insertions(+), 20 deletions(-)

New commits:
commit 3dbea9f1a0169360fa85880a5a19165be2f75041
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jul 11 14:41:25 2010 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index ee1f56f..ed05852 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.5+4) UNRELEASED; urgency=low
+xutils-dev (1:7.5+4) unstable; urgency=low
 
   [ Robert Hooker ]
   * util-macros 1.10.0.
@@ -9,7 +9,7 @@ xutils-dev (1:7.5+4) UNRELEASED; urgency=low
 and xmkmf.  These packages are only in old ubuntu releases, and upgrades
 from dapper to maverick are not supported AFAIK.
 
- -- Robert Hooker sarv...@ubuntu.com  Sat, 03 Jul 2010 18:00:29 -0400
+ -- Julien Cristau jcris...@debian.org  Sun, 11 Jul 2010 14:41:22 +0100
 
 xutils-dev (1:7.5+3) unstable; urgency=low
 

commit 9e059e5799dd1448e8ae09eb3ce64966dcf84d66
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jul 11 14:39:28 2010 +0100

Drop obsolete Conflicts/Replaces/Provides

imake, makedepend, xorg-build-macros and xmkmf are only in old ubuntu
releases, and upgrades from dapper to maverick are not supported AFAIK.

diff --git a/debian/changelog b/debian/changelog
index fc79e65..ee1f56f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ xutils-dev (1:7.5+4) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Bump Standards-Version to 3.9.0.
+  * Drop Conflicts/Replaces/Provides on imake, makedepend, xorg-build-macros
+and xmkmf.  These packages are only in old ubuntu releases, and upgrades
+from dapper to maverick are not supported AFAIK.
 
  -- Robert Hooker sarv...@ubuntu.com  Sat, 03 Jul 2010 18:00:29 -0400
 
diff --git a/debian/control b/debian/control
index b99d13e..521dc0d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,6 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
 Package: xutils-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
-Conflicts: imake (= 1:1.0.1-1), makedepend (= 1:1.0.0-1), xorg-build-macros 
(= 1.0.1-1), xmkmf (= 0.99.0-6)
-Replaces: imake (= 1:1.0.1-1), makedepend (= 1:1.0.0-1), xorg-build-macros 
(= 1.0.1-1), xmkmf (= 0.99.0-6)
-Provides: imake, makedepend, xorg-build-macros, xmkmf
 Description: X Window System utility programs for development
  xutils-dev provides a set of utility programs shipped with the X Window System
  that do not require the X libraries; many of these programs are useful

commit b8ce252483b11c2d79bfd4cc88bdfcec9e9d0ed0
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jul 11 14:35:56 2010 +0100

Bump Standards-Version to 3.9.0.

diff --git a/debian/changelog b/debian/changelog
index 24276d6..fc79e65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 xutils-dev (1:7.5+4) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * util-macros 1.10.0.
 
+  [ Julien Cristau ]
+  * Bump Standards-Version to 3.9.0.
+
  -- Robert Hooker sarv...@ubuntu.com  Sat, 03 Jul 2010 18:00:29 -0400
 
 xutils-dev (1:7.5+3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2ba4a97..b99d13e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Andres Salomon 
dilin...@debian.org, Brice Goglin bgog...@debian.org
 Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, x11proto-core-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.0
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
 

commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois k...@debian.org
Date:   Sun May 2 02:14:45 2010 +0200

Add xorg-driver-{video,input} to Provides.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 
2/dev/null)
 # these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
 
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)

commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau jcris...@debian.org
Date:   Fri Apr 16 22:14:46 2010 +0200

Update serverabi rule for xserver

xutils-dev: Changes to 'debian-unstable'

2010-07-03 Thread Robert Hooker 
 debian/changelog  |4 +-
 util-macros/ChangeLog |   60 ++
 util-macros/configure |   20 +++---
 util-macros/configure.ac  |2 -
 util-macros/xorg-macros.m4.in |   47 
 5 files changed, 120 insertions(+), 13 deletions(-)

New commits:
commit 64b9379be29ba9a52d7c53342988cf37282509ee
Author: Robert Hooker sarv...@ubuntu.com
Date:   Sat Jul 3 18:00:48 2010 -0400

util-macros 1.10.0

diff --git a/debian/changelog b/debian/changelog
index d58572f..24276d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 xutils-dev (1:7.5+4) UNRELEASED; urgency=low
 
-  * util-macros 1.8.0.
+  * util-macros 1.10.0.
 
- -- Robert Hooker sarv...@ubuntu.com  Fri, 28 May 2010 22:02:29 -0400
+ -- Robert Hooker sarv...@ubuntu.com  Sat, 03 Jul 2010 18:00:29 -0400
 
 xutils-dev (1:7.5+3) unstable; urgency=low
 
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index d8cd9dd..6a20723 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,63 @@
+commit fbe66aedcf2165e43388894d3b2ee2f38e889f93
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Jun 24 17:36:33 2010 -0400
+
+Version bump: 1.10.0
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 4eed3443945a9d1443ec688efd835f46ed9adfc9
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Fri Jun 25 14:52:25 2010 -0400
+
+XORG_CHECK_SGML_DOCTOOLS: add interface for xorg stylesheet
+
+Add STYLESHEET_SRCDIR for directory location
+and XSL_STLESHEET for the name of the xorg style sheet
+
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 01ef7c69d91259e5904f26b6b4630243d548232a
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Jun 24 18:12:45 2010 -0400
+
+XORG_WITH_XMLTO: add HAVE_XMLTO_TEXT for text output format
+
+The xmlto program has dependencies when converting docbook XML
+to text format. It requires either lynx, links or w3m
+text web browsers.
+
+Users want to skip the text format to avoid having to install these.
+
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit fe878c0ce0b9093c13714ec6662b0c99a9a2d1d4
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Fri Jun 18 21:54:27 2010 -0400
+
+Version bump: 1.9.0
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit d4d18c07d7aa1005ad3d48dfdb19f245df2ebae0
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Fri Jun 18 20:32:13 2010 -0400
+
+XORG_WITH_GROFF: add HAVE_GROFF_HTML Automake conditional
+
+Groff uses grohtml to generate html output format. This program, in turn,
+uses a number of pnm* commands from the netpbm package, psselect
+from the psutils package and the ghostscript package.
+
+These are independently installed, so they could be missing.
+A check is made to ensure those dependencies are installed.
+If not, the makefile can use the conditional to supress the target.
+
+Reviewed-by: Dan Nicholson dbn.li...@gmail.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
 commit f0590edffe21ac6b7a11eab7caf6c8aad7c8bc07
 Author: Gaetan Nadon mems...@videotron.ca
 Date:   Thu May 27 09:27:54 2010 -0400
diff --git a/util-macros/configure b/util-macros/configure
index e31c336..44e9186 100755
--- a/util-macros/configure
+++ b/util-macros/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for util-macros 1.8.0.
+# Generated by GNU Autoconf 2.63 for util-macros 1.10.0.
 #
 # Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
 #
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='util-macros'
 PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.8.0'
-PACKAGE_STRING='util-macros 1.8.0'
+PACKAGE_VERSION='1.10.0'
+PACKAGE_STRING='util-macros 1.10.0'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file=Makefile.am
@@ -1227,7 +1227,7 @@ if test $ac_init_help = long; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat _ACEOF
-\`configure' configures util-macros 1.8.0 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.10.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1293,7 +1293,7 @@ fi
 
 if test -n $ac_init_help; then
   case $ac_init_help in
- short | recursive ) echo Configuration of util-macros 1.8.0:;;
+ short | recursive ) echo Configuration of util-macros 1.10.0:;;
esac
   cat \_ACEOF
 
@@ -1367,7 +1367,7 @@ fi
 test -n $ac_init_help  exit $ac_status
 if $ac_init_version; then
   cat \_ACEOF
-util-macros

xutils-dev: Changes to 'debian-unstable'

2010-05-28 Thread Robert Hooker 
 debian/changelog  |6 +
 util-macros/ChangeLog |  146 
 util-macros/configure |   46 +++-
 util-macros/configure.ac  |2 
 util-macros/xorg-macros.m4.in |  153 --
 util-macros/xorgversion.m4|   15 
 6 files changed, 269 insertions(+), 99 deletions(-)

New commits:
commit 8a8e7ca52d096c5e8d25f88f61ab23415ef5662e
Author: Robert Hooker sarv...@ubuntu.com
Date:   Fri May 28 22:07:09 2010 -0400

util-macros 1.8.0.

diff --git a/debian/changelog b/debian/changelog
index 226a4de..d58572f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xutils-dev (1:7.5+4) UNRELEASED; urgency=low
+
+  * util-macros 1.8.0.
+
+ -- Robert Hooker sarv...@ubuntu.com  Fri, 28 May 2010 22:02:29 -0400
+
 xutils-dev (1:7.5+3) unstable; urgency=low
 
   * util-macros 1.7.0.
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index fe45d2a..d8cd9dd 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,149 @@
+commit f0590edffe21ac6b7a11eab7caf6c8aad7c8bc07
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu May 27 09:27:54 2010 -0400
+
+Version bump: 1.8.0
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit ce3ece9cbf2380ab0e0535f52f0c6c6507d779c8
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Wed May 26 21:09:31 2010 -0400
+
+config: XORG_MANPAGE_SECTIONS: add AC_PROG_SED
+
+The sed command is required to create the man pages.
+
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 8cb69a59d54656d17ea7bcf479b0f27a17dc559e
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Mon May 17 10:36:48 2010 -0400
+
+XORG_MANPAGE_SECTIONS: add MAN_SUBSTS automake variable
+
+It will replace the 155 copies in package makefiles
+
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 2dd06a9bcfa6868260421ae803fa7d34a5d3a0c9
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Mon May 17 07:37:28 2010 -0400
+
+XORG_RELEASE_VERSION: remove option --with-release-version #24816
+
+The short story:
+- this option has never been used by OS builders as intended
+- the implementation changes automake internals
+- the implementation breaks a few makefiles (if used)
+- one less option for the user to be confused with on all 240 xorg modules
+
+The long story:
+https://bugs.freedesktop.org/show_bug.cgi?id=24816
+
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 99f9a3efe2ba46f9ba446b72a402f239e3357c12
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sun May 16 16:46:17 2010 -0400
+
+XORG_LINT_LIBRARY: rework to match XORG_WITH_LINT
+
+XORG_LINT_LIBRARY has implementations dependencies on XORG_WITH_LINT
+The library name can no longer be set by overloading the semantic
+of --enable-lint-library.
+If this function is required it should be added using an AC_ARG_VAR.
+
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 2cbe2acb5c70a76830f6ddc1bdc66c333507996f
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sat May 15 14:16:36 2010 -0400
+
+XORG_WITH_LINT: rework and extend platform coverage
+
+Guess the lint program name by platform.
+Use ARG variable for user input values.
+Provide default flags per platform.
+
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 4fd20af3ebf6bcfa4e991af6fd11d78494e4b95b
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Fri May 14 20:19:15 2010 -0400
+
+XORG_DEFAULT_OPTIONS: add AC_PROG_INSTALL
+
+All modules install something.
+This makes it clear it can removed from modules config.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 958c872c82c0612911e398304111ea5d98dbe973
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Fri May 14 17:55:13 2010 -0400
+
+XORG_STRICT_OPTION: remove redundant expansion of AC_PROG_CC macro
+
+Calling AC_PROG_CC before AC_PROG_CC_C99 is not required.
+C99 is not an add-on to CC although either one will cache results
+than can be used by the other.
+
+This is effectively a no-op. Note that if a module configure.ac
+file calls AC_PROG_CC after AC_PROG_CC_C99, the compiler will be reset
+to ISO_C89 from ISO_C99.
+Currently about half the xorg modules use C89 while the other half use C99.
+
+Reviewed-by: Rémi Cardona r...@gentoo.org
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 795e808cb32d183f9d8040749899e325420e9798
+Author: Yaakov Selkowitz yselkow...@users.sourceforge.net
+Date:   Tue

xutils-dev: Changes to 'debian-unstable'

2010-05-11 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 016832d736d9df3889b1c4c4234666b12212ecff
Author: Julien Cristau jcris...@debian.org
Date:   Tue May 11 14:31:24 2010 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index c928951..226a4de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.5+3) UNRELEASED; urgency=low
+xutils-dev (1:7.5+3) unstable; urgency=low
 
   * util-macros 1.7.0.
   * imake 1.0.3.
@@ -7,7 +7,7 @@ xutils-dev (1:7.5+3) UNRELEASED; urgency=low
   * Rediff 04_xutils-dev-debian.diff.
   * Update imake section in debian/copyright from upstream COPYING.
 
- -- Julien Cristau jcris...@debian.org  Sat, 03 Apr 2010 17:53:38 +0200
+ -- Julien Cristau jcris...@debian.org  Tue, 11 May 2010 14:31:01 +0200
 
 xutils-dev (1:7.5+2) unstable; urgency=low
 


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

xutils-dev: Changes to 'debian-unstable'

2010-05-09 Thread Julien Cristau 
 debian/changelog|7 
 debian/copyright|   55 
 debian/patches/01_netbsd_imake.c_fixes.diff |   38 
 debian/patches/04_xutils-dev-debian.diff|   68 
 debian/patches/series   |1 
 imake/COPYING   |   52 
 imake/ChangeLog |  458 +
 imake/INSTALL   |  291 +
 imake/Makefile.am   |   31 
 imake/Makefile.in   |  473 +
 imake/README|   35 
 imake/aclocal.m4| 2302 ++---
 imake/compile   |  142 
 imake/config.guess  |  291 -
 imake/config.h.in   |   45 
 imake/config.sub|  161 
 imake/configure | 6868 
 imake/configure.ac  |   14 
 imake/depcomp   |  172 
 imake/imake.c   |  174 
 imake/imake.man |   21 
 imake/imakemdep.h   | 1798 +++
 imake/install-sh|  517 +-
 imake/mdepend.cpp   |2 
 imake/missing   |  104 
 imake/mkinstalldirs |  158 
 util-macros/ChangeLog   |   28 
 util-macros/Makefile.am |2 
 util-macros/Makefile.in |1 
 util-macros/configure   |   20 
 util-macros/configure.ac|2 
 util-macros/xorg-macros.m4.in   |   54 
 32 files changed, 8804 insertions(+), 5581 deletions(-)

New commits:
commit d32ae4264ab951f18fd4f633bef23d749253b6d6
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 9 14:51:45 2010 +0200

Update imake section in debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index 7906fbc..c928951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xutils-dev (1:7.5+3) UNRELEASED; urgency=low
   * Drop 01_netbsd_imake.c_fixes.diff.  Doesn't apply, and Debian/NetBSD seems
 dead.
   * Rediff 04_xutils-dev-debian.diff.
+  * Update imake section in debian/copyright from upstream COPYING.
 
  -- Julien Cristau jcris...@debian.org  Sat, 03 Apr 2010 17:53:38 +0200
 
diff --git a/debian/copyright b/debian/copyright
index cf4756a..0cfd573 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,33 +28,54 @@ gccmakedep:
   Project.
 
 imake:
+  Copyright (c) 1985, 1986, 1987, 1989, 1993, 1994, 1996, 1998 The Open Group
 
-  Copyright (c) 1985, 1986, 1987, 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.
+
+  Copyright © 1999, 2000, 2003 by The XFree86 Project, Inc.  All Rights 
Reserved.
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the Software),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
   The above copyright notice and this permission notice 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

xutils-dev: Changes to 'debian-unstable'

2010-04-03 Thread Julien Cristau 
 debian/changelog  |6 
 util-macros/ChangeLog |  159 ++
 util-macros/configure |   20 +-
 util-macros/configure.ac  |2 
 util-macros/xorg-macros.m4.in |  362 --
 5 files changed, 523 insertions(+), 26 deletions(-)

New commits:
commit d96c58037a954d41a35810dddca0e2ea5a55b83d
Author: Julien Cristau jcris...@debian.org
Date:   Sat Apr 3 17:53:51 2010 +0200

util-macros 1.6.1.

diff --git a/debian/changelog b/debian/changelog
index 588a23b..d799d0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xutils-dev (1:7.5+3) UNRELEASED; urgency=low
+
+  * util-macros 1.6.1.
+
+ -- Julien Cristau jcris...@debian.org  Sat, 03 Apr 2010 17:53:38 +0200
+
 xutils-dev (1:7.5+2) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index d0fd11c..2ea646d 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,162 @@
+commit be6c44abf825a5814ca836165f62b66c30e7a966
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Thu Mar 11 11:11:42 2010 -0500
+
+Version bump: 1.6.1
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit b1660bfd095627778496bf403a741ff6ad44659a
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Mar 9 10:52:15 2010 -0500
+
+doc: fix typo in AC_MSG_CHECKING for XORG_CHECK_LINUXDOC
+
+The message should start with a lowercase letter.
+
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Dan Nicholson dbn.li...@gmail.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 2c833326fdd8303b5563eb9f621ff57e3bf5
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Mar 9 10:13:22 2010 -0500
+
+doc: Specify minimum xmlto version to XORG_WITH_DOXYGEN
+
+Adds an optional parameter to XORG_WITH_DOXYGEN to enforce a minimum
+version needed like the asciidoc version check.
+
+Reviewed-by: Dan Nicholson dbn.li...@gmail.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit d7cedc8ce552581c9acbfbe373cbee16a689abef
+Author: Dan Nicholson dbn.li...@gmail.com
+Date:   Wed Mar 3 20:16:46 2010 -0800
+
+doc: Specify minimum xmlto version to XORG_WITH_XMLTO
+
+Adds an optional parameter to XORG_WITH_XMLTO to enforce a minimum
+version needed like the asciidoc version check.
+
+Signed-off-by: Dan Nicholson dbn.li...@gmail.com
+
+commit c87b5e9657e3fa1270f7283ab8b16aed1be7b5fd
+Author: Dan Nicholson dbn.li...@gmail.com
+Date:   Wed Mar 3 20:16:45 2010 -0800
+
+doc: Specify minimum asciidoc version to XORG_WITH_ASCIIDOC
+
+Adds an optional parameter to XORG_WITH_ASCIIDOC to enforce a minimum
+version needed.
+
+Tested-by: Gaetan Nadon mems...@videotron.ca
+Tested-by: Fernando Carrijo fcarr...@yahoo.com.br
+Signed-off-by: Dan Nicholson dbn.li...@gmail.com
+
+commit a01b2ce6b196555660a64c43623acab1f6fea76a
+Author: Dan Nicholson dbn.li...@gmail.com
+Date:   Sat Feb 27 11:28:08 2010 -0800
+
+silent: Set AM_DEFAULT_VERBOSITY for compatibility on older automake
+
+Custom silent rules will become recursive on older automake where
+AM_SILENT_RULES is not included. Set AM_DEFAULT_VERBOSITY in this
+fallback case for compatibility.
+
+Signed-off-by: Dan Nicholson dbn.li...@gmail.com
+Reviewed-by: Gaetan Nadon mems...@videotron.ca
+
+commit de24a6d42eafa1aaa089927e9b2c2c7ef8827550
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Feb 23 11:03:42 2010 -0500
+
+AM_SILENT_RULES: move from XORG_CWARNFLAGS to XORG_DEFAULT_OPTIONS
+
+This m4 statement does not belong in the macro for compiler
+warning flags. It is more appropriate to group it with the macro
+providing default options for X.Org modules.
+
+Reviewed-by: Dan Nicholson dbn.li...@gmail.com
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 0851a3455fddbbaef73fae088469a48f2f975783
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Fri Jan 29 14:02:26 2010 -0500
+
+Version bump: 1.6.0
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit a8f386498bb18c7f95f874a56e3526a1b0b3029c
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Tue Feb 2 17:14:00 2010 -0500
+
+doc: add XORG_ENABLE_DEVEL_DOCS and XORG_ENABLE_SPECS
+
+Identical to XORG_ENABLE_DOCS, this macros allows modules
+to classify docs per type and selectively control their building.
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 1df1e7fd649b4ff3e00a908d4ade54bc6b32892f
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sun Jan 31 08:56:50 2010 -0500
+
+XORG_WITH_GROFF: add tests for -ms and -mm macro packages
+
+OS and distros often splits groff in a basic and full package, the former
+having the groff program and the later having devices, fonts and macros
+

xutils-dev: Changes to 'debian-unstable'

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

New commits:
commit 83843f6ecefb74a67417b447b2a0a8b471219347
Author: Brice Goglin bgog...@debian.org
Date:   Sun Feb 7 11:41:38 2010 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index d5a190f..588a23b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.5+2) UNRELEASED; urgency=low
+xutils-dev (1:7.5+2) unstable; urgency=low
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -8,7 +8,7 @@ xutils-dev (1:7.5+2) UNRELEASED; urgency=low
   [ Brice Goglin ]
   * util-macros 1.5.0, closes: #568335.
 
- -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:15 +
+ -- Brice Goglin bgog...@debian.org  Sun, 07 Feb 2010 11:41:23 +0100
 
 xutils-dev (1: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

xutils-dev: Changes to 'debian-unstable'

2010-02-03 Thread Brice Goglin 
 debian/changelog  |4 
 util-macros/ChangeLog |   32 
 util-macros/Makefile.in   |  186 +---
 util-macros/aclocal.m4|  149 +--
 util-macros/configure | 1712 ++
 util-macros/configure.ac  |2 
 util-macros/install-sh|5 
 util-macros/missing   |   49 -
 util-macros/xorg-macros.m4.in |  153 +++
 9 files changed, 1242 insertions(+), 1050 deletions(-)

New commits:
commit f128b836dee6411897ab886b346c1aa310897eb9
Author: Brice Goglin bgog...@debian.org
Date:   Thu Feb 4 07:42:17 2010 +0100

util-macros 1.5.0

diff --git a/debian/changelog b/debian/changelog
index 466ad5e..d5a190f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 xutils-dev (1: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 ]
+  * util-macros 1.5.0, closes: #568335.
+
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:15 +
 
 xutils-dev (1:7.5+1) unstable; urgency=low
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index e00a914..d0fd11c 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,35 @@
+commit 46d22716aed8d7e8ee188c2f2d2b3ba600dc3dd3
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sun Jan 17 21:21:10 2010 -0500
+
+Version bump: 1.5.0
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 7e89b1cecfdb8115fa159584762f4d0db7455305
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Sun Jan 17 21:01:44 2010 -0500
+
+Add XORG_WITH_ASCIIDOC and XORG_WITH_DOXYGEN
+
+Based on XORG_WITH_XMLTO
+
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
+commit 296c390247553b0070dd05260fe6f55f793a374c
+Author: Matthieu Herrb matthieu.he...@laas.fr
+Date:   Tue Jan 5 23:04:25 2010 +0100
+
+Add XORG_WITH_XMLTO to factorize xmlto tests.
+
+This also allow to configure with --without-xmlto to ignore
+a 3rd party xmlto tool on systems that normally don't have it,
+in order to have reproducable builds.
+
+Reviewed-by: Rémi Cardona r...@gentoo.org
+Signed-off-by: Matthieu Herrb matthieu.he...@laas.fr
+Signed-off-by: Gaetan Nadon mems...@videotron.ca
+
 commit 2e75ae9b22de0fa36adde6de7b7e5c1c1a825d69
 Author: Julien Cristau jcris...@debian.org
 Date:   Sat Jan 16 15:00:38 2010 +
diff --git a/util-macros/Makefile.in b/util-macros/Makefile.in
index 7839380..55e792e 100644
--- a/util-macros/Makefile.in
+++ b/util-macros/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -38,9 +37,8 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
 am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -68,7 +66,6 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache 
config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = xorg-macros.pc xorg-macros.m4
-CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo $(srcdir) | sed 's|.|.|g'`;
@@ -76,32 +73,20 @@ am__vpath_adj = case $$p in \
 $(srcdir)/*) f=`echo $$p | sed s|^$$srcdirstrip/||`;; \
 *) f=$$p;; \
   esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo $(srcdir) | sed 's/[].[^$$\\*|]//g'`
-am__nobase_strip = \
-  for p in $$list; do echo $$p; done | sed -e s|$$srcdirstrip/||
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo $$p $$p; done | \
-  sed s| $$srcdirstrip/| |;' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files[.] =  } { files[$$2] = files[$$2]   $$1; \
-if (++n[$$2] == $(am__install_max)) \
-  { print $$2, files[$$2]; n[$$2] = 0; files[$$2] =  } } \
-END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = $(DESTDIR)$(aclocaldir) $(DESTDIR)$(pkgdatadir) \
$(DESTDIR)$(pkgconfigdir)

xutils-dev: 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 8059cfc04a4d7d89aada79a59ada2a0f5791e075
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 23 01:46:27 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index f228f39..466ad5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xutils-dev (1:7.5+2) UNRELEASED; urgency=low
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:15 +
 
diff --git a/debian/control b/debian/control
index d4c6766..2ba4a97 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xutils-dev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Andres Salomon 
dilin...@debian.org, Julien Cristau jcris...@debian.org, Brice Goglin 
bgog...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Andres Salomon 
dilin...@debian.org, Brice Goglin bgog...@debian.org
 Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, x11proto-core-dev
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev


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

xutils-dev: Changes to 'debian-unstable'

2010-01-16 Thread Julien Cristau 
 debian/changelog   |   12 
 debian/copyright   |   65 
 debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff |   27 
 debian/patches/series  |1 
 debian/rules   |   16 
 debian/watch.gccmakedep|2 
 debian/watch.imake |2 
 debian/watch.lndir |2 
 debian/watch.makedepend|2 
 debian/watch.util-macros   |2 
 debian/watch.xorg-cf-files |2 
 debian/xsfbs/xsfbs.mk  |   17 
 debian/xsfbs/xsfbs.sh  |4 
 debian/xutils-dev.install  |2 
 makedepend/AUTHORS |1 
 makedepend/COPYING |1 
 makedepend/ChangeLog   |  569 +
 makedepend/Makefile.am |   24 
 makedepend/Makefile.in |  478 -
 makedepend/aclocal.m4  | 1834 +++--
 makedepend/autogen.sh  |1 
 makedepend/compile |  142 
 makedepend/config.guess|  107 
 makedepend/config.sub  |  116 
 makedepend/configure   | 4269 -
 makedepend/configure.ac|   13 
 makedepend/cppsetup.c  |  108 
 makedepend/def.h   |   44 
 makedepend/depcomp |  172 
 makedepend/ifparser.c  |2 
 makedepend/ifparser.h  |2 
 makedepend/imakemdep.h | 1090 ---
 makedepend/include.c   |   18 
 makedepend/install-sh  |  517 +
 makedepend/main.c  |   71 
 makedepend/makedepend-config.h.in  |   30 
 makedepend/makedepend.man  |2 
 makedepend/missing |  104 
 makedepend/parse.c |   20 
 makedepend/pr.c|   14 
 util-macros/COPYING|   36 
 util-macros/ChangeLog  |  184 
 util-macros/INSTALL|  291 
 util-macros/Makefile.am|6 
 util-macros/Makefile.in|  226 
 util-macros/aclocal.m4 |  217 
 util-macros/configure  | 1655 ++---
 util-macros/configure.ac   |   16 
 util-macros/install-sh |  231 
 util-macros/missing|   49 
 util-macros/xorg-macros.m4.in  |   57 
 util-macros/xorg-macros.pc.in  |   16 
 util-macros/xorgversion.m4 |7 
 xorg-cf-files/ChangeLog| 2500 +++
 xorg-cf-files/DragonFly.cf |8 
 xorg-cf-files/FreeBSD.cf   |2 
 xorg-cf-files/Imake.cf |5 
 xorg-cf-files/Imake.rules  |2 
 xorg-cf-files/Imake.tmpl   |2 
 xorg-cf-files/Makefile.am  |   11 
 xorg-cf-files/Makefile.in  |  311 
 xorg-cf-files/NetBSD.cf|   14 
 xorg-cf-files/OpenBSD.cf   |2 
 xorg-cf-files/X11.tmpl |4 
 xorg-cf-files/aclocal.m4   | 1253 +++
 xorg-cf-files/config.guess | 1561 
 xorg-cf-files/config.sub   | 1686 +
 xorg-cf-files/configure| 4136 ++--
 xorg-cf-files/configure.ac |   10 
 xorg-cf-files/darwin.cf|2 
 xorg-cf-files/gnu.cf   |2 
 xorg-cf-files/ibm.cf   |2 
 xorg-cf-files/ibmLib.rules

xutils-dev: Changes to 'debian-unstable'

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

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

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

diff --git a/debian/changelog b/debian/changelog
index a16..f228f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xutils-dev (1:7.5+2) UNRELEASED; urgency=low
+
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
+ -- Julien Cristau jcris...@debian.org  Sat, 16 Jan 2010 16:47:15 +
+
 xutils-dev (1:7.5+1) unstable; urgency=low
 
   * Add watch files and debian/rules target to download tarballs.
diff --git a/debian/rules b/debian/rules
index e943e5b..09d76a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,12 +42,12 @@ build-stamp: $(STAMP_DIR)/genscripts $(foreach dir, 
$(SUBDIRS), $(STAMP_DIR)/bui
$@
 
 $(STAMP_DIR)/build-%: $(STAMP_DIR)/patch
-   mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE)
-   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  \
+   mkdir -p $*-build
+   cd $*-build  \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS=$(CFLAGS)
-   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  \
+   cd $*-build  \
$(MAKE)
$@
 
@@ -60,7 +60,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
 
@@ -71,7 +71,7 @@ install: build
dh_installdirs
 
set -e; for FILE in $(SUBDIRS); do \
-   $(MAKE) -C $${FILE}-obj-$(DEB_BUILD_GNU_TYPE) 
DESTDIR=$(CURDIR)/debian/tmp install; \
+   $(MAKE) -C $${FILE}-build DESTDIR=$(CURDIR)/debian/tmp install; 
\
done
 
 # Build architecture-dependent files here.


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

xutils-dev: Changes to 'debian-unstable'

2009-09-11 Thread Julien Cristau 
 debian/changelog  |8 
 debian/control|3 
 debian/rules  |5 
 debian/xsfbs/xsfbs.mk |4 
 debian/xsfbs/xsfbs.sh |  229 ---
 util-macros/ChangeLog |   68 ++
 util-macros/Makefile.in   |1 
 util-macros/aclocal.m4|4 
 util-macros/configure | 1222 --
 util-macros/configure.ac  |2 
 util-macros/xorg-macros.m4.in |   50 +
 util-macros/xorgversion.m4|2 
 12 files changed, 838 insertions(+), 760 deletions(-)

New commits:
commit 51db8da0d2cbff5560a395cb0f8f79c10f1ce86e
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 11 22:49:24 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 1561c87..daea518 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xutils-dev (1:7.5~1) UNRELEASED; urgency=low
+xutils-dev (1:7.5~1) unstable; urgency=low
 
   * util-macros 1.3.0.
   * debian/rules: make sure we bail if one install command fails.
   * Drop obsolete Pre-Depends on x11-common.  Bump Standards-Version to 3.8.3.
 
- -- Julien Cristau jcris...@debian.org  Fri, 11 Sep 2009 22:11:45 +0200
+ -- Julien Cristau jcris...@debian.org  Fri, 11 Sep 2009 22:49:22 +0200
 
 xutils-dev (1:7.4+5) unstable; urgency=low
 

commit cea7c3f0e20a58fe5e30011cb7fdbbdf6e12f3aa
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 11 22:42:32 2009 +0200

Drop obsolete Pre-Depends on x11-common.  Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 7992a56..1561c87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xutils-dev (1:7.5~1) UNRELEASED; urgency=low
 
   * util-macros 1.3.0.
   * debian/rules: make sure we bail if one install command fails.
+  * Drop obsolete Pre-Depends on x11-common.  Bump Standards-Version to 3.8.3.
 
  -- Julien Cristau jcris...@debian.org  Fri, 11 Sep 2009 22:11:45 +0200
 
diff --git a/debian/control b/debian/control
index a921040..d4c6766 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,12 @@ Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Andres Salomon 
dilin...@debian.org, Julien Cristau jcris...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, x11proto-core-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
 
 Package: xutils-dev
 Architecture: any
-Pre-Depends: x11-common (= 1:7.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
 Conflicts: imake (= 1:1.0.1-1), makedepend (= 1:1.0.0-1), xorg-build-macros 
(= 1.0.1-1), xmkmf (= 0.99.0-6)
 Replaces: imake (= 1:1.0.1-1), makedepend (= 1:1.0.0-1), xorg-build-macros 
(= 1.0.1-1), xmkmf (= 0.99.0-6)

commit 0de1137e5b02bff786a1e366f1623bdb71fb95d8
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 11 22:15:25 2009 +0200

debian/rules: make sure we bail if one install command fails.

diff --git a/debian/changelog b/debian/changelog
index 4ca6a91..7992a56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xutils-dev (1:7.5~1) UNRELEASED; urgency=low
 
   * util-macros 1.3.0.
+  * debian/rules: make sure we bail if one install command fails.
 
  -- Julien Cristau jcris...@debian.org  Fri, 11 Sep 2009 22:11:45 +0200
 
diff --git a/debian/rules b/debian/rules
index c903d41..bea5642 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,9 +70,8 @@ install: build
dh_clean -k
dh_installdirs
 
-   for FILE in $(SUBDIRS); do \
-   cd $$FILE-obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) 
DESTDIR=$(CURDIR)/debian/tmp install ; \
-   cd ..; \
+   set -e; for FILE in $(SUBDIRS); do \
+   $(MAKE) -C $${FILE}-obj-$(DEB_BUILD_GNU_TYPE) 
DESTDIR=$(CURDIR)/debian/tmp install; \
done
 
 # Build architecture-dependent files here.

commit ca466f888215470e7844c0196914aba2d638e381
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 11 22:12:35 2009 +0200

util-macros 1.3.0.

diff --git a/debian/changelog b/debian/changelog
index 9b15d15..4ca6a91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xutils-dev (1:7.5~1) UNRELEASED; urgency=low
+
+  * util-macros 1.3.0.
+
+ -- Julien Cristau jcris...@debian.org  Fri, 11 Sep 2009 22:11:45 +0200
+
 xutils-dev (1:7.4+5) unstable; urgency=low
 
   * Don't call dh_makeshlibs, silences lintian warning.
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index a21ec23..a44619d 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,71 @@
+commit d6584a4a52a6fb0eaf979555097bb32621c13cb1
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Wed Sep 9 13:31:38 2009 -0700
+
+Version bump: 1.3.0
+
+Signed-off-by: Alan

xutils-dev: Changes to 'debian-unstable'

2009-08-02 Thread Julien Cristau 
 debian/README.source  |   73 +++
 debian/changelog  |7 +++
 debian/control|2 
 debian/rules  |   37 +-
 debian/xsfbs/repack.sh|   32 +++
 debian/xsfbs/xsfbs.sh |   78 --
 util-macros/ChangeLog |   86 ++
 util-macros/configure |   20 -
 util-macros/configure.ac  |2 
 util-macros/xorg-macros.m4.in |   35 +++--
 10 files changed, 245 insertions(+), 127 deletions(-)

New commits:
commit 07f2ed1ee9936fe808577d787204becf939f915b
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 2 15:06:51 2009 +0200

Bump Standards-Version to 3.8.2

diff --git a/debian/changelog b/debian/changelog
index cff4359..1ddad88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xutils-dev (1:7.4+5) UNRELEASED; urgency=low
 3.8), move building each subdir to its own rule, and allow building in
 parallel.  Also call dh_install with --fail-missing to avoid building a
 broken package.
+  * Bump Standards-Version to 3.8.2 due to the above change and the addition
+of README.source from xsfbs.
 
  -- Julien Cristau jcris...@debian.org  Fri, 19 Dec 2008 13:41:50 +0100
 
diff --git a/debian/control b/debian/control
index 3ce310a..a921040 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Andres Salomon 
dilin...@debian.org, Julien Cristau jcris...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, x11proto-core-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
 

commit c83a6ceef8111bbd98273f9026d6943905f7d999
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 2 15:05:30 2009 +0200

debian/rules updates

Parse space-separated DEB_BUILD_OPTIONS (policy 3.8), move building each
subdir to its own rule, and allow building in parallel.  Also call
dh_install with --fail-missing to avoid building a broken package.

diff --git a/debian/changelog b/debian/changelog
index e14ec64..cff4359 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ xutils-dev (1:7.4+5) UNRELEASED; urgency=low
   * Don't call dh_makeshlibs, silences lintian warning.
   * Fix patches 01 and 02 to apply with -p1, to silence lintian.
   * util-macros 1.2.2.
+  * Adjust debian/rules to parse space-separated DEB_BUILD_OPTIONS (policy
+3.8), move building each subdir to its own rule, and allow building in
+parallel.  Also call dh_install with --fail-missing to avoid building a
+broken package.
 
  -- Julien Cristau jcris...@debian.org  Fri, 19 Dec 2008 13:41:50 +0100
 
diff --git a/debian/rules b/debian/rules
index c0f2042..c903d41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,16 +14,17 @@ 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
-SUBDIRS=gccmakedep imake lndir makedepend util-macros xorg-cf-files
+SUBDIRS= gccmakedep imake lndir makedepend util-macros xorg-cf-files
 
 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,19 +37,19 @@ else
 endif
 
 
-build: genscripts patch build-stamp
-build-stamp:
-   dh_testdir
-   for FILE in $(SUBDIRS); do \
-   test -d $$FILE-obj-$(DEB_BUILD_GNU_TYPE) || mkdir 
$$FILE-obj-$(DEB_BUILD_GNU_TYPE); \
-   (cd $$FILE-obj-$(DEB_BUILD_GNU_TYPE)  \
-   ../$$FILE/configure --prefix=/usr 
--mandir=\$${prefix}/share/man \
---infodir=\$${prefix}/share/info $(confflags) \
-CFLAGS=$(CFLAGS)  \
-   $(MAKE)) || exit 1; \
-   done
+build: build-stamp
+build-stamp: $(STAMP_DIR)/genscripts $(foreach dir, $(SUBDIRS), 
$(STAMP_DIR)/build-$(dir))
+   $@
 
-   touch build-stamp
+$(STAMP_DIR)/build-%: $(STAMP_DIR)/patch
+   mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE)
+   cd $*-obj-$(DEB_BUILD_GNU_TYPE)  \
+   ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
+

xutils-dev: Changes to 'debian-unstable'

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

New commits:
commit a85930a966bf64b2ef09c1be06911b00655500c6
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 2 15:10:29 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 1ddad88..9b15d15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.4+5) UNRELEASED; urgency=low
+xutils-dev (1:7.4+5) unstable; urgency=low
 
   * Don't call dh_makeshlibs, silences lintian warning.
   * Fix patches 01 and 02 to apply with -p1, to silence lintian.
@@ -10,7 +10,7 @@ xutils-dev (1:7.4+5) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.8.2 due to the above change and the addition
 of README.source from xsfbs.
 
- -- Julien Cristau jcris...@debian.org  Fri, 19 Dec 2008 13:41:50 +0100
+ -- Julien Cristau jcris...@debian.org  Sun, 02 Aug 2009 15:10:23 +0200
 
 xutils-dev (1:7.4+4) unstable; urgency=low
 


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

xutils-dev: Changes to 'debian-unstable'

2008-12-19 Thread Julien Cristau 
 debian/changelog  |6 
 debian/xutils-dev.install |1 
 util-macros/ChangeLog |   87 
 util-macros/Makefile.am   |   12 -
 util-macros/Makefile.in   |   48 ++--
 util-macros/README|2 
 util-macros/aclocal.m4|   36 +--
 util-macros/configure |  103 +++---
 util-macros/configure.ac  |   23 --
 util-macros/install-sh|  228 ++
 util-macros/xorg-macros.m4|  425 --
 util-macros/xorg-macros.m4.in |   39 +++
 util-macros/xorgversion.m4|   17 +
 13 files changed, 391 insertions(+), 636 deletions(-)

New commits:
commit b37f4f1fa6cd7877e4ae8f89541924c841abe5f1
Author: Julien Cristau jcris...@debian.org
Date:   Fri Dec 19 13:34:52 2008 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index a99c55d..a63800e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xutils-dev (1:7.4+4) UNRELEASED; urgency=low
+xutils-dev (1:7.4+4) unstable; urgency=low
 
   * util-macros 1.2.1.
 
- -- Julien Cristau jcris...@debian.org  Fri, 19 Dec 2008 13:14:59 +0100
+ -- Julien Cristau jcris...@debian.org  Fri, 19 Dec 2008 13:34:41 +0100
 
 xutils-dev (1:7.4+3) unstable; urgency=low
 

commit a44457e27f92e58749aa2ad42c28df6cd1b0b369
Author: Julien Cristau jcris...@debian.org
Date:   Fri Dec 19 13:33:49 2008 +0100

xorgversion.m4 is now included in xorg-macros.m4

diff --git a/debian/xutils-dev.install b/debian/xutils-dev.install
index 1a18dbb..929e2e5 100644
--- a/debian/xutils-dev.install
+++ b/debian/xutils-dev.install
@@ -10,7 +10,6 @@ usr/share/man/man1/cleanlinks.1
 usr/share/man/man1/mkhtmlindex.1
 usr/share/man/man1/lndir.1
 usr/share/man/man1/makedepend.1
-usr/share/aclocal/xorgversion.m4
 usr/share/aclocal/xorg-macros.m4
 usr/bin/gccmakedep
 usr/bin/imake

commit a169e0031753f82ec68684c48de463bc157af89a
Author: Julien Cristau jcris...@debian.org
Date:   Fri Dec 19 13:15:18 2008 +0100

util-macros 1.2.1

diff --git a/debian/changelog b/debian/changelog
index ab95e1e..a99c55d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xutils-dev (1:7.4+4) UNRELEASED; urgency=low
+
+  * util-macros 1.2.1.
+
+ -- Julien Cristau jcris...@debian.org  Fri, 19 Dec 2008 13:14:59 +0100
+
 xutils-dev (1:7.4+3) unstable; urgency=low
 
   * Add a mention of xorg-macros in the long description, so apt-cache search
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index a3bee74..702386b 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,90 @@
+commit 58803c60b73110a49aecec4202e7820887633bcc
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Tue Dec 16 15:05:46 2008 -0800
+
+Version bump: 1.2.1
+
+commit e1d9461d1325bb7e48ef616650eb1d49f8945c2b
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Tue Dec 16 15:05:05 2008 -0800
+
+Replace gitweb URL with cgit URL in README
+
+commit 55e8d740881ef622376440819119641e67aeb285
+Author: Peter Breitenlohner p...@mppmu.mpg.de
+Date:   Mon Dec 8 17:40:31 2008 +0100
+
+fix distcheck target
+
+Arrange that distcleancheck ignores ChangeLog left over by distclean.
+
+Don't mention ChangeLog under *CLEANFILES, can't be rebuilt from release
+tarball; ChangeLog is automatically distributed, no need to mention it.
+
+commit 88920d0896be5194f626888d5d8b54edd1ffe1f6
+Author: Matthieu Herrb matthieu.he...@laas.fr
+Date:   Wed Dec 10 08:45:56 2008 +0100
+
+use more CWARNFLAGS with gcc 3.4 too.
+
+Only gcc 3.3 and earlier version don't support them.
+Reported and tested by Peter Breitenlohner.
+
+commit 9ff834493ece0a0ea7d7f15c1706bab022362cc5
+Author: Matthieu Herrb matthieu.he...@laas.fr
+Date:   Sun Dec 7 11:54:39 2008 +0100
+
+Fix CWARNFLAGS for gcc versions  4
+
+commit 1d2a0c58ffa7be9c47ea0a097f54e012cf5d44de
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Wed Jul 30 13:47:04 2008 -0700
+
+Allow setting XORG_SGML_PATH to a non-default path when running configure
+
+commit dcbbcb582cf712e59c1474632380943bea8f1a5e
+Author: Peter Breitenlohner p...@mppmu.mpg.de
+Date:   Fri Nov 14 23:06:48 2008 +0100
+
+bump to 1.2.0
+
+commit 0e8c41dd09080cf692b7437bb23435137febaf26
+Author: Peter Breitenlohner p...@mppmu.mpg.de
+Date:   Fri Nov 14 23:05:45 2008 +0100
+
+fix XORG_PROG_RAWCPP for cygwin
+
+Patch by Yaakov Selkowitz from xorg mailing list
+
http://lists.freedesktop.org/archives/xorg/attachments/20081016/04a64242/attachment.asc
+
+commit 4cce4c8169a252bce129411dbf70c3212974e7ca
+Author: Peter Breitenlohner p...@mppmu.mpg.de
+Date:   Fri Nov 14 22:59:28 2008 +0100
+
+define XORG_CWARNFLAGS macro
+
+commit 2663b7a6b31e5e3d03b42a50b27f64737a35e9aa
+Author: Peter Breitenlohner p...@mppmu.mpg.de
+Date:   Fri Nov 14 22:38:27 2008 +0100
+
+define and use XORG_CHANGELOG macro
+
+commit b8a5186c585b4f01971457f0d59cc7480cf528e8
+Author: Peter

xutils-dev: Changes to 'debian-unstable'

2008-12-19 Thread Julien Cristau 
 debian/changelog|7 +++
 debian/patches/01_netbsd_imake.c_fixes.diff |6 +++---
 debian/patches/02_mkdirhier_rewrite.diff|   12 ++--
 debian/patches/series   |8 
 debian/rules|1 -
 5 files changed, 20 insertions(+), 14 deletions(-)

New commits:
commit 7c12e8bde01907c6c525b2d24d72f136d1af3add
Author: Julien Cristau jcris...@debian.org
Date:   Fri Dec 19 13:43:18 2008 +0100

Fix patches 01 and 02 to apply with -p1, to silence lintian.

diff --git a/debian/changelog b/debian/changelog
index c78734b..ef2f31d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xutils-dev (1:7.4+5) UNRELEASED; urgency=low
 
   * Don't call dh_makeshlibs, silences lintian warning.
+  * Fix patches 01 and 02 to apply with -p1, to silence lintian.
 
  -- Julien Cristau jcris...@debian.org  Fri, 19 Dec 2008 13:41:50 +0100
 
diff --git a/debian/patches/01_netbsd_imake.c_fixes.diff 
b/debian/patches/01_netbsd_imake.c_fixes.diff
index 40e9be9..b95a3ea 100644
--- a/debian/patches/01_netbsd_imake.c_fixes.diff
+++ b/debian/patches/01_netbsd_imake.c_fixes.diff
@@ -3,10 +3,10 @@ $Id: 841_netbsd_imake.c_fixes.diff 689 2005-10-19 22:11:30Z 
dnusinow $
 Patch to imake.c for Debian/NetBSD support by Joel Baker
 luci...@lightbearer.com.
 
-Index: imake/imake.c
+Index: a/imake/imake.c
 ===
 imake/imake.c.orig 2006-05-29 22:37:55.0 -0400
-+++ imake/imake.c  2006-05-29 22:44:50.0 -0400
+--- a/imake/imake.c.orig   2006-05-29 22:37:55.0 -0400
 b/imake/imake.c2006-05-29 22:44:50.0 -0400
 @@ -1087,6 +1087,10 @@
fprintf (inFile, %s\n, #define LinuxWare   11);
fprintf (inFile, %s\n, #define LinuxYggdrasil  12);
diff --git a/debian/patches/02_mkdirhier_rewrite.diff 
b/debian/patches/02_mkdirhier_rewrite.diff
index 71f5afd..d2f5d88 100644
--- a/debian/patches/02_mkdirhier_rewrite.diff
+++ b/debian/patches/02_mkdirhier_rewrite.diff
@@ -6,10 +6,10 @@ This shell script and manpage by Branden Robinson.
 
 Not submitted upstream to XFree86 or X.Org.
 
-Index: imake/mkdirhier
+Index: a/imake/mkdirhier
 ===
 imake/mkdirhier(revision 309)
-+++ imake/mkdirhier(working copy)
+--- a/imake/mkdirhier  (revision 309)
 b/imake/mkdirhier  (working copy)
 @@ -1,67 +1,94 @@
  #!/bin/sh
 -# $Xorg: mkdirhier.sh,v 1.3 2000/08/17 19:41:53 cpqbld Exp $
@@ -161,10 +161,10 @@ Index: imake/mkdirhier
 +exit $STATUS
 +
 +# vim:set ai et sts=4 sw=4 tw=80:
-Index: imake/mkdirhier.man
+Index: a/imake/mkdirhier.man
 ===
 imake/mkdirhier.man(revision 309)
-+++ imake/mkdirhier.man(working copy)
+--- a/imake/mkdirhier.man  (revision 309)
 b/imake/mkdirhier.man  (working copy)
 @@ -1,42 +1,111 @@
 -.\ $Xorg: mkdirhier.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $
 -.\ Copyright (c) 1993, 1994, 1998 The Open Group
diff --git a/debian/patches/series b/debian/patches/series
index f5871a1..56e830f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
-01_netbsd_imake.c_fixes.diff -p0
-02_mkdirhier_rewrite.diff -p0
-03_xutils-dev-FHS.diff -p1
-04_xutils-dev-debian.diff 
+01_netbsd_imake.c_fixes.diff
+02_mkdirhier_rewrite.diff
+03_xutils-dev-FHS.diff
+04_xutils-dev-debian.diff
 05_xaw_without_xp.diff
 06_font_path.diff
 07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff

commit 718337de85873172e578c8a561f018e0bf6337d9
Author: Julien Cristau jcris...@debian.org
Date:   Fri Dec 19 13:42:22 2008 +0100

Don't call dh_makeshlibs, silences lintian warning.

diff --git a/debian/changelog b/debian/changelog
index a63800e..c78734b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xutils-dev (1:7.4+5) UNRELEASED; urgency=low
+
+  * Don't call dh_makeshlibs, silences lintian warning.
+
+ -- Julien Cristau jcris...@debian.org  Fri, 19 Dec 2008 13:41:50 +0100
+
 xutils-dev (1:7.4+4) unstable; urgency=low
 
   * util-macros 1.2.1.
diff --git a/debian/rules b/debian/rules
index 686af15..c0f2042 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,7 +88,6 @@ binary-arch: build install
dh_fixperms
dh_installdeb
dh_shlibdeps
-   dh_makeshlibs
dh_gencontrol
dh_md5sums
dh_builddeb


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

xutils-dev: Changes to 'debian-unstable'

2008-07-18 Thread Julien Cristau 
 debian/changelog  |7 +++
 debian/control|5 -
 debian/xsfbs/xsfbs.mk |   29 +++--
 3 files changed, 22 insertions(+), 19 deletions(-)

New commits:
commit b160e91ee1baf6b50d8e6d987945e57076115d91
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Jul 18 20:01:40 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 24df720..ab95e1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xutils-dev (1:7.4+3) UNRELEASED; urgency=low
+xutils-dev (1:7.4+3) unstable; urgency=low
 
   * Add a mention of xorg-macros in the long description, so apt-cache search
 can find them.  Thanks, Eric Anholt!
 
- -- Julien Cristau [EMAIL PROTECTED]  Fri, 18 Jul 2008 19:57:51 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 18 Jul 2008 20:01:34 +0200
 
 xutils-dev (1:7.4+2) unstable; urgency=low
 

commit 469e00fc0492e9bc7fc481312f7d6fd91a6b387e
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Jul 18 20:00:41 2008 +0200

Add a mention of xorg-macros in the long description

This way 'apt-cache search xorg-macros' can find this package.
Thanks, Eric Anholt!

diff --git a/debian/changelog b/debian/changelog
index 34d55cd..24df720 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xutils-dev (1:7.4+3) UNRELEASED; urgency=low
+
+  * Add a mention of xorg-macros in the long description, so apt-cache search
+can find them.  Thanks, Eric Anholt!
+
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 18 Jul 2008 19:57:51 +0200
+
 xutils-dev (1:7.4+2) unstable; urgency=low
 
   * Extend 05_xaw_without_xp.diff to disable Xp from Xaw on hurd-i386
diff --git a/debian/control b/debian/control
index a0e283d..3ce310a 100644
--- a/debian/control
+++ b/debian/control
@@ -26,4 +26,7 @@ Description: X Window System utility programs for development
   - lndir, a tool that creates a shadow directory of symbolic links to
 another directory tree;
   - makedepend, a tool to create dependencies in makefiles;
-  - makeg, a tool for making debuggable executables;
+  - makeg, a tool for making debuggable executables.
+ .
+ This package also contains xorg-macros.m4, a set of macros used in configure
+ scripts of X.Org packages.

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

xsfbs.mk: make 'log' a separate target

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

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

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

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

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

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 
's/^.://')
 BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo [EMAIL PROTECTED](cat 
/etc/mailname 2/dev/null))}})
 
 # Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the strings woody or sarge in the Debian part of the
+# digits, dots, and/or the codename of a release in the Debian part of the
 # version number.  Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr $$(echo 
$${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g') : .*[^0-9.].* /dev/null 
21; then echo yes; fi)
+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr $$(echo 
$${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g') : .*[^0-9.].* 
/dev/null 21; then echo yes; fi)
 
 # Set up parameters for the Debian build environment.
 
@@ -69,16 +69,6 @@ endif
 # $(STAMP_DIR) houses stamp files for complex targets.

xutils-dev: Changes to 'debian-unstable'

2008-06-12 Thread Brice Goglin 
 debian/changelog |5 +++--
 debian/control   |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit d0ddfcf66e18fd57178cbf34540afb39cdde1b36
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Fri Jun 13 07:27:20 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 0221046..34d55cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xutils-dev (1:7.4+2) UNRELEASED; urgency=low
+xutils-dev (1:7.4+2) unstable; urgency=low
 
   * Extend 05_xaw_without_xp.diff to disable Xp from Xaw on hurd-i386
 and try to disable it for kfreebsd-i386 as well.
 Thanks Samuel Thibault, closes: #483093.
+  * Add myself to Uploaders.
 
- -- Brice Goglin [EMAIL PROTECTED]  Sun, 01 Jun 2008 19:21:31 +0200
+ -- Brice Goglin [EMAIL PROTECTED]  Fri, 13 Jun 2008 07:26:55 +0200
 
 xutils-dev (1:7.4+1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 85b8740..a0e283d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xutils-dev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow [EMAIL PROTECTED], Andres Salomon [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
+Uploaders: David Nusinow [EMAIL PROTECTED], Andres Salomon [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED], Brice Goglin [EMAIL 
PROTECTED]
 Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, x11proto-core-dev
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev


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

xutils-dev: Changes to 'debian-unstable'

2008-06-01 Thread Brice Goglin 
 debian/changelog  |8 
 debian/patches/05_xaw_without_xp.diff |   52 
 debian/xsfbs/xsfbs-autoreconf.mk  |  150 -
 debian/xsfbs/xsfbs.mk |   26 --
 debian/xsfbs/xsfbs.sh |  387 ++
 5 files changed, 274 insertions(+), 349 deletions(-)

New commits:
commit e1b811bfbb6c43a7554888dafad1f5dcf769ec2e
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sun Jun 1 19:22:59 2008 +0200

Extend 05_xaw_without_xp.diff to disable Xp from Xaw on hurd-i386

and try to disable it for kfreebsd-i386 as well.

diff --git a/debian/changelog b/debian/changelog
index d9429d7..0221046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xutils-dev (1:7.4+2) UNRELEASED; urgency=low
+
+  * Extend 05_xaw_without_xp.diff to disable Xp from Xaw on hurd-i386
+and try to disable it for kfreebsd-i386 as well.
+Thanks Samuel Thibault, closes: #483093.
+
+ -- Brice Goglin [EMAIL PROTECTED]  Sun, 01 Jun 2008 19:21:31 +0200
+
 xutils-dev (1:7.4+1) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/patches/05_xaw_without_xp.diff 
b/debian/patches/05_xaw_without_xp.diff
index 441bb73..34e3801 100644
--- a/debian/patches/05_xaw_without_xp.diff
+++ b/debian/patches/05_xaw_without_xp.diff
@@ -1,7 +1,13 @@
+---
+ xorg-cf-files/FreeBSD.cf |   10 ++
+ xorg-cf-files/gnu.cf |   10 ++
+ xorg-cf-files/linux.cf   |   10 ++
+ 3 files changed, 30 insertions(+)
+
 Index: xutils-dev/xorg-cf-files/linux.cf
 ===
 xutils-dev.orig/xorg-cf-files/linux.cf 2006-04-18 14:09:37.0 
-0700
-+++ xutils-dev/xorg-cf-files/linux.cf  2006-04-18 14:33:56.0 -0700
+--- xutils-dev.orig/xorg-cf-files/linux.cf 2008-06-01 18:36:51.0 
+0200
 xutils-dev/xorg-cf-files/linux.cf  2008-06-01 18:36:51.0 +0200
 @@ -1153,6 +1153,16 @@
  #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
  #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
@@ -19,3 +25,45 @@ Index: xutils-dev/xorg-cf-files/linux.cf
  #if HaveLib64
  # ifndef LibDirName
  #  define LibDirName  lib64
+Index: xutils-dev/xorg-cf-files/gnu.cf
+===
+--- xutils-dev.orig/xorg-cf-files/gnu.cf   2008-06-01 18:36:51.0 
+0200
 xutils-dev/xorg-cf-files/gnu.cf2008-06-01 18:36:51.0 +0200
+@@ -541,6 +541,16 @@
+ #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
+ #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+ 
++#ifndef ExtraXawClientLibs
++# define ExtraXawClientLibs /**/
++#endif
++#ifndef ExtraXawClientDepLibs
++# define ExtraXawClientDepLibs /**/
++#endif
++#ifndef ExtraXawReqs
++# define ExtraXawReqs /**/
++#endif
++
+ #ifndef BuildDmx
+ #define BuildDmx  YES
+ #endif
+Index: xutils-dev/xorg-cf-files/FreeBSD.cf
+===
+--- xutils-dev.orig/xorg-cf-files/FreeBSD.cf   2008-06-01 18:43:49.0 
+0200
 xutils-dev/xorg-cf-files/FreeBSD.cf2008-06-01 18:44:03.0 
+0200
+@@ -570,6 +570,16 @@
+ #endif
+ #endif
+ 
++#ifndef ExtraXawClientLibs
++# define ExtraXawClientLibs /**/
++#endif
++#ifndef ExtraXawClientDepLibs
++# define ExtraXawClientDepLibs /**/
++#endif
++#ifndef ExtraXawReqs
++# define ExtraXawReqs /**/
++#endif
++
+ /*
+  * A hack to work around an optimization problem with gcc 2.95.2 - 2.95.4
+  */

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

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

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

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

xutils-dev: Changes to 'debian-unstable'

2008-03-07 Thread Julien Cristau 
 debian/changelog  |4 
 util-macros/ChangeLog |   21 +
 util-macros/Makefile.in   |   96 ---
 util-macros/aclocal.m4|  161 +++--
 util-macros/configure |  121 ++---
 util-macros/configure.ac  |2 
 util-macros/install-sh|  514 +-
 util-macros/missing   |   61 ++--
 util-macros/xorg-macros.m4|8 
 util-macros/xorg-macros.m4.in |6 
 util-macros/xorgversion.m4|4 
 11 files changed, 648 insertions(+), 350 deletions(-)

New commits:
commit 5e02f58f5670faad19c58e21ca5bcec0bd74
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 7 11:49:49 2008 +0100

util-macros 1.1.6.

diff --git a/debian/changelog b/debian/changelog
index cb4105b..33069bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 xutils-dev (1:7.2.ds2-2) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * debian/control:
 - C/R/P: imake, makedepend, xorg-build-macros, xmkmf
   Change from ubuntu to help upgrades from their earlier releases.
 
+  [ Julien Cristau ]
+  * util-macros 1.1.6.
+
  -- Timo Aaltonen [EMAIL PROTECTED]  Mon,  4 Jun 2007 12:12:41 +0300
 
 xutils-dev (1:7.2.ds2-1) unstable; urgency=low
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index d633f8b..a3bee74 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,24 @@
+commit e1c1ee013e72dafd7b00ca96a8d4a25273b88e15
+Author: Jeremy Huddleston [EMAIL PROTECTED]
+Date:   Sat Feb 16 02:18:50 2008 -0800
+
+Support version strings  like 1.2.3-blah4
+
+commit e20c503d24e5ccf03035aa0f6d833d235d2179df
+Author: Keith Packard [EMAIL PROTECTED]
+Date:   Mon Aug 13 19:21:58 2007 -0700
+
+Cannot use AC_CHECK_FILE when cross compiling; assume no LINUXDOC.
+
+As AC_CHECK_FILE cannot be used when cross compiling, just assume linuxdoc
+is not present.
+
+commit f2ddb356d86225a8ff6d1d1397fb2156cebd360f
+Author: Daniel Stone [EMAIL PROTECTED]
+Date:   Sun Dec 24 06:17:44 2006 +0200
+
+bump to 1.1.5
+
 commit e8b485d9252ffbb357a0b987ab1488d4033b555c
 Author: Matthieu Herrb [EMAIL PROTECTED]
 Date:   Mon Dec 18 18:25:25 2006 -0800
diff --git a/util-macros/Makefile.in b/util-macros/Makefile.in
index ed1d48e..d8fafea 100644
--- a/util-macros/Makefile.in
+++ b/util-macros/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,15 +35,11 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -64,7 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = xorg-macros.m4
 SOURCES =
@@ -100,6 +96,7 @@ DEFS = @DEFS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -108,6 +105,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -119,11 +117,16 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -147,8 +150,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir =

xutils-dev: Changes to 'debian-unstable'

2008-03-07 Thread Julien Cristau 
 debian/changelog |7 +--
 debian/control   |6 --
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 109bd37ce8fb071d60fcb00b998233c3f374668e
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Mar 8 02:57:34 2008 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index cdb80eb..d9429d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.4+1) UNRELEASED; urgency=low
+xutils-dev (1:7.4+1) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * debian/control:
@@ -11,7 +11,7 @@ xutils-dev (1:7.4+1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.7.3 (no changes).
   * Add Vcs-* control fields.
 
- -- Timo Aaltonen [EMAIL PROTECTED]  Mon,  4 Jun 2007 12:12:41 +0300
+ -- Julien Cristau [EMAIL PROTECTED]  Sat, 08 Mar 2008 02:57:06 +0100
 
 xutils-dev (1:7.2.ds2-1) unstable; urgency=low
 

commit ece61be9bb86ec87cb268f76e71a47b6cf6b857e
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Mar 8 03:01:27 2008 +0100

debian/control updates

Add myself to Uploaders, remove Fabio and Branden with their permission.
Bump Standards-Version to 3.7.3 (no changes).
Add Vcs-* control fields.

diff --git a/debian/changelog b/debian/changelog
index a1fbe77..cdb80eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ xutils-dev (1:7.4+1) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * util-macros 1.1.6.
+  * Add myself to Uploaders, remove Fabio and Branden with their permission.
+  * Bump Standards-Version to 3.7.3 (no changes).
+  * Add Vcs-* control fields.
 
  -- Timo Aaltonen [EMAIL PROTECTED]  Mon,  4 Jun 2007 12:12:41 +0300
 
diff --git a/debian/control b/debian/control
index 3a0acc2..85b8740 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xutils-dev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED], Fabio M. Di Nitto [EMAIL PROTECTED], Andres Salomon [EMAIL 
PROTECTED]
+Uploaders: David Nusinow [EMAIL PROTECTED], Andres Salomon [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
 Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, x11proto-core-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
 
 Package: xutils-dev
 Architecture: any

commit af33f90bc919f6ef1924103d7d3dda6f15bcbfc2
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 7 14:17:35 2008 +0100

Bump version number.

diff --git a/debian/changelog b/debian/changelog
index 33069bb..a1fbe77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.2.ds2-2) UNRELEASED; urgency=low
+xutils-dev (1:7.4+1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * debian/control:


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

xutils-dev: Changes to 'debian-unstable'

2008-03-07 Thread Julien Cristau 
 debian/xsfbs/xsfbs.mk |  122 --
 debian/xsfbs/xsfbs.sh |7 --
 2 files changed, 30 insertions(+), 99 deletions(-)

New commits:
commit 844199da71f29556be3436fa0fead2f0cc0bfc1b
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Jan 8 20:18:49 2008 -0500

Kill the manifest code.
It served its purpose for the monolith and is now dead.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b8f7afd..4822173 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -196,7 +196,6 @@ xsfclean: cleanscripts unpatch
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
-debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \
 debian/po/pothead
 
 # Generate the debconf templates POT file header.
@@ -209,58 +208,6 @@ debian/po/pothead: debian/po/pothead.in
 updatepo: debian/po/pothead
debian/scripts/debconf-updatepo --pot-header=pothead --verbose
 
-# Use the MANIFEST files to determine whether we're shipping everything we
-# expect to ship, and not shipping anything we don't expect to ship.
-.PHONY: check-manifest
-stampdir_targets+=check-manifest
-check-manifest: $(STAMP_DIR)/check-manifest
-$(STAMP_DIR)/check-manifest: $(STAMP_DIR)/install
-   # Compare manifests.
-   (cd debian/tmp  find -type f | LC_ALL=C sort | cut -c3-) \
- debian/MANIFEST.$(ARCH).new
-   # Construct MANIFEST files from MANIFEST.$(ARCH).in and
-   # MANIFEST.$(ARCH).all or MANIFEST.all.
-   if expr $(findstring -DBuildFonts=NO,$(IMAKE_DEFINES)) \
- : -DBuildFonts=NO /dev/null 21; then \
- LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH); 
\
-   else \
- if [ -e debian/MANIFEST.$(ARCH).all ]; then \
-   LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in 
debian/MANIFEST.$(ARCH).all debian/MANIFEST.$(ARCH); \
- else \
-   LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all 
debian/MANIFEST.$(ARCH); \
- fi; \
-   fi
-   # Confirm that the installed file list has not changed.
-   if [ -e debian/MANIFEST.$(ARCH) ]; then \
- if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then 
\
-   diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new || 
DIFFSTATUS=$$?; \
-   case $${DIFFSTATUS:-0} in \
- 0) ;; \
- 1) if [ -n $$IGNORE_MANIFEST_CHANGES ]; then \
-  echo 'MANIFEST check failed; ignoring problem because 
\$$IGNORE_MANIFEST_CHANGES set' 2; \
-  echo 'Please ensure that the package maintainer has an 
up-to-date version of the' 2; \
-  echo 'MANIFEST.$(ARCH).in file.' 2; \
-else \
-  echo 'MANIFEST check failed; please see debian/README' 2; \
-  exit 1; \
-fi; \
-;; \
- *) echo diff reported unexpected exit status $$DIFFSTATUS when 
performing MANIFEST check 2; \
-exit 1; \
-;; \
-   esac; \
- fi; \
-   fi
-   $@
-
-# Because we build (and install) different files depending on whether or not
-# any architecture-independent packages are being created, the list of files we
-# expect to see will differ; see the discussion of the build target above.
-.PHONY: check-manifest-arch check-manifest-indep
-check-manifest-arch: IMAKE_DEFINES+= -DBuildSpecsDocs=NO -DBuildFonts=NO 
-DInstallHardcopyDocs=NO
-check-manifest-arch: check-manifest
-check-manifest-indep: check-manifest
-
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.
 #

commit 331c032528ba1faebef1d8eaa56db47f533f0426
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sat Sep 22 23:49:11 2007 -0400

Remove make-orig-tar-gz target

This target wasn't kept up to date and was totally broken for the git
world. The way we use git has made this target pretty well impossible to
use in any form, so it's been supersceded by a script that is currently
located at
http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index bfca7bb..b8f7afd 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -272,29 +272,6 @@ prune-upstream-tree:
dh_testdir
grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
 
-# Change to what should be the correct directory, ensure it is, and if
-# so, create the .orig.tar.gz file.  Exclude the debian directory and its
-# contents, and any .svn directories and their contents (so that we can safely
-# build an .orig.tar.gz from SVN checkout, not just an export).
-#
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build scenarios.
-#
-# This rule *IS* the

xutils-dev: Changes to 'debian-unstable'

2007-06-04 Thread Timo Aaltonen 
 debian/changelog |8 
 debian/control   |3 +++
 2 files changed, 11 insertions(+)

New commits:
commit 2357376b8e0f5da61c09ec2ee0b60814be2e40d6
Author: Timo Aaltonen [EMAIL PROTECTED]
Date:   Mon Jun 4 12:36:00 2007 +0300

debian/control: add C/R/P for imake/makedepend/xorg-build-macros/xmkmf to 
allow Ubuntu to sync this in future.

The change can be dropped after the next LTS release.

diff --git a/debian/changelog b/debian/changelog
index 681ba44..cb4105b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xutils-dev (1:7.2.ds2-2) UNRELEASED; urgency=low
+
+  * debian/control:
+- C/R/P: imake, makedepend, xorg-build-macros, xmkmf
+  Change from ubuntu to help upgrades from their earlier releases.
+
+ -- Timo Aaltonen [EMAIL PROTECTED]  Mon,  4 Jun 2007 12:12:41 +0300
+
 xutils-dev (1:7.2.ds2-1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 910103e..3a0acc2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,9 @@ Package: xutils-dev
 Architecture: any
 Pre-Depends: x11-common (= 1:7.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
+Conflicts: imake (= 1:1.0.1-1), makedepend (= 1:1.0.0-1), xorg-build-macros 
(= 1.0.1-1), xmkmf (= 0.99.0-6)
+Replaces: imake (= 1:1.0.1-1), makedepend (= 1:1.0.0-1), xorg-build-macros 
(= 1.0.1-1), xmkmf (= 0.99.0-6)
+Provides: imake, makedepend, xorg-build-macros, xmkmf
 Description: X Window System utility programs for development
  xutils-dev provides a set of utility programs shipped with the X Window System
  that do not require the X libraries; many of these programs are useful


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

xutils-dev: Changes to 'debian-unstable'

2007-04-08 Thread Julien Cristau 
 debian/changelog   |   23 
 debian/patches/02_mkdirhier_rewrite.diff   |2 
 debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff |   27 
 debian/patches/series  |1 
 debian/xsfbs/xsfbs-autoreconf.mk   |  150 ++
 debian/xsfbs/xsfbs.mk  |  374 +
 debian/xsfbs/xsfbs.sh  |  907 +
 gccmakedep/aclocal.m4  |   87 +
 gccmakedep/config.guess|   63 
 gccmakedep/config.sub  |   87 -
 gccmakedep/configure   |  343 +---
 gccmakedep/mkinstalldirs   |   89 -
 imake/aclocal.m4   |   87 +
 imake/config.guess |   63 
 imake/config.sub   |   87 -
 imake/configure|  351 +
 imake/mkinstalldirs|   89 -
 lndir/aclocal.m4   |   87 +
 lndir/compile  |  147 +-
 lndir/config.guess |  667 +
 lndir/config.sub   |  222 ++-
 lndir/configure|  285 +---
 lndir/depcomp  |  103 +
 lndir/install-sh   |  477 +++---
 lndir/missing  |  142 +-
 lndir/mkinstalldirs|   89 -
 makedepend/AUTHORS |2 
 makedepend/ChangeLog   |   10 
 makedepend/Makefile.in |5 
 makedepend/aclocal.m4  |  107 +
 makedepend/compile |  147 +-
 makedepend/config.guess|  667 +
 makedepend/config.sub  |  230 ++-
 makedepend/configure   |  555 ++-
 makedepend/configure.ac|2 
 makedepend/depcomp |  103 +
 makedepend/install-sh  |  477 +++---
 makedepend/makedepend-config.h.in  |9 
 makedepend/missing |  142 +-
 makedepend/mkinstalldirs   |  111 -
 makedepend/parse.c |9 
 util-macros/ChangeLog  |   36 
 util-macros/Makefile.am|2 
 util-macros/Makefile.in|  126 -
 util-macros/aclocal.m4 |   37 
 util-macros/configure  |  202 +-
 util-macros/configure.ac   |2 
 util-macros/xorg-macros.m4 |2 
 util-macros/xorgversion.m4 |   20 
 xorg-cf-files/configure|  140 +-
 xorg-cf-files/mkinstalldirs|   89 -
 51 files changed, 5291 insertions(+), 2990 deletions(-)

New commits:
commit c82ab28a750327c28fd8b1dc592e79198cd9be81
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Apr 9 04:00:10 2007 +0200

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 8a87a51..681ba44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.2.ds-2) UNRELEASED; urgency=low
+xutils-dev (1:7.2.ds2-1) unstable; urgency=low
 
   [ Julien Cristau ]
   * [xorg-cf-files] Add patch from upstream git to define GNUArchitecture on
@@ -10,8 +10,9 @@ xutils-dev (1:7.2.ds-2) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Update makedepend to 1.0.1.
+  * Upload to unstable.
 
- -- Julien Cristau [EMAIL PROTECTED]  Mon, 09 Apr 2007 03:48:18 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 09 Apr 2007 03:55:00 +0200
 
 xutils-dev (1:7.2.ds-1) experimental; urgency=low
 

commit feff7efb9f00b4f1b032420a509e5a03934ab4ac
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Apr 9 03:52:57 2007 +0200

Update to makedepend 1.0.1.

diff --git a/debian/changelog b/debian/changelog
index c81cfc1..8a87a51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,10 @@ xutils-dev (1:7.2.ds-2) UNRELEASED; urgency=low
   * [imake] Fix typo in 02_mkdirhier_rewrite.diff.
 Thanks, A. Costa (closes: #306690).
 
- -- Brice Goglin [EMAIL PROTECTED]  Sun, 18 Feb 2007

xutils-dev: Changes to 'debian-unstable'

2007-02-04 Thread David Nusinow 
New branch 'debian-unstable' available with the following commits:
commit 454603c4a2cd4cfa24d869afedf7558d1ba7d391
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Dec 20 02:08:40 2006 +

* Add 06_font_path.diff. This fixes X11.tmpl so that imake-using apps will
  install fonts to /usr/share/fonts/X11 and encodings to
  /usr/share/fonts/X11/encodings, just like the xfonts packages. Thanks
  Géraud Meyer for reporting the bug and Julien Cristau for finding the 
fix.
  Closes: #403765

commit 773366e7f0df823015ef4130977ceacff1c63d40
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Dec 5 00:10:48 2006 +

Prepare changelog for upload

commit 8957315e1610c9bd6f98337f63ac8fe952850814
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Dec 3 17:43:02 2006 +

* Add util-macros 1.1.2 to allow building docbook docs

commit 7ad5a7b437568197528649d76f784f9b6d5dec51
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sat Oct 14 16:58:18 2006 +

* Remove obsolete qualifier about imake and old gcc conflict from long
  package description. Thanks Kevin B. McCarty. Closes: #362141

commit 030f3d5cc14ed7d7911a48a05cb1f7754dcd0f4b
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sat Oct 14 16:24:57 2006 +

* Autoreconf to fix manpage suffix bugs on all platforms I'm aware of.
  Thanks Robert Millan. Closes: #363483

commit 322c622fee2087b24ef0d0b28b37726311755773
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Aug 29 01:11:38 2006 +

* New upstream release of util-macros (1.1.1). This makes our manpage
  section patch obsolete.

commit 1e65f2e4556529f55d7ac82e7318fd17a1295f67
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Aug 29 01:07:04 2006 +

* Merge xutils-dev from 7.1 branch to trunk now that it's in unstable

commit 1d7d69a0512e25c5713b1382bcf4c498987ede0b
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed May 31 01:51:30 2006 +

* Stop trying to put the debugging symbols somewhere. We're not going to
  ship them unless there's a compelling reason to do so
* Run dh_install with --list-missing
* Bump debhelper compatibility to 5

commit 98cd62c818bb1bea351ceabf3f38c3b9f2a414f9
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 05:19:35 2006 +

* Correct the mkdirhier manpage rewrite patch so that the manpage suffix is
  correct

commit 7d94d55d7740fe5f486de719217bf1824c7c77ea
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 04:32:24 2006 +

Fix up install file for manpage suffix fix

commit dae1a1b9bccc7a139c7d927cf60af31a7a0c151a
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 04:23:12 2006 +

* Bump standards version to 3.7.2.0

commit 1319c14830230efa5586b87ec59a103ef72e81d2
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 04:22:34 2006 +

* Move depends on xorg-x11 to pre-depends

commit 19073deee9e0ef691d80101fca9b01d821d0d23b
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 04:21:00 2006 +

  + Make use of this fix in this package by autoreconf'ing with the macros
containing this fix installed

commit 4db5755464b96fee5c7628a509a6694593381950
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 03:50:30 2006 +

* Add 06_linux_manpage_suffixes.diff which now creates manpages without the
  x suffix on linux

commit 7b5ba13991033f75894f89c8198bef2bd9ae8799
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 03:26:02 2006 +

Copy site.def.in from vendor branch to working branch

commit e64a502443edfffe4747bfdb2745f1b4b7c167e7
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 03:22:28 2006 +

remove obsolete site.def

commit 0beee684d2c8da9d94f923b86762eae2b36a575c
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 03:02:40 2006 +

Fix rename goof in series file

commit cf18be7868d86ca4c1352b76ddff6c3cbb1d7e62
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 02:54:12 2006 +

Add suffix to 05_xaw_without_xp

commit 837e1caaf74736a0a4b9d1d6aad61f83589b370d
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 02:53:45 2006 +

* Add a series number for the xaw_without_xp patch

commit ad9ee0f6fea9d493db0c3b5cea92a16fd531f2b3
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 02:52:23 2006 +

Update patches for new versions

commit 33312bdca01567ba75ca19ed697b0eaa608690fd
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 02:42:45 2006 +

* Update xorg-cf-files to 1.0.2

commit e144fbe342f523b52fb49bd3c2e993412802b2d7
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 02:40:24 2006 +

* Update util-macros to 1.0.2

commit 0425fc2e4261331469ca1ba467dacfad4512fd3c
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue May 30 02:37:38 2006 +

* Update imake to 1.0.2

commit 04777d5e965ba309fb0d7197f50143cc5e6caa2c
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue