Bug#813359: xserver-xorg-input-aiptek: Compilation fails due to API change in xorg

2016-03-09 Thread Tobias Schlemmer 
Hi,

Am 04.03.2016 um 20:13 schrieb Julien Cristau:
> On Thu, Mar  3, 2016 at 21:36:38 +0100, Tobias Schlemmer wrote:
> 
>> Package: xserver-xorg-input-aiptek
>> Version: 1:1.4.1-1
>> Followup-For: Bug #813359
> is the aiptek tablet not supported by any of the better maintained
> drivers (libinput/evdev/wacom)?

Thanks for the question. But those drivers have all their drawbacks.

• libinput simply crashes xorg when I tap with the pen on the tablet. If
I'm not mistaken I read, that this driver does not support tablets, yet.

• Wacom seems not to be of any help.

• evdev does not work out of the box. With no configuration the X server
searches for the aiptek drivers, even if evdev is loaded. So I had to
modify xorg.conf in order to get the driver running at all. But then it
does not work as expected. It uses the key area for the pen pointer AND
sends keyboard events when I tapped on one Key symbols. This is bad
behaviour as it leads to unpredictable results.

• Furthermore searching the internet for Aiptek and Xorg does not reveal
any of the other optiions. For my devices it's even worse at it is
branded as Trust.

• The Ubuntu Wiki only talks about the aiptek module.

Conclusion: The aiptek module seems to be the most useful one, so far.


Regards,

Tobias

xserver-xorg-video-intel_2.99.917+git20160307-1_source.changes ACCEPTED into unstable

2016-03-09 Thread Debian FTP Masters 


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.8
Date: Wed, 09 Mar 2016 21:26:17 +0200
Source: xserver-xorg-video-intel
Binary: xserver-xorg-video-intel xserver-xorg-video-intel-dbg
Architecture: source
Version: 2:2.99.917+git20160307-1
Distribution: unstable
Urgency: medium
Maintainer: Debian X Strike Force 
Changed-By: Timo Aaltonen 
Description:
 xserver-xorg-video-intel - X.Org X server -- Intel i8xx, i9xx display driver
 xserver-xorg-video-intel-dbg - X.Org X server -- Intel i8xx, i9xx display 
driver (debug symbols)
Changes:
 xserver-xorg-video-intel (2:2.99.917+git20160307-1) unstable; urgency=medium
 .
   [ Timo Aaltonen ]
   * New upstream snapshot.
   * control: Update the description, older hw likely still wants this
 driver.
   * sna-let-modesetting-handle-gen9+.diff: Use modesetting+glamor on
 Skylake and up.
 .
   [ Matthias Klose ]
   * Move the shared libraries into multiarch libdir.
   * rules: Enable parallel builds.
Checksums-Sha1:
 9b654c977757cedaa1bba4ad89b8ea6e3ca7ec8a 3206 
xserver-xorg-video-intel_2.99.917+git20160307-1.dsc
 8738b1beda233d66ed1d630cd4c9e66df245a8e5 1601531 
xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz
 1cd1cb98c076bfe095c1a125659427b4e41809a5 947575 
xserver-xorg-video-intel_2.99.917+git20160307-1.diff.gz
Checksums-Sha256:
 e0c6e15090613670d3ff6cf69c2d1652a82a9597d3c77f0e7397fbd3dd189540 3206 
xserver-xorg-video-intel_2.99.917+git20160307-1.dsc
 48f45cd2ec9c232ca50d97063aa4c980bf8728e1daff81b781a41dd36792f7ec 1601531 
xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz
 7523e0783a6c207b64da8e348f1314dbf5fb794448ec9cb70a7ad451aec1c628 947575 
xserver-xorg-video-intel_2.99.917+git20160307-1.diff.gz
Files:
 9ffbc306e411afaaeea984d10a296fa5 3206 x11 optional 
xserver-xorg-video-intel_2.99.917+git20160307-1.dsc
 ef5b9fe28b2b85e99ce7d83241d8ec77 1601531 x11 optional 
xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz
 61514f6f0942c61ae87a35da8f299361 947575 x11 optional 
