From: Robert Edmonds <edmonds@debian.org>
Date: Mon, 30 Mar 2015 01:10:31 +0000 (-0400)
Subject: Merge tag '0.27-rc4' into debian
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1e86c1eb9d2c12585fba6a3d3c362f4a76bc0f74;p=packages%2Fb%2Fbup.git

Merge tag '0.27-rc4' into debian

0.27-rc4

Conflicts:
	Makefile
---

1e86c1eb9d2c12585fba6a3d3c362f4a76bc0f74
diff --cc Makefile
index ee34f84,1189613..738f15b
--- a/Makefile
+++ b/Makefile
@@@ -1,5 -1,9 +1,9 @@@
+ 
+ sampledata_rev := $(shell t/configure-sampledata --revision)
+ current_sampledata := t/sampledata/var/rev/v$(sampledata_rev)
+ 
  OS:=$(shell uname | sed 's/[-_].*//')
 -CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
 +CFLAGS := -Wall -O2 -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
  CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
  SOEXT:=.so
  
@@@ -13,15 -17,18 +17,18 @@@ els
    test_tmp := $(CURDIR)/t/tmp
  endif
  
- .PHONY: all
- all: bup
- 	t/configure-sampledata --setup
+ initial_setup := $(shell ./configure-version --update)
+ bup_deps := bup lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
  
- bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds main.py
- 	-ln -s main.py bup
- 	test -L bup
 -all: $(bup_deps) Documentation/all $(current_sampledata)
++all: $(bup_deps) $(current_sampledata)
  
- Documentation/all: bup
+ bup:
+ 	ln -s main.py bup
+ 
+ Documentation/all: $(bup_deps)
+ 
+ $(current_sampledata):
+ 	t/configure-sampledata --setup
  
  INSTALL=install
  PYTHON=python