X Strike Force XOrg SVN commit: r106 - in xorg-lib-xext/trunk/debian: . patches
Author: fabbione
Date: 2004-10-24 00:59:39 -0500 (Sun, 24 Oct 2004)
New Revision: 106
Added:
xorg-lib-xext/trunk/debian/libxext-dev.install
xorg-lib-xext/trunk/debian/libxext-dev.lintian
xorg-lib-xext/trunk/debian/libxext6.install
xorg-lib-xext/trunk/debian/libxext6.lintian
xorg-lib-xext/trunk/debian/libxext6.postinst
xorg-lib-xext/trunk/debian/libxext6.postrm
xorg-lib-xext/trunk/debian/patches/029_xinerama_needs_xlib.h.diff
xorg-lib-xext/trunk/debian/patches/915_debian_fix_Imakefiles.diff
xorg-lib-xext/trunk/debian/patches/916_debian_fix_region.h.diff
Modified:
xorg-lib-xext/trunk/debian/CHANGESETS
xorg-lib-xext/trunk/debian/MANIFEST.any
xorg-lib-xext/trunk/debian/TODO
xorg-lib-xext/trunk/debian/changelog
xorg-lib-xext/trunk/debian/control
xorg-lib-xext/trunk/debian/rules
Log:
* Import initial debian/* files
Modified: xorg-lib-xext/trunk/debian/CHANGESETS
===================================================================
--- xorg-lib-xext/trunk/debian/CHANGESETS 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/CHANGESETS 2004-10-24 05:59:39 UTC (rev 106)
@@ -9,6 +9,6 @@
files anywhere.)
* Import initial debian/* files
+ 106
-
vim:set ai et sts=4 sw=4 tw=80:
Property changes on: xorg-lib-xext/trunk/debian/CHANGESETS
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xorg-lib-xext/trunk/debian/MANIFEST.any
===================================================================
--- xorg-lib-xext/trunk/debian/MANIFEST.any 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/MANIFEST.any 2004-10-24 05:59:39 UTC (rev 106)
@@ -0,0 +1,102 @@
+usr/X11R6/include/X11/extensions/MITMisc.h
+usr/X11R6/include/X11/extensions/Print.h
+usr/X11R6/include/X11/extensions/Printstr.h
+usr/X11R6/include/X11/extensions/XEVI.h
+usr/X11R6/include/X11/extensions/XEVIstr.h
+usr/X11R6/include/X11/extensions/XI.h
+usr/X11R6/include/X11/extensions/XInput.h
+usr/X11R6/include/X11/extensions/XIproto.h
+usr/X11R6/include/X11/extensions/XKB.h
+usr/X11R6/include/X11/extensions/XKBgeom.h
+usr/X11R6/include/X11/extensions/XKBproto.h
+usr/X11R6/include/X11/extensions/XKBsrv.h
+usr/X11R6/include/X11/extensions/XKBstr.h
+usr/X11R6/include/X11/extensions/XLbx.h
+usr/X11R6/include/X11/extensions/XRes.h
+usr/X11R6/include/X11/extensions/XResproto.h
+usr/X11R6/include/X11/extensions/XShm.h
+usr/X11R6/include/X11/extensions/XTest.h
+usr/X11R6/include/X11/extensions/Xag.h
+usr/X11R6/include/X11/extensions/Xagsrv.h
+usr/X11R6/include/X11/extensions/Xagstr.h
+usr/X11R6/include/X11/extensions/Xcup.h
+usr/X11R6/include/X11/extensions/Xcupstr.h
+usr/X11R6/include/X11/extensions/Xdbe.h
+usr/X11R6/include/X11/extensions/Xdbeproto.h
+usr/X11R6/include/X11/extensions/Xevie.h
+usr/X11R6/include/X11/extensions/Xeviestr.h
+usr/X11R6/include/X11/extensions/Xext.h
+usr/X11R6/include/X11/extensions/Xinerama.h
+usr/X11R6/include/X11/extensions/Xv.h
+usr/X11R6/include/X11/extensions/XvMC.h
+usr/X11R6/include/X11/extensions/XvMClib.h
+usr/X11R6/include/X11/extensions/XvMCproto.h
+usr/X11R6/include/X11/extensions/Xvlib.h
+usr/X11R6/include/X11/extensions/Xvproto.h
+usr/X11R6/include/X11/extensions/bigreqstr.h
+usr/X11R6/include/X11/extensions/composite.h
+usr/X11R6/include/X11/extensions/compositeproto.h
+usr/X11R6/include/X11/extensions/damage.h
+usr/X11R6/include/X11/extensions/damageproto.h
+usr/X11R6/include/X11/extensions/damagewire.h
+usr/X11R6/include/X11/extensions/dmxext.h
+usr/X11R6/include/X11/extensions/dmxproto.h
+usr/X11R6/include/X11/extensions/dpms.h
+usr/X11R6/include/X11/extensions/dpmsstr.h
+usr/X11R6/include/X11/extensions/extutil.h
+usr/X11R6/include/X11/extensions/lbxbuf.h
+usr/X11R6/include/X11/extensions/lbxbufstr.h
+usr/X11R6/include/X11/extensions/lbxdeltastr.h
+usr/X11R6/include/X11/extensions/lbximage.h
+usr/X11R6/include/X11/extensions/lbxopts.h
+usr/X11R6/include/X11/extensions/lbxstr.h
+usr/X11R6/include/X11/extensions/lbxzlib.h
+usr/X11R6/include/X11/extensions/mitmiscstr.h
+usr/X11R6/include/X11/extensions/multibuf.h
+usr/X11R6/include/X11/extensions/multibufst.h
+usr/X11R6/include/X11/extensions/panoramiXext.h
+usr/X11R6/include/X11/extensions/panoramiXproto.h
+usr/X11R6/include/X11/extensions/randr.h
+usr/X11R6/include/X11/extensions/randrproto.h
+usr/X11R6/include/X11/extensions/record.h
+usr/X11R6/include/X11/extensions/recordstr.h
+usr/X11R6/include/X11/extensions/render.h
+usr/X11R6/include/X11/extensions/renderproto.h
+usr/X11R6/include/X11/extensions/saver.h
+usr/X11R6/include/X11/extensions/saverproto.h
+usr/X11R6/include/X11/extensions/scrnsaver.h
+usr/X11R6/include/X11/extensions/security.h
+usr/X11R6/include/X11/extensions/securstr.h
+usr/X11R6/include/X11/extensions/shape.h
+usr/X11R6/include/X11/extensions/shapestr.h
+usr/X11R6/include/X11/extensions/shmstr.h
+usr/X11R6/include/X11/extensions/sync.h
+usr/X11R6/include/X11/extensions/syncstr.h
+usr/X11R6/include/X11/extensions/xcmiscstr.h
+usr/X11R6/include/X11/extensions/xf86bigfont.h
+usr/X11R6/include/X11/extensions/xf86bigfstr.h
+usr/X11R6/include/X11/extensions/xf86dga.h
+usr/X11R6/include/X11/extensions/xf86dga1.h
+usr/X11R6/include/X11/extensions/xf86dga1str.h
+usr/X11R6/include/X11/extensions/xf86dgastr.h
+usr/X11R6/include/X11/extensions/xf86misc.h
+usr/X11R6/include/X11/extensions/xf86mscstr.h
+usr/X11R6/include/X11/extensions/xf86rush.h
+usr/X11R6/include/X11/extensions/xf86rushstr.h
+usr/X11R6/include/X11/extensions/xf86vmode.h
+usr/X11R6/include/X11/extensions/xf86vmstr.h
+usr/X11R6/include/X11/extensions/xfixesproto.h
+usr/X11R6/include/X11/extensions/xfixeswire.h
+usr/X11R6/include/X11/extensions/xtestext1.h
+usr/X11R6/include/X11/extensions/xteststr.h
+usr/X11R6/include/X11/extensions/xtrapbits.h
+usr/X11R6/include/X11/extensions/xtrapddmi.h
+usr/X11R6/include/X11/extensions/xtrapdi.h
+usr/X11R6/include/X11/extensions/xtrapemacros.h
+usr/X11R6/include/X11/extensions/xtraplib.h
+usr/X11R6/include/X11/extensions/xtraplibp.h
+usr/X11R6/include/X11/extensions/xtrapproto.h
+usr/X11R6/lib/libXext.a
+usr/X11R6/lib/libXext.so.6.4
+usr/share/lintian/overrides/libxext-dev
+usr/share/lintian/overrides/libxext6
Property changes on: xorg-lib-xext/trunk/debian/TODO
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xorg-lib-xext/trunk/debian/changelog
===================================================================
--- xorg-lib-xext/trunk/debian/changelog 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/changelog 2004-10-24 05:59:39 UTC (rev 106)
@@ -1,4 +1,4 @@
-xorg-@NAME@ (6.8.1-0+SVN) unstable; urgency=low
+xorg-lib-xext (6.8.1-0+SVN) unstable; urgency=low
* First release.
Property changes on: xorg-lib-xext/trunk/debian/changelog
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xorg-lib-xext/trunk/debian/control
===================================================================
--- xorg-lib-xext/trunk/debian/control 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/control 2004-10-24 05:59:39 UTC (rev 106)
@@ -1,12 +1,19 @@
-Source: xorg-@NAME@
+Source: xorg-lib-xext
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
Standards-Version: 3.6.1
-Build-Depends-Indep: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xorg-dev (>= 6.8.1-0+SVN)
+Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xorg-dev (>= 6.8.1-0+SVN), xorg-source-lib-xext (>= 6.8.1-0+SVN), xorg-source-include-extensions (>= 6.8.1-0+SVN)
-Package: @FOO@
-Architecture: all|any
-Description: @BAR@
+Package: libxext6
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: X.org libxext6 files
@BAZ@
+
+Package: libxext-dev
+Architecture: any
+Depends: libxext6 (= ${Source-Version})
+Description: X.org libxext6 development files
+ @BAZ@
Added: xorg-lib-xext/trunk/debian/libxext-dev.install
===================================================================
--- xorg-lib-xext/trunk/debian/libxext-dev.install 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/libxext-dev.install 2004-10-24 05:59:39 UTC (rev 106)
@@ -0,0 +1,101 @@
+usr/X11R6/include/X11/extensions/MITMisc.h
+usr/X11R6/include/X11/extensions/Print.h
+usr/X11R6/include/X11/extensions/Printstr.h
+usr/X11R6/include/X11/extensions/XEVI.h
+usr/X11R6/include/X11/extensions/XEVIstr.h
+usr/X11R6/include/X11/extensions/XI.h
+usr/X11R6/include/X11/extensions/XInput.h
+usr/X11R6/include/X11/extensions/XIproto.h
+usr/X11R6/include/X11/extensions/XKB.h
+usr/X11R6/include/X11/extensions/XKBgeom.h
+usr/X11R6/include/X11/extensions/XKBproto.h
+usr/X11R6/include/X11/extensions/XKBsrv.h
+usr/X11R6/include/X11/extensions/XKBstr.h
+usr/X11R6/include/X11/extensions/XLbx.h
+usr/X11R6/include/X11/extensions/XRes.h
+usr/X11R6/include/X11/extensions/XResproto.h
+usr/X11R6/include/X11/extensions/XShm.h
+usr/X11R6/include/X11/extensions/XTest.h
+usr/X11R6/include/X11/extensions/Xag.h
+usr/X11R6/include/X11/extensions/Xagsrv.h
+usr/X11R6/include/X11/extensions/Xagstr.h
+usr/X11R6/include/X11/extensions/Xcup.h
+usr/X11R6/include/X11/extensions/Xcupstr.h
+usr/X11R6/include/X11/extensions/Xdbe.h
+usr/X11R6/include/X11/extensions/Xdbeproto.h
+usr/X11R6/include/X11/extensions/Xevie.h
+usr/X11R6/include/X11/extensions/Xeviestr.h
+usr/X11R6/include/X11/extensions/Xext.h
+usr/X11R6/include/X11/extensions/Xinerama.h
+usr/X11R6/include/X11/extensions/Xv.h
+usr/X11R6/include/X11/extensions/XvMC.h
+usr/X11R6/include/X11/extensions/XvMClib.h
+usr/X11R6/include/X11/extensions/XvMCproto.h
+usr/X11R6/include/X11/extensions/Xvlib.h
+usr/X11R6/include/X11/extensions/Xvproto.h
+usr/X11R6/include/X11/extensions/bigreqstr.h
+usr/X11R6/include/X11/extensions/composite.h
+usr/X11R6/include/X11/extensions/compositeproto.h
+usr/X11R6/include/X11/extensions/damage.h
+usr/X11R6/include/X11/extensions/damageproto.h
+usr/X11R6/include/X11/extensions/damagewire.h
+usr/X11R6/include/X11/extensions/dmxext.h
+usr/X11R6/include/X11/extensions/dmxproto.h
+usr/X11R6/include/X11/extensions/dpms.h
+usr/X11R6/include/X11/extensions/dpmsstr.h
+usr/X11R6/include/X11/extensions/extutil.h
+usr/X11R6/include/X11/extensions/lbxbuf.h
+usr/X11R6/include/X11/extensions/lbxbufstr.h
+usr/X11R6/include/X11/extensions/lbxdeltastr.h
+usr/X11R6/include/X11/extensions/lbximage.h
+usr/X11R6/include/X11/extensions/lbxopts.h
+usr/X11R6/include/X11/extensions/lbxstr.h
+usr/X11R6/include/X11/extensions/lbxzlib.h
+usr/X11R6/include/X11/extensions/mitmiscstr.h
+usr/X11R6/include/X11/extensions/multibuf.h
+usr/X11R6/include/X11/extensions/multibufst.h
+usr/X11R6/include/X11/extensions/panoramiXext.h
+usr/X11R6/include/X11/extensions/panoramiXproto.h
+usr/X11R6/include/X11/extensions/randr.h
+usr/X11R6/include/X11/extensions/randrproto.h
+usr/X11R6/include/X11/extensions/record.h
+usr/X11R6/include/X11/extensions/recordstr.h
+usr/X11R6/include/X11/extensions/render.h
+usr/X11R6/include/X11/extensions/renderproto.h
+usr/X11R6/include/X11/extensions/saver.h
+usr/X11R6/include/X11/extensions/saverproto.h
+usr/X11R6/include/X11/extensions/scrnsaver.h
+usr/X11R6/include/X11/extensions/security.h
+usr/X11R6/include/X11/extensions/securstr.h
+usr/X11R6/include/X11/extensions/shape.h
+usr/X11R6/include/X11/extensions/shapestr.h
+usr/X11R6/include/X11/extensions/shmstr.h
+usr/X11R6/include/X11/extensions/sync.h
+usr/X11R6/include/X11/extensions/syncstr.h
+usr/X11R6/include/X11/extensions/xcmiscstr.h
+usr/X11R6/include/X11/extensions/xf86bigfont.h
+usr/X11R6/include/X11/extensions/xf86bigfstr.h
+usr/X11R6/include/X11/extensions/xf86dga.h
+usr/X11R6/include/X11/extensions/xf86dga1.h
+usr/X11R6/include/X11/extensions/xf86dga1str.h
+usr/X11R6/include/X11/extensions/xf86dgastr.h
+usr/X11R6/include/X11/extensions/xf86misc.h
+usr/X11R6/include/X11/extensions/xf86mscstr.h
+usr/X11R6/include/X11/extensions/xf86rush.h
+usr/X11R6/include/X11/extensions/xf86rushstr.h
+usr/X11R6/include/X11/extensions/xf86vmode.h
+usr/X11R6/include/X11/extensions/xf86vmstr.h
+usr/X11R6/include/X11/extensions/xfixesproto.h
+usr/X11R6/include/X11/extensions/xfixeswire.h
+usr/X11R6/include/X11/extensions/xtestext1.h
+usr/X11R6/include/X11/extensions/xteststr.h
+usr/X11R6/include/X11/extensions/xtrapbits.h
+usr/X11R6/include/X11/extensions/xtrapddmi.h
+usr/X11R6/include/X11/extensions/xtrapdi.h
+usr/X11R6/include/X11/extensions/xtrapemacros.h
+usr/X11R6/include/X11/extensions/xtraplib.h
+usr/X11R6/include/X11/extensions/xtraplibp.h
+usr/X11R6/include/X11/extensions/xtrapproto.h
+usr/X11R6/lib/libXext.a
+usr/X11R6/lib/libXext.so
+usr/share/lintian/overrides/libxext-dev
Added: xorg-lib-xext/trunk/debian/libxext-dev.lintian
===================================================================
--- xorg-lib-xext/trunk/debian/libxext-dev.lintian 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/libxext-dev.lintian 2004-10-24 05:59:39 UTC (rev 106)
@@ -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
+
+libxext-dev: packages-installs-file-to-usr-x11r6
Property changes on: xorg-lib-xext/trunk/debian/libxext-dev.lintian
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xorg-lib-xext/trunk/debian/libxext6.install
===================================================================
--- xorg-lib-xext/trunk/debian/libxext6.install 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/libxext6.install 2004-10-24 05:59:39 UTC (rev 106)
@@ -0,0 +1,3 @@
+usr/X11R6/lib/libXext.so.6.4
+usr/X11R6/lib/libXext.so.6
+usr/share/lintian/overrides/libxext6
Added: xorg-lib-xext/trunk/debian/libxext6.lintian
===================================================================
--- xorg-lib-xext/trunk/debian/libxext6.lintian 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/libxext6.lintian 2004-10-24 05:59:39 UTC (rev 106)
@@ -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
+
+libxext6: packages-installs-file-to-usr-x11r6
Property changes on: xorg-lib-xext/trunk/debian/libxext6.lintian
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xorg-lib-xext/trunk/debian/libxext6.postinst
===================================================================
--- xorg-lib-xext/trunk/debian/libxext6.postinst 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/libxext6.postinst 2004-10-24 05:59:39 UTC (rev 106)
@@ -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-xext/trunk/debian/libxext6.postinst
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id
Added: xorg-lib-xext/trunk/debian/libxext6.postrm
===================================================================
--- xorg-lib-xext/trunk/debian/libxext6.postrm 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/libxext6.postrm 2004-10-24 05:59:39 UTC (rev 106)
@@ -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-xext/trunk/debian/libxext6.postrm
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id
Added: xorg-lib-xext/trunk/debian/patches/029_xinerama_needs_xlib.h.diff
===================================================================
--- xorg-lib-xext/trunk/debian/patches/029_xinerama_needs_xlib.h.diff 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/patches/029_xinerama_needs_xlib.h.diff 2004-10-24 05:59:39 UTC (rev 106)
@@ -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-xext/trunk/debian/patches/029_xinerama_needs_xlib.h.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xorg-lib-xext/trunk/debian/patches/915_debian_fix_Imakefiles.diff
===================================================================
--- xorg-lib-xext/trunk/debian/patches/915_debian_fix_Imakefiles.diff 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/patches/915_debian_fix_Imakefiles.diff 2004-10-24 05:59:39 UTC (rev 106)
@@ -0,0 +1,12 @@
+diff -ruN xc-old/lib/Xext/Imakefile xc/lib/Xext/Imakefile
+--- xc-old/lib/Xext/Imakefile 2004-08-16 15:02:59.000000000 +0000
++++ xc/lib/Xext/Imakefile 2004-10-24 04:57:19.993836504 +0000
+@@ -30,7 +30,7 @@
+ #endif
+
+ DEFINES = $(ALLOC_DEFINES)
+- INCLUDES = -I$(XLIBSRC)
++ INCLUDES = -I$(XLIBSRC) -I$(TOP)/include
+ SRCS = globals.c extutil.c XMultibuf.c XShape.c $(SHMSRCS) \
+ MITMisc.c XTestExt1.c XSync.c Xdbe.c XLbx.c \
+ XSecurity.c XAppgroup.c Xcup.c DPMS.c XEVI.c
Property changes on: xorg-lib-xext/trunk/debian/patches/915_debian_fix_Imakefiles.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xorg-lib-xext/trunk/debian/patches/916_debian_fix_region.h.diff
===================================================================
--- xorg-lib-xext/trunk/debian/patches/916_debian_fix_region.h.diff 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/patches/916_debian_fix_region.h.diff 2004-10-24 05:59:39 UTC (rev 106)
@@ -0,0 +1,24 @@
+diff -ruN xc-old/lib/Xext/XShape.c xc/lib/Xext/XShape.c
+--- xc-old/lib/Xext/XShape.c 2004-04-23 18:43:41.000000000 +0000
++++ xc/lib/Xext/XShape.c 2004-10-24 05:12:02.977602568 +0000
+@@ -30,7 +30,7 @@
+ #define NEED_REPLIES
+ #include <X11/Xlibint.h>
+ #include <X11/Xutil.h>
+-#include "region.h" /* in Xlib sources */
++#include <X11/region.h>
+ #include <X11/extensions/Xext.h>
+ #include <X11/extensions/extutil.h>
+ #include <X11/extensions/shapestr.h>
+diff -ruN xc-old/lib/Xext/XShm.c xc/lib/Xext/XShm.c
+--- xc-old/lib/Xext/XShm.c 2004-04-23 18:43:41.000000000 +0000
++++ xc/lib/Xext/XShm.c 2004-10-24 05:16:50.688863808 +0000
+@@ -37,7 +37,7 @@
+ #include <X11/extensions/shmstr.h>
+ #include <X11/extensions/Xext.h>
+ #include <X11/extensions/extutil.h>
+-#include "ImUtil.h"
++#include <X11/ImUtil.h>
+
+ static XExtensionInfo _shm_info_data;
+ static XExtensionInfo *shm_info = &_shm_info_data;
Property changes on: xorg-lib-xext/trunk/debian/patches/916_debian_fix_region.h.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xorg-lib-xext/trunk/debian/rules
===================================================================
--- xorg-lib-xext/trunk/debian/rules 2004-10-24 05:55:51 UTC (rev 105)
+++ xorg-lib-xext/trunk/debian/rules 2004-10-24 05:59:39 UTC (rev 106)
@@ -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
-PROJECT_DIR=@DIRECTORY_TO_BUILD@
+PROJECT_DIR=lib/Xext
# dpkg-arch rules
ifeq (,$(DEB_BUILD_GNU_TYPE))
@@ -32,7 +32,14 @@
abspath=`pwd` && \
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 && \
+ cd ../../include/extensions && \
+ imake -I/usr/X11R6/lib/X11/config -DTOPDIR=$$abspath/$(SOURCE_TREE) -DCURDIR=$$abspath/$(SOURCE_TREE)/include/extensions -DUseInstalled && \
$(MAKE) Makefiles
+ if [ -d $(SOURCE_TREE)/include ]; then \
+ cd $(SOURCE_TREE)/include && \
+ ln -sf . X11; \
+ fi
touch $@
build: $(STAMP_DIR)/build
@@ -48,10 +55,13 @@
dh_testroot
abspath=`pwd` && \
cd $(SOURCE_TREE)/$(PROJECT_DIR) && \
+ $(MAKE) install install.man DESTDIR=$$abspath/debian/tmp && \
+ cd ../../include/extensions && \
$(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/@FOO@.lintian debian/tmp/usr/share/lintian/overrides/@FOO@
+ install -d -m 755 debian/tmp/usr/share/lintian/overrides/
+ install -m 644 debian/libxext6.lintian debian/tmp/usr/share/lintian/overrides/libxext6
+ install -m 644 debian/libxext-dev.lintian debian/tmp/usr/share/lintian/overrides/libxext-dev
touch $@
binary-arch: check-manifest
@@ -63,6 +73,7 @@
dh_compress -a
dh_fixperms -a
dh_installdeb -a
+ dh_makeshlibs -a
dh_shlibdeps -a
dh_gencontrol -a
dh_md5sums -a
@@ -70,15 +81,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-xext/trunk/debian/rules
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: