Author: fabbione
Date: 2004-10-17 03:19:45 -0500 (Sun, 17 Oct 2004)
New Revision: 47
Added:
xorg-config/trunk/debian/MANIFEST.any
xorg-config/trunk/debian/shared/
xorg-config/trunk/debian/shared/arch.mk
xorg-config/trunk/debian/shared/check-manifest.mk
Modified:
xorg-config/trunk/debian/CHANGESETS
xorg-config/trunk/debian/rules
xorg-config/trunk/debian/xutils-devel.install
Log:
* Implement MANIFEST check:
+ Add shared script debian/shared/arch.mk to determine the architecture on
which the package is building.
+ Add shared script debian/shared/check-manifest.mk to implement a common
manifest check target.
+ Update debian/xutils-devel.install to install the new files.
+ Update debian/rules:
- Include local copy of arch.mk and check-manifest.mk.
- Update binary-arch and binary-indep target to use check-manifest.
- Update clean target to remove temporary MANIFEST files.
+ Add debian/MANIFEST.any.
Modified: xorg-config/trunk/debian/CHANGESETS
===================================================================
--- xorg-config/trunk/debian/CHANGESETS 2004-10-17 07:04:28 UTC (rev 46)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-17 08:19:45 UTC (rev 47)
@@ -60,4 +60,17 @@
+ Modify xutils-devel.install to add lintian override.
46
+* Implement MANIFEST check:
+ + Add shared script debian/shared/arch.mk to determine the architecture on
+ which the package is building.
+ + Add shared script debian/shared/check-manifest.mk to implement a common
+ manifest check target.
+ + Update debian/xutils-devel.install to install the new files.
+ + Update debian/rules:
+ - Include local copy of arch.mk and check-manifest.mk.
+ - Update binary-arch and binary-indep target to use check-manifest.
+ - Update clean target to remove temporary MANIFEST files.
+ + Add debian/MANIFEST.any.
+ 47
+
vim:set ai et sts=4 sw=4 tw=80:
Added: xorg-config/trunk/debian/MANIFEST.any
===================================================================
--- xorg-config/trunk/debian/MANIFEST.any 2004-10-17 07:04:28 UTC (rev 46)
+++ xorg-config/trunk/debian/MANIFEST.any 2004-10-17 08:19:45 UTC (rev 47)
@@ -0,0 +1,153 @@
+usr/bin/ccmakedep
+usr/bin/cleanlinks
+usr/bin/gccmakedep
+usr/bin/imake
+usr/bin/lndir
+usr/bin/makedepend
+usr/bin/makeg
+usr/bin/makestrs
+usr/bin/mergelib
+usr/bin/mkdirhier
+usr/bin/mkhtmlindex
+usr/bin/pswrap
+usr/bin/revpath
+usr/bin/xmkmf
+usr/share/doc/xorg/html/ccmakedep.1.html
+usr/share/doc/xorg/html/cleanlinks.1.html
+usr/share/doc/xorg/html/gccmakedep.1.html
+usr/share/doc/xorg/html/imake.1.html
+usr/share/doc/xorg/html/lndir.1.html
+usr/share/doc/xorg/html/makedepend.1.html
+usr/share/doc/xorg/html/makeg.1.html
+usr/share/doc/xorg/html/makestrs.1.html
+usr/share/doc/xorg/html/mergelib.1.html
+usr/share/doc/xorg/html/mkdirhier.1.html
+usr/share/doc/xorg/html/mkhtmlindex.1.html
+usr/share/doc/xorg/html/pswrap.1.html
+usr/share/doc/xorg/html/revpath.1.html
+usr/share/doc/xorg/html/xmkmf.1.html
+usr/share/lintian/overrides/xutils-devel
+usr/share/man/man1/ccmakedep.1x
+usr/share/man/man1/cleanlinks.1x
+usr/share/man/man1/gccmakedep.1x
+usr/share/man/man1/imake.1x
+usr/share/man/man1/lndir.1x
+usr/share/man/man1/makedepend.1x
+usr/share/man/man1/makeg.1x
+usr/share/man/man1/makestrs.1x
+usr/share/man/man1/mergelib.1x
+usr/share/man/man1/mkdirhier.1x
+usr/share/man/man1/mkhtmlindex.1x
+usr/share/man/man1/pswrap.1x
+usr/share/man/man1/revpath.1x
+usr/share/man/man1/xmkmf.1x
+usr/share/xorg/config/Amoeba.cf
+usr/share/xorg/config/apollo.cf
+usr/share/xorg/config/bsd.cf
+usr/share/xorg/config/bsdi.cf
+usr/share/xorg/config/bsdLib.rules
+usr/share/xorg/config/bsdLib.tmpl
+usr/share/xorg/config/cde.rules
+usr/share/xorg/config/cde.tmpl
+usr/share/xorg/config/convex.cf
+usr/share/xorg/config/cray.cf
+usr/share/xorg/config/cygwin.cf
+usr/share/xorg/config/cygwin.rules
+usr/share/xorg/config/cygwin.tmpl
+usr/share/xorg/config/darwin.cf
+usr/share/xorg/config/darwinLib.rules
+usr/share/xorg/config/darwinLib.tmpl
+usr/share/xorg/config/date.def
+usr/share/xorg/config/DGUX.cf
+usr/share/xorg/config/FreeBSD.cf
+usr/share/xorg/config/fujitsu.cf
+usr/share/xorg/config/generic.cf
+usr/share/xorg/config/gnu.cf
+usr/share/xorg/config/gnuLib.rules
+usr/share/xorg/config/gnuLib.tmpl
+usr/share/xorg/config/host.def
+usr/share/xorg/config/hp.cf
+usr/share/xorg/config/hpLib.rules
+usr/share/xorg/config/hpLib.tmpl
+usr/share/xorg/config/ibm.cf
+usr/share/xorg/config/ibmLib.rules
+usr/share/xorg/config/ibmLib.tmpl
+usr/share/xorg/config/Imake.cf
+usr/share/xorg/config/Imake.rules
+usr/share/xorg/config/Imake.tmpl
+usr/share/xorg/config/isc.cf
+usr/share/xorg/config/Library.tmpl
+usr/share/xorg/config/linux.cf
+usr/share/xorg/config/lnxdoc.rules
+usr/share/xorg/config/lnxdoc.tmpl
+usr/share/xorg/config/lnxLib.rules
+usr/share/xorg/config/lnxLib.tmpl
+usr/share/xorg/config/luna.cf
+usr/share/xorg/config/lynx.cf
+usr/share/xorg/config/mach.cf
+usr/share/xorg/config/macII.cf
+usr/share/xorg/config/minix.cf
+usr/share/xorg/config/Mips.cf
+usr/share/xorg/config/Motif.rules
+usr/share/xorg/config/Motif.tmpl
+usr/share/xorg/config/moto.cf
+usr/share/xorg/config/ncr.cf
+usr/share/xorg/config/nec.cf
+usr/share/xorg/config/necLib.rules
+usr/share/xorg/config/necLib.tmpl
+usr/share/xorg/config/NetBSD.cf
+usr/share/xorg/config/noop.rules
+usr/share/xorg/config/nto.cf
+usr/share/xorg/config/nto.rules
+usr/share/xorg/config/Oki.cf
+usr/share/xorg/config/oldlib.rules
+usr/share/xorg/config/OpenBSD.cf
+usr/share/xorg/config/os2.cf
+usr/share/xorg/config/os2Lib.rules
+usr/share/xorg/config/os2Lib.tmpl
+usr/share/xorg/config/os2.rules
+usr/share/xorg/config/osf1.cf
+usr/share/xorg/config/osfLib.rules
+usr/share/xorg/config/osfLib.tmpl
+usr/share/xorg/config/pegasus.cf
+usr/share/xorg/config/QNX4.cf
+usr/share/xorg/config/QNX4.rules
+usr/share/xorg/config/sco5.cf
+usr/share/xorg/config/sco.cf
+usr/share/xorg/config/scoLib.rules
+usr/share/xorg/config/sequent.cf
+usr/share/xorg/config/ServerLib.tmpl
+usr/share/xorg/config/Server.tmpl
+usr/share/xorg/config/sgi.cf
+usr/share/xorg/config/sgiLib.rules
+usr/share/xorg/config/sgiLib.tmpl
+usr/share/xorg/config/site.def
+usr/share/xorg/config/sony.cf
+usr/share/xorg/config/sun.cf
+usr/share/xorg/config/sunLib.rules
+usr/share/xorg/config/sunLib.tmpl
+usr/share/xorg/config/sv3Lib.rules
+usr/share/xorg/config/sv3Lib.tmpl
+usr/share/xorg/config/sv4Lib.rules
+usr/share/xorg/config/sv4Lib.tmpl
+usr/share/xorg/config/svr3.cf
+usr/share/xorg/config/svr4.cf
+usr/share/xorg/config/Threads.tmpl
+usr/share/xorg/config/ultrix.cf
+usr/share/xorg/config/usl.cf
+usr/share/xorg/config/version.def
+usr/share/xorg/config/Win32.cf
+usr/share/xorg/config/Win32.rules
+usr/share/xorg/config/WinLib.tmpl
+usr/share/xorg/config/X11.rules
+usr/share/xorg/config/X11.tmpl
+usr/share/xorg/config/x386.cf
+usr/share/xorg/config/xf86.rules
+usr/share/xorg/config/xf86site.def
+usr/share/xorg/config/xf86.tmpl
+usr/share/xorg/config/xfree86.cf
+usr/share/xorg/config/xorg.cf
+usr/share/xorg/config/xorgsite.def
+usr/share/xorg/config/xorg.tmpl
+usr/share/xorg/dbuild-scripts/arch.mk
+usr/share/xorg/dbuild-scripts/check-manifest.mk
Modified: xorg-config/trunk/debian/rules
===================================================================
--- xorg-config/trunk/debian/rules 2004-10-17 07:04:28 UTC (rev 46)
+++ xorg-config/trunk/debian/rules 2004-10-17 08:19:45 UTC (rev 47)
@@ -22,6 +22,12 @@
include $(SCRIPT_DIR)/dpkg-arch.mk
endif
+# Determine our architecture.
+include debian/shared/arch.mk
+
+# Import standard check-manifest.
+include debian/shared/check-manifest.mk
+
configure: $(STAMP_DIR)/configure
$(STAMP_DIR)/configure: $(patched)
dh_testdir
@@ -54,11 +60,16 @@
abspath=`pwd` && \
cd $(SOURCE_TREE)/config && \
$(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 common Debian build scripts.
+ install -d -m 755 debian/tmp/usr/share/xorg/dbuild-scripts/
+ 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
touch $@
-binary-arch: install
+binary-arch: check-manifest
dh_testdir
dh_install --sourcedir=debian/tmp
dh_installchangelogs -a
@@ -71,7 +82,7 @@
dh_md5sums -a
dh_builddeb -a
-binary-indep: install
+binary-indep: check-manifest
dh_testdir
binary: binary-arch binary-indep
@@ -79,7 +90,7 @@
clean:
dh_testdir
dh_clean
- rm -rf debian/tmp
+ rm -rf debian/tmp debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
perl $(SCRIPT_DIR)/dbs_split clean
Added: xorg-config/trunk/debian/shared/arch.mk
===================================================================
--- xorg-config/trunk/debian/shared/arch.mk 2004-10-17 07:04:28 UTC (rev 46)
+++ xorg-config/trunk/debian/shared/arch.mk 2004-10-17 08:19:45 UTC (rev 47)
@@ -0,0 +1,24 @@
+#!/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$
+
+# Determine our architecture.
+BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+# Work around some old-time dpkg braindamage.
+BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH))
+# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation
policy.
+ifdef DEB_HOST_ARCH
+ ARCH:=$(DEB_HOST_ARCH)
+else
+# dpkg-cross sets the ARCH environment variable; if set, use it.
+ ifdef ARCH
+ ARCH:=$(ARCH)
+ else
+ ARCH:=$(BUILD_ARCH)
+ endif
+endif
+
+# vim:set noet ai sts=8 sw=8 tw=0:
Property changes on: xorg-config/trunk/debian/shared/arch.mk
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xorg-config/trunk/debian/shared/check-manifest.mk
===================================================================
--- xorg-config/trunk/debian/shared/check-manifest.mk 2004-10-17 07:04:28 UTC
(rev 46)
+++ xorg-config/trunk/debian/shared/check-manifest.mk 2004-10-17 08:19:45 UTC
(rev 47)
@@ -0,0 +1,41 @@
+#!/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$
+
+check-manifest: $(STAMP_DIR)/check-manifest
+$(STAMP_DIR)/check-manifest: $(STAMP_DIR)/install
+ # compare manifests
+ dh_testdir
+ (cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-)
>debian/MANIFEST.$(ARCH).new
+ # Construct MANIFEST files from MANIFEST.$(ARCH).in or MANIFEST.any
+ if [ -e debian/MANIFEST.$(ARCH).in ]; then \
+ LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH);
\
+ else \
+ LC_ALL=C sort -u debian/MANIFEST.any >debian/MANIFEST.$(ARCH); \
+ fi
+ if [ -e debian/MANIFEST.$(ARCH) ]; then \
+ if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then
\
+ diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new ||
DIFFSTATUS=$$?; \
+ case $${DIFFSTATUS:-0} in \
+ 0) ;; \
+ 1) if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \
+ echo 'MANIFEST check failed; ignoring problem because
\$$IGNORE_MANIFEST_CHANGES set' >&2; \
+ echo 'Please ensure that the package maintainer has an
up-to-date version of the' >&2; \
+ echo 'MANIFEST.$(ARCH) file.' >&2; \
+ else \
+ echo 'MANIFEST check failed; please see debian/README' >&2; \
+ exit 1; \
+ fi; \
+ ;; \
+ *) echo "diff reported unexpected exit status $$DIFFSTATUS when
performing MANIFEST check" >&2; \
+ exit 1; \
+ ;; \
+ esac; \
+ fi; \
+ fi
+ touch $@
+
+# vim:set noet ai sts=8 sw=8 tw=0:
Property changes on: xorg-config/trunk/debian/shared/check-manifest.mk
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xorg-config/trunk/debian/xutils-devel.install
===================================================================
--- xorg-config/trunk/debian/xutils-devel.install 2004-10-17 07:04:28 UTC
(rev 46)
+++ xorg-config/trunk/debian/xutils-devel.install 2004-10-17 08:19:45 UTC
(rev 47)
@@ -149,3 +149,5 @@
usr/share/xorg/config/xorg.cf
usr/share/xorg/config/xorgsite.def
usr/share/xorg/config/xorg.tmpl
+usr/share/xorg/dbuild-scripts/arch.mk
+usr/share/xorg/dbuild-scripts/check-manifest.mk