xserver-xorg-video-intel_2.99.917+git20160307-1.diff.gz

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBAgAGBQJW4Hz/AAoJEMtwMWWoiYTcgW0QAJGoSZlSn8iQSag7i/0nJPi+
2ZWPtSjDKpc+MmBWYIDVfLM3flfbwAgArRkdRax7fBp0y3DL9CaZz2lUyTtYNxo6
/ral5EwF+XfGnpTRDCw5X1SVJfXxianKcxNLsE1ePAvowCgBbPL8zQLLR5BdTwOZ
S2axfu/9YrfHzRNwWfJuERKRS9N3SboOpalPqqVlMtSlgWrvjIqkHh3W1I4X0G8D
6B4DeWEwJG4d1O8PIVg0OGhn3qZZyRNvabWyJaqrKrnNpx/mqW80775yNNt623mQ
3L6Kop97/jOXdf5yE7mUlhaAsX2Qj4OJ7UFMzdT6e0Gy9uUy6Vyj6dvVu5yA61+J
IgWDokmd5DsAuQJfOygWLo0PFeeKTbggpa+I2m8u0N2Tl4BJv1OEllNmytDLLzuC
q9o5r2D8CGQkCEt97EN0Bh+obB7Vb03gyZwg3oE/Y/XmqbCOObmiM2IdhaRiDXoU
BMOuSZn2K1ykYUXVpOCBYO8w/9KLS7nb6Ug/xustu6lLrkHwAwqiAHla4TZb1Prm
D46X0KXRjcq7f7LuVnnpN5fbGMwVpRIJBfrSMHwbgNzgoP6T4RkLcKd58BHLx6Fe
2wUArlUl6YxF46uMYGUOfghv+kjOvH+lZUk52vVypukxU6GJpznjYbuidCl/OtdP
FW+41PrOJHmtthXu2CWs
=vkfR
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

xserver-xorg-video-intel: Changes to 'refs/tags/xserver-xorg-video-intel-2_2.99.917+git20160307-1'

2016-03-09 Thread Timo Aaltonen 
Tag 'xserver-xorg-video-intel-2_2.99.917+git20160307-1' created by Timo 
Aaltonen  at 2016-03-09 19:26 +

Tagging upload of xserver-xorg-video-intel 2:2.99.917+git20160307-1 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJW4HjxAAoJEMtwMWWoiYTctLoP/j38uQhnJksd8tYme49hp0TG
stfba5Pmzwoc9D0L9SOeTjg21dgjk7eAYiUbi8Ce3mn83+5sZxVR1LzGMKv5ZfGa
oLHg1v3NvKjI0OzZf2W3qwTfna96lWcp42VFYUgOE+3cUhAi+XWy2b3wPkWwjJdg
eob5A5Nw5XCqpOeEfG2o914kxICzy26vSpGmulnwCARo6BK7zQm7utoOsL/R0EAY
UQOOy9fZ3TyNM1bSWjdgteFgccOU5+d7gz3EA8FLetqRZDQmIy0Dve2ZkGrYDK9v
EeYGd+K6hj301O5h8WpS6qBUQdwGDurjkq275DR/BzLk4jjQEtIxpJp4NvRlzzos
/cmxfO2L5M/eDjzDr7/4xCDCs/YJlxpFEZSz1Ysoazwk8CISB+PYa7TUBhs6NwSY
xwkzQTh28zHuJaO95RX9z+uUXtWw/Nss63vnXAHRoyGy0oKXmw4TCTTJMyGrzf/e
xM1DqA+ZKN4QjNwsY3W//UCj/7yh5WDBI8zP7TKpGLWNayNN3sB0VqwbshebD9ZY
CwI0mgTZeYD0+Xymq7kz/HbaofjoFBNR7VKB61ZTHZCi4hGFyAvsp6tce8TyMLxr
D9O4UCXA5kpGiFJLqIo9nSRIh+5OqTOIk42AzJpXO21Yr4c8CMHmb6//SMas1pHe
p3ohwVH5OSnsix56d2eZ
=M6o0
-END PGP SIGNATURE-

Changes since xserver-xorg-video-intel-2_2.99.917+git20160218-1:
Chris Wilson (4):
  sna/dri2: Ensure the flipqueue is drained on pageflip failure
  sna/dri2: Reset front pointer on frame event across a modeset
  sna: Flush the DRM event queue after a modeset
  sna/dri2: Add active-scanout tracking to single CRTC flips

Timo Aaltonen (6):
  Merge branch 'upstream-unstable' into debian-unstable
  control: Update the description, older hw likely still wants this driver.
  sna-let-modesetting-handle-gen9+.diff: Use modesetting+glamor on Skylake 
