.gitignore | 3 + ChangeLog | 118 +++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 4 - Xtrans.c | 4 - Xtransint.h | 14 ++--- Xtranslcl.c | 2 Xtranssock.c | 25 ++++++---- Xtransutil.c | 13 ++++- configure.ac | 2 debian/README.source | 73 ++++++++++++++++++++++++++++++ debian/changelog | 7 ++ debian/control | 2 debian/xsfbs/repack.sh | 32 +++++++++++++ debian/xsfbs/xsfbs.sh | 78 -------------------------------- 14 files changed, 273 insertions(+), 104 deletions(-)
New commits: commit e7153d511203515b1c7b4fec7946507d56816788 Author: Brice Goglin <[email protected]> Date: Sat Aug 1 09:26:24 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 20d055e..7abe854 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xtrans (1.2.4-1) UNRELEASED; urgency=low +xtrans (1.2.4-1) unstable; urgency=low * New upstream release. * Add README.source, bump Standards-Version to 3.8.2. - -- Brice Goglin <[email protected]> Sat, 01 Aug 2009 09:24:35 +0200 + -- Brice Goglin <[email protected]> Sat, 01 Aug 2009 09:26:20 +0200 xtrans (1.2.3-3) unstable; urgency=low commit d80f2b28f1a9214c0ae87d66af27e1348c5bba1f Author: Brice Goglin <[email protected]> Date: Sat Aug 1 09:24:53 2009 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index 9f97eb7..1305d27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,121 @@ +commit 4f82ca502d8ec33b0038700675d54539d85d723c +Author: Alan Coopersmith <[email protected]> +Date: Fri Jul 31 17:24:25 2009 -0700 + + Version 1.2.4 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e5f52f206916b7c5264b9371f9bd0113632a4a16 +Author: Alan Coopersmith <[email protected]> +Date: Thu Jul 30 16:07:39 2009 -0700 + + Fix ifdef checks for SVR4 to do the right thing on Solaris + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 6d1ad967b894a37f423fd52247df5fcc3bfab1a8 +Author: Alan Coopersmith <[email protected]> +Date: Mon May 18 18:26:36 2009 -0700 + + xfs segfaults in _FontTransSocketReopen when cloning itself + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 1e32f79670a6dc0baae2c2622d2b562f41266ea5 +Author: Alan Coopersmith <[email protected]> +Date: Fri Apr 24 02:10:53 2009 -0700 + + Constify path argument to trans_mkdir() + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 732f3366c40c4bea258b11b96c4763f5948a4844 +Author: Benjamin Close <[email protected]> +Date: Mon Feb 9 16:34:00 2009 +1030 + + Update is_numeric base on the declaration change in 389e01fb51ba2d708015e27d8fc17c88a0e55802 + + Signed-off-by: Benjamin Close <[email protected]> + +commit 300893171ca7ad684472e5961a7b2ba0eb291f6b +Author: Benjamin Close <[email protected]> +Date: Mon Feb 9 16:33:59 2009 +1030 + + Revert "Fix "XXX declared 'static' but not defined"" + + This reverts commit d192bac409fe5ef99fa9fb9b5a0d5f656f0f1412. + + When transport.c is directly include (as in the case of libICE:icetrans.c:32) + Xtranssock.c must be included before Xtransutil.c in order for the socket + structures to be included. Including Xtransutil.c after Xtranssock.c requires + is_number and trans_mkdir to be defined. + + This reintroduces the warning until a cleaner solution can be found + but fixes the build. + + Found by: Tinderbox + + Signed-off-by: Benjamin Close <[email protected]> + +commit 389e01fb51ba2d708015e27d8fc17c88a0e55802 +Author: Alan Coopersmith <[email protected]> +Date: Fri Feb 6 11:31:06 2009 -0800 + + Constify string argument to is_numeric + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit cca91ddaae2121f42b2d5c08867bb93df8f9de13 +Author: Alan Coopersmith <[email protected]> +Date: Fri Feb 6 11:27:02 2009 -0800 + + Fix libICE build after code motion in d192bac409... + + The #ifdef ICE_t case in Xtransutil.c depended on some #includes that + are done in files that transport.c previously included before Xtransutil.c + but are now after Xtransutil.c is included. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d192bac409fe5ef99fa9fb9b5a0d5f656f0f1412 +Author: Tomas Carnecky <[email protected]> +Date: Wed Feb 4 15:26:18 2009 +0100 + + Fix "XXX declared 'static' but not defined" + + The functions are declared static in Xtransint.h but are defined + in Xtransutil.c. So when someone (xserver/os/connection.c) + incuded Xtransint.h, gcc would throw the warning. + I removed the declarations from the header and rearranged includes + in transport.c so that Xtransutil.c is included just after + Xtransint.h. This way the functions are still defined for the + files that need them (Xtranssock.c, Xtranstli.c). + + Signed-off-by: Tomas Carnecky <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 77784ae71b6af1ec270198cfdd5f2eab1fe4a0c0 +Author: Tomas Carnecky <[email protected]> +Date: Wed Feb 4 15:22:28 2009 +0100 + + Fix "warning: format not a string literal and no format arguments" + + Signed-off-by: Tomas Carnecky <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit c893bc4aa7a674c6888aacc8249b3c4a8f6bf12a +Author: Paulo Cesar Pereira de Andrade <[email protected]> +Date: Fri Jan 30 18:47:32 2009 -0200 + + Janitor: Correct make distcheck and compiler warnings. + + Compiler warnings are spread on other packages, with a + warning in the format: + /usr/include/X11/Xtrans/Xtranssock.c:548: warning: 'ciptr' may be used uninitialized in this function + so the code was slightly changed so that the compiler + would not "think" it could be used without initialization. + commit 1cf4a1a6716f2c0adf5ee4d0a194a1013be53105 Author: Alan Coopersmith <[email protected]> Date: Sun Jan 11 10:54:52 2009 -0800 diff --git a/debian/changelog b/debian/changelog index 54b2858..20d055e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -xtrans (1.2.3-4) UNRELEASED; urgency=low +xtrans (1.2.4-1) UNRELEASED; urgency=low + * New upstream release. * Add README.source, bump Standards-Version to 3.8.2. - -- Brice Goglin <[email protected]> Sat, 01 Aug 2009 09:23:49 +0200 + -- Brice Goglin <[email protected]> Sat, 01 Aug 2009 09:24:35 +0200 xtrans (1.2.3-3) unstable; urgency=low commit a6679eb3e950b003431d70f24a57c03dfbea0c4f Author: Alan Coopersmith <[email protected]> Date: Fri Jul 31 17:24:25 2009 -0700 Version 1.2.4 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index cf5ec71..3fcf515 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.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans) +AC_INIT(xtrans, 1.2.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE commit 4ce716d84136e73ff3025f31fb5a1cb871b853f1 Author: Alan Coopersmith <[email protected]> Date: Thu Jul 30 16:07:39 2009 -0700 Fix ifdef checks for SVR4 to do the right thing on Solaris Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/Xtrans.c b/Xtrans.c index 278651a..7b18f10 100644 --- a/Xtrans.c +++ b/Xtrans.c @@ -103,7 +103,7 @@ Xtransport_table Xtransports[] = { #ifndef sun { &TRANS(PTSFuncs), TRANS_LOCAL_PTS_INDEX }, #endif /* sun */ -#ifdef SVR4 +#if defined(SVR4) || defined(__SVR4) { &TRANS(NAMEDFuncs), TRANS_LOCAL_NAMED_INDEX }, #endif #ifdef sun @@ -1348,7 +1348,7 @@ static int TRANS(WriteV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt) #endif /* SYSV && __i386__ || WIN32 || __sxg__ */ -#if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SCO__) +#if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SVR4) || defined(__SCO__) #ifndef NEED_UTSNAME #define NEED_UTSNAME #endif diff --git a/Xtransint.h b/Xtransint.h index 0bd4b46..cd5b64f 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -94,7 +94,7 @@ from The Open Group. * to avoid a race condition. JKJ (6/5/97) */ -# if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SCO__) +# if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SVR4) || defined(__SCO__) # ifndef NEED_UTSNAME # define NEED_UTSNAME # endif diff --git a/Xtranslcl.c b/Xtranslcl.c index f6a2468..8391156 100644 --- a/Xtranslcl.c +++ b/Xtranslcl.c @@ -75,7 +75,7 @@ from The Open Group. #include <sys/signal.h> #include <sys/ioctl.h> #include <sys/stat.h> -#if defined(SVR4) +#if defined(SVR4) || defined(__SVR4) #include <sys/filio.h> #endif #ifdef sun diff --git a/Xtranssock.c b/Xtranssock.c index f36e3a6..0935744 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -87,7 +87,7 @@ from the copyright holders. #endif /* !NO_TCP_H */ #include <sys/ioctl.h> -#if defined(SVR4) +#if defined(SVR4) || defined(__SVR4) #include <sys/filio.h> #endif @@ -222,7 +222,7 @@ static int TRANS(SocketINETClose) (XtransConnInfo ciptr); #if defined HAVE_SOCKLEN_T || (defined(IPv6) && defined(AF_INET6)) # define SOCKLEN_T socklen_t -#elif defined(SVR4) || defined(__SCO__) +#elif defined(SVR4) || defined(__SVR4) || defined(__SCO__) # define SOCKLEN_T size_t #else # define SOCKLEN_T int @@ -1194,7 +1194,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr) if (!abstract && ( stat (unsock->sun_path, &statb) == -1 || ((statb.st_mode & S_IFMT) != -#if (defined (sun) && defined(SVR4)) || defined(NCR) || defined(SCO325) || !defined(S_IFSOCK) +#if defined(NCR) || defined(SCO325) || !defined(S_IFSOCK) S_IFIFO #else S_IFSOCK commit 9b6b3db1acda0e0e6b71979310703c604b1d6a0f Author: Alan Coopersmith <[email protected]> Date: Mon May 18 18:26:36 2009 -0700 xfs segfaults in _FontTransSocketReopen when cloning itself Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/Xtranssock.c b/Xtranssock.c index eabb587..f36e3a6 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -528,7 +528,14 @@ TRANS(SocketReopen) (int i, int type, int fd, char *port) ciptr->family = AF_UNIX; memcpy(ciptr->peeraddr, ciptr->addr, sizeof(struct sockaddr)); ciptr->port = rindex(addr->sa_data, ':'); - if (ciptr->port[0] == ':') ciptr->port++; /* port should now point to portnum or NULL */ + if (ciptr->port == NULL) { + if (is_numeric(addr->sa_data)) { + ciptr->port = addr->sa_data; + } + } else if (ciptr->port[0] == ':') { + ciptr->port++; + } + /* port should now point to portnum or NULL */ return ciptr; } commit 914f80dd5dae9bbddcaa550c5a70e2a8ad984a26 Author: Alan Coopersmith <[email protected]> Date: Fri Apr 24 02:10:53 2009 -0700 Constify path argument to trans_mkdir() Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/Xtransint.h b/Xtransint.h index 8cc0b68..0bd4b46 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -352,7 +352,7 @@ static int is_numeric ( #ifdef TRANS_SERVER static int trans_mkdir ( - char *, /* path */ + const char *, /* path */ int /* mode */ ); #endif diff --git a/Xtransutil.c b/Xtransutil.c index b4e03fe..bd9ff52 100644 --- a/Xtransutil.c +++ b/Xtransutil.c @@ -479,7 +479,7 @@ is_numeric (const char *str) * bit cannot be set and fail. */ static int -trans_mkdir(char *path, int mode) +trans_mkdir(const char *path, int mode) { struct stat buf; commit 61c8f88796b81be8e46ca2b2ae727acf9d7c0dba Author: Benjamin Close <[email protected]> Date: Mon Feb 9 16:34:00 2009 +1030 Update is_numeric base on the declaration change in 389e01fb51ba2d708015e27d8fc17c88a0e55802 Signed-off-by: Benjamin Close <[email protected]> diff --git a/Xtransint.h b/Xtransint.h index 623cdef..8cc0b68 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -347,7 +347,7 @@ static int TRANS(WriteV)( static int is_numeric ( - char * /* str */ + const char * /* str */ ); #ifdef TRANS_SERVER commit 8ca1e3fd1d3e3eba540304fc8275b7d963ad22ff Author: Benjamin Close <[email protected]> Date: Mon Feb 9 16:33:59 2009 +1030 Revert "Fix "XXX declared 'static' but not defined"" This reverts commit d192bac409fe5ef99fa9fb9b5a0d5f656f0f1412. When transport.c is directly include (as in the case of libICE:icetrans.c:32) Xtranssock.c must be included before Xtransutil.c in order for the socket structures to be included. Including Xtransutil.c after Xtranssock.c requires is_number and trans_mkdir to be defined. This reintroduces the warning until a cleaner solution can be found but fixes the build. Found by: Tinderbox Signed-off-by: Benjamin Close <[email protected]> diff --git a/Xtransint.h b/Xtransint.h index e1a95a2..623cdef 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -345,6 +345,18 @@ static int TRANS(WriteV)( #endif /* CRAY || WIN32 || __sxg__ */ + +static int is_numeric ( + char * /* str */ +); + +#ifdef TRANS_SERVER +static int trans_mkdir ( + char *, /* path */ + int /* mode */ +); +#endif + /* * Some XTRANSDEBUG stuff */ diff --git a/transport.c b/transport.c index baf5bfd..5131d99 100644 --- a/transport.c +++ b/transport.c @@ -59,7 +59,6 @@ from The Open Group. #endif #include "Xtransint.h" -#include "Xtransutil.c" #ifdef LOCALCONN #include "Xtranslcl.c" @@ -71,3 +70,4 @@ from The Open Group. #include "Xtranstli.c" #endif #include "Xtrans.c" +#include "Xtransutil.c" commit cfec22de0a1b3c7ed7598008295565f6a99a0fa9 Author: Alan Coopersmith <[email protected]> Date: Fri Feb 6 11:31:06 2009 -0800 Constify string argument to is_numeric Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/Xtransutil.c b/Xtransutil.c index 6c4d93f..b4e03fe 100644 --- a/Xtransutil.c +++ b/Xtransutil.c @@ -448,8 +448,7 @@ TRANS(WSAStartup) (void) #include <ctype.h> static int -is_numeric (char *str) - +is_numeric (const char *str) { int i; commit 7044c5c49254a0e7204222912e0d38f22326a55f Author: Alan Coopersmith <[email protected]> Date: Fri Feb 6 11:27:02 2009 -0800 Fix libICE build after code motion in d192bac409... The #ifdef ICE_t case in Xtransutil.c depended on some #includes that are done in files that transport.c previously included before Xtransutil.c but are now after Xtransutil.c is included. Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/Xtransutil.c b/Xtransutil.c index 0f7c7b2..6c4d93f 100644 --- a/Xtransutil.c +++ b/Xtransutil.c @@ -225,6 +225,13 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp) #ifdef ICE_t +/* Needed for _XGethostbyaddr usage in TRANS(GetPeerNetworkId) */ +# if defined(TCPCONN) || defined(UNIXCONN) +# define X_INCLUDE_NETDB_H +# define XOS_USE_NO_LOCKING +# include <X11/Xos_r.h> +# endif + #include <signal.h> char * @@ -438,6 +445,7 @@ TRANS(WSAStartup) (void) } #endif +#include <ctype.h> static int is_numeric (char *str) commit bd6d7b3209c8f24002a3296fb52f924a640c147b Author: Tomas Carnecky <[email protected]> Date: Wed Feb 4 15:26:18 2009 +0100 Fix "XXX declared 'static' but not defined" The functions are declared static in Xtransint.h but are defined in Xtransutil.c. So when someone (xserver/os/connection.c) incuded Xtransint.h, gcc would throw the warning. I removed the declarations from the header and rearranged includes in transport.c so that Xtransutil.c is included just after Xtransint.h. This way the functions are still defined for the files that need them (Xtranssock.c, Xtranstli.c). Signed-off-by: Tomas Carnecky <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/Xtransint.h b/Xtransint.h index 623cdef..e1a95a2 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -345,18 +345,6 @@ static int TRANS(WriteV)( #endif /* CRAY || WIN32 || __sxg__ */ - -static int is_numeric ( - char * /* str */ -); - -#ifdef TRANS_SERVER -static int trans_mkdir ( - char *, /* path */ - int /* mode */ -); -#endif - /* * Some XTRANSDEBUG stuff */ diff --git a/transport.c b/transport.c index 5131d99..baf5bfd 100644 --- a/transport.c +++ b/transport.c @@ -59,6 +59,7 @@ from The Open Group. #endif #include "Xtransint.h" +#include "Xtransutil.c" #ifdef LOCALCONN #include "Xtranslcl.c" @@ -70,4 +71,3 @@ from The Open Group. #include "Xtranstli.c" #endif #include "Xtrans.c" -#include "Xtransutil.c" commit 394dbfe26848c78b97cdac2f0be3af0f818a967b Author: Tomas Carnecky <[email protected]> Date: Wed Feb 4 15:22:28 2009 +0100 Fix "warning: format not a string literal and no format arguments" Signed-off-by: Tomas Carnecky <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/Xtransint.h b/Xtransint.h index 523751e..623cdef 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -372,7 +372,7 @@ static int trans_mkdir ( int hack= 0, saveerrno=errno; \ struct timeval tp;\ gettimeofday(&tp,0); \ - ErrorF(__xtransname); \ + ErrorF("%s",__xtransname); \ ErrorF(x+hack,a,b,c); \ ErrorF("timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \ errno=saveerrno; \ @@ -382,7 +382,7 @@ static int trans_mkdir ( int hack= 0, saveerrno=errno; \ struct timeval tp;\ gettimeofday(&tp,0); \ - fprintf(stderr, __xtransname); fflush(stderr); \ + fprintf(stderr, "%s", __xtransname); fflush(stderr); \ fprintf(stderr, x+hack,a,b,c); fflush(stderr); \ fprintf(stderr, "timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \ fflush(stderr); \ @@ -394,14 +394,14 @@ static int trans_mkdir ( /* Use ErrorF() for the X server */ #define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \ int hack= 0, saveerrno=errno; \ - ErrorF(__xtransname); \ + ErrorF("%s",__xtransname); \ ErrorF(x+hack,a,b,c); \ errno=saveerrno; \ } else ((void)0) #else #define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \ int hack= 0, saveerrno=errno; \ - fprintf(stderr, __xtransname); fflush(stderr); \ + fprintf(stderr, "%s", __xtransname); fflush(stderr); \ fprintf(stderr, x+hack,a,b,c); fflush(stderr); \ errno=saveerrno; \ } else ((void)0) commit 3fdd99aac6ebc0cf451a848c30e7a5e2320deeb3 Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Fri Jan 30 18:47:32 2009 -0200 Janitor: Correct make distcheck and compiler warnings. Compiler warnings are spread on other packages, with a warning in the format: /usr/include/X11/Xtrans/Xtranssock.c:548: warning: 'ciptr' may be used uninitialized in this function so the code was slightly changed so that the compiler would not "think" it could be used without initialization. diff --git a/.gitignore b/.gitignore index 2a50369..187e984 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ missing mkinstalldirs xtrans.pc *~ +xtrans-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 07e0153..f30b57a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,9 +15,9 @@ aclocal_DATA = xtrans.m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xtrans.pc -EXTRA_DIST = xtrans.pc.in ${aclocal_DATA} +EXTRA_DIST = xtrans.pc.in ${aclocal_DATA} ChangeLog -CLEANFILES = ChangeLog +MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog diff --git a/Xtranssock.c b/Xtranssock.c index ad3e116..eabb587 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -555,8 +555,12 @@ TRANS(SocketOpenCOTSClientBase) (char *transname, char *protocol, while ((i = TRANS(SocketSelectFamily) (i, transname)) >= 0) { if ((ciptr = TRANS(SocketOpen) ( - i, Sockettrans2devtab[i].devcotsname)) != NULL) + i, Sockettrans2devtab[i].devcotsname)) != NULL) { + /* Save the index for later use */ + + ciptr->index = i; break; + } } if (i < 0) { if (i == -1) @@ -568,10 +572,6 @@ TRANS(SocketOpenCOTSClientBase) (char *transname, char *protocol, return NULL; } - /* Save the index for later use */ - - ciptr->index = i; - return ciptr; } commit 361e3f7a71c8365882de6732ff62cde0d67f19ae Author: Brice Goglin <[email protected]> Date: Sat Aug 1 09:24:14 2009 +0200 Bump Standards-Version to 3.8.2 now that we have README.source diff --git a/debian/changelog b/debian/changelog index e499803..54b2858 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xtrans (1.2.3-4) UNRELEASED; urgency=low + + * Add README.source, bump Standards-Version to 3.8.2. + + -- Brice Goglin <[email protected]> Sat, 01 Aug 2009 09:23:49 +0200 + xtrans (1.2.3-3) unstable; urgency=low * Upload to unstable. Now really. diff --git a/debian/control b/debian/control index 5024fc1..84402d2 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]>, Julien Cristau <[email protected]> Build-Depends: debhelper (>= 5.0.0), quilt, automake, xutils-dev (>= 1:7.4+4) -Standards-Version: 3.7.3 +Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xtrans Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xtrans.git commit 8f72294ada477f003888b6776883c1dd98289f3f Author: Julien Cristau <[email protected]> Date: Wed Jun 3 03:37:37 2009 +0200 Kill custom readlink function This was needed for very, very old versions of debianutils. Closes: #498890 diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 197eb74..781826f 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -303,16 +303,6 @@ EOF fi } -# we require a readlink command or shell function -if ! which readlink > /dev/null 2>&1; then - message "The readlink command was not found. Please install version" \ - "1.13.1 or later of the debianutils package." - readlink () { - # returns what symlink in $1 actually points to - perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1" - } -fi - check_symlink () { # syntax: check_symlink symlink # commit 7deebf983f53c505bc25171ab77fdc408f250a6e Author: Julien Cristau <[email protected]> Date: Tue May 26 15:58:19 2009 +0200 xsfbs: don't run dpkg --print-installation-architecture This is deprecated in new dpkg, and had no users anyway. diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 8840ff9..197eb74 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -57,8 +57,6 @@ EOF exit $SHELL_LIB_USAGE_ERROR fi -ARCHITECTURE="$(dpkg --print-installation-architecture)" - if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then RECONFIGURE="true" else commit 4178d948cd66a938222d0d7c6353ee8d60229e40 Author: David Nusinow <[email protected]> Date: Mon May 25 20:08:50 2009 -0400 Add README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..34ab4bf --- /dev/null +++ b/debian/README.source @@ -0,0 +1,73 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + 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 xsfclean target so that patches +are unapplied on clean. + +When the upstream sources contain some DFSG-nonfree files, they are +listed in text files in debian/prune/ in the "debian-*" branch of +the Debian repository. XSFBS' scripts then take care of removing +these listed files during the build so as to generate a modified +DFSG-free .orig.tar.gz tarball. commit fa6396d6bf68b9a0154089146287245f9ad60a1e Author: Julien Cristau <[email protected]> Date: Wed Feb 25 21:31:03 2009 +0100 xsfbs: repack.sh needs to be executable diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh old mode 100644 new mode 100755 commit 2ed171f9f390de4e97141c0016d3ba615e8c943e Author: Julien Cristau <[email protected]> Date: Tue Feb 17 17:20:42 2009 +0100 xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so libx11's postinst was the only post-sarge user, and it's gone now. diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 72efa95..8840ff9 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -719,72 +719,6 @@ run () { fi } -register_x_lib_dir_with_ld_so () { - # syntax: register_x_lib_dir_with_ld_so - # - # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared - # libraries. - # - # Call this function from the postinst script of a package that places a - # shared library in /usr/X11R6/lib, before invoking ldconfig. - - local dir ldsoconf - - dir="/usr/X11R6/lib" - ldsoconf="/etc/ld.so.conf" - - # is the line not already present? - if ! fgrep -qsx "$dir" "$ldsoconf"; then - observe "adding $dir directory to $ldsoconf" - echo "$dir" >> "$ldsoconf" - fi -} - -deregister_x_lib_dir_with_ld_so () { - # syntax: deregister_x_lib_dir_with_ld_so - # - # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared - # libraries, if and only if no shared libaries remain there. - # - # Call this function from the postrm script of a package that places a shared - # library in /usr/X11R6/lib, in the event "$1" is "remove", and before - # invoking ldconfig. - - local dir ldsoconf fgrep_status cmp_status - - dir="/usr/X11R6/lib" - ldsoconf="/etc/ld.so.conf" - - # is the line present? - if fgrep -qsx "$dir" "$ldsoconf"; then - # are there any shared objects in the directory? - if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then - # glob expansion produced nothing, so no shared libraries are present - observe "removing $dir directory from $ldsoconf" - # rewrite the file (very carefully) - set +e - fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp" - fgrep_status=$? - set -e - case $fgrep_status in - 0|1) ;; # we don't actually care if any lines matched or not - *) die "error reading \"$ldsoconf\"; fgrep exited with status" \ - "$fgrep_status" ;; - esac - set +e - cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf" - cmp_status=$? - set -e - case $cmp_status in - 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical - 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ - *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \ - "cmp exited with status $cmp_status" ;; - esac - fi - fi -} - make_symlink_sane () { # syntax: make_symlink_sane symlink target # commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d Author: Julien Cristau <[email protected]> Date: Sun Feb 1 01:31:31 2009 +0100 xsfbs: add a repack script for uscan This will automatically prune upstream tarballs diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh new file mode 100644 index 0000000..5935cc9 --- /dev/null +++ b/debian/xsfbs/repack.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +if ! [ -d debian/prune ]; then + exit 0 +fi + +if [ "x$1" != x--upstream-version ]; then + exit 1 +fi + +version="$2" +filename="$3" + +if [ -z "$version" ] || ! [ -f "$filename" ]; then + exit 1 +fi + +dir="$(pwd)" +tempdir="$(mktemp -d)" + +cd "$tempdir" +tar xf "$dir/$filename" +cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done + +tar czf "$dir/$filename" * +cd "$dir" +rm -rf "$tempdir" +echo "Done pruning upstream tarball" + +exit 0 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
