bump version number, build updates to fix a cflags propogation issue

which was recently introduced.

diff --git a/VERSION b/VERSION
index 6b81001f8c96160e35d376f955997ffcc575d467..a5c287cb163e78306d63ee57b976e185fa89c28a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=0
-PKG_REVISION=2
+PKG_REVISION=3
 PKG_BUILD=0

diff --git a/debian/changelog b/debian/changelog
index fd46891db440705e4acfa2d3d3f917078294ae04..be8dec815d04ca83ca364e266dd533a0538b0806 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfsprogs (2.0.3-1) unstable; urgency=low
+
+  * New upstream bugfix release
+
+ -- Nathan Scott <nathans@debian.org>  Sat, 13 Apr 2002 09:45:06 +1000
+
 xfsprogs (2.0.2-1) unstable; urgency=low
 
   * New upstream bugfix release

diff --git a/doc/CHANGES b/doc/CHANGES
index 98598a07457d65fe80401b0fa35fcba1d0382fb4..ba1eff256ea4f058154c6bebf3c30f0fb3052962 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,9 @@
-xfsprogs-2.0.2 (4 April 2002)
+xfsprogs-2.0.3 (13 April 2002)
+       - Important build system update, was causing libxfs to be
+         built incorrectly, which can cause xfs_repair to fail by
+         tripping asserts in additional libxfs debug code.
+
+xfsprogs-2.0.2 (04 April 2002)
        - Bumped version of libhandle to libhandle.so.1.0.1
          This changes open_by_handle() and friends so that 
          O_LARGEFILE is added to the open flags.

diff --git a/include/builddefs.in b/include/builddefs.in
index ca5c226de5e108c3da157416523377d1f7822cee..66fe60f3f64f7b0db6046e9fc8686349952f2a15 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -32,6 +32,9 @@
 # @configure_input@
 #
 
+ifndef _BUILDMACROS_INCLUDED_
+_BUILDMACROS_INCLUDED_ = 1
+
 DEBUG = @debug_build@
 OPTIMIZER = @opt_build@
 MALLOCLIB = @malloc_lib@
@@ -81,3 +84,11 @@ CFLAGS += -O1 $(OPTIMIZER) $(DEBUG) -funsigned-char -Wall $(LCFLAGS) \
        -D_FILE_OFFSET_BITS=64 -DXFS_BIG_FILES=1 -DXFS_BIG_FILESYSTEMS=1
 
 include $(TOPDIR)/include/buildmacros
+
+endif
+
+#
+# For targets that should always be rebuilt,
+# define a target that is never up-to-date.
+# Targets needing this should depend on $(_FORCE)
+_FORCE = __force_build

diff --git a/include/buildmacros b/include/buildmacros
index 001397e75e054725cc9306fac867fcb81c36b0c7..26f90f452dba178cab6a1c238e155ff5e273a25e 100644 (file)
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -30,9 +30,6 @@
 # http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
 #
 
-ifndef _BUILDMACROS_INCLUDED_
-_BUILDMACROS_INCLUDED_ = 1
-
 BUILDRULES = $(TOPDIR)/include/buildrules
 
 # LCFLAGS, LLDFLAGS, LLDLIBS, LSRCFILES and LDIRT may be specified in
@@ -168,11 +165,3 @@ SOURCE_MAKERULE = \
                $(MAKEF) DIR=$$DIR/$$d -C $$d $@ || exit $$?; \
            fi; \
        done
-
-endif
-
-#
-# For targets that should always be rebuilt,
-# define a target that is never up-to-date.
-# Targets needing this should depend on $(_FORCE)
-_FORCE = __force_build