Author: fabbione
Date: 2004-10-22 11:56:00 -0500 (Fri, 22 Oct 2004)
New Revision: 84
Added:
xorg-config/trunk/debian/xorg-dev.install
xorg-config/trunk/debian/xorg-dev.lintian
Removed:
xorg-config/trunk/debian/shared/symlinks.mk
Modified:
xorg-config/trunk/debian/CHANGESETS
xorg-config/trunk/debian/MANIFEST.any
xorg-config/trunk/debian/control
xorg-config/trunk/debian/patches/915_debian_fix_Imakefiles.diff
xorg-config/trunk/debian/rules
xorg-config/trunk/debian/shared/all.mk
xorg-config/trunk/debian/xutils-devel.install
xorg-config/trunk/debian/xutils-devel.lintian
Log:
* Ship X.org top header files [0] and kill symlink.mk:
+ Add xorg-dev package to debian/control.
+ Update 915_debian_fix_Imakefiles.diff to remove SUBDIRS from xc/include.
+ Update debian/rules to install xc/include/.
+ Update MANIFEST.any.
+ Remove symlinks.mk from allover the package. Each package should be
responsible to create what it needs to build.
Modified: xorg-config/trunk/debian/CHANGESETS
===================================================================
--- xorg-config/trunk/debian/CHANGESETS 2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-22 16:56:00 UTC (rev 84)
@@ -135,4 +135,16 @@
* Update symlinks.mk to perform less checks and add the Xdmcp.h
81
+* Ship X.org top header files [0] and kill symlink.mk:
+ + Add xorg-dev package to debian/control.
+ + Update 915_debian_fix_Imakefiles.diff to remove SUBDIRS from xc/include.
+ + Update debian/rules to install xc/include/.
+ + Update MANIFEST.any.
+ + Remove symlinks.mk from allover the package. Each package should be
+ responsible to create what it needs to build.
+ 84
+
+[0] Not that i didn't have this idea before.. it's just that i like to make my
+life more complicated than it should be.
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: xorg-config/trunk/debian/MANIFEST.any
===================================================================
--- xorg-config/trunk/debian/MANIFEST.any 2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/MANIFEST.any 2004-10-22 16:56:00 UTC (rev 84)
@@ -12,6 +12,29 @@
usr/X11R6/bin/pswrap
usr/X11R6/bin/revpath
usr/X11R6/bin/xmkmf
+usr/X11R6/include/X11/DECkeysym.h
+usr/X11R6/include/X11/HPkeysym.h
+usr/X11R6/include/X11/Sunkeysym.h
+usr/X11R6/include/X11/X.h
+usr/X11R6/include/X11/XF86keysym.h
+usr/X11R6/include/X11/XWDFile.h
+usr/X11R6/include/X11/Xalloca.h
+usr/X11R6/include/X11/Xarch.h
+usr/X11R6/include/X11/Xatom.h
+usr/X11R6/include/X11/Xdefs.h
+usr/X11R6/include/X11/Xfuncproto.h
+usr/X11R6/include/X11/Xfuncs.h
+usr/X11R6/include/X11/Xmd.h
+usr/X11R6/include/X11/Xos.h
+usr/X11R6/include/X11/Xos_r.h
+usr/X11R6/include/X11/Xosdefs.h
+usr/X11R6/include/X11/Xpoll.h
+usr/X11R6/include/X11/Xproto.h
+usr/X11R6/include/X11/Xprotostr.h
+usr/X11R6/include/X11/Xthreads.h
+usr/X11R6/include/X11/ap_keysym.h
+usr/X11R6/include/X11/keysym.h
+usr/X11R6/include/X11/keysymdef.h
usr/X11R6/lib/X11/config/Amoeba.cf
usr/X11R6/lib/X11/config/DGUX.cf
usr/X11R6/lib/X11/config/FreeBSD.cf
@@ -134,9 +157,9 @@
usr/X11R6/man/man1/pswrap.1
usr/X11R6/man/man1/revpath.1
usr/X11R6/man/man1/xmkmf.1
+usr/share/lintian/overrides/xorg-dev
usr/share/lintian/overrides/xutils-devel
usr/share/xorg/dbuild-scripts/all.mk
usr/share/xorg/dbuild-scripts/arch.mk
usr/share/xorg/dbuild-scripts/check-manifest.mk
usr/share/xorg/dbuild-scripts/patch-audit.mk
-usr/share/xorg/dbuild-scripts/symlinks.mk
Modified: xorg-config/trunk/debian/control
===================================================================
--- xorg-config/trunk/debian/control 2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/control 2004-10-22 16:56:00 UTC (rev 84)
@@ -33,3 +33,10 @@
- revpath, which generates a relative path that can be used to undo a
change-directory and
- xmkmf, a tool that creates a Makefile from an Imakefile.
+
+Package: xorg-dev
+Depends: xutils-devel
+Architecture: all
+Description: X.org top level header files
+ xorg-dev provides all the top level header files required to build almost, if
+ not all, the libraries and applications that uses a X Window System.
Modified: xorg-config/trunk/debian/patches/915_debian_fix_Imakefiles.diff
===================================================================
--- xorg-config/trunk/debian/patches/915_debian_fix_Imakefiles.diff
2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/patches/915_debian_fix_Imakefiles.diff
2004-10-22 16:56:00 UTC (rev 84)
@@ -6,8 +6,8 @@
Patch by Fabio M. Di Nitto.
diff -ruN xc-old/config/pswrap/Imakefile xc/config/pswrap/Imakefile
---- xc-old/config/pswrap/Imakefile 2004-04-23 20:42:00.000000000 +0200
-+++ xc/config/pswrap/Imakefile 2004-10-18 15:31:17.411526720 +0200
+--- xc-old/config/pswrap/Imakefile 2004-04-23 18:42:00.000000000 +0000
++++ xc/config/pswrap/Imakefile 2004-10-22 15:33:25.155443016 +0000
@@ -6,6 +6,8 @@
YFLAGS = -d
EXTRA_LIBRARIES = LexLib
@@ -18,8 +18,8 @@
systemnames.c psw.c pswstring.c pswsemantics.c
diff -ruN xc-old/config/util/Imakefile xc/config/util/Imakefile
---- xc-old/config/util/Imakefile 2004-06-26 14:50:32.000000000 +0200
-+++ xc/config/util/Imakefile 2004-10-18 15:31:33.820032248 +0200
+--- xc-old/config/util/Imakefile 2004-06-26 12:50:32.000000000 +0000
++++ xc/config/util/Imakefile 2004-10-22 15:33:25.155443016 +0000
@@ -6,6 +6,8 @@
CCMDEP_PROG = ccmakedep
@@ -29,3 +29,15 @@
#ifdef ExportListGenSource
EXPORTLISTGEN = exportlistgen
#endif
+diff -ruN xc-old/include/Imakefile xc/include/Imakefile
+--- xc-old/include/Imakefile 2004-08-09 22:37:21.000000000 +0000
++++ xc/include/Imakefile 2004-10-22 15:34:14.806894848 +0000
+@@ -15,7 +15,7 @@
+ DPSDIR = DPS
+ #endif
+
+-SUBDIRS = bitmaps extensions fonts $(GLXDIR) $(DPSDIR)
++SUBDIRS =
+
+ #ifdef Win32Architecture
+ EXTRA_HEADERS = Xw32defs.h Xwinsock.h
Modified: xorg-config/trunk/debian/rules
===================================================================
--- xorg-config/trunk/debian/rules 2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/rules 2004-10-22 16:56:00 UTC (rev 84)
@@ -32,18 +32,19 @@
# Import anal patch-audit check.
include debian/shared/patch-audit.mk
-# Import symlink creation target.
-include debian/shared/symlinks.mk
-
configure: $(STAMP_DIR)/configure
$(STAMP_DIR)/configure: $(patched)
dh_testdir
echo "" > $(SOURCE_TREE)/$(PROJECT_DIR)/cf/date.def
echo "" > $(SOURCE_TREE)/$(PROJECT_DIR)/cf/host.def
+ if [ -d $(SOURCE_TREE)/include ]; then \
+ cd $(SOURCE_TREE)/include && \
+ ln -sf . X11; \
+ fi
touch $@
build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: patch-audit symlinks configure
+$(STAMP_DIR)/build: patch-audit configure
dh_testdir
# bootstrap imake and create version.def
cd $(SOURCE_TREE) && \
@@ -55,6 +56,10 @@
./imake/imake -Icf -DTOPDIR=../ -DCURDIR=. && \
$(MAKE) Makefiles && \
$(MAKE) all
+ cd $(SOURCE_TREE)/include && \
+ ../config/imake/imake -I../config/cf -DTOPDIR=../ -DCURDIR=. && \
+ $(MAKE) Makefiles && \
+ $(MAKE) all
touch $@
install: $(STAMP_DIR)/install
@@ -63,17 +68,19 @@
dh_testroot
abspath=`pwd` && \
cd $(SOURCE_TREE)/$(PROJECT_DIR) && \
+ $(MAKE) install install.man DESTDIR=$$abspath/debian/tmp && \
+ cd ../include && \
$(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/xutils-devel.lintian
debian/tmp/usr/share/lintian/overrides/xutils-devel
+ install -m 644 debian/xorg-dev.lintian
debian/tmp/usr/share/lintian/overrides/xorg-dev
# Install common Debian build scripts.
install -d -m 755 debian/tmp/usr/share/xorg/dbuild-scripts/
install -m 644 debian/shared/all.mk
debian/tmp/usr/share/xorg/dbuild-scripts/all.mk
install -m 644 debian/shared/arch.mk
debian/tmp/usr/share/xorg/dbuild-scripts/arch.mk
install -m 644 debian/shared/check-manifest.mk
debian/tmp/usr/share/xorg/dbuild-scripts/check-manifest.mk
install -m 644 debian/shared/patch-audit.mk
debian/tmp/usr/share/xorg/dbuild-scripts/patch-audit.mk
- install -m 644 debian/shared/symlinks.mk
debian/tmp/usr/share/xorg/dbuild-scripts/symlinks.mk
touch $@
binary-arch: check-manifest
@@ -92,6 +99,15 @@
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
Modified: xorg-config/trunk/debian/shared/all.mk
===================================================================
--- xorg-config/trunk/debian/shared/all.mk 2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/shared/all.mk 2004-10-22 16:56:00 UTC (rev 84)
@@ -16,7 +16,4 @@
# Import anal patch-audit check.
include /usr/share/xorg/dbuild-scripts/patch-audit.mk
-# Import symlink creation target.
-include /usr/share/xorg/dbuild-scripts/symlinks.mk
-
# vim:set noet ai sts=8 sw=8 tw=0:
Deleted: xorg-config/trunk/debian/shared/symlinks.mk
===================================================================
--- xorg-config/trunk/debian/shared/symlinks.mk 2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/shared/symlinks.mk 2004-10-22 16:56:00 UTC (rev 84)
@@ -1,27 +0,0 @@
-#!/usr/bin/make -f
-# Original by Fabio M. Di Nitto <[EMAIL PROTECTED]>
-# 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$
-
-symlinks: $(STAMP_DIR)/symlinks
-$(STAMP_DIR)/symlinks: $(patched)
- dh_testdir
- # create symlink to not depend on X11
- if [ -d $(SOURCE_TREE)/include ]; then \
- cd $(SOURCE_TREE)/include && \
- ln -sf . X11 && \
- if [ -e ../lib/xtrans/Xtrans.c ]; then \
- ln -sf ../lib/xtrans/Xtrans.h Xtrans.h; \
- fi && \
- if [ -e ../lib/Xau/Xauth.h ]; then \
- ln -sf ../lib/Xau/Xauth.h Xauth.h; \
- fi && \
- if [ -e ../lib/Xdmcp/Xdmcp.h ]; then \
- ln -sf ../lib/Xdmcp/Xdmcp.h Xdmcp.h; \
- fi; \
- fi
- touch $@
-
-# vim:set noet ai sts=8 sw=8 tw=0:
Added: xorg-config/trunk/debian/xorg-dev.install
===================================================================
--- xorg-config/trunk/debian/xorg-dev.install 2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/xorg-dev.install 2004-10-22 16:56:00 UTC (rev 84)
@@ -0,0 +1,24 @@
+usr/X11R6/include/X11/DECkeysym.h
+usr/X11R6/include/X11/HPkeysym.h
+usr/X11R6/include/X11/Sunkeysym.h
+usr/X11R6/include/X11/X.h
+usr/X11R6/include/X11/XF86keysym.h
+usr/X11R6/include/X11/XWDFile.h
+usr/X11R6/include/X11/Xalloca.h
+usr/X11R6/include/X11/Xarch.h
+usr/X11R6/include/X11/Xatom.h
+usr/X11R6/include/X11/Xdefs.h
+usr/X11R6/include/X11/Xfuncproto.h
+usr/X11R6/include/X11/Xfuncs.h
+usr/X11R6/include/X11/Xmd.h
+usr/X11R6/include/X11/Xos.h
+usr/X11R6/include/X11/Xos_r.h
+usr/X11R6/include/X11/Xosdefs.h
+usr/X11R6/include/X11/Xpoll.h
+usr/X11R6/include/X11/Xproto.h
+usr/X11R6/include/X11/Xprotostr.h
+usr/X11R6/include/X11/Xthreads.h
+usr/X11R6/include/X11/ap_keysym.h
+usr/X11R6/include/X11/keysym.h
+usr/X11R6/include/X11/keysymdef.h
+usr/share/lintian/overrides/xorg-dev
Added: xorg-config/trunk/debian/xorg-dev.lintian
===================================================================
--- xorg-config/trunk/debian/xorg-dev.lintian 2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/xorg-dev.lintian 2004-10-22 16:56:00 UTC (rev 84)
@@ -0,0 +1,4 @@
+# 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
+
+xorg-dev: packages-installs-file-to-usr-x11r6
Modified: xorg-config/trunk/debian/xutils-devel.install
===================================================================
--- xorg-config/trunk/debian/xutils-devel.install 2004-10-22 08:00:38 UTC
(rev 83)
+++ xorg-config/trunk/debian/xutils-devel.install 2004-10-22 16:56:00 UTC
(rev 84)
@@ -139,4 +139,3 @@
usr/share/xorg/dbuild-scripts/arch.mk
usr/share/xorg/dbuild-scripts/check-manifest.mk
usr/share/xorg/dbuild-scripts/patch-audit.mk
-usr/share/xorg/dbuild-scripts/symlinks.mk
Modified: xorg-config/trunk/debian/xutils-devel.lintian
===================================================================
--- xorg-config/trunk/debian/xutils-devel.lintian 2004-10-22 08:00:38 UTC
(rev 83)
+++ xorg-config/trunk/debian/xutils-devel.lintian 2004-10-22 16:56:00 UTC
(rev 84)
@@ -5,7 +5,6 @@
xutils-devel: script-not-executable ./usr/share/xorg/dbuild-scripts/arch.mk
xutils-devel: script-not-executable
./usr/share/xorg/dbuild-scripts/check-manifest.mk
xutils-devel: script-not-executable
./usr/share/xorg/dbuild-scripts/patch-audit.mk
-xutils-devel: script-not-executable ./usr/share/xorg/dbuild-scripts/symlinks.mk
# 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
