Author: fabbione Date: 2004-10-23 23:22:52 -0500 (Sat, 23 Oct 2004) New Revision: 97
Added: xorg-lib-x11/trunk/debian/libx11-6.install xorg-lib-x11/trunk/debian/libx11-6.lintian xorg-lib-x11/trunk/debian/libx11-6.postinst xorg-lib-x11/trunk/debian/libx11-6.postrm xorg-lib-x11/trunk/debian/libx11-dev.install xorg-lib-x11/trunk/debian/libx11-dev.lintian xorg-lib-x11/trunk/debian/patches/008_fix_xgetpw_macro.diff xorg-lib-x11/trunk/debian/patches/017_fix_Xlib_depend_target.diff xorg-lib-x11/trunk/debian/patches/029_xinerama_needs_xlib.h.diff xorg-lib-x11/trunk/debian/patches/086_fix_SEGV_in_ximcp.diff xorg-lib-x11/trunk/debian/patches/099a_improve_search_for_libXcursor.diff xorg-lib-x11/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff xorg-lib-x11/trunk/debian/patches/915_debian_fix_Imakefiles.diff Modified: xorg-lib-x11/trunk/debian/CHANGESETS xorg-lib-x11/trunk/debian/MANIFEST.any xorg-lib-x11/trunk/debian/TODO xorg-lib-x11/trunk/debian/changelog xorg-lib-x11/trunk/debian/control xorg-lib-x11/trunk/debian/rules Log: * Import initial debian/* files Modified: xorg-lib-x11/trunk/debian/CHANGESETS =================================================================== --- xorg-lib-x11/trunk/debian/CHANGESETS 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/CHANGESETS 2004-10-24 04:22:52 UTC (rev 97) @@ -9,6 +9,6 @@ files anywhere.) * Import initial debian/* files + 97 - vim:set ai et sts=4 sw=4 tw=80: Property changes on: xorg-lib-x11/trunk/debian/CHANGESETS ___________________________________________________________________ Name: svn:keywords + Id Modified: xorg-lib-x11/trunk/debian/MANIFEST.any =================================================================== --- xorg-lib-x11/trunk/debian/MANIFEST.any 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/MANIFEST.any 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,21 @@ +usr/X11R6/include/X11/XKBlib.h +usr/X11R6/include/X11/Xcms.h +usr/X11R6/include/X11/Xlib.h +usr/X11R6/include/X11/Xlibint.h +usr/X11R6/include/X11/Xlocale.h +usr/X11R6/include/X11/Xresource.h +usr/X11R6/include/X11/Xutil.h +usr/X11R6/include/X11/cursorfont.h +usr/X11R6/lib/X11/XErrorDB +usr/X11R6/lib/X11/XKeysymDB +usr/X11R6/lib/X11/Xcms.txt +usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2 +usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2 +usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2 +usr/X11R6/lib/X11/locale/lib/common/xlibi18n.so.2 +usr/X11R6/lib/X11/locale/lib/common/xlocale.so.2 +usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2 +usr/X11R6/lib/libX11.a +usr/X11R6/lib/libX11.so.6.2 +usr/share/lintian/overrides/libx11-6 +usr/share/lintian/overrides/libx11-dev Property changes on: xorg-lib-x11/trunk/debian/TODO ___________________________________________________________________ Name: svn:keywords + Id Modified: xorg-lib-x11/trunk/debian/changelog =================================================================== --- xorg-lib-x11/trunk/debian/changelog 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/changelog 2004-10-24 04:22:52 UTC (rev 97) @@ -1,4 +1,4 @@ [EMAIL PROTECTED]@ (6.8.1-0+SVN) unstable; urgency=low +xorg-lib-x11 (6.8.1-0+SVN) unstable; urgency=low * First release. Property changes on: xorg-lib-x11/trunk/debian/changelog ___________________________________________________________________ Name: svn:keywords + Id Modified: xorg-lib-x11/trunk/debian/control =================================================================== --- xorg-lib-x11/trunk/debian/control 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/control 2004-10-24 04:22:52 UTC (rev 97) @@ -1,12 +1,19 @@ -Source: [EMAIL PROTECTED]@ +Source: xorg-lib-x11 Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]> Standards-Version: 3.6.1 -Build-Depends-Indep: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xutils-devel (>= 6.8.1-0+SVN) +Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xorg-dev (>= 6.8.1-0+SVN), libxau-dev (>= 6.8.1-0+SVN), libxdmcp-dev (>= 6.8.1-0+SVN), xorg-source-lib-x11 (>= 6.8.1-0+SVN), xorg-source-lib-xtrans (>= 6.8.1-0+SVN) -Package: @FOO@ -Architecture: all|any -Description: @BAR@ - @BAZ@ +Package: libx11-6 +Architecture: any +Depends: ${shlibs:Depends} +Description: X.org libx11-6 files + BAZ + +Package: libx11-dev +Architecture: any +Depends: libx11-6 (= ${Source-Version}) +Description: X.org libx11-6 development files + BAZ devel. Added: xorg-lib-x11/trunk/debian/libx11-6.install =================================================================== --- xorg-lib-x11/trunk/debian/libx11-6.install 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/libx11-6.install 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,12 @@ +usr/X11R6/lib/X11/XErrorDB +usr/X11R6/lib/X11/XKeysymDB +usr/X11R6/lib/X11/Xcms.txt +usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2 +usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2 +usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2 +usr/X11R6/lib/X11/locale/lib/common/xlibi18n.so.2 +usr/X11R6/lib/X11/locale/lib/common/xlocale.so.2 +usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2 +usr/X11R6/lib/libX11.so.6.2 +usr/X11R6/lib/libX11.so.6 +usr/share/lintian/overrides/libx11-6 Added: xorg-lib-x11/trunk/debian/libx11-6.lintian =================================================================== --- xorg-lib-x11/trunk/debian/libx11-6.lintian 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/libx11-6.lintian 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,6 @@ +# $Id$ + +# lintian doesn't know that we ARE a X Windows System as per +# http://www.debian.org/doc/debian-policy/ch-customized-programs.html#s11.8.7 + +libx11-6: packages-installs-file-to-usr-x11r6 Property changes on: xorg-lib-x11/trunk/debian/libx11-6.lintian ___________________________________________________________________ Name: svn:keywords + Id Added: xorg-lib-x11/trunk/debian/libx11-6.postinst =================================================================== --- xorg-lib-x11/trunk/debian/libx11-6.postinst 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/libx11-6.postinst 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,14 @@ +#!/bin/sh +# $Id$ + +set -e + +if [ "$1" = "configure" ]; then + ldconfig +fi + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=4 sw=4 tw=80: Property changes on: xorg-lib-x11/trunk/debian/libx11-6.postinst ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Added: xorg-lib-x11/trunk/debian/libx11-6.postrm =================================================================== --- xorg-lib-x11/trunk/debian/libx11-6.postrm 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/libx11-6.postrm 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,14 @@ +#!/bin/sh +# $Id$ + +set -e + +if [ "$1" = "remove" ]; then + ldconfig +fi + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=4 sw=4 tw=80: Property changes on: xorg-lib-x11/trunk/debian/libx11-6.postrm ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Added: xorg-lib-x11/trunk/debian/libx11-dev.install =================================================================== --- xorg-lib-x11/trunk/debian/libx11-dev.install 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/libx11-dev.install 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,11 @@ +usr/X11R6/include/X11/XKBlib.h +usr/X11R6/include/X11/Xcms.h +usr/X11R6/include/X11/Xlib.h +usr/X11R6/include/X11/Xlibint.h +usr/X11R6/include/X11/Xlocale.h +usr/X11R6/include/X11/Xresource.h +usr/X11R6/include/X11/Xutil.h +usr/X11R6/include/X11/cursorfont.h +usr/X11R6/lib/libX11.a +usr/X11R6/lib/libX11.so +usr/share/lintian/overrides/libx11-dev Added: xorg-lib-x11/trunk/debian/libx11-dev.lintian =================================================================== --- xorg-lib-x11/trunk/debian/libx11-dev.lintian 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/libx11-dev.lintian 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,6 @@ +# $Id$ + +# lintian doesn't know that we ARE a X Windows System as per +# http://www.debian.org/doc/debian-policy/ch-customized-programs.html#s11.8.7 + +libx11-dev: packages-installs-file-to-usr-x11r6 Property changes on: xorg-lib-x11/trunk/debian/libx11-dev.lintian ___________________________________________________________________ Name: svn:keywords + Id Added: xorg-lib-x11/trunk/debian/patches/008_fix_xgetpw_macro.diff =================================================================== --- xorg-lib-x11/trunk/debian/patches/008_fix_xgetpw_macro.diff 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/patches/008_fix_xgetpw_macro.diff 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,20 @@ +$Id$ + +Fix the _XGetpwnam macro to be more consistent; this patch by Robert Millan. + +--- xc/lib/X11/GetDflt.c.old 2003-04-11 14:54:53.000000000 +0200 ++++ xc/lib/X11/GetDflt.c 2003-04-11 12:48:58.000000000 +0200 +@@ -126,10 +126,11 @@ + (void) strncpy(dest, ptr, len-1); + dest[len-1] = '\0'; + } else { ++ struct passwd *dummy; + if ((ptr = getenv("USER"))) +- pw = _XGetpwnam(ptr,pwparams); ++ pw = _XGetpwnam(ptr,pwparams,&dummy); + else +- pw = _XGetpwuid(getuid(),pwparams); ++ pw = _XGetpwuid(getuid(),pwparams,&dummy); + if (pw != NULL) { + (void) strncpy(dest, pw->pw_dir, len-1); + dest[len-1] = '\0'; Property changes on: xorg-lib-x11/trunk/debian/patches/008_fix_xgetpw_macro.diff ___________________________________________________________________ Name: svn:keywords + Id Added: xorg-lib-x11/trunk/debian/patches/017_fix_Xlib_depend_target.diff =================================================================== --- xorg-lib-x11/trunk/debian/patches/017_fix_Xlib_depend_target.diff 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/patches/017_fix_Xlib_depend_target.diff 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,20 @@ +$Id$ + +This patch by Ishikawa MUTSUMI. + +Fixes build failure due to missing depend target in Xlib's Imakefile if +"BuildServersOnly" is YES, "BuildXnestServer" is NO, and "BuildGLXLibrary" +is NO. + +diff -ruN xc-old/lib/X11/Imakefile xc/lib/X11/Imakefile +--- xc-old/lib/X11/Imakefile 2004-09-01 01:04:33.000000000 +0000 ++++ xc/lib/X11/Imakefile 2004-10-22 08:29:34.606474096 +0000 +@@ -13,6 +13,8 @@ + #if BuildServersOnly && !XWinServer && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer + all:: + ++depend:: ++ + BuildIncludes($(HEADERS),IncSubdir,..) + + #else Property changes on: xorg-lib-x11/trunk/debian/patches/017_fix_Xlib_depend_target.diff ___________________________________________________________________ Name: svn:keywords + Id Added: xorg-lib-x11/trunk/debian/patches/029_xinerama_needs_xlib.h.diff =================================================================== --- xorg-lib-x11/trunk/debian/patches/029_xinerama_needs_xlib.h.diff 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/patches/029_xinerama_needs_xlib.h.diff 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,19 @@ +$Id$ + +Xinerama calls Xlib functions, so it must include Xlib.h. + +This patch by Xavier Bestel. + +Not submitted upstream. + +--- xc/include/extensions/Xinerama.h.orig Tue Mar 11 12:11:42 2003 ++++ xc/include/extensions/Xinerama.h Tue Mar 11 12:11:54 2003 +@@ -29,6 +29,8 @@ + #ifndef _Xinerama_h + #define _Xinerama_h + ++#include <X11/Xlib.h> ++ + typedef struct { + int screen_number; + short x_org; Property changes on: xorg-lib-x11/trunk/debian/patches/029_xinerama_needs_xlib.h.diff ___________________________________________________________________ Name: svn:keywords + Id Added: xorg-lib-x11/trunk/debian/patches/086_fix_SEGV_in_ximcp.diff =================================================================== --- xorg-lib-x11/trunk/debian/patches/086_fix_SEGV_in_ximcp.diff 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/patches/086_fix_SEGV_in_ximcp.diff 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,19 @@ +$Id$ + +Fixes SEGV in _XimRegisterKeyPressFilter() if _XimProtoCreateIC() failed to +create an input context. See Debian #239991. + +This patch by Chung-chieh Shan. + +Not submitted to XFree86. + +--- xc/lib/X11/imDefIc.c~ 2004-04-21 12:09:52.000000000 -0500 ++++ xc/lib/X11/imDefIc.c 2004-04-21 12:10:17.000000000 -0500 +@@ -1546,6 +1546,7 @@ + return (XIC)ic; + + ErrorOnCreatingIC: ++ _XimUnregisterFilter(ic); + if (ic->private.proto.ic_resources) + Xfree(ic->private.proto.ic_resources); + if (ic->private.proto.ic_inner_resources) Property changes on: xorg-lib-x11/trunk/debian/patches/086_fix_SEGV_in_ximcp.diff ___________________________________________________________________ Name: svn:keywords + Id Added: xorg-lib-x11/trunk/debian/patches/099a_improve_search_for_libXcursor.diff =================================================================== --- xorg-lib-x11/trunk/debian/patches/099a_improve_search_for_libXcursor.diff 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/patches/099a_improve_search_for_libXcursor.diff 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,19 @@ +$Id$ + +Not everybody has symlinks on their system for compile-time linking of +objects with libXcursor. Attempt to find libXcursor.so.1 first, then (per +the existing code), fall back to libXcursor.so and finally libXcursor. + +This patch by Branden Robinson. Not submitted upstream yet. + +--- xc/lib/X11/CrGlCur.c~ 2003-10-30 17:43:58.000000000 -0500 ++++ xc/lib/X11/CrGlCur.c 2003-10-30 17:45:51.000000000 -0500 +@@ -50,7 +50,7 @@ + #endif + + #ifndef LIBXCURSOR +-#define LIBXCURSOR "libXcursor.so" ++#define LIBXCURSOR "libXcursor.so.1" + #endif + + static char libraryName[] = LIBXCURSOR; Property changes on: xorg-lib-x11/trunk/debian/patches/099a_improve_search_for_libXcursor.diff ___________________________________________________________________ Name: svn:keywords + Id Added: xorg-lib-x11/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff =================================================================== --- xorg-lib-x11/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,27 @@ +$Id$ + +Dynamic loading of Xcursor by Xlib wasn't working when an external Xcursor +library was available during the build; Xlib was being told that the name +of the Xcursor object was "Xcursor.so.", because SOXCURSORREV was only +defined in xc/lib/Xcursor/Imakefile, which is not used when an external +Xcursor library is used. + +This patch by Branden Robinson. + +Not submitted upstream. + +diff -ruN xc-old/lib/X11/Imakefile xc/lib/X11/Imakefile +--- xc-old/lib/X11/Imakefile 2004-10-22 08:54:23.827078000 +0000 ++++ xc/lib/X11/Imakefile 2004-10-22 08:54:52.710687176 +0000 +@@ -133,7 +133,10 @@ + THRSTUBSRCS = UIThrStubs.c + THRSTUBOBJS = UIThrStubs.o + #endif +-#if BuildLoadableXlibXcursor ++#ifdef SharedXcursorRev ++SOXCURSORREV = SharedXcursorRev ++#endif ++#if BuildLoadableXlibXcursor || HasXcursorLibrary + XCURSOR_DEFINES = -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.$(SOXCURSORREV)\" + #endif + #if NeedLibInsideFlag Property changes on: xorg-lib-x11/trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff ___________________________________________________________________ Name: svn:keywords + Id Added: xorg-lib-x11/trunk/debian/patches/915_debian_fix_Imakefiles.diff =================================================================== --- xorg-lib-x11/trunk/debian/patches/915_debian_fix_Imakefiles.diff 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/patches/915_debian_fix_Imakefiles.diff 2004-10-24 04:22:52 UTC (rev 97) @@ -0,0 +1,251 @@ +$Id$ + +This patch will collect all the bits required to fix up the changes +introduced by splitting the tree. + +Patch by Fabio M. Di Nitto. + +diff -ruN xc-old/lib/X11/Imakefile xc/lib/X11/Imakefile +--- xc-old/lib/X11/Imakefile 2004-10-24 04:03:39.873369000 +0000 ++++ xc/lib/X11/Imakefile 2004-10-24 04:10:43.328994184 +0000 +@@ -39,6 +39,8 @@ + SUBDIRS = xlibi18n + #endif + ++INCLUDES = -I$(TOP)/include ++ + #include <Threads.tmpl> + + #ifndef MotifBC +@@ -55,7 +57,7 @@ + EXCLUDE_SYMBOL = -Wl,--exclude-symbol,XdmcpWrap:_XdmcpWrapperToOddParity + #endif + +-REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL) ++REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS) $(EXCLUDE_SYMBOL) -L/usr/X11R6/lib -lXau -lXdmcp + + #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture) + XBSDLIB = /**/ +@@ -68,8 +70,6 @@ + #endif + #if HasXdmAuth + XDMAUTHDEFS = -DHASXDMAUTH +- XDMAUTHOBJS = Wrap.o Wraphelp.o +- XDMAUTHSRCS = Wrap.c Wraphelp.c + #endif + #if BuildXKBlib + XKB_DEFINES = -DXKB +@@ -150,8 +150,6 @@ + $(POSTLOCALELIBDEFINES) + OPEN_DEFINES = -I$(EXTINCSRC) $(K5INCL) $(K5DEFS) + DEPEND_DEFINES = $(OPEN_DEFINES) $(TRANS_INCLUDES) $(CONN_DEFINES) $(THREADS_DEFINES) DependDefines +- AUTHOBJS = AuDispose.o AuGetBest.o AuFileName.o AuRead.o +- AUTHSRCS = AuDispose.c AuGetBest.c AuFileName.c AuRead.c + SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(EXTRASRCS) /* try *.c if you have trouble */ + LINTLIBS = + +@@ -1020,7 +1018,6 @@ + SpecialCLibObjectRule(ximtrans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES)) + LinkFile(ximtrans.c,$(TRANSCOMMSRC)/transport.c) + SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES)) +-SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS)) + SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),$(CONN_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES)) + SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES)) + SpecialCLibObjectRule(FontInfo,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES)) +@@ -1060,19 +1057,6 @@ + InstallLintLibrary(X11,$(LINTLIBDIR)) + + +-LinkSourceFile(AuDispose.c,$(XAUTHSRC)) +-LinkSourceFile(AuGetBest.c,$(XAUTHSRC)) +-LinkSourceFile(AuFileName.c,$(XAUTHSRC)) +-LinkSourceFile(AuRead.c,$(XAUTHSRC)) +-#if HasKrb5 +-LinkSourceFile(k5encode.c,$(XAUTHSRC)) +-#endif +-#if HasXdmAuth +-LinkSourceFile(Wrap.h,$(XDMCPLIBSRC)) +-LinkSourceFile(Wrap.c,$(XDMCPLIBSRC)) +-LinkSourceFile(Wraphelp.c,$(XDMCPLIBSRC)) +-#endif +- + #ifdef QNX4Architecture + LOCAL_LDFLAGS=-F + #endif +@@ -1085,10 +1069,10 @@ + HOST_LDLIBS=$(LDLIBS) + #endif + +-ks_tables.h: $(XINCLUDESRC)/keysymdef.h util/makekeys.c ++ks_tables.h: util/makekeys.c + RemoveFiles($@ HostProgramTargetName(makekeys) makekeys.Osuf) + -HostLinkRule(HostProgramTargetName(makekeys),$(CFLAGS) $(LOCAL_LDFLAGS),util/makekeys.c,$(HOST_LDLIBS)) +- RunProgram(MAKEKEYS,< $(XINCLUDESRC)/keysymdef.h > ks_tables_h) ++ RunProgram(MAKEKEYS,< $(INCROOT)/X11/keysymdef.h > ks_tables_h) + $(MV) ks_tables_h $@ + RemoveFiles(HostProgramTargetName(makekeys) makekeys.Osuf ks_tables_h) + +diff -ruN xc-old/lib/X11/xlibi18n/Imakefile xc/lib/X11/xlibi18n/Imakefile +--- xc-old/lib/X11/xlibi18n/Imakefile 2003-11-14 16:48:47.000000000 +0000 ++++ xc/lib/X11/xlibi18n/Imakefile 2004-10-24 04:03:40.007348856 +0000 +@@ -1,6 +1,8 @@ + #define IHaveSubdirs + #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" + ++INCLUDES = -I$(TOP)/include ++ + SUBDIRS = lc im om + + MakeSubdirs($(SUBDIRS)) +diff -ruN xc-old/lib/X11/xlibi18n/im/Imakefile xc/lib/X11/xlibi18n/im/Imakefile +--- xc-old/lib/X11/xlibi18n/im/Imakefile 2003-11-14 16:48:47.000000000 +0000 ++++ xc/lib/X11/xlibi18n/im/Imakefile 2004-10-24 04:03:40.007348856 +0000 +@@ -2,6 +2,8 @@ + #define IHaveSubdirs + #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" + ++INCLUDES = -I$(TOP)/include ++ + SUBDIRS = ximcp + + MakeSubdirs($(SUBDIRS)) +diff -ruN xc-old/lib/X11/xlibi18n/im/ximcp/Imakefile xc/lib/X11/xlibi18n/im/ximcp/Imakefile +--- xc-old/lib/X11/xlibi18n/im/ximcp/Imakefile 2004-04-23 18:43:35.000000000 +0000 ++++ xc/lib/X11/xlibi18n/im/ximcp/Imakefile 2004-10-24 04:03:40.007348856 +0000 +@@ -1,5 +1,7 @@ + XCOMM $XFree86$ + ++INCLUDES = -I$(TOP)/include ++ + #include "../../Xi18nLib.conf" + + EXTRA_INCLUDES = -I../../.. +@@ -15,7 +17,7 @@ + + CONN_DEFINES = ConnectionFlags + XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT +- REQUIREDLIBS = SharedXlibi18nReqs ++ REQUIREDLIBS = SharedXlibi18nReqs -L../../.. + + LinkSourceFile(imCallbk.c, ../../..) + LinkSourceFile(imDefFlt.c, ../../..) +diff -ruN xc-old/lib/X11/xlibi18n/lc/Imakefile xc/lib/X11/xlibi18n/lc/Imakefile +--- xc-old/lib/X11/xlibi18n/lc/Imakefile 2003-11-14 16:48:47.000000000 +0000 ++++ xc/lib/X11/xlibi18n/lc/Imakefile 2004-10-24 04:03:40.008348704 +0000 +@@ -2,6 +2,8 @@ + #define IHaveSubdirs + #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" + ++INCLUDES = -I$(TOP)/include ++ + SUBDIRS = gen def Utf8 xlocale + + MakeSubdirs($(SUBDIRS)) +diff -ruN xc-old/lib/X11/xlibi18n/lc/Utf8/Imakefile xc/lib/X11/xlibi18n/lc/Utf8/Imakefile +--- xc-old/lib/X11/xlibi18n/lc/Utf8/Imakefile 2004-04-23 18:43:35.000000000 +0000 ++++ xc/lib/X11/xlibi18n/lc/Utf8/Imakefile 2004-10-24 04:03:40.008348704 +0000 +@@ -1,12 +1,14 @@ + XCOMM $XFree86$ + ++INCLUDES = -I$(TOP)/include ++ + #include "../../Xi18nLib.conf" + + EXTRA_INCLUDES = -I../../.. + XI18NLIBNAME = xlibi18n + SRCS = lcUTF8Load.c + OBJS = ${SRCS:.c=.o} +- REQUIREDLIBS = SharedXlibi18nReqs ++ REQUIREDLIBS = SharedXlibi18nReqs -L../../.. + + LinkSourceFile(lcUTF8Load.c, ../../..) + +diff -ruN xc-old/lib/X11/xlibi18n/lc/def/Imakefile xc/lib/X11/xlibi18n/lc/def/Imakefile +--- xc-old/lib/X11/xlibi18n/lc/def/Imakefile 2004-04-23 18:43:35.000000000 +0000 ++++ xc/lib/X11/xlibi18n/lc/def/Imakefile 2004-10-24 04:03:40.008348704 +0000 +@@ -1,12 +1,14 @@ + XCOMM $XFree86$ + ++INCLUDES = -I$(TOP)/include ++ + #include "../../Xi18nLib.conf" + + EXTRA_INCLUDES = -I../../.. + XI18NLIBNAME = xlcDef + SRCS = lcDefConv.c + OBJS = ${SRCS:.c=.o} +- REQUIREDLIBS = SharedXlibi18nReqs ++ REQUIREDLIBS = SharedXlibi18nReqs -L../../.. + + LinkSourceFile(lcDefConv.c, ../../..) + +diff -ruN xc-old/lib/X11/xlibi18n/lc/gen/Imakefile xc/lib/X11/xlibi18n/lc/gen/Imakefile +--- xc-old/lib/X11/xlibi18n/lc/gen/Imakefile 2004-04-23 18:43:36.000000000 +0000 ++++ xc/lib/X11/xlibi18n/lc/gen/Imakefile 2004-10-24 04:03:40.008348704 +0000 +@@ -1,12 +1,14 @@ + XCOMM $XFree86$ + ++INCLUDES = -I$(TOP)/include ++ + #include "../../Xi18nLib.conf" + + EXTRA_INCLUDES = -I../../.. + XI18NLIBNAME = xlibi18n + SRCS = lcGenConv.c + OBJS = ${SRCS:.c=.o} +- REQUIREDLIBS = SharedXlibi18nReqs ++ REQUIREDLIBS = SharedXlibi18nReqs -L../../.. + + LinkSourceFile(lcGenConv.c, ../../..) + +diff -ruN xc-old/lib/X11/xlibi18n/lc/xlocale/Imakefile xc/lib/X11/xlibi18n/lc/xlocale/Imakefile +--- xc-old/lib/X11/xlibi18n/lc/xlocale/Imakefile 2004-04-23 18:43:36.000000000 +0000 ++++ xc/lib/X11/xlibi18n/lc/xlocale/Imakefile 2004-10-24 04:03:40.008348704 +0000 +@@ -1,12 +1,14 @@ + XCOMM $XFree86$ + ++INCLUDES = -I$(TOP)/include ++ + #include "../../Xi18nLib.conf" + + EXTRA_INCLUDES = -I../../.. + XI18NLIBNAME = xlocale + SRCS = lcEuc.c lcSjis.c lcJis.c + OBJS = ${SRCS:.c=.o} +- REQUIREDLIBS = SharedXlibi18nReqs ++ REQUIREDLIBS = SharedXlibi18nReqs -L../../.. + + LinkSourceFile(lcEuc.c, ../../..) + LinkSourceFile(lcSjis.c, ../../..) +diff -ruN xc-old/lib/X11/xlibi18n/om/Imakefile xc/lib/X11/xlibi18n/om/Imakefile +--- xc-old/lib/X11/xlibi18n/om/Imakefile 2003-11-14 16:48:47.000000000 +0000 ++++ xc/lib/X11/xlibi18n/om/Imakefile 2004-10-24 04:03:40.008348704 +0000 +@@ -2,6 +2,8 @@ + #define IHaveSubdirs + #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" + ++INCLUDES = -I$(TOP)/include ++ + SUBDIRS = generic + + MakeSubdirs($(SUBDIRS)) +diff -ruN xc-old/lib/X11/xlibi18n/om/generic/Imakefile xc/lib/X11/xlibi18n/om/generic/Imakefile +--- xc-old/lib/X11/xlibi18n/om/generic/Imakefile 2004-04-23 18:43:36.000000000 +0000 ++++ xc/lib/X11/xlibi18n/om/generic/Imakefile 2004-10-24 04:03:40.009348552 +0000 +@@ -1,5 +1,7 @@ + XCOMM $XFree86$ + ++INCLUDES = -I$(TOP)/include ++ + #include "../../Xi18nLib.conf" + + EXTRA_INCLUDES = -I../../.. +@@ -7,7 +9,7 @@ + omTextEsc.c omTextExt.c omTextPer.c omXChar.c + + OBJS = ${SRCS:.c=.o} +- REQUIREDLIBS = SharedXlibi18nReqs ++ REQUIREDLIBS = SharedXlibi18nReqs -L../../.. + + LinkSourceFile(omDefault.c, ../../..) + LinkSourceFile(omGeneric.c, ../../..) Property changes on: xorg-lib-x11/trunk/debian/patches/915_debian_fix_Imakefiles.diff ___________________________________________________________________ Name: svn:keywords + Id Modified: xorg-lib-x11/trunk/debian/rules =================================================================== --- xorg-lib-x11/trunk/debian/rules 2004-10-24 04:17:14 UTC (rev 96) +++ xorg-lib-x11/trunk/debian/rules 2004-10-24 04:22:52 UTC (rev 97) @@ -3,7 +3,7 @@ # Licensed under the GNU General Public License, version 2. See the file # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. -# $Id: rules 54 2004-10-19 08:45:53Z fabbione $ +# $Id$ # debhelper export DH_OPTIONS @@ -16,7 +16,7 @@ SOURCE_TREE=build-tree/xc SOURCE_DIR=build-tree [EMAIL PROTECTED]@ +PROJECT_DIR=lib/X11 # dpkg-arch rules ifeq (,$(DEB_BUILD_GNU_TYPE)) @@ -33,13 +33,25 @@ cd $(SOURCE_TREE)/$(PROJECT_DIR) && \ imake -I/usr/X11R6/lib/X11/config -DTOPDIR=$$abspath/$(SOURCE_TREE) -DCURDIR=$$abspath/$(SOURCE_TREE)/$(PROJECT_DIR) -DUseInstalled && \ $(MAKE) Makefiles + if [ -d $(SOURCE_TREE)/include ]; then \ + cd $(SOURCE_TREE)/include && \ + ln -sf . X11 && \ + ln -sf ../lib/xtrans/Xtrans.h Xtrans.h && \ + ln -sf ../lib/X11/Xlib.h Xlib.h && \ + ln -sf ../lib/X11/Xresource.h Xresource.h && \ + ln -sf ../lib/X11/Xlibint.h Xlibint.h && \ + ln -sf ../lib/X11/Xcms.h Xcms.h && \ + ln -sf ../lib/X11/Xutil.h Xutil.h && \ + ln -sf ../lib/X11/XKBlib.h XKBlib.h && \ + ln -sf ../lib/X11/Xlocale.h Xlocale.h; \ + fi touch $@ build: $(STAMP_DIR)/build -$(STAMP_DIR)/build: patch-audit symlinks configure +$(STAMP_DIR)/build: patch-audit configure dh_testdir cd $(SOURCE_TREE)/$(PROJECT_DIR) && \ - $(MAKE) + $(MAKE) ks_tables.h all touch $@ install: $(STAMP_DIR)/install @@ -50,8 +62,9 @@ cd $(SOURCE_TREE)/$(PROJECT_DIR) && \ $(MAKE) install install.man DESTDIR=$$abspath/debian/tmp # Install lintian override. - #install -d -m 755 debian/tmp/usr/share/lintian/overrides/ - #install -m 644 debian/@[EMAIL PROTECTED] debian/tmp/usr/share/lintian/overrides/@FOO@ + install -d -m 755 debian/tmp/usr/share/lintian/overrides/ + install -m 644 debian/libx11-6.lintian debian/tmp/usr/share/lintian/overrides/libx11-6 + install -m 644 debian/libx11-dev.lintian debian/tmp/usr/share/lintian/overrides/libx11-dev touch $@ binary-arch: check-manifest @@ -63,6 +76,7 @@ dh_compress -a dh_fixperms -a dh_installdeb -a + dh_makeshlibs -a dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a @@ -70,15 +84,6 @@ binary-indep: check-manifest dh_testdir - dh_install --sourcedir=debian/tmp - dh_installchangelogs -i - dh_installdocs -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i binary: binary-arch binary-indep Property changes on: xorg-lib-x11/trunk/debian/rules ___________________________________________________________________ Name: svn:keywords + Id
