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

X Strike Force XOrg SVN commit: r29 - / xorg-config xorg-config/trunk xorg-config/trunk/debian xorg-config/trunk/debian/patches



Author: fabbione
Date: 2004-10-05 23:19:16 -0500 (Tue, 05 Oct 2004)
New Revision: 29

Added:
   xorg-config/
   xorg-config/trunk/
   xorg-config/trunk/debian/
   xorg-config/trunk/debian/changelog
   xorg-config/trunk/debian/compat
   xorg-config/trunk/debian/control
   xorg-config/trunk/debian/patches/
   xorg-config/trunk/debian/patches/900_disable_rman
   xorg-config/trunk/debian/rules
   xorg-config/trunk/debian/xutils-configs.install
   xorg-config/trunk/debian/xutils-devel.install
Log:
Initial import.


Added: xorg-config/trunk/debian/changelog
===================================================================
--- xorg-config/trunk/debian/changelog	2004-10-05 19:26:14 UTC (rev 28)
+++ xorg-config/trunk/debian/changelog	2004-10-06 04:19:16 UTC (rev 29)
@@ -0,0 +1,5 @@
+xorg-config (6.8.1-0+SVN) unstable; urgency=low
+
+  * First release.
+
+ -- Fabio M. Di Nitto <fabbione@fabbione.net>  Wed, 22 Sep 2004 13:51:39 +0200

Added: xorg-config/trunk/debian/compat
===================================================================
--- xorg-config/trunk/debian/compat	2004-10-05 19:26:14 UTC (rev 28)
+++ xorg-config/trunk/debian/compat	2004-10-06 04:19:16 UTC (rev 29)
@@ -0,0 +1 @@
+4

Added: xorg-config/trunk/debian/control
===================================================================
--- xorg-config/trunk/debian/control	2004-10-05 19:26:14 UTC (rev 28)
+++ xorg-config/trunk/debian/control	2004-10-06 04:19:16 UTC (rev 29)
@@ -0,0 +1,32 @@
+Source: xorg-config
+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: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), rman, xorg-source-config (>= 6.8.1-0+SVN), xorg-source-include (>= 6.8.1-0+SVN)
+
+Package: xutils-devel
+Architecture: any
+Description: X.org build utilities
+ X.org build utilities:
+  - ccmakedep
+  - cleanlinks
+  - gccmakedep
+  - imake
+  - lndir
+  - makedepend
+  - makeg
+  - makestrs
+  - mergelib
+  - mkdirhier
+  - mkhtmlindex
+  - pswrap
+  - revpath
+  - xmkmf
+
+Package: xutils-configs
+Architecture: all
+Description: X.org build specific config files
+ X.org build specific config files:
+  - blablabla

Added: xorg-config/trunk/debian/patches/900_disable_rman
===================================================================
--- xorg-config/trunk/debian/patches/900_disable_rman	2004-10-05 19:26:14 UTC (rev 28)
+++ xorg-config/trunk/debian/patches/900_disable_rman	2004-10-06 04:19:16 UTC (rev 29)
@@ -0,0 +1,41 @@
+$Id$
+
+Stop building rman:
+ + add Build-Depends: rman.
+ + remove Build-Depends: xorg-source-extras.
+
+Define proper path to rman.
+
+Enforce generation of HTML documentation.
+
+This patch by Fabio Massimo Di Nitto.
+  
+diff -ruN xc-old/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl
+--- xc-old/config/cf/Imake.tmpl	2004-07-28 05:24:29.000000000 +0200
++++ xc/config/cf/Imake.tmpl	2004-10-05 23:06:20.254602272 +0200
+@@ -233,7 +233,7 @@
+ #endif
+ 
+ #ifndef BuildRman
+-#define BuildRman YES
++#define BuildRman NO
+ #endif
+ 
+ #ifndef HasGperf
+@@ -251,14 +251,14 @@
+ #else
+ #define RmanCmd $(TOP)/config/util/rman
+ #endif
++#else
++#define RmanCmd /usr/bin/rman
+ #endif
+ #endif
+ 
+ #ifndef RmanOptions
+-#if BuildRman
+ #define RmanOptions -f HTML
+ #endif
+-#endif
+ 
+ #ifndef BuildHtmlManPages
+ #ifdef RmanCmd