and up.
  Move the shared libraries into multiarch libdir.
  rules: Enable parallel builds.
  upload to unstable

Ville Syrjälä (1):
  sna: Restrict reflected rotations to be rotations

---
 debian/changelog   |   15 +
 debian/control |5 
 debian/patches/series  |2 
 debian/patches/sna-let-modesetting-handle-gen9+.diff   |   40 +++
 debian/rules   |5 
 debian/xserver-xorg-video-intel.install|4 
 debian/xserver-xorg-video-intel.install.kfreebsd-amd64 |4 
 debian/xserver-xorg-video-intel.install.kfreebsd-i386  |4 
 src/sna/kgem.h |1 
 src/sna/sna_display.c  |   22 +
 src/sna/sna_dri2.c |  212 ++---
 11 files changed, 224 insertions(+), 90 deletions(-)
---

xserver-xorg-video-intel: Changes to 'debian-unstable'

2016-03-09 Thread Timo Aaltonen 
 debian/changelog   |9 +++--
 debian/rules   |5 -
 debian/xserver-xorg-video-intel.install|4 ++--
 debian/xserver-xorg-video-intel.install.kfreebsd-amd64 |4 ++--
 debian/xserver-xorg-video-intel.install.kfreebsd-i386  |4 ++--
 5 files changed, 17 insertions(+), 9 deletions(-)

New commits:
commit e415f62c90247e917ab91cde9f6138993031abcd
Author: Timo Aaltonen 
Date:   Wed Mar 9 21:26:39 2016 +0200

upload to unstable

diff --git a/debian/changelog b/debian/changelog
index de35387..0f715a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20160307-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]
   * New upstream snapshot.
@@ -11,7 +11,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160307-1) 
UNRELEASED; urgency=medium
   * Move the shared libraries into multiarch libdir.
   * rules: Enable parallel builds.
 
- -- Timo Aaltonen   Mon, 07 Mar 2016 15:20:56 +0200
+ -- Timo Aaltonen   Wed, 09 Mar 2016 21:26:17 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20160218-1) unstable; urgency=medium
 

commit 41b55d35b89467827fa00498726a69cf62de2d09
Author: Timo Aaltonen 
Date:   Tue Mar 8 15:26:32 2016 +0200

rules: Enable parallel builds.

diff --git a/debian/changelog b/debian/changelog
index 238588b..de35387 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; 
urgency=medium
 
   [ Matthias Klose ]
   * Move the shared libraries into multiarch libdir.
+  * rules: Enable parallel builds.
 
  -- Timo Aaltonen   Mon, 07 Mar 2016 15:20:56 +0200
 
diff --git a/debian/rules b/debian/rules
index 8e907f5..3020c64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ override_dh_installchangelogs:
dh_installchangelogs debian/upstream.changelog
 
 %:
-   dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
+   dh $@ --parallel --with quilt,autoreconf,xsf --builddirectory=build/
 
 # Snapshots should only target experimental:
 generate-snapshot: UPSTREAM_VERSION = $(shell echo $(SOURCE_VERSION) | sed 
's/^[0-9]*://;s/-.*$$//')

commit 951719b29a5a849358b39c505d2f8b8af8cc73f3
Author: Timo Aaltonen 
Date:   Tue Mar 8 15:18:47 2016 +0200

Move the shared libraries into multiarch libdir.

diff --git a/debian/changelog b/debian/changelog
index 91d3321..238588b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium
 
+  [ Timo Aaltonen ]
   * New upstream snapshot.
   * control: Update the description, older hw likely still wants this
 driver.
   * sna-let-modesetting-handle-gen9+.diff: Use modesetting+glamor on
 Skylake and up.
 
+  [ Matthias Klose ]
+  * Move the shared libraries into multiarch libdir.
+
  -- Timo Aaltonen   Mon, 07 Mar 2016 15:20:56 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20160218-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 9b5efd9..8e907f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,9 @@ override_dh_install:
find debian/tmp -name '*.la' -delete
rm -f debian/tmp/usr/lib/libI810XvMC.so
rm -f debian/tmp/usr/lib/libIntelXvMC.so
+   mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+   mv debian/tmp/usr/lib/libI810XvMC.so.* 
debian/tmp/usr/lib/libIntelXvMC.so.* \
+   debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/.
dh_install --fail-missing
 
 # Debug package:
