X Strike Force SVN commit: rev 316 - in branches/4.3.0/sid/debian: . scripts
Author: branden
Date: 2003-07-27 22:32:40 -0500 (Sun, 27 Jul 2003)
New Revision: 316
Removed:
branches/4.3.0/sid/debian/doogie-build-system
branches/4.3.0/sid/debian/scripts/fix.source.patch
branches/4.3.0/sid/debian/scripts/patch.apply
branches/4.3.0/sid/debian/scripts/patch.unapply
branches/4.3.0/sid/debian/scripts/source.patch
branches/4.3.0/sid/debian/scripts/source.unpack
branches/4.3.0/sid/debian/scripts/unfix.source.patch
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/control
branches/4.3.0/sid/debian/rules
branches/4.3.0/sid/debian/scripts/vars
branches/4.3.0/sid/debian/setperms
Log:
Convert to using the packaged version of Debian n?\195?\169e Doogie's Build System.
debian/control: build-depend on dbs
debian/rules:
* use DBS
* stop calling debconf2po-update, per Denis Barbier (Closes: #172579)
debian/scripts/vars: DBS knows where the stampdir is
debian/setperms: no longer need to enforce permissions on local version of
DBS
debian/{doogie-build-system,scripts/{fix.source.patch,patch.apply,
patch.unapply,source.patch,source.unpack,unfix.source.patch}: deleted in
favor of DBS
Thanks to Warren Turkal for most of this changeset.
Modified: branches/4.3.0/sid/debian/changelog
==============================================================================
--- branches/4.3.0/sid/debian/changelog 2003-07-28 00:59:20 UTC (rev 315)
+++ branches/4.3.0/sid/debian/changelog 2003-07-28 03:32:40 UTC (rev 316)
@@ -11,6 +11,20 @@
Uni) and ISHIKAWA Mutsumi. A proper changelog entry for this release may
not be possible even if God Himself grabbed my keyboard away from me.
+ * converted package build process to use packaged version of DBS, courtesy
+ of Warren Turkal
+ - debian/control: build-depend on dbs
+ - debian/rules: use DBS
+ - debian/scripts/vars: DBS knows where the stampdir is
+ - debian/setperms: no longer need to enforce permissions on local version of
+ DBS
+ - debian/{doogie-build-system,scripts/{fix.source.patch,patch.apply,
+ patch.unapply,source.patch,source.unpack,unfix.source.patch}: deleted in
+ favor of DBS
+
+ * debian/rules: stop calling debconf2po-update, per Denis Barbier
+ (Closes: #172579)
+
* remove special-case logic in linux.cf that defined "HasLinuxInput" to
"NO" for Mc68020Architecture:
- m68k is now supported by the Linux 2.4.20 kernel (at least in
Modified: branches/4.3.0/sid/debian/control
==============================================================================
--- branches/4.3.0/sid/debian/control 2003-07-28 00:59:20 UTC (rev 315)
+++ branches/4.3.0/sid/debian/control 2003-07-28 03:32:40 UTC (rev 316)
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <branden@debian.org>
Standards-Version: 3.5.10
-Build-Depends: dpkg (>= 1.7.0), cpp-3.2, flex, bison, bsdmainutils, m4, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>> 2001.01.26) [i386], libglide3-alpha-dev [alpha], kernel-headers-2.4 [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh sparc], libpng12-0-dev | libpng-dev (>= 1.2.1), libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev, libxrender-dev, libxcursor-dev, libstdc++5-dev | libstdc++-dev
+Build-Depends: dbs, dpkg (>= 1.7.0), cpp-3.2, flex, bison, bsdmainutils, m4, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>> 2001.01.26) [i386], libglide3-alpha-dev [alpha], kernel-headers-2.4 [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh sparc], libpng12-0-dev | libpng-dev (>= 1.2.1), libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev, libxrender-dev, libxcursor-dev, libstdc++5-dev | libstdc++-dev
Package: lbxproxy
Architecture: any
Deleted: branches/4.3.0/sid/debian/doogie-build-system
==============================================================================
--- branches/4.3.0/sid/debian/doogie-build-system 2003-07-28 00:59:20 UTC (rev 315)
+++ branches/4.3.0/sid/debian/doogie-build-system 2003-07-28 03:32:40 UTC (rev 316)
@@ -1,65 +0,0 @@
-#!/usr/bin/make -f
-# Debian rules file for XFree86
-# Originally by Stephen Early <sde1000@debian.org>
-# Modified by Mark W. Eichin <eichin@kitten.gen.ma.us>
-# Modified by Branden Robinson <branden@debian.org>
-# Complete overhaul by Adam Heath <doogie@debian.org>
-
-patchapply: debian/stampdir/patchapply
-debian/stampdir/patchapply: debian/stampdir/source.build
- debian/scripts/patch.apply
- touch $@
- rm -f debian/stampdir/patchunapply
-
-patchunapply: debian/stampdir/patchunapply
-debian/stampdir/patchunapply: debian/stampdir/source.build
- debian/scripts/patch.unapply
- touch $@
- rm -f debian/stampdir/patchapply
-
-.export: SOURCE_TREE
-
-#
-# The rules that really do the work all start with debian/stampdir/
-# This little trick allows us to use stamp files to keep us from
-# having to rerun long targets over and over. It also puts
-# all stamp files in one place, for easy cleaning.
-#
-# If a stampdir rule depends on something else, be sure it is
-# another stampdir rule. Depending on base rule won't work.
-#
-
-source.build: debian/stampdir/source.build
-debian/stampdir/source.build: debian/stampdir/source.unpack debian/stampdir/source.patch
- touch $@
-
-source.clean: unfix.source.patch
- rm -rf $(SOURCE_DIR) debian/stampdir/upstream debian/stampdir/patches
- rm -f $(patsubst %,debian/stampdir/%,source.build source.make source.unpack fix.source.patch)
-
-source.make: debian/stampdir/source.make
-debian/stampdir/source.make: debian/stampdir/source.build debian/stampdir/patchapply
- touch $@
-
-source.unpack: debian/stampdir/source.unpack
-debian/stampdir/source.unpack:
- debian/scripts/source.unpack
- touch $@
-
-source.patch: debian/stampdir/source.patch
-debian/stampdir/source.patch: debian/stampdir/source.unpack debian/stampdir/fix.source.patch
- debian/scripts/source.patch
- touch $@
-
-fix.source.patch: debian/stampdir/fix.source.patch
-debian/stampdir/fix.source.patch:
- debian/scripts/fix.source.patch
- touch $@
-
-unfix.source.patch: debian/stampdir/unfix.source.patch
-debian/stampdir/unfix.source.patch:
- debian/scripts/unfix.source.patch
- touch $@
-
-DIR_TARGETS+=debian/stampdir
-# STAMPDIR_TARGETS+=source.make source.unpack source.patch fix.source.patch unfix.source.patch patchunapply patchunapply
Modified: branches/4.3.0/sid/debian/rules
==============================================================================
--- branches/4.3.0/sid/debian/rules 2003-07-28 00:59:20 UTC (rev 315)
+++ branches/4.3.0/sid/debian/rules 2003-07-28 03:32:40 UTC (rev 316)
@@ -12,18 +12,20 @@
# default rule to keep things from going nuts by accident
default: environment
-checksource: source.make
- $(checksource_command)
+# debhelper
+export DH_OPTIONS
-define checksource_command
- # make sure all the patches applied cleanly
- @if grep -v '^patch' debian/stampdir/patches/*.log; then echo "Some patches did not apply cleanly. Please investigate." >&2; exit 1; fi
- # yes, they did
-endef
+# Use the DBS archive/patch handling system.
+SCRIPT_DIR = /usr/share/dbs
-# Include Adam Heath's source archive/patch handling system.
-include debian/doogie-build-system
+TAR_DIR = xc
+include $(SCRIPT_DIR)/dbs-build.mk
+# dpkg-arch rules
+ifeq (,$(DEB_BUILD_GNU_TYPE))
+ include $(SCRIPT_DIR)/dpkg-arch.mk
+endif
+
# oh my God, this is a gross hack
ELSE:=else
M4:=m4
@@ -32,9 +34,6 @@
DUMMY:=$(shell if [ ! -x debian/setperms ]; then chmod 755 debian/setperms; fi)
DUMMY:=$(shell debian/setperms)
-# debhelper
-export DH_OPTIONS
-
# workaround for an aggressive overfeature of groff
export GROFF_NO_SGR=1
@@ -141,14 +140,12 @@
cleanscripts:
rm -f debian/*.config debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
rm -f debian/xserver-xfree86-dbg.templates
- # tell po-debconf xserver-xfree86-dbg.templates is gone
- debconf2po-update
rm -f $(STAMP_DIR)/genscripts
-clean: source.clean cleanscripts
+clean: cleanscripts
dh_testdir
- dh_testroot
- rm -rf $(STAMP_DIR) $(DEBTREEDIR)
+ rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ perl $(SCRIPT_DIR)/dbs_split clean
rm -rf debian/local/exports debian/local/xlibmesa-drm-src/modules
dh_clean debian/local/xserver-wrapper debian/local/xterm.faq.text.gz debian/MANIFEST.$(ARCH).new
@@ -192,15 +189,16 @@
# don't forget the templates file, which doesn't need any substitutions
cp debian/xserver-xfree86.templates \
debian/xserver-xfree86-dbg.templates
- # tell po-debconf xserver-xfree86-dbg.templates is here
- debconf2po-update
touch $@
+configure: $(STAMP_DIR)/stamp-configure
+$(STAMP_DIR)/stamp-configure: $(patched)
+ dh_testdir
+
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE build-server RULE BELOW
-build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: $(STAMP_DIR)/source.make $(STAMP_DIR)/genscripts
+build: $(STAMP_DIR)/stamp-build
+$(STAMP_DIR)/stamp-build: $(patched) $(STAMP_DIR)/genscripts
dh_testdir
- $(checksource_command)
# copy Xft stuff into exports/{lib,include} so we don't have to pull
# in -L/usr/include and other, similarly ugly, stuff (including, but
@@ -244,7 +242,7 @@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE install-server RULE BELOW
install: $(STAMP_DIR)/install
-$(STAMP_DIR)/install: $(STAMP_DIR)/build
+$(STAMP_DIR)/install: $(STAMP_DIR)/stamp-build
dh_testdir
dh_testroot
ifndef test_rules
@@ -356,7 +354,7 @@
binary-indep: $(STAMP_DIR)/binary-indep
$(STAMP_DIR)/binary-indep: DH_OPTIONS=-i
-$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/build $(STAMP_DIR)/install
+$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/stamp-build $(STAMP_DIR)/install
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
@@ -388,7 +386,7 @@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE binary-server RULE BELOW
binary-arch: $(STAMP_DIR)/binary-arch
$(STAMP_DIR)/binary-arch: DH_OPTIONS=-s
-$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/build $(STAMP_DIR)/install
+$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/stamp-build $(STAMP_DIR)/install
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
@@ -468,9 +466,8 @@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE build RULE ABOVE
build-server: $(STAMP_DIR)/build-server
-$(STAMP_DIR)/build-server: $(STAMP_DIR)/source.make $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/build-server: $(patched) $(STAMP_DIR)/genscripts
dh_testdir
- $(checksource_command)
# create source tree for static, debuggable XFree86 server
mkdir $(SOURCE_TREE)-xserver-xfree86-dbg
# we don't copy the doc, fonts or nls directories to save space; see
@@ -550,7 +547,7 @@
touch $@
.PHONY: build build-arch build-install install clean binary-arch binary-indep binary
-.PHONY: default environment checksource
+.PHONY: default environment
.PHONY: build-server install-server binary-server
.PHONY: cleanscripts
Deleted: branches/4.3.0/sid/debian/scripts/fix.source.patch
==============================================================================
--- branches/4.3.0/sid/debian/scripts/fix.source.patch 2003-07-28 00:59:20 UTC (rev 315)
+++ branches/4.3.0/sid/debian/scripts/fix.source.patch 2003-07-28 03:32:40 UTC (rev 316)
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-. debian/scripts/vars
-
-if [ ! -e debian/fixpatch ]; then
- exit 0
-fi
-
-mkdir -p $STAMP_DIR/upstream/fixpatch upstream
-
-for f in $(find debian/fixpatch -type f | sort); do
- stampfile=$STAMP_DIR/upstream/fixpatch/$(basename $f)
- if [ ! -e $stampfile ]; then
- echo -n "Fixing upstream patch $f..."
- case "$f" in
- *.gz) cmd=zcat ;;
- *.bz) cmd=bzcat ;;
- *.bz2) cmd=bz2cat ;;
- *) cmd=cat ;;
- esac
- if $cmd $f | (cd upstream; patch -p1 ) > $stampfile.log; then
- echo "done."
- touch $stampfile
- else
- echo "failed!"
- exit 1
- fi
- else
- echo "upstream patch fix $f already applied."
- fi
-done
Deleted: branches/4.3.0/sid/debian/scripts/patch.apply
==============================================================================
--- branches/4.3.0/sid/debian/scripts/patch.apply 2003-07-28 00:59:20 UTC (rev 315)
+++ branches/4.3.0/sid/debian/scripts/patch.apply 2003-07-28 03:32:40 UTC (rev 316)
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-LC_COLLATE=C
-
-. debian/scripts/vars
-
-[ ! -d debian/patches ] && exit
-
-mkdir -p $STAMP_DIR/patches $SOURCE_TREE
-
-for f in $(find debian/patches \( -type f -or -type l \) -not -name "*~" | sort); do
- stampfile=$STAMP_DIR/patches/$(basename $f)
- if [ ! -e $stampfile ]; then
- echo -n "Applying patch $f..."
- case "$f" in
- *.gz) cmd=zcat ;;
- *.bz) cmd=bzcat ;;
- *.bz2) cmd=bz2cat ;;
- *) cmd=cat ;;
- esac
- if ! $cmd $f | (cd $SOURCE_TREE; patch --dry-run -p1) > $stampfile.log; then
- echo "dry run failed."
- cat $stampfile.log
- exit 1
- fi
- if $cmd $f | (cd $SOURCE_TREE; patch -p1) > $stampfile.log; then
- echo "done."
- touch $stampfile
- else
- echo "failed!"
- exit 1
- fi
- else
- echo "Patch $f already applied."
- fi
-done
Deleted: branches/4.3.0/sid/debian/scripts/patch.unapply
==============================================================================
--- branches/4.3.0/sid/debian/scripts/patch.unapply 2003-07-28 00:59:20 UTC (rev 315)
+++ branches/4.3.0/sid/debian/scripts/patch.unapply 2003-07-28 03:32:40 UTC (rev 316)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-LC_COLLATE=C
-
-. debian/scripts/vars
-
-mkdir -p $STAMP_DIR/patches/
-
-for f in $(find debian/patches -type f -not -name "*~" | sort -r); do
- stampfile=$STAMP_DIR/patches/`basename $f`
- if [ -e $stampfile ]; then
- echo -n "Reversing patch $f"
- case "$f" in
- *.gz) cmd=zcat ;;
- *.bz) cmd=bzcat ;;
- *.bz2) cmd=bz2cat ;;
- *) cmd=cat ;;
- esac
- if $cmd $f | (cd $PATCH_TREE; patch -R -p1) > $stampfile.log; then
- echo " successful."
- rm $stampfile
- else
- echo " failed!"
- exit 1
- fi
- else
- echo "Patch $f not applied."
- fi
-done
Deleted: branches/4.3.0/sid/debian/scripts/source.patch
==============================================================================
--- branches/4.3.0/sid/debian/scripts/source.patch 2003-07-28 00:59:20 UTC (rev 315)
+++ branches/4.3.0/sid/debian/scripts/source.patch 2003-07-28 03:32:40 UTC (rev 316)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-. debian/scripts/vars
-
-[ ! -d upstream/patches ] && exit
-
-mkdir -p $STAMP_DIR/upstream/patches/ $SOURCE_TREE
-
-for f in `find upstream/patches -type f | sort`; do
- stampfile=$STAMP_DIR/upstream/patches/`basename $f`
- if [ ! -e $stampfile ]; then
- echo -n "Applying upstream patch $f..."
- case "$f" in
- *.gz) cmd=zcat;;
- *.bz) cmd=bzcat;;
- *.bz2) cmd=bz2cat;;
- *) cmd=cat;;
- esac
- if $cmd $f | (cd $SOURCE_TREE; patch -p1) > $stampfile.log; then
- echo "done."
- touch $stampfile
- else
- echo "failed!"
- exit 1
- fi
- else
- echo "upstream patch $f already applied."
- fi
-done
Deleted: branches/4.3.0/sid/debian/scripts/source.unpack
==============================================================================
--- branches/4.3.0/sid/debian/scripts/source.unpack 2003-07-28 00:59:20 UTC (rev 315)
+++ branches/4.3.0/sid/debian/scripts/source.unpack 2003-07-28 03:32:40 UTC (rev 316)
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-. debian/scripts/vars
-
-mkdir -p $STAMP_DIR/upstream/archives/ $SOURCE_DIR
-
-for f in $(find upstream/archives -type f | sort); do
- stampfile=$STAMP_DIR/upstream/archives/$(basename $f)
- if [ ! -e $stampfile ]; then
- case $f in
- *.gz|*.tgz) cmd=zcat;;
- *.bz) cmd=bzcat;;
- *.bz2) cmd=bzcat;;
- *) cmd=cat;;
- esac
- echo -n "Extracting upstream archive $f..."
- if $cmd $f | (cd $SOURCE_DIR; tar xvf -) > $stampfile.log; then
- echo "done."
- touch $stampfile
- else
- echo "failed!"
- exit 1
- fi
- else
- echo "upstream archive $f already extracted."
- fi
-done
Deleted: branches/4.3.0/sid/debian/scripts/unfix.source.patch
==============================================================================
--- branches/4.3.0/sid/debian/scripts/unfix.source.patch 2003-07-28 00:59:20 UTC (rev 315)
+++ branches/4.3.0/sid/debian/scripts/unfix.source.patch 2003-07-28 03:32:40 UTC (rev 316)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-. debian/scripts/vars
-
-mkdir -p $STAMP_DIR/upstream/fixpatch upstream
-
-[ ! -e debian/fixpatch ] && exit
-
-for f in $(find debian/fixpatch -type f | sort); do
- stampfile=$STAMP_DIR/upstream/fixpatch/$(basename $f)
- if [ -e $stampfile ]; then
- echo -n "Unfixing upstream patch $f..."
- case "$f" in
- *.gz) cmd=zcat;;
- *.bz) cmd=bzcat;;
- *.bz2) cmd=bz2cat;;
- *) cmd=cat;;
- esac
- if $cmd $f | (cd upstream; patch -p1 -R ) > $stampfile.log; then
- echo "done."
- rm $stampfile
- else
- echo "failed!"
- exit 1
- fi
- else
- echo "upstream patch fix $f already reversed."
- fi
-done
Modified: branches/4.3.0/sid/debian/scripts/vars
==============================================================================
--- branches/4.3.0/sid/debian/scripts/vars 2003-07-28 00:59:20 UTC (rev 315)
+++ branches/4.3.0/sid/debian/scripts/vars 2003-07-28 03:32:40 UTC (rev 316)
@@ -12,4 +12,3 @@
# debian/rules to know when certain targets are done.
SOURCE_TREE=build-tree/xc
SOURCE_DIR=build-tree
-STAMP_DIR=debian/stampdir
Modified: branches/4.3.0/sid/debian/setperms
==============================================================================
--- branches/4.3.0/sid/debian/setperms 2003-07-28 00:59:20 UTC (rev 315)
+++ branches/4.3.0/sid/debian/setperms 2003-07-28 03:32:40 UTC (rev 316)
@@ -2,17 +2,7 @@
set -e
-for FILE in doogie-build-system; do
- chmod 755 debian/$FILE
-done
-
-for FILE in fix.source.patch \
- getglibcversion \
- patch.apply \
- patch.unapply \
- source.patch \
- source.unpack \
- unfix.source.patch \
+for FILE in getglibcversion \
vars*; do
chmod 755 debian/scripts/$FILE
done
Reply to: