[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 67383973173810867d189639912ca30d5c3e438d
Author: Clint Adams <schizo at debian.org>
Date:   Tue Dec 21 20:33:28 2004 +0000

    derive version from debian/changelog in prebuild
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-42

diff --git a/Makefile.am b/Makefile.am
index db04706..41438b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ DISTCLEANFILES = fakerootconfig.h
 EXTRA_DIST=wrapawk wrapfunc.inp                        \
            debian/rules debian/changelog debian/control  \
 	   message.h \
-	   DEBUG BUGS
+	   DEBUG BUGS VERSION
 
 CLEAN_FILES=fakerootconfig.h
 
diff --git a/configure.ac b/configure.ac
index 1c4e0e7..fd60c1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([fakeroot],[1.2.2],[schizo at debian.org],[fakeroot])
+AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo at debian.org],[fakeroot])
 AC_PREREQ(2.59)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
diff --git a/debian/changelog b/debian/changelog
index 93c6f1f..fd41f6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 fakeroot (1.2.2) unstable; urgency=low
 
-  * Add version check to the prebuild target; abort
-    if the changelog doesn't match configure.ac.
+  * Derive version from debian/changelog entry.
     closes: #286648.
 
  -- Clint Adams <schizo at debian.org>  Tue, 21 Dec 2004 12:16:30 -0500
diff --git a/debian/rules b/debian/rules
index 3acf9e4..f17dc0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -175,9 +175,7 @@ binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary checkroot prebuild
 
 prebuild:
-	if [ $(sed -n '/^AC_INIT(\[fakeroot\],\[\([^,]*\)\],.*$/ { s//\1/;p }' configure.ac) != $(dpkg-parsechangelog | sed -n '/^Version: \(.*\)$/ {s//\1/;p}') ]; \
-	then exit 1; \
-	fi
+	dpkg-parsechangelog | sed -n '/^Version: \(.*\)$/ {s//\1/;p}' >VERSION
 
 	autoreconf -fi
 	cd fake && autoreconf -fi

-- 
fakeroot