ChangeLog | 32 ++++++++++++++++++++++++++++++++
Makefile.am | 2 +-
README | 50 ++++++++++++++++++++++++++++++++++++--------------
configure.ac | 7 ++++++-
debian/changelog | 7 +++++++
debian/control | 2 +-
xtrans.m4 | 3 ++-
7 files changed, 85 insertions(+), 18 deletions(-)
New commits:
commit 8af51825be5fd4a1045e95b5251d4d2e4055106f
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Jan 16 04:53:20 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 5d88619..cbf0441 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xtrans (1.2.3-1) UNRELEASED; urgency=low
+xtrans (1.2.3-1) experimental; urgency=low
* New upstream release.
* Bump xutils-dev build-dep to >= 1:7.4+4 for util-macros 1.2.
- -- Julien Cristau <jcris...@debian.org> Fri, 16 Jan 2009 04:50:22 +0100
+ -- Julien Cristau <jcris...@debian.org> Fri, 16 Jan 2009 04:53:05 +0100
xtrans (1.2.2-1) experimental; urgency=low
commit f679ff2480df4183a6986d61331e481365eef4c3
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Jan 16 04:52:34 2009 +0100
update changelogs and build-deps for new upstream
* New upstream release.
* Bump xutils-dev build-dep to >= 1:7.4+4 for util-macros 1.2.
diff --git a/ChangeLog b/ChangeLog
index 7552df2..9f97eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+commit 1cf4a1a6716f2c0adf5ee4d0a194a1013be53105
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Sun Jan 11 10:54:52 2009 -0800
+
+ Version 1.2.3
+
+commit d0c5592142369afa93dcd58ca6f390dbd127a28a
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Sun Jan 11 10:51:49 2009 -0800
+
+ Add bugzilla, mailing list & git repo pointers to README
+
+commit 9f12a154437554938a4fa18b7d3948c7dff8d631
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Mon Dec 1 13:58:31 2008 -0800
+
+ Switch ChangeLog generation to use XORG_CHANGELOG from xorg-macros 1.2
+
+commit 8c313881a0c586179c09922a7e00a1f8d669a68a
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Mon Dec 1 08:37:42 2008 -0800
+
+ 18748: xtrans.m4 causes configure --help to list --enable-ipv6 in wrong
case.
+
+ X.Org Bug #18748 <http://bugs.freedesktop.org/show_bug.cgi?id=18748>
+
+commit c626a4298e98f4988701dd587bc8355c62542ec4
+Author: Alan Hourihane <al...@tungstengraphics.com>
+Date: Wed Oct 15 11:19:41 2008 +0100
+
+ add winsock check for windows builds
+
commit 005bd80a9eab736aea737869b8a1079c565e1cd6
Author: Adam Jackson <a...@redhat.com>
Date: Tue Oct 7 09:56:49 2008 -0400
diff --git a/debian/changelog b/debian/changelog
index 5ee4bd3..5d88619 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xtrans (1.2.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Bump xutils-dev build-dep to >= 1:7.4+4 for util-macros 1.2.
+
+ -- Julien Cristau <jcris...@debian.org> Fri, 16 Jan 2009 04:50:22 +0100
+
xtrans (1.2.2-1) experimental; urgency=low
[ Brice Goglin ]
diff --git a/debian/control b/debian/control
index cb0a81f..5024fc1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin
<bgog...@debian.org>, Julien Cristau <jcris...@debian.org>
-Build-Depends: debhelper (>= 5.0.0), quilt, automake, xutils-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, automake, xutils-dev (>= 1:7.4+4)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xtrans
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xtrans.git
commit 1cf4a1a6716f2c0adf5ee4d0a194a1013be53105
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Sun Jan 11 10:54:52 2009 -0800
Version 1.2.3
diff --git a/configure.ac b/configure.ac
index dff9d46..cf5ec71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xtrans, 1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans)
+AC_INIT(xtrans, 1.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit d0c5592142369afa93dcd58ca6f390dbd127a28a
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Sun Jan 11 10:51:49 2009 -0800
Add bugzilla, mailing list & git repo pointers to README
diff --git a/README b/README
index 551f129..8560b5d 100644
--- a/README
+++ b/README
@@ -1,14 +1,36 @@
-xtrans is a library of code that is shared among various X packages to handle
-network protocol transport in a modular fashion, allowing a single place to
-add new transport types. It is used by the X server, libX11, libICE, the
-X font server, and related components.
-
-It is however, *NOT* a shared library, but code which each consumer includes
and
-builds it's own copy of with various #ifdef flags to make each copy slightly
-different. To support this in the modular build system, this package simply
-installs the C source files into $(prefix)/include/X11/Xtrans and installs a
-pkg-config file and an autoconf m4 macro file with the flags needed to use it.
-
-Documentation of the xtrans API can be found in the xorg-docs package, in
-PostScript format in xorg-docs/hardcopy/xtrans/Xtrans.PS.gz and in the original
-troff format in xorg-docs/specs/xtrans/Xtrans.mm .
\ No newline at end of file
+xtrans is a library of code that is shared among various X packages to
+handle network protocol transport in a modular fashion, allowing a
+single place to add new transport types. It is used by the X server,
+libX11, libICE, the X font server, and related components.
+
+It is however, *NOT* a shared library, but code which each consumer
+includes and builds it's own copy of with various #ifdef flags to make
+each copy slightly different. To support this in the modular build
+system, this package simply installs the C source files into
+$(prefix)/include/X11/Xtrans and installs a pkg-config file and an
+autoconf m4 macro file with the flags needed to use it.
+
+Documentation of the xtrans API can be found in the xorg-docs package,
+in PostScript format in xorg-docs/hardcopy/xtrans/Xtrans.PS.gz and in
+the original troff format in xorg-docs/specs/xtrans/Xtrans.mm .
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+under the component "Lib/xtrans".
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/lib/libxtrans
+
+ http://cgit.freedesktop.org/xorg/lib/libxtrans
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit 9f12a154437554938a4fa18b7d3948c7dff8d631
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Mon Dec 1 13:58:31 2008 -0800
Switch ChangeLog generation to use XORG_CHANGELOG from xorg-macros 1.2
diff --git a/Makefile.am b/Makefile.am
index 39b67d3..07e0153 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,6 @@ CLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git
directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 19b736f..dff9d46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,10 @@ AC_INIT(xtrans, 1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG macro
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
# Because xtrans is included into other modules rather than being linked
# with, these defines have to be added to the cflags line
@@ -44,6 +48,7 @@ sticky_bit_define="-DHAS_STICKY_DIR_BIT"
AC_SUBST(sticky_bit_define)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
xtrans.pc])
commit 8c313881a0c586179c09922a7e00a1f8d669a68a
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Mon Dec 1 08:37:42 2008 -0800
18748: xtrans.m4 causes configure --help to list --enable-ipv6 in wrong
case.
X.Org Bug #18748 <http://bugs.freedesktop.org/show_bug.cgi?id=18748>
diff --git a/xtrans.m4 b/xtrans.m4
index c4701d4..f6bc2ea 100644
--- a/xtrans.m4
+++ b/xtrans.m4
@@ -36,7 +36,7 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
# Needs to come after above checks for libsocket & libnsl for SVR4 systems
AC_ARG_ENABLE(ipv6,
- AC_HELP_STRING([--enable-IPv6],[Enable IPv6 support]),
+ AC_HELP_STRING([--enable-ipv6],[Enable IPv6 support]),
[IPV6CONN=$enableval],
[AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])])
AC_MSG_CHECKING([if IPv6 support should be built])
commit c626a4298e98f4988701dd587bc8355c62542ec4
Author: Alan Hourihane <al...@tungstengraphics.com>
Date: Wed Oct 15 11:19:41 2008 +0100
add winsock check for windows builds
diff --git a/xtrans.m4 b/xtrans.m4
index 31d456b..c4701d4 100644
--- a/xtrans.m4
+++ b/xtrans.m4
@@ -32,6 +32,7 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
# SVR4 hides these in libraries other than libc
AC_SEARCH_LIBS(socket, [socket])
AC_SEARCH_LIBS(gethostbyname, [nsl])
+ AC_HAVE_LIBRARY([ws2_32])
# Needs to come after above checks for libsocket & libnsl for SVR4 systems
AC_ARG_ENABLE(ipv6,
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