diff --git a/debian/xserver-xorg-video-intel.install 
b/debian/xserver-xorg-video-intel.install
index b603516..9508a54 100644
--- a/debian/xserver-xorg-video-intel.install
+++ b/debian/xserver-xorg-video-intel.install
@@ -1,7 +1,7 @@
 usr/bin/intel-virtual-output
 usr/lib/xorg/modules/drivers/*.so
-usr/lib/libI810XvMC.so*
-usr/lib/libIntelXvMC.so*
+usr/lib/*/libI810XvMC.so*
+usr/lib/*/libIntelXvMC.so*
 usr/lib/xserver-xorg-video-intel/xf86-video-intel-backlight-helper
 usr/share/polkit-1/actions/org.x.xf86-video-intel.backlight-helper.policy
 usr/share/man
diff --git a/debian/xserver-xorg-video-intel.install.kfreebsd-amd64 
b/debian/xserver-xorg-video-intel.install.kfreebsd-amd64
index 48c5ed0..800b416 100644
--- a/debian/xserver-xorg-video-intel.install.kfreebsd-amd64
+++ b/debian/xserver-xorg-video-intel.install.kfreebsd-amd64
@@ -1,4 +1,4 @@
 usr/lib/xorg/modules/drivers/*.so
-usr/lib/libI810XvMC.so*
-usr/lib/libIntelXvMC.so*
+usr/lib/*/libI810XvMC.so*
+usr/lib/*/libIntelXvMC.so*
 usr/share/man
diff --git a/debian/xserver-xorg-video-intel.install.kfreebsd-i386 
b/debian/xserver-xorg-video-intel.install.kfreebsd-i386
index

Processing of xserver-xorg-video-intel_2.99.917+git20160307-1_source.changes

2016-03-09 Thread Debian FTP Masters 
xserver-xorg-video-intel_2.99.917+git20160307-1_source.changes uploaded 
successfully to localhost
along with the files:
  xserver-xorg-video-intel_2.99.917+git20160307-1.dsc
  xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz
  xserver-xorg-video-intel_2.99.917+git20160307-1.diff.gz

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

xorg-server: Changes to 'ubuntu'

2016-03-09 Thread Timo Aaltonen 
 ChangeLog  | 
7920 +++---
 Xext/geext.c   |   
10 
 Xext/geint.h   |   
 5 
 Xext/hashtable.c   |   
 4 
 Xext/panoramiX.c   |   
10 
 Xext/panoramiXprocs.c  |   
21 
 Xext/saver.c   |   
 2 
 Xext/security.c|   
24 
 Xext/shape.c   |   
 2 
 Xext/sync.c|   
 4 
 Xext/xace.c|   
13 
 Xext/xace.h|   
 2 
 Xext/xcmisc.c  |   
 2 
 Xext/xf86bigfont.c |   
 4 
 Xext/xres.c|   
10 
 Xext/xselinux_hooks.c  |   
 1 
 Xext/xselinux_label.c  |   
 2 
 Xext/xtest.c   |   
 2 
 Xext/xvmain.c  |   
84 
 Xi/exevents.c  |   
 9 
 Xi/getprop.c   |   
 2 
 Xi/xichangehierarchy.c |   
 6 
 Xi/xiproperty.c|   
 8 
 Xi/xiquerypointer.c|   
 4 
 autogen.sh |   
 8 
 composite/compinit.c   |   
35 
 composite/compwindow.c |   
 2 
 config/10-evdev.conf   |   
40 
 config/Makefile.am |   
 4 
 config/config.c|   
 3 
 configure.ac   |  
150 
 dbe/dbe.c  |   
14 
 dbe/midbe.c|   
 2 
 debian/changelog   |   
70 
 debian/control |   
13 
 debian/patches/02_kbsd-input-devd.diff |   
 8 
 debian/patches/03_static-nettle.diff   |   
 2 
 debian/patches/05_Revert-Unload-submodules.diff|   
 2 
 debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch|   
 4 
 debian/patches/191-Xorg-add-an-extra-module-path.patch |   
 6 
 debian/patches/208_switch_on_release.diff  |   
14 
 debian/patches/227_null_ptr_midispcur.patch|   
 8 
 debian/patches/228_autobind_gpu.patch  |   
 4 
 debian/patches/fix-detach-gpu.patch|   
16 
 debian/patches/fix-ftbfs-ppc64el.patch |   
16 
 debian/patches/fix-xineramaqueryscreens-for-reverse-prime.diff |   
70 
 debian/patches/os-make-sure-the-clientswritable-fd-set-is-initialized.diff |   
63 
 debian/patches/series  |   
 7 
 debian/patches/xext-fix-udeb-build.diff|   
37 
 debian/patches/xf86-ignore-conflicting-rr-caps.patch   |   
 2 
 debian/patches/xfree86-no-xv-for-gpuscreens.patch  |   
14 
 debian/patches/xi2-resize-touch.patch  |   
12 
 debian/patches/xmir-desktop-file-hint-flag.patch   |   
 7 
 debian/patches/xmir-fixes.diff |  
117 
 debian/patches/xrandr-rroutputchanged-main.patch   |   
63 
 debian/rules   |   
19 
 debian/serverminver|   
 6 
 dix/atom.c |   
10 
 dix/colormap.c

xterm: Changes to 'debian-unstable'

2016-03-09 Thread Sven Joachim 
 debian/changelog |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6efaeb69a0e7c6ac62d2c55f685aff546233c0bd
Author: Sven Joachim 
Date:   Wed Mar 9 18:39:08 2016 +0100

Delete trailing whitespace from debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 11d9160..eb9a5e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,14 +4,14 @@ xterm (323-1) UNRELEASED; urgency=medium
   * Use https for Vcs-* fields.
   * Prefer lynx over lynx-cur in Build-Depends.
   * Bump Standards-Version to 3.9.7, no changes needed.
-  
+
  -- Sven Joachim   Wed, 09 Mar 2016 17:30:44 +0100
 
 xterm (322-1) unstable; urgency=medium
 
   * New upstream release.
 - Fix regression due to incorrect fix for compiler warning when
-  allocating storage for /etc/shells (Closes: #809646). 
+  allocating storage for /etc/shells (Closes: #809646).
   * Update years in debian/copyright.
 
  -- Sven Joachim   Sat, 02 Jan 2016 16:17:27 +0100
@@ -1024,7 +1024,7 @@ xterm (210-1) unstable; urgency=low
* Merge duplicate Provides fields
 
  -- David Nusinow   Mon, 13 Mar 2006 22:12:41 -0500
- 
+
 xterm (208-3.1) unstable; urgency=low
 
   * Emergency NMU to fix queue/accepted breakage: s/Provides/Replaces/

xterm: Changes to 'pristine-tar'

2016-03-09 Thread Sven Joachim 
 xterm_323.orig.tar.gz.delta |binary
 xterm_323.orig.tar.gz.id|1 +
 2 files changed, 1 insertion(+)

New commits:
commit 6746b621f31ca845342ea99ec3649ca7766ede71
Author: Sven Joachim 
Date:   Wed Mar 9 17:28:14 2016 +0100

pristine-tar data for xterm_323.orig.tar.gz

diff --git a/xterm_323.orig.tar.gz.delta b/xterm_323.orig.tar.gz.delta
new file mode 100644
index 000..ff4e1d0
Binary files /dev/null and b/xterm_323.orig.tar.gz.delta differ
diff --git a/xterm_323.orig.tar.gz.id b/xterm_323.orig.tar.gz.id
new file mode 100644
index 000..ab537f1
--- /dev/null
+++ b/xterm_323.orig.tar.gz.id
@@ -0,0 +1 @@
+e33cc2c804df5a8ee862e9eba110a8506ce75192

xterm: Changes to 'upstream-unstable'

2016-03-09 Thread Sven Joachim 
 Imakefile|   15 
 MANIFEST |2 
 XTerm.ad |6 
 aclocal.m4   |   33 
 button.c |   19 
 charproc.c   |   12 
 configure| 3743 ++-
 configure.in |   16 
 ctlseqs.ms   |   16 
 ctlseqs.txt  |   10 
 html.c   |  304 +++
 menu.c   |   50 
 menu.h   |   10 
 misc.c   |   64 
 package/debian/changelog |6 
 package/debian/rules |1 
 package/freebsd/Makefile |2 
 package/xterm.spec   |8 
 print.c  |   12 
 ptyx.h   |8 
 svg.c|  288 +++
 uxterm.desktop   |5 
 version.h|6 
 xterm.appdata.xml|   10 
 xterm.dat|2 
 xterm.desktop|5 
 xterm.h  |   21 
 xterm.log.html   |   33 
 xterm.man|  119 +
 xtermcfg.hin |5 
 30 files changed, 2819 insertions(+), 2012 deletions(-)

New commits:
commit dabaa890d428573a9cfa4a13a5e42d229df66887
Author: Sven Joachim 
Date:   Wed Mar 9 17:28:12 2016 +0100

Imported Upstream version 323

diff --git a/Imakefile b/Imakefile
index f2119ec..bbe389a 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.111 2014/07/22 22:29:17 tom Exp $
+XCOMM $XTermId: Imakefile,v 1.112 2016/01/28 01:56:53 Jens.Schweikhardt Exp $
 XCOMM
 XCOMM Attention xterm porters
 XCOMM
@@ -165,6 +165,9 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
 #if !HasPutenv
   PUTENVDEF = -DNOPUTENV
 #endif
+#ifdef DumpsXTerm
+   DUMPSDEF = -DOPT_SCREEN_DUMPS=1
+#endif
 #ifdef RegisXTerm
SIXELDEF = -DOPT_REGIS_GRAPHICS=1
 #endif
@@ -180,11 +183,15 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
 XKB_DEFINES = XkbClientDefines
PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
-DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) 
$(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) 
$(IMAKEDEFINES) $(SIXELDEF) $(TRACEDEF)
+DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) 
$(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) 
$(IMAKEDEFINES) $(SIXELDEF) $(TRACEDEF) $(DUMPSDEF)
INCLUDES = -I. $(XRFINCLUDES)
 
 MAINSRC = main.c
 MAINOBJ = main.o
+#ifdef DumpsXTerm
+   DUMPSSRC = html.c svg.c
+   DUMPSOBJ = html.o svg.o
+#endif
 #ifdef RegisXTerm
SIXELSRC = graphics_regis.c
SIXELOBJ = graphics_regis.o
@@ -202,13 +209,13 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
  linedata.c menu.c misc.c print.c ptydata.c scrollback.c \
  screen.c scrollbar.c tabs.c util.c version.c xstrings.c \
  xtermcap.c TekPrsTbl.c Tekproc.c VTPrsTbl.c \
- $(MAINSRC) $(EXTRASRC) $(UTF8SRC) $(SIXELSRC) $(TRACESRC)
+ $(MAINSRC) $(EXTRASRC) $(UTF8SRC) $(SIXELSRC) $(TRACESRC) 
$(DUMPSSRC)
   OBJS1 = button.o cachedGCs.o charproc.o charsets.o cursor.o \
  data.o doublechr.o fontutils.o input.o \
  linedata.o menu.o misc.o print.o ptydata.o scrollback.o \
  screen.o scrollbar.o tabs.o util.o version.o xstrings.o \
  xtermcap.o TekPrsTbl.o Tekproc.o VTPrsTbl.o \
- $(MAINOBJ) $(EXTRAOBJ) $(UTF8OBJ) $(SIXELOBJ) $(TRACEOBJ)
+ $(MAINOBJ) $(EXTRAOBJ) $(UTF8OBJ) $(SIXELOBJ) $(TRACEOBJ) 
$(DUMPSOBJ)
   SRCS2 = resize.c version.c xstrings.c
   OBJS2 = resize.o version.o xstrings.o
SRCS = $(SRCS1) $(SRCS2)
diff --git a/MANIFEST b/MANIFEST
index 1009b48..067c42e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-322, version xterm-322
+MANIFEST for xterm-323, version xterm-323
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/XTerm.ad b/XTerm.ad
index 69e578b..716b175 100644
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -1,8 +1,8 @@
-! $XTermId: XTerm.ad,v 1.99 2013/06/23 08:57:13 Ross.Combs Exp $
+! $XTermId: XTerm.ad,v 1.101 2016/01/28 02:15:29 tom Exp $
 ! -
 ! this file is part of xterm
 !
-! Copyright 1996-2010,2011 by Thomas E. Dickey
+! Copyright 1996-2011,2016 by Thomas E. Dickey
 ! 
 ! All Rights Reserved
 ! 
@@ -52,6 +52,8 @@
 *mainMenu*print-on-error*Label:  Print-All on Error
 *mainMenu*print*Label:  Print Window
 *mainMenu*print-redir*Label:  Redirect to Printer
+*mainMenu*dump-html*Label:  XHTML Screen Dump
+*mainMenu*dump-svg*Label:  SVG Screen Dump

xterm: Changes to 'debian-unstable'

2016-03-09 Thread Sven Joachim 
 Imakefile|   15 
 MANIFEST |2 
 XTerm.ad |6 
 aclocal.m4   |   33 
 button.c |   19 
 charproc.c   |   12 
 configure| 3743 ++-
 configure.in |   16 
 ctlseqs.ms   |   16 
 ctlseqs.txt  |   10 
 debian/changelog |9 
 debian/control   |8 
 html.c   |  304 +++
 menu.c   |   50 
 menu.h   |   10 
 misc.c   |   64 
 package/debian/changelog |6 
 package/debian/rules |1 
 package/freebsd/Makefile |2 
 package/xterm.spec   |8 
 print.c  |   12 
 ptyx.h   |8 
 svg.c|  288 +++
 uxterm.desktop   |5 
 version.h|6 
 xterm.appdata.xml|   10 
 xterm.dat|2 
 xterm.desktop|5 
 xterm.h  |   21 
 xterm.log.html   |   33 
 xterm.man|  119 +
 xtermcfg.hin |5 
 32 files changed, 2832 insertions(+), 2016 deletions(-)

New commits:
commit 3a51bfc76925cce913c02faea4feaa722c5a2019
Author: Sven Joachim 
Date:   Wed Mar 9 18:02:39 2016 +0100

Bump Standards-Version to 3.9.7

diff --git a/debian/changelog b/debian/changelog
index 2d89ff0..11d9160 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ xterm (323-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Use https for Vcs-* fields.
   * Prefer lynx over lynx-cur in Build-Depends.
-
+  * Bump Standards-Version to 3.9.7, no changes needed.
+  
  -- Sven Joachim   Wed, 09 Mar 2016 17:30:44 +0100
 
 xterm (322-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 2ae5ed3..450bcaa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Sven Joachim 
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xterm.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xterm.git
 Homepage: http://invisible-island.net/xterm/xterm.html

commit 878eb38f6fd539a6bb7e48eda8457012b536a9d3
Author: Sven Joachim 
Date:   Wed Mar 9 18:00:11 2016 +0100

Prefer lynx over lynx-cur in Build-Depends

The lynx package used to be a transitional package for lynx-cur, but
recently their roles have been reversed.

diff --git a/debian/changelog b/debian/changelog
index d1d284b..2d89ff0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xterm (323-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Use https for Vcs-* fields.
+  * Prefer lynx over lynx-cur in Build-Depends.
 
  -- Sven Joachim   Wed, 09 Mar 2016 17:30:44 +0100
 
diff --git a/debian/control b/debian/control
index 2dee3b3..2ae5ed3 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  debhelper (>= 9),
  quilt,
  autotools-dev,
- lynx-cur | lynx,
+ lynx | lynx-cur,
  xorg-docs-core,
  desktop-file-utils,
 

commit 7492dbd12d2110a0b7c91dc55e036297fb231bd3
Author: Sven Joachim 
Date:   Wed Mar 9 17:55:34 2016 +0100

Use https for Vcs-* fields

Prefer cgit over gitweb in the Vcs-Browser URL.

diff --git a/debian/changelog b/debian/changelog
index 7110df4..d1d284b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xterm (323-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Use https for Vcs-* fields.
 
  -- Sven Joachim   Wed, 09 Mar 2016 17:30:44 +0100
 
diff --git a/debian/control b/debian/control
index f118351..2dee3b3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Sven Joachim 
 Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xorg/app/xterm.git
-Vcs-Git: git://anonscm.debian.org/pkg-xorg/app/xterm
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xterm.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xterm.git
 Homepage: http://invisible-island.net/xterm/xterm.html
 Build-Depends:
  libncurses5-dev | libncurses-dev,

commit d91e59d6d326654db351e2c83f9191522a480848
Author: Sven Joachim 
Date:   Wed Mar 9 17:30:51 2016 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 8b3e577..7110df4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (323-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Sven Joachim   Wed, 09 Mar 2016 17:30:44 +0100
+
 xterm (322-1) unstable; urgency=medium
 
   * New upstream release.

commit