Added: xorg-config/trunk/debian/rules
===================================================================
--- xorg-config/trunk/debian/rules	2004-10-05 19:26:14 UTC (rev 28)
+++ xorg-config/trunk/debian/rules	2004-10-06 04:19:16 UTC (rev 29)
@@ -0,0 +1,86 @@
+#!/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>.
+
+# debhelper
+export DH_OPTIONS
+
+# Use the DBS archive/patch handling system.
+SCRIPT_DIR = /usr/share/dbs
+
+TAR_DIR = xc
+include $(SCRIPT_DIR)/dbs-build.mk
+
+SOURCE_TREE=build-tree/xc
+SOURCE_DIR=build-tree
+
+# dpkg-arch rules
+ifeq (,$(DEB_BUILD_GNU_TYPE))
+  include $(SCRIPT_DIR)/dpkg-arch.mk
+endif
+
+configure: $(STAMP_DIR)/configure
+$(STAMP_DIR)/configure: $(patched)
+	dh_testdir
+	echo "" > $(SOURCE_TREE)/config/cf/date.def
+	echo "" > $(SOURCE_TREE)/config/cf/host.def
+	touch $@
+
+build: $(STAMP_DIR)/build
+$(STAMP_DIR)/build: configure
+	dh_testdir
+	# bootstrap imake and create version.def
+	cd $(SOURCE_TREE) && \
+	  $(MAKE) Makefile.boot && \
+	  $(MAKE) -f xmakefile version.def && \
+	  $(MAKE) Makefile.boot
+	# build all config dir
+	cd $(SOURCE_TREE)/config && \
+	  ./imake/imake -Icf -DTOPDIR=../ -DCURDIR=. && \
+	  $(MAKE) Makefiles && \
+	  $(MAKE) all
+	touch $@
+
+install: $(STAMP_DIR)/install
+$(STAMP_DIR)/install: build
+	dh_testdir
+	dh_testroot
+	abspath=`pwd` && \
+	cd $(SOURCE_TREE)/config && \
+	  $(MAKE) install install.man DESTDIR=$$abspath/debian/tmp
+	dh_installdirs
+	dh_install --sourcedir=debian/tmp
+	touch $@
+
+binary-arch: install
+	dh_testdir
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a 
+	dh_installdeb -a 
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary-indep: install
+	dh_testdir
+	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
+
+clean:
+	dh_testdir
+	dh_clean
+	rm -rf debian/tmp
+	rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+	perl $(SCRIPT_DIR)/dbs_split clean


Property changes on: xorg-config/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + 

