x11-utils: Changes to 'debian-unstable'
appres/ChangeLog | 129
appres/INSTALL | 291 +
appres/Makefile.am | 33
appres/Makefile.in | 62
appres/aclocal.m4 | 863 ++++-
appres/appres.c | 4
appres/appres.man | 3
appres/config.guess | 210 -
appres/config.h.in | 3
appres/config.sub | 115
appres/configure | 3936 +++++++++++---------------
appres/configure.ac | 27
debian/changelog | 46
debian/control | 17
debian/copyright | 388 +-
debian/copyright.head | 6
debian/rules | 16
editres/ChangeLog | 127
editres/INSTALL | 291 +
editres/Makefile.am | 34
editres/Makefile.in | 66
editres/aclocal.m4 | 851 ++++-
editres/config.guess | 210 -
editres/config.h.in | 3
editres/config.sub | 115
editres/configure | 4109 +++++++++++----------------
editres/configure.ac | 31
luit/ChangeLog | 122
luit/Makefile.am | 71
luit/Makefile.in | 346 +-
luit/acinclude.m4 | 116
luit/aclocal.m4 | 2243 +++++++++------
luit/charset.c | 624 ++--
luit/charset.h | 41
luit/config.guess | 158 -
luit/config.h.in | 30
luit/config.sub | 104
luit/configure | 2015 +++++--------
luit/configure.ac | 47
luit/iso2022.c | 1503 +++++-----
luit/iso2022.h | 79
luit/luit.c | 909 +++---
luit/luit.h | 7
luit/luit.man | 224 -
luit/man/Makefile.am | 35
luit/man/Makefile.in | 438 ++
luit/man/luit.man | 246 +
luit/other.c | 446 +--
luit/other.h | 39
luit/parser.c | 203 -
luit/parser.h | 5
luit/sys.c | 523 +--
luit/sys.h | 26
viewres/ChangeLog | 80
viewres/Makefile.am | 22
viewres/Makefile.in | 26
viewres/aclocal.m4 | 825 ++++-
viewres/config.guess | 18
viewres/config.sub | 76
viewres/configure | 1791 +++---------
viewres/configure.ac | 23
xdpyinfo/COPYING | 26
xdpyinfo/ChangeLog | 169 +
xdpyinfo/INSTALL | 17
xdpyinfo/Makefile.am | 33
xdpyinfo/Makefile.in | 68
xdpyinfo/aclocal.m4 | 833 ++++-
xdpyinfo/config.guess | 210 -
xdpyinfo/config.h.in | 6
xdpyinfo/config.sub | 115
xdpyinfo/configure | 5118 +++++++++++++---------------------
xdpyinfo/configure.ac | 34
xdpyinfo/xdpyinfo.c | 161 -
xdriinfo/ChangeLog | 108
xdriinfo/INSTALL | 157 -
xdriinfo/Makefile.am | 31
xdriinfo/Makefile.in | 60
xdriinfo/aclocal.m4 | 863 ++++-
xdriinfo/config.guess | 210 -
xdriinfo/config.h.in | 6
xdriinfo/config.sub | 115
xdriinfo/configure | 4073 +++++++++++----------------
xdriinfo/configure.ac | 28
xev/ChangeLog | 126
xev/INSTALL | 291 +
xev/Makefile.am | 31
xev/Makefile.in | 62
xev/aclocal.m4 | 851 ++++-
xev/config.guess | 210 -
xev/config.h.in | 3
xev/config.sub | 115
xev/configure | 3932 +++++++++++---------------
xev/configure.ac | 18
xev/xev.c | 20
xev/xev.man | 10
xfd/COPYING | 25
xfd/ChangeLog | 478 +++
xfd/INSTALL | 143
xfd/Makefile.am | 62
xfd/Makefile.in | 511 +--
xfd/README | 26
xfd/Xfd.ad | 40
xfd/aclocal.m4 | 2531 +++++++++++------
xfd/app-defaults/Xfd | 40
xfd/compile | 142
xfd/config.guess | 279 -
xfd/config.h.in | 39
xfd/config.sub | 201 +
xfd/configure | 6093 +++++++++++++++++++++++------------------
xfd/configure.ac | 53
xfd/depcomp | 172 -
xfd/grid.c | 18
xfd/install-sh | 517 ++-
xfd/m4/ax_define_dir.m4 | 49
xfd/missing | 104
xfd/mkinstalldirs | 158 -
xfd/xfd.c | 80
xfd/xfd.man | 13
xfontsel/ChangeLog | 199 +
xfontsel/INSTALL | 143
xfontsel/Makefile.am | 59
xfontsel/Makefile.in | 494 +--
xfontsel/README | 27
xfontsel/ULabel.c | 92
xfontsel/XFontSel.ad | 148
xfontsel/aclocal.m4 | 2530 +++++++++++------
xfontsel/app-defaults/XFontSel | 148
xfontsel/autogen.sh | 13
xfontsel/compile | 142
xfontsel/config.guess | 279 -
xfontsel/config.h.in | 33
xfontsel/config.sub | 201 +
xfontsel/configure | 5822 ++++++++++++++++++++++-----------------
xfontsel/configure.ac | 29
xfontsel/depcomp | 172 -
xfontsel/install-sh | 517 ++-
xfontsel/missing | 104
xfontsel/xfontsel.c | 205 -
xkill/ChangeLog | 137
xkill/INSTALL | 291 +
xkill/Makefile.am | 30
xkill/Makefile.in | 62
xkill/aclocal.m4 | 863 ++++-
xkill/config.guess | 210 -
xkill/config.h.in | 3
xkill/config.sub | 115
xkill/configure | 3936 +++++++++++---------------
xkill/configure.ac | 26
xkill/xkill.c | 26
xkill/xkill.man | 3
xlsclients/ChangeLog | 66
xlsclients/Makefile.am | 22
xlsclients/Makefile.in | 23
xlsclients/aclocal.m4 | 182 -
xlsclients/config.guess | 18
xlsclients/config.sub | 76
xlsclients/configure | 881 +++--
xlsclients/configure.ac | 17
xlsclients/strnlen.h | 32
xprop/COPYING | 48
xprop/ChangeLog | 149 +
xprop/INSTALL | 291 +
xprop/Makefile.am | 31
xprop/Makefile.in | 62
xprop/aclocal.m4 | 851 ++++-
xprop/config.guess | 210 -
xprop/config.h.in | 3
xprop/config.sub | 115
xprop/configure | 4268 ++++++++++++----------------
xprop/configure.ac | 19
xprop/dsimple.c | 2
xprop/dsimple.h | 2
xprop/xprop.c | 150 -
xprop/xprop.man | 11
xvinfo/ChangeLog | 117
xvinfo/INSTALL | 291 +
xvinfo/Makefile.am | 31
xvinfo/Makefile.in | 62
xvinfo/aclocal.m4 | 851 ++++-
xvinfo/config.guess | 210 -
xvinfo/config.h.in | 3
xvinfo/config.sub | 115
xvinfo/configure | 3932 +++++++++++---------------
xvinfo/configure.ac | 18
xvinfo/xvinfo.c | 2
xvinfo/xvinfo.man | 3
xwininfo/COPYING | 23
xwininfo/ChangeLog | 335 ++
xwininfo/INSTALL | 291 +
xwininfo/Makefile.am | 33
xwininfo/Makefile.in | 73
xwininfo/aclocal.m4 | 851 ++++-
xwininfo/clientwin.c | 178 -
xwininfo/clientwin.h | 6
xwininfo/config.guess | 210 -
xwininfo/config.h.in | 45
xwininfo/config.sub | 115
xwininfo/configure | 4186 +++++++++++++---------------
xwininfo/configure.ac | 48
xwininfo/dsimple.c | 761 +++--
xwininfo/dsimple.h | 64
xwininfo/strnlen.c | 37
xwininfo/strnlen.h | 32
xwininfo/xwininfo.c | 2399 ++++++++++------
xwininfo/xwininfo.man | 2
205 files changed, 53573 insertions(+), 41670 deletions(-)
New commits:
commit 2d58d07a59a932f3c9097a303b066e3dc1eb4404
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 9 20:34:06 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index cab6fe4..58fa733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-x11-utils (7.6+1) UNRELEASED; urgency=low
+x11-utils (7.6+1) unstable; urgency=low
* Remove David Nusinow and Brice Goglin from Uploaders. Thanks for your
work!
* Drop Pre-Depends on x11-common.
* Bump Standards-Version to 3.9.1.
+ * Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Wed, 09 Feb 2011 20:31:47 +0100
+ -- Julien Cristau <jcristau@debian.org> Wed, 09 Feb 2011 20:34:01 +0100
x11-utils (7.6~1) experimental; urgency=low
commit bb3011d07e9dd56fc341c907a87ec6fb0fbf186d
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 9 20:33:47 2011 +0100
Bump Standards-Version to 3.9.1.
diff --git a/debian/changelog b/debian/changelog
index 5224cc0..cab6fe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-utils (7.6+1) UNRELEASED; urgency=low
* Remove David Nusinow and Brice Goglin from Uploaders. Thanks for your
work!
* Drop Pre-Depends on x11-common.
+ * Bump Standards-Version to 3.9.1.
-- Julien Cristau <jcristau@debian.org> Wed, 09 Feb 2011 20:31:47 +0100
diff --git a/debian/control b/debian/control
index 7be13e6..1424d60 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Build-Depends:
# xvinfo: libxv-dev, libx11-dev
# xwininfo: libxmuu-dev, libxext-dev, libx11-dev, libxcb-shape0-dev,
# x11proto-core-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-utils
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-utils.git
commit 94b9002606f37bc03658a9985f785bb70b0c6fad
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 9 20:33:11 2011 +0100
Drop Pre-Depends on x11-common.
diff --git a/debian/changelog b/debian/changelog
index 84f8238..5224cc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-utils (7.6+1) UNRELEASED; urgency=low
* Remove David Nusinow and Brice Goglin from Uploaders. Thanks for your
work!
+ * Drop Pre-Depends on x11-common.
-- Julien Cristau <jcristau@debian.org> Wed, 09 Feb 2011 20:31:47 +0100
diff --git a/debian/control b/debian/control
index 5f7a173..7be13e6 100644
--- a/debian/control
+++ b/debian/control
@@ -63,7 +63,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-utils.git
Package: x11-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
-Pre-Depends: x11-common (>= 1:7.0.0)
Conflicts: appres, editres, listres, luit, viewres, xdpyinfo, xdriinfo, xev, xfd, xfontsel,
xkill, xlsatoms, xlsclients, xlsfonts, xmessage, xprop, xvinfo, xwininfo
Replaces: xbase-clients (<< 1:7.2.ds3), xutils (<< 1:7.2),
commit 80c75d61f94280e253115ca503a87db58dac9e19
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 9 20:32:19 2011 +0100
Remove David Nusinow and Brice Goglin from Uploaders.
Thanks for your work!
diff --git a/debian/changelog b/debian/changelog
index 8ddda9b..84f8238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-utils (7.6+1) UNRELEASED; urgency=low
+
+ * Remove David Nusinow and Brice Goglin from Uploaders. Thanks for your
+ work!
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 09 Feb 2011 20:31:47 +0100
+
x11-utils (7.6~1) experimental; urgency=low
[ Robert Hooker ]
diff --git a/debian/control b/debian/control
index e0a3fc9..5f7a173 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-utils
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
xutils-dev (>= 1:7.5+4),
commit 29fdf2d6cc01f1011bff8d55520b543d75557fef
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 23:30:06 2010 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 8c78529..8ddda9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-utils (7.6~1) UNRELEASED; urgency=low
+x11-utils (7.6~1) experimental; urgency=low
[ Robert Hooker ]
* Add libxcomposite-dev to the build deps to enable Composite support
@@ -35,7 +35,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low
* Switch from --list-missing to --fail-missing for additional safety.
* Add myself to Uploaders.
- -- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 22:22:56 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 23:21:32 +0100
x11-utils (7.5+4) unstable; urgency=low
commit b0cbc690f437eae5e09d5a4ffc6027e202644ae6
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 23:21:31 2010 +0100
Add x11proto-core-dev build-dep accordingly.
diff --git a/debian/changelog b/debian/changelog
index 26ce3d0..8c78529 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low
* xprop 1.2.0
* xvinfo 1.1.1
* xwininfo 1.1.1
+ * Add x11proto-core-dev build-dep accordingly.
* Add libxcb-shape0-dev build-dep accordingly.
* Bump lixcb1-dev build-dep accordingly.
* Add an update-copyright target to refresh debian/copyright using
diff --git a/debian/control b/debian/control
index 5e50b00..e0a3fc9 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Build-Depends:
x11proto-gl-dev,
libgl1-mesa-dev,
quilt,
+ x11proto-core-dev (>= 7.0.17),
x11proto-input-dev (>= 1.4),
libxinerama-dev (>= 1:1.0.1),
libfontenc-dev,
@@ -53,7 +54,8 @@ Build-Depends:
# xmessage: libxaw7-dev, libxt-dev
# xprop: libxmuu-dev, libx11-dev
# xvinfo: libxv-dev, libx11-dev
-# xwininfo: libxmuu-dev, libxext-dev, libx11-dev, libxcb-shape0-dev
+# xwininfo: libxmuu-dev, libxext-dev, libx11-dev, libxcb-shape0-dev,
+# x11proto-core-dev
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-utils
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-utils.git
commit b153789cdd266c8db111d96fdf9c06141946e1f0
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 23:07:42 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index b24058b..26ce3d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low
* Stop passing MANCONF="/etc/manpath.config", that was for xman, which
is now in x11-apps.
* Switch from --list-missing to --fail-missing for additional safety.
+ * Add myself to Uploaders.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 22:22:56 +0100
diff --git a/debian/control b/debian/control
index ad0061a..5e50b00 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-utils
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
xutils-dev (>= 1:7.5+4),
commit 0abe8b0c5ba0c558f773859801947c701f4873bc
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 23:06:25 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index d1b1cf3..b24058b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low
* Stop passing RSH=rsh, not used anymore.
* Stop passing MANCONF="/etc/manpath.config", that was for xman, which
is now in x11-apps.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 22:22:56 +0100
diff --git a/debian/rules b/debian/rules
index fa8c771..cc5e74e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --fail-missing
dh_installmenu
dh_installchangelogs
dh_link
commit 64e54c73508df160ef22ba1a552a5659178d46fd
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 23:04:58 2010 +0100
Bump lixcb1-dev build-dep accordingly.
diff --git a/debian/changelog b/debian/changelog
index e1b7b9d..d1b1cf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low
* xvinfo 1.1.1
* xwininfo 1.1.1
* Add libxcb-shape0-dev build-dep accordingly.
+ * Bump lixcb1-dev build-dep accordingly.
* Add an update-copyright target to refresh debian/copyright using
upstream's COPYING files, thanks to Julien Cristau.
* Refresh debian/copyright accordingly.
diff --git a/debian/control b/debian/control
index b456849..ad0061a 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends:
x11proto-input-dev (>= 1.4),
libxinerama-dev (>= 1:1.0.1),
libfontenc-dev,
- libxcb1-dev,
+ libxcb1-dev (>= 1.6),
libxcb-atom1-dev,
libxcb-shape0-dev,
gettext,
commit 6c6cb16cee6694db4d6d7cb87d269f66044771c9
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 23:04:24 2010 +0100
Add libxcb-shape0-dev build-dep accordingly.
diff --git a/debian/changelog b/debian/changelog
index 857fca9..e1b7b9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low
* xprop 1.2.0
* xvinfo 1.1.1
* xwininfo 1.1.1
+ * Add libxcb-shape0-dev build-dep accordingly.
* Add an update-copyright target to refresh debian/copyright using
upstream's COPYING files, thanks to Julien Cristau.
* Refresh debian/copyright accordingly.
diff --git a/debian/control b/debian/control
index 20ef534..b456849 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Build-Depends:
libfontenc-dev,
libxcb1-dev,
libxcb-atom1-dev,
+ libxcb-shape0-dev,
gettext,
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
@@ -52,7 +53,7 @@ Build-Depends:
# xmessage: libxaw7-dev, libxt-dev
# xprop: libxmuu-dev, libx11-dev
# xvinfo: libxv-dev, libx11-dev
-# xwininfo: libxmuu-dev, libxext-dev, libx11-dev
+# xwininfo: libxmuu-dev, libxext-dev, libx11-dev, libxcb-shape0-dev
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-utils
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-utils.git
commit 50e4bfa20ff05cf2891053469aa4d372e367692d
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 22:57:07 2010 +0100
Stop passing MANCONF="/etc/manpath.config", that was for xman, which is now in x11-apps.
diff --git a/debian/changelog b/debian/changelog
index 7c528e0..857fca9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ x11-utils (7.6~1) UNRELEASED; urgency=low
* Refresh debian/copyright accordingly.
* Stop passing --disable-xprint, it's gone.
* Stop passing RSH=rsh, not used anymore.
+ * Stop passing MANCONF="/etc/manpath.config", that was for xman, which
+ is now in x11-apps.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 22:22:56 +0100
diff --git a/debian/rules b/debian/rules
index 5368c7c..fa8c771 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,8 +49,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
cd $*-build && \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)" \
- MANCONF="/etc/manpath.config"
+ CFLAGS="$(CFLAGS)"
cd $*-build && $(MAKE)
>$@
commit be70be34fc8bc9294b22b21e762cff1a2bddbce8
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 22:55:14 2010 +0100
Stop passing RSH=rsh, not used anymore.
diff --git a/debian/changelog b/debian/changelog
index 2702314..7c528e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low
upstream's COPYING files, thanks to Julien Cristau.
* Refresh debian/copyright accordingly.
* Stop passing --disable-xprint, it's gone.
+ * Stop passing RSH=rsh, not used anymore.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 22:22:56 +0100
diff --git a/debian/rules b/debian/rules
index 29a2017..5368c7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,6 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)" \
- RSH=rsh \
MANCONF="/etc/manpath.config"
cd $*-build && $(MAKE)
>$@
commit f49978e19a6a0d30e8ae3c0aa75732b0b1ada94c
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 22:54:21 2010 +0100
Stop passing --disable-xprint, it's gone.
diff --git a/debian/changelog b/debian/changelog
index c1410f9..2702314 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low
* Add an update-copyright target to refresh debian/copyright using
upstream's COPYING files, thanks to Julien Cristau.
* Refresh debian/copyright accordingly.
+ * Stop passing --disable-xprint, it's gone.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 22:22:56 +0100
diff --git a/debian/rules b/debian/rules
index ba02c40..29a2017 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,6 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
cd $*-build && \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
- --disable-xprint \
CFLAGS="$(CFLAGS)" \
RSH=rsh \
MANCONF="/etc/manpath.config"
commit f7190079761b424cfc54c8425ba69e23aa023814
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 22:50:34 2010 +0100
Add xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index 033e719..c1410f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release candidate: X11R7.6 RC1.
+ * Add xutils-dev build-dep for new macros.
* appres 1.0.3
* editres 1.0.5
* luit 1.1.0
diff --git a/debian/control b/debian/control
index 79c1a8a..20ef534 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
+ xutils-dev (>= 1:7.5+4),
pkg-config,
libx11-dev (>= 2:1.0.0),
libxaw7-dev (>= 1:1.0.1),
commit 6caf4908e031ceab501e32c50d2fc3990f3c8be0
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 22:41:13 2010 +0100
Add gettext build-dep accordingly.
diff --git a/debian/changelog b/debian/changelog
index 5f8bef1..033e719 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low
* xdriinfo 1.0.4
* xev 1.1.0
* xfd 1.1.0
+ * Add gettext build-dep accordingly.
* xfontsel 1.0.3
* xkill 1.0.3
* xlsclients 1.1.1
diff --git a/debian/control b/debian/control
index 44a7df6..79c1a8a 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Build-Depends:
libfontenc-dev,
libxcb1-dev,
libxcb-atom1-dev,
+ gettext,
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
@@ -40,7 +41,8 @@ Build-Depends:
# libxinerama-dev, libdmx-dev, libxcomposite-dev
# xdriinfo: libx11-dev, x11proto-gl-dev, libgl1-mesa-dev
# xev: libx11-dev
-# xfd: libxaw7-dev, libfreetype2-dev, libfontconfig-dev, libxft-dev, libxt-dev
+# xfd: libxaw7-dev, libfreetype2-dev, libfontconfig-dev, libxft-dev, libxt-dev,
+# gettext
# xfontsel: libxaw7-dev, libxt-dev
# xkill: libx11-dev, libxmuu-dev
# xlsatoms: libxcb1-dev
commit 0c3201c69c6c1efb90ea3444614024413f8e04a1
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 22:29:43 2010 +0100
Refresh debian/copyright accordingly.
diff --git a/debian/changelog b/debian/changelog
index 6e6331d..5f8bef1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low
* xwininfo 1.1.1
* Add an update-copyright target to refresh debian/copyright using
upstream's COPYING files, thanks to Julien Cristau.
+ * Refresh debian/copyright accordingly.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 22:22:56 +0100
diff --git a/debian/copyright b/debian/copyright
index 05be090..f5df658 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,73 +1,94 @@
The contents of this package were downloaded from
http://xorg.freedesktop.org/releases/individual/app/
+
It contains the appres, editres, listres, luit, viewres, xdpyinfo,
xdriinfo, xev, xfd, xfontsel, xkill, xlsatoms, xlsclients, xlsfonts,
xmessage, xprop, xvinfo and xwininfo applications.
-editres:
+appres:
Copyright 1989, 1998 The Open Group
-
+
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
-
+
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
-
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+
+ Except as contained in this notice, the name of The Open Group shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization from The Open Group.
+
+editres:
+ Copyright 1989, 1990, 1998 The Open Group
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ 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.
listres:
- Copyright (c) 1989 X Consortium
-
+ Copyright (c) 1989, 1994 X Consortium
+
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
-
+
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
-
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+
Except as contained in this notice, the name of the X Consortium shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the X Consortium.
- * *
- * Author: Jim Fulton, MIT X Consortium
- */
luit:
Copyright (c) 2001 by Juliusz Chroboczek
Copyright (c) 2002 by Tomohiro KUBOTA
-
+
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
@@ -77,62 +98,78 @@ luit:
THE SOFTWARE.
viewres:
- Copyright (c) 1989 X Consortium
-
+ Copyright (c) 1989, 1994 X Consortium
+
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
-
+
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
-
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+
Except as contained in this notice, the name of the X Consortium shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the X Consortium.
- * *
- * Author: Jim Fulton, MIT X Consortium
- */
xdpyinfo:
Copyright 1988, 1998 The Open Group
Copyright 2005 Hitachi, Ltd.
-
+
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.
- *
- * Author: Jim Fulton, MIT X Consortium
- */
+
+xdriinfo:
+ Client application for querying drivers' configuration information
+ Copyright (C) 2003 Felix Kuehling
+
+ 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
+ FELIX KUEHLING, OR ANY OTHER CONTRIBUTORS 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.
xev:
Copyright (c) 1988 X Consortium
-
+
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
@@ -140,10 +177,10 @@ xev:
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.
@@ -151,81 +188,93 @@ xev:
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-
+
Except as contained in this notice, the name of the X Consortium shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from the X Consortium.
xfd:
- Copyright 1989, 1998 The Open Group
-
+ Copyright 1989, 1993, 1994, 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.
- * *
- * Author: Jim Fulton, MIT X Consortium
- */
xfontsel:
- Copyright (c) 1985-1989 X Consortium
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be included
Reply to: