[Fakeroot-commits] [SCM] fakeroot branch, master, updated. debian/1.14.3-6-gfcaffaa

[Clint Adams]

The following commit has been merged in the master branch:
commit c3b4d1f463601694ea08cba9c0f28e006207dbe2
Author: Clint Adams <schizo at debian.org>
Date:   Sun Nov 8 21:06:34 2009 -0500

    Adapt prebuild to preroll for upstream separation.

diff --git a/Makefile.am b/Makefile.am
index ba6fd6d..d382d03 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,8 @@ EXTRA_DIST=wrapawk wrapfunc.inp                        \
            debian/rules debian/changelog debian/control  \
 	   message.h \
 	   DEBUG BUGS \
-	   setenv.c
+	   setenv.c \
+	   preroll
 
 CLEAN_FILES=fakerootconfig.h
 
diff --git a/debian/rules b/debian/rules
index 7320d0c..d919d0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,8 +33,6 @@ BIARCH_LIB_DIR=usr/lib64
 endif
 endif
 
-fakeroot_version := $(shell dpkg-parsechangelog | sed -n '/^Version: \(.*\)$$/ {s//\1/;p}')
-
 build: build-stamp
 build-stamp:
 	$(checkdir)
@@ -220,16 +218,7 @@ binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary checkroot prebuild
 
 prebuild:
-	printf "define(FAKEROOT_VERSION, %s)\n" $(fakeroot_version) >acinclude.m4
-
-	autoreconf -fi
-
-	cd doc && po4a -k 0 --rm-backups --variable "srcdir=$(CURDIR)/doc/" po4a/po4a.cfg
-
-#	./configure
-#	$(MAKE) dist
-#	mv fakeroot-$(fakeroot_version).tar.gz ../fakeroot_$(fakeroot_version).tar.gz
-#	$(MAKE) distclean
+	@echo prebuild handled differently now
 
 define checkdir
 	test -f debian/rules
diff --git a/preroll b/preroll
new file mode 100755
index 0000000..874644a
--- /dev/null
+++ b/preroll
@@ -0,0 +1,11 @@
+#!/bin/sh -v
+
+mkdir build-aux
+
+[ -n "${DEB_VERSION}" ] || exit 1
+
+printf "define(FAKEROOT_VERSION, %s)\n" "${DEB_VERSION%-*}" >acinclude.m4 || exit 1
+autoreconf -fi || exit 1
+(cd doc && po4a -k 0 --rm-backups --variable "srcdir=../doc/" po4a/po4a.cfg) || exit 1
+
+rm -rf autom4te.cache build-aux

-- 
fakeroot