Added: xorg-config/trunk/debian/xutils-configs.install
===================================================================
--- xorg-config/trunk/debian/xutils-configs.install	2004-10-05 19:26:14 UTC (rev 28)
+++ xorg-config/trunk/debian/xutils-configs.install	2004-10-06 04:19:16 UTC (rev 29)
@@ -0,0 +1,108 @@
+usr/X11R6/lib/X11/config/Imake.rules
+usr/X11R6/lib/X11/config/Motif.rules
+usr/X11R6/lib/X11/config/Win32.rules
+usr/X11R6/lib/X11/config/X11.rules
+usr/X11R6/lib/X11/config/bsdLib.rules
+usr/X11R6/lib/X11/config/cde.rules
+usr/X11R6/lib/X11/config/cygwin.rules
+usr/X11R6/lib/X11/config/darwinLib.rules
+usr/X11R6/lib/X11/config/gnuLib.rules
+usr/X11R6/lib/X11/config/hpLib.rules
+usr/X11R6/lib/X11/config/ibmLib.rules
+usr/X11R6/lib/X11/config/lnxLib.rules
+usr/X11R6/lib/X11/config/lnxdoc.rules
+usr/X11R6/lib/X11/config/necLib.rules
+usr/X11R6/lib/X11/config/noop.rules
+usr/X11R6/lib/X11/config/nto.rules
+usr/X11R6/lib/X11/config/oldlib.rules
+usr/X11R6/lib/X11/config/os2.rules
+usr/X11R6/lib/X11/config/os2Lib.rules
+usr/X11R6/lib/X11/config/osfLib.rules
+usr/X11R6/lib/X11/config/scoLib.rules
+usr/X11R6/lib/X11/config/sgiLib.rules
+usr/X11R6/lib/X11/config/sunLib.rules
+usr/X11R6/lib/X11/config/sv3Lib.rules
+usr/X11R6/lib/X11/config/sv4Lib.rules
+usr/X11R6/lib/X11/config/QNX4.rules
+usr/X11R6/lib/X11/config/xf86.rules
+usr/X11R6/lib/X11/config/Imake.tmpl
+usr/X11R6/lib/X11/config/Library.tmpl
+usr/X11R6/lib/X11/config/Motif.tmpl
+usr/X11R6/lib/X11/config/Server.tmpl
+usr/X11R6/lib/X11/config/ServerLib.tmpl
+usr/X11R6/lib/X11/config/Threads.tmpl
+usr/X11R6/lib/X11/config/WinLib.tmpl
+usr/X11R6/lib/X11/config/X11.tmpl
+usr/X11R6/lib/X11/config/bsdLib.tmpl
+usr/X11R6/lib/X11/config/cde.tmpl
+usr/X11R6/lib/X11/config/cygwin.tmpl
+usr/X11R6/lib/X11/config/darwinLib.tmpl
+usr/X11R6/lib/X11/config/hpLib.tmpl
+usr/X11R6/lib/X11/config/gnuLib.tmpl
+usr/X11R6/lib/X11/config/ibmLib.tmpl
+usr/X11R6/lib/X11/config/lnxLib.tmpl
+usr/X11R6/lib/X11/config/lnxdoc.tmpl
+usr/X11R6/lib/X11/config/necLib.tmpl
+usr/X11R6/lib/X11/config/os2Lib.tmpl
+usr/X11R6/lib/X11/config/osfLib.tmpl
+usr/X11R6/lib/X11/config/sgiLib.tmpl
+usr/X11R6/lib/X11/config/sunLib.tmpl
+usr/X11R6/lib/X11/config/sv3Lib.tmpl
+usr/X11R6/lib/X11/config/sv4Lib.tmpl
+usr/X11R6/lib/X11/config/xf86.tmpl
+usr/X11R6/lib/X11/config/xorg.tmpl
+usr/X11R6/lib/X11/config/xf86site.def
+usr/X11R6/lib/X11/config/xorgsite.def
+usr/X11R6/lib/X11/config/date.def
+usr/X11R6/lib/X11/config/version.def
+usr/X11R6/lib/X11/config/host.def
+usr/X11R6/lib/X11/config/site.def
+usr/X11R6/lib/X11/config/Imake.cf
+usr/X11R6/lib/X11/config/Amoeba.cf
+usr/X11R6/lib/X11/config/DGUX.cf
+usr/X11R6/lib/X11/config/FreeBSD.cf
+usr/X11R6/lib/X11/config/Mips.cf
+usr/X11R6/lib/X11/config/NetBSD.cf
+usr/X11R6/lib/X11/config/OpenBSD.cf
+usr/X11R6/lib/X11/config/Oki.cf
+usr/X11R6/lib/X11/config/cygwin.cf
+usr/X11R6/lib/X11/config/Win32.cf
+usr/X11R6/lib/X11/config/apollo.cf
+usr/X11R6/lib/X11/config/bsd.cf
+usr/X11R6/lib/X11/config/bsdi.cf
+usr/X11R6/lib/X11/config/convex.cf
+usr/X11R6/lib/X11/config/cray.cf
+usr/X11R6/lib/X11/config/fujitsu.cf
+usr/X11R6/lib/X11/config/generic.cf
+usr/X11R6/lib/X11/config/gnu.cf
+usr/X11R6/lib/X11/config/hp.cf
+usr/X11R6/lib/X11/config/ibm.cf
+usr/X11R6/lib/X11/config/isc.cf
+usr/X11R6/lib/X11/config/linux.cf
+usr/X11R6/lib/X11/config/luna.cf
+usr/X11R6/lib/X11/config/macII.cf
+usr/X11R6/lib/X11/config/mach.cf
+usr/X11R6/lib/X11/config/minix.cf
+usr/X11R6/lib/X11/config/moto.cf
+usr/X11R6/lib/X11/config/ncr.cf
+usr/X11R6/lib/X11/config/nec.cf
+usr/X11R6/lib/X11/config/nto.cf
+usr/X11R6/lib/X11/config/os2.cf
+usr/X11R6/lib/X11/config/osf1.cf
+usr/X11R6/lib/X11/config/pegasus.cf
+usr/X11R6/lib/X11/config/sco.cf
+usr/X11R6/lib/X11/config/sco5.cf
+usr/X11R6/lib/X11/config/sequent.cf
+usr/X11R6/lib/X11/config/sgi.cf
+usr/X11R6/lib/X11/config/sony.cf
+usr/X11R6/lib/X11/config/sun.cf
+usr/X11R6/lib/X11/config/svr3.cf
+usr/X11R6/lib/X11/config/svr4.cf
+usr/X11R6/lib/X11/config/ultrix.cf
+usr/X11R6/lib/X11/config/usl.cf
+usr/X11R6/lib/X11/config/lynx.cf
+usr/X11R6/lib/X11/config/x386.cf
+usr/X11R6/lib/X11/config/QNX4.cf
+usr/X11R6/lib/X11/config/darwin.cf
+usr/X11R6/lib/X11/config/xfree86.cf
+usr/X11R6/lib/X11/config/xorg.cf

