[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XOrg SVN commit: r78 - in xorg-config/trunk/debian: . shared



Author: fabbione
Date: 2004-10-22 00:41:54 -0500 (Fri, 22 Oct 2004)
New Revision: 78

Added:
   xorg-config/trunk/debian/shared/all.mk
   xorg-config/trunk/debian/shared/symlinks.mk
Modified:
   xorg-config/trunk/debian/CHANGESETS
   xorg-config/trunk/debian/MANIFEST.any
   xorg-config/trunk/debian/rules
   xorg-config/trunk/debian/xutils-devel.install
   xorg-config/trunk/debian/xutils-devel.lintian
Log:
* Add symlinks.mk to handle all symlinks creation at build time and
  all.mk to include all .mk scripts at once:
  + Modidy debian/rules to make use/ship them.
  + Update MANIFEST.any, xutils-devel.install and .lintian.



Modified: xorg-config/trunk/debian/CHANGESETS
===================================================================
--- xorg-config/trunk/debian/CHANGESETS	2004-10-22 05:20:17 UTC (rev 77)
+++ xorg-config/trunk/debian/CHANGESETS	2004-10-22 05:41:54 UTC (rev 78)
@@ -126,4 +126,10 @@
   complex to face two transition at the same time.)
     69
 
+* Add symlinks.mk to handle all symlinks creation at build time and
+  all.mk to include all .mk scripts at once:
+  + Modidy debian/rules to make use/ship them.
+  + Update MANIFEST.any, xutils-devel.install and .lintian.
+    78
+
 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 05:20:17 UTC (rev 77)
+++ xorg-config/trunk/debian/MANIFEST.any	2004-10-22 05:41:54 UTC (rev 78)
@@ -135,6 +135,8 @@
 usr/X11R6/man/man1/revpath.1
 usr/X11R6/man/man1/xmkmf.1
 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/rules
===================================================================
--- xorg-config/trunk/debian/rules	2004-10-22 05:20:17 UTC (rev 77)
+++ xorg-config/trunk/debian/rules	2004-10-22 05:41:54 UTC (rev 78)
@@ -32,18 +32,18 @@
 # 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
-	# create symlink to not depend on X11
-	cd $(SOURCE_TREE)/include && \
-	  ln -sf . X11
 	touch $@
 
 build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: patch-audit configure
+$(STAMP_DIR)/build: patch-audit symlinks configure
 	dh_testdir
 	# bootstrap imake and create version.def
 	cd $(SOURCE_TREE) && \
@@ -69,9 +69,11 @@
 	install -m 644 debian/xutils-devel.lintian debian/tmp/usr/share/lintian/overrides/xutils-devel
 	# 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

Added: xorg-config/trunk/debian/shared/all.mk
===================================================================
--- xorg-config/trunk/debian/shared/all.mk	2004-10-22 05:20:17 UTC (rev 77)
+++ xorg-config/trunk/debian/shared/all.mk	2004-10-22 05:41:54 UTC (rev 78)
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+# Original by Fabio M. Di Nitto <fabbione@fabbione.net>
+# 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$
+
+# include all in one shot
+
+# Determine our architecture.
+include /usr/share/xorg/dbuild-scripts/arch.mk
+
+# Import standard check-manifest.
+include /usr/share/xorg/dbuild-scripts/check-manifest.mk
+
+# 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:


Property changes on: xorg-config/trunk/debian/shared/all.mk
___________________________________________________________________
Name: svn:keywords
   + Id

Added: xorg-config/trunk/debian/shared/symlinks.mk
===================================================================
--- xorg-config/trunk/debian/shared/symlinks.mk	2004-10-22 05:20:17 UTC (rev 77)
+++ xorg-config/trunk/debian/shared/symlinks.mk	2004-10-22 05:41:54 UTC (rev 78)
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+# Original by Fabio M. Di Nitto <fabbione@fabbione.net>
+# 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; \
+	fi
+	# xc/lib/xtrans
+	if [ -e $(SOURCE_TREE)/lib/xtrans/Xtrans.c ] && [ -d $(SOURCE_TREE)/include ]; then \
+	  cd $(SOURCE_TREE)/include && \
+	  ln -sf ../lib/xtrans/Xtrans.h Xtrans.h; \
+	fi
+	# xc/lib/Xau
+	if [ -e $(SOURCE_TREE)/lib/Xau/Xauth.h ] && [ -d $(SOURCE_TREE)/include ]; then \
+	  cd $(SOURCE_TREE)/include && \
+	  ln -sf ../lib/Xau/Xauth.h Xauth.h; \
+	fi
+	touch $@
+
+# vim:set noet ai sts=8 sw=8 tw=0:


Property changes on: xorg-config/trunk/debian/shared/symlinks.mk
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: xorg-config/trunk/debian/xutils-devel.install
===================================================================
--- xorg-config/trunk/debian/xutils-devel.install	2004-10-22 05:20:17 UTC (rev 77)
+++ xorg-config/trunk/debian/xutils-devel.install	2004-10-22 05:41:54 UTC (rev 78)
@@ -135,6 +135,8 @@
 usr/X11R6/man/man1/revpath.1
 usr/X11R6/man/man1/xmkmf.1
 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/xutils-devel.lintian
===================================================================
--- xorg-config/trunk/debian/xutils-devel.lintian	2004-10-22 05:20:17 UTC (rev 77)
+++ xorg-config/trunk/debian/xutils-devel.lintian	2004-10-22 05:41:54 UTC (rev 78)
@@ -1,9 +1,11 @@
 # dbuild-scripts/ contains several different kind of scripts that are never
 # used on their own. There is no reason to have them executable.
 
+xutils-devel: script-not-executable ./usr/share/xorg/dbuild-scripts/all.mk
 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



Reply to: