Here is a patch for the xfree86-4.3.0/debian/ directory as of the June 21
nightly snapshot from the xsf svn that converts to the newest dbs building
scheme.
There are a few deleted files.
debian/
doogie-build-system
debian/scripts/
fix.source.patch
patch.apply
patch.unapply
source.patch
source.unpack
unfix.source.patch
You must also put the xfree tarball directly into the xfree86-4.3.0 directory
now, and change your .orig.tar.gz accodingly.
The root of the package directory now looks like:
xfree86-4.3.0/
debian/
xfree86-4.3.0.tar.bz2
before building now.
Warren
--
Treasurer, GOLUM, Inc.
http://www.golum.org
Only in ../../xfree/xfree86-4.3.0/debian/: doogie-build-system
diff -ru3 debian/po/ca.po ../../xfree/xfree86-4.3.0/debian/po/ca.po
--- debian/po/ca.po 2003-06-23 03:44:14.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/ca.po 2003-06-21 00:02:58.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfree86 4.2.1-6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: 2003-03-04 10:26+0100\n"
"Last-Translator: Ivan Vilata i Balaguer <[EMAIL PROTECTED]>\n"
"Language-Team: Catalan <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/da.po ../../xfree/xfree86-4.3.0/debian/po/da.po
--- debian/po/da.po 2003-06-23 03:44:14.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/da.po 2003-06-21 00:02:58.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/de.po ../../xfree/xfree86-4.3.0/debian/po/de.po
--- debian/po/de.po 2003-06-23 03:44:14.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/de.po 2003-06-21 00:03:00.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/es.po ../../xfree/xfree86-4.3.0/debian/po/es.po
--- debian/po/es.po 2003-06-23 03:44:15.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/es.po 2003-06-21 00:02:59.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/fr.po ../../xfree/xfree86-4.3.0/debian/po/fr.po
--- debian/po/fr.po 2003-06-23 03:44:15.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/fr.po 2003-06-21 00:03:00.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/gl.po ../../xfree/xfree86-4.3.0/debian/po/gl.po
--- debian/po/gl.po 2003-06-23 03:44:15.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/gl.po 2003-06-21 00:02:58.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/it.po ../../xfree/xfree86-4.3.0/debian/po/it.po
--- debian/po/it.po 2003-06-23 03:44:15.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/it.po 2003-06-21 00:03:02.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/ja.po ../../xfree/xfree86-4.3.0/debian/po/ja.po
--- debian/po/ja.po 2003-06-23 03:44:16.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/ja.po 2003-06-21 00:03:01.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/nl.po ../../xfree/xfree86-4.3.0/debian/po/nl.po
--- debian/po/nl.po 2003-06-23 03:44:16.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/nl.po 2003-06-21 00:03:01.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/pl.po ../../xfree/xfree86-4.3.0/debian/po/pl.po
--- debian/po/pl.po 2003-06-23 03:44:16.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/pl.po 2003-06-21 00:03:01.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/pt_BR.po ../../xfree/xfree86-4.3.0/debian/po/pt_BR.po
--- debian/po/pt_BR.po 2003-06-23 03:44:17.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/pt_BR.po 2003-06-21 00:02:59.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfree86-4.2.1-5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: 2003-02-01 16:16-0200\n"
"Last-Translator: André Luís Lopes <[EMAIL PROTECTED]>\n"
"Language-Team: Debian-BR Project <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/ru.po ../../xfree/xfree86-4.3.0/debian/po/ru.po
--- debian/po/ru.po 2003-06-23 03:44:18.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/ru.po 2003-06-21 00:02:59.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Serge Winitzki <[EMAIL PROTECTED]>\n"
"Language-Team: Russian <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/sv.po ../../xfree/xfree86-4.3.0/debian/po/sv.po
--- debian/po/sv.po 2003-06-23 03:44:18.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/sv.po 2003-06-21 00:03:00.000000000 -0500
@@ -10,8 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
diff -ru3 debian/po/templates.pot ../../xfree/xfree86-4.3.0/debian/po/templates.pot
--- debian/po/templates.pot 2003-06-23 03:44:18.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/po/templates.pot 2003-06-21 00:02:57.000000000 -0500
@@ -15,8 +15,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-06-23 03:44-0500\n"
+"POT-Creation-Date: 2003-04-20 12:41+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
diff -ru3 debian/rules ../../xfree/xfree86-4.3.0/debian/rules
--- debian/rules 2003-06-23 01:53:40.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/rules 2003-06-21 00:02:46.000000000 -0500
@@ -12,21 +12,17 @@
# default rule to keep things from going nuts by accident
default: environment
-# debhelper
-export DH_COMPAT=4
-export DH_OPTIONS
+checksource: source.make
+ $(checksource_command)
-# Include Adam Heath's source archive/patch handling system.
-#include debian/doogie-build-system
-SCRIPT_DIR = /usr/share/dbs
+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
-TAR_DIR = xc
-include $(SCRIPT_DIR)/dbs-build.mk
-
-# dpkg-arch rules
-ifeq (,$(DEB_BUILD_GNU_TYPE))
- include $(SCRIPT_DIR)/dpkg-arch.mk
-endif
+# Include Adam Heath's source archive/patch handling system.
+include debian/doogie-build-system
# oh my God, this is a gross hack
ELSE:=else
@@ -36,6 +32,10 @@
DUMMY:=$(shell if [ ! -x debian/setperms ]; then chmod 755 debian/setperms; fi)
DUMMY:=$(shell debian/setperms)
+# debhelper
+export DH_COMPAT=4
+export DH_OPTIONS
+
# workaround for an aggressive overfeature of groff
export GROFF_NO_SGR=1
@@ -149,10 +149,10 @@
# Tell debconf that -dbg.templates is gone.
debconf2po-update
-clean: cleanscripts
+clean: source.clean cleanscripts
dh_testdir
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
- perl $(SCRIPT_DIR)/dbs_split clean
+ dh_testroot
+ rm -rf $(STAMP_DIR) $(DEBTREEDIR)
dh_clean debian/local/xserver-wrapper debian/local/xterm.faq.text.gz debian/MANIFEST.$(ARCH).new # debian/local/XFree86-FAQ.text.gz
rm -rf debian/local/exports debian/local/xlibmesa-drm-src/modules
@@ -199,14 +199,11 @@
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)/stamp-build
-$(STAMP_DIR)/stamp-build: $(patched) $(STAMP_DIR)/genscripts
+build: $(STAMP_DIR)/build
+$(STAMP_DIR)/build: $(STAMP_DIR)/source.make $(STAMP_DIR)/genscripts
dh_testdir
+ $(checksource_command)
# shoot me now. please.
# copy Xft stuff into exports/{lib,include} so we don't have to pull
@@ -253,7 +250,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)/stamp-build
+$(STAMP_DIR)/install: $(STAMP_DIR)/build
dh_testdir
dh_testroot
ifndef test_rules
@@ -366,7 +363,7 @@
binary-indep: $(STAMP_DIR)/binary-indep
$(STAMP_DIR)/binary-indep: DH_OPTIONS=-i
-$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/stamp-build $(STAMP_DIR)/install
+$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/build $(STAMP_DIR)/install
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
@@ -398,7 +395,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)/stamp-build $(STAMP_DIR)/install
+$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/build $(STAMP_DIR)/install
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
@@ -478,8 +475,9 @@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE build RULE ABOVE
build-server: $(STAMP_DIR)/build-server
-$(STAMP_DIR)/build-server: $(patched) $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/build-server: $(STAMP_DIR)/source.make $(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
@@ -559,7 +557,7 @@
touch $@
.PHONY: build build-arch build-install install clean binary-arch binary-indep binary
-.PHONY: default environment
+.PHONY: default environment checksource
.PHONY: build-server install-server binary-server
.PHONY: cleanscripts
Only in ../../xfree/xfree86-4.3.0/debian/scripts: fix.source.patch
Only in ../../xfree/xfree86-4.3.0/debian/scripts: patch.apply
Only in ../../xfree/xfree86-4.3.0/debian/scripts: patch.unapply
Only in ../../xfree/xfree86-4.3.0/debian/scripts: source.patch
Only in ../../xfree/xfree86-4.3.0/debian/scripts: source.unpack
Only in ../../xfree/xfree86-4.3.0/debian/scripts: unfix.source.patch
diff -ru3 debian/scripts/vars ../../xfree/xfree86-4.3.0/debian/scripts/vars
--- debian/scripts/vars 2003-06-23 01:27:02.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/scripts/vars 2003-06-21 00:01:00.000000000 -0500
@@ -12,4 +12,4 @@
# debian/rules to know when certain targets are done.
SOURCE_TREE=build-tree/xc
SOURCE_DIR=build-tree
-#STAMP_DIR=debian/stampdir
+STAMP_DIR=debian/stampdir
diff -ru3 debian/setperms ../../xfree/xfree86-4.3.0/debian/setperms
--- debian/setperms 2003-06-23 00:51:54.000000000 -0500
+++ ../../xfree/xfree86-4.3.0/debian/setperms 2003-06-21 00:02:20.000000000 -0500
@@ -2,7 +2,17 @@
set -e
-for FILE in getglibcversion \
+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 \
vars*; do
chmod 755 debian/scripts/$FILE
done