Added: xorg-config/trunk/debian/xutils-devel.install
===================================================================
--- xorg-config/trunk/debian/xutils-devel.install	2004-10-05 19:26:14 UTC (rev 28)
+++ xorg-config/trunk/debian/xutils-devel.install	2004-10-06 04:19:16 UTC (rev 29)
@@ -0,0 +1,42 @@
+usr/X11R6/lib/X11/doc/html/imake.1.html
+usr/X11R6/lib/X11/doc/html/makedepend.1.html
+usr/X11R6/lib/X11/doc/html/lndir.1.html
+usr/X11R6/lib/X11/doc/html/makestrs.1.html
+usr/X11R6/lib/X11/doc/html/revpath.1.html
+usr/X11R6/lib/X11/doc/html/xmkmf.1.html
+usr/X11R6/lib/X11/doc/html/mkdirhier.1.html
+usr/X11R6/lib/X11/doc/html/gccmakedep.1.html
+usr/X11R6/lib/X11/doc/html/mergelib.1.html
+usr/X11R6/lib/X11/doc/html/makeg.1.html
+usr/X11R6/lib/X11/doc/html/cleanlinks.1.html
+usr/X11R6/lib/X11/doc/html/mkhtmlindex.1.html
+usr/X11R6/lib/X11/doc/html/ccmakedep.1.html
+usr/X11R6/lib/X11/doc/html/pswrap.1.html
+usr/X11R6/bin/imake
+usr/X11R6/bin/makedepend
+usr/X11R6/bin/lndir
+usr/X11R6/bin/makestrs
+usr/X11R6/bin/revpath
+usr/X11R6/bin/xmkmf
+usr/X11R6/bin/mkdirhier
+usr/X11R6/bin/gccmakedep
+usr/X11R6/bin/mergelib
+usr/X11R6/bin/makeg
+usr/X11R6/bin/cleanlinks
+usr/X11R6/bin/mkhtmlindex
+usr/X11R6/bin/ccmakedep
+usr/X11R6/bin/pswrap
+usr/X11R6/man/man1/imake.1x
+usr/X11R6/man/man1/makedepend.1x
+usr/X11R6/man/man1/lndir.1x
+usr/X11R6/man/man1/makestrs.1x
+usr/X11R6/man/man1/revpath.1x
+usr/X11R6/man/man1/xmkmf.1x
+usr/X11R6/man/man1/mkdirhier.1x
+usr/X11R6/man/man1/gccmakedep.1x
+usr/X11R6/man/man1/mergelib.1x
+usr/X11R6/man/man1/makeg.1x
+usr/X11R6/man/man1/cleanlinks.1x
+usr/X11R6/man/man1/mkhtmlindex.1x
+usr/X11R6/man/man1/ccmakedep.1x
+usr/X11R6/man/man1/pswrap.1x



Reply to: