[X2Go-Commits] [nx-libs] branch 3.6.x updated (99ef17f -> f729583)

git-admin at x2go.org git-admin at x2go.org
Fri May 15 14:07:09 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch 3.6.x
in repository nx-libs.

      from  99ef17f   debian/changelog: merge with 3.5.0.x branch.
       new  cbf4e4d   COPYING: Add Arctica Project to copyright holders.
       new  c189f6e   imake cleanup: Break up multiple vars into invidual lines to ease further work on patches / pull requests.
       new  662a895   imake cleanup: Drop references to X11 build-logic that is not present in nx-X11.
       new  7b7ba94   Merge branch 'sunweaver-pr/imake-cleanup-nonpresent-buildlogic' into arctica-3.6.x
       new  83983e9   libnx-xinerama1: also create libXinerama symlink in postinst (and remove in prerm.)
       new  7a6b40a   Merge pull request #19 from ArcticaProject/PR-ionic/libXinerama_symlink_to_libnx-xinerama1
       new  a9bc7bd   debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only delete known files. Fixes RPM build failures.
       new  e595613   debian/changelog: correctly sync with 3.5.0.x branch. Add latest entries.
       new  e6e323a   nx-libs.spec: actually create libXinerama.so.1 symlink during build phase.
       new  7ccbb07   debian/changelog: sync with 3.5.0.x branch.
       new  dba779d   dix: Allow zero-height PutImage requests (fix for X.Org's CVE-2015-3418).
       new  c9d81fc   Merge pull request #20 from sunweaver/pr/fix-CVE-2015-3418
       new  06f36d0   debian/libnx-xinerama1.*: fix faulty logic when creating symlinks.
       new  fca264f   debian/changelog: add entry for last change.
       new  b573cbb   debian/changelog: merge with master branch.
       new  06aa416   library clean-up: Don't build libNX_Xdamage anymore. Use system's libXdamage shared library. (Fixes ArcticaProject/nx-libs#6, X2GoBTS#826).
       new  b77b26f   debian/libnx-xinerama1.*: fix faulty logic when creating symlinks.
       new  998527c   debian/changelog: add entry for last change.
       new  027f593   debian/changelog: merge with master branch.
       new  f729583   Merge branch 'sunweaver-pr/libxdamage-cleanup' into arctica-3.6.x

The 20 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 COPYING                                         |    1 +
 Makefile                                        |    9 +-
 debian/changelog                                |  112 +-
 debian/control                                  |   55 +-
 debian/libnx-xdamage-dev.install.in             |    2 -
 debian/libnx-xdamage1.install.in                |    1 -
 debian/libnx-xdamage1.symbols                   |    9 -
 debian/libnx-xinerama1.postinst.in              |   11 +-
 debian/libnx-xinerama1.prerm                    |   53 +-
 debian/nx-x11proto-damage-dev.install.in        |    2 -
 debian/rules                                    |    1 -
 doc/nx-X11_vs_XOrg69_patches/host.def.NX.patch  |    2 +-
 nx-X11/config/Imakefile                         |    8 +-
 nx-X11/config/cf/Imake.tmpl                     |   15 -
 nx-X11/config/cf/README                         |   83 --
 nx-X11/config/cf/X11.tmpl                       | 1294 +----------------------
 nx-X11/config/cf/host.def                       |  127 +--
 nx-X11/config/cf/linux.cf                       |   30 -
 nx-X11/config/cf/lnxLib.rules                   |   72 --
 nx-X11/config/cf/lnxLib.tmpl                    |   55 -
 nx-X11/config/cf/site.def                       |   19 -
 nx-X11/config/cf/xf86site.def                   |   75 +-
 nx-X11/config/cf/xfree86.cf                     |   62 --
 nx-X11/config/cf/xorg.cf                        |   62 --
 nx-X11/config/cf/xorgsite.def                   |  113 +-
 nx-X11/include/Imakefile                        |   15 +-
 nx-X11/include/extensions/Imakefile             |   47 +-
 nx-X11/include/extensions/damageproto.h         |  149 ---
 nx-X11/include/extensions/damagewire.h          |   57 -
 nx-X11/lib/GL/GL/Imakefile                      |    2 -
 nx-X11/lib/GL/Imakefile                         |   20 +-
 nx-X11/lib/GL/mesa/Imakefile                    |   15 +-
 nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile |    2 +-
 nx-X11/lib/Imakefile                            |  143 +--
 nx-X11/lib/Xdamage/AUTHORS                      |    2 -
 nx-X11/lib/Xdamage/COPYING                      |   22 -
 nx-X11/lib/Xdamage/ChangeLog                    |   13 -
 nx-X11/lib/Xdamage/INSTALL                      |    8 -
 nx-X11/lib/Xdamage/Imakefile                    |   68 --
 nx-X11/lib/Xdamage/README                       |   10 -
 nx-X11/lib/Xdamage/Xdamage.c                    |  365 -------
 nx-X11/lib/Xdamage/Xdamage.h                    |   68 --
 nx-X11/lib/Xdamage/autogen.sh                   |    3 -
 nx-X11/lib/Xdamage/configure.ac                 |   93 --
 nx-X11/lib/Xdamage/xdamage.pc.in                |   10 -
 nx-X11/lib/Xdamage/xdamageint.h                 |   66 --
 nx-X11/programs/Xserver/Imakefile               |   25 +-
 nx-X11/programs/Xserver/dix/dispatch.c          |    2 +-
 nx-X11/programs/Xserver/os/Imakefile            |   17 +-
 nx-X11/programs/Xserver/os/lbxio.c              |  555 ----------
 nx-libs.spec                                    |   29 +-
 nxcompshad/Makefile.in                          |    2 +-
 52 files changed, 256 insertions(+), 3825 deletions(-)
 delete mode 100644 debian/libnx-xdamage-dev.install.in
 delete mode 100644 debian/libnx-xdamage1.install.in
 delete mode 100644 debian/libnx-xdamage1.symbols
 delete mode 100644 debian/nx-x11proto-damage-dev.install.in
 delete mode 100644 nx-X11/include/extensions/damageproto.h
 delete mode 100644 nx-X11/include/extensions/damagewire.h
 delete mode 100644 nx-X11/lib/Xdamage/AUTHORS
 delete mode 100644 nx-X11/lib/Xdamage/COPYING
 delete mode 100644 nx-X11/lib/Xdamage/ChangeLog
 delete mode 100644 nx-X11/lib/Xdamage/INSTALL
 delete mode 100644 nx-X11/lib/Xdamage/Imakefile
 delete mode 100644 nx-X11/lib/Xdamage/NEWS
 delete mode 100644 nx-X11/lib/Xdamage/README
 delete mode 100644 nx-X11/lib/Xdamage/Xdamage.c
 delete mode 100644 nx-X11/lib/Xdamage/Xdamage.h
 delete mode 100755 nx-X11/lib/Xdamage/autogen.sh
 delete mode 100644 nx-X11/lib/Xdamage/configure.ac
 delete mode 100644 nx-X11/lib/Xdamage/xdamage.pc.in
 delete mode 100644 nx-X11/lib/Xdamage/xdamageint.h
 delete mode 100644 nx-X11/programs/Xserver/os/lbxio.c

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list