diff --git a/debian/changelog b/debian/changelog index 590b75c..754e877 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ dvdisaster (0.79.5-7) UNRELEASED; urgency=medium * Add debian/gbp.conf to conform with DEP14 conventions. * Build with Debhelper compat level 12. * Set "Rules-Requires-Root: no". + * Simplify process by which mutable files are backed up and restored. -- Carlos Maddela Thu, 31 Jan 2019 03:58:19 +1100 diff --git a/debian/rules b/debian/rules index 53a47e0..746eb40 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,7 @@ export FORCE_SOURCE_DATE = 1 MUTABLE_FILES := build.h $(wildcard locale/*.po) \ documentation/config/version.tex \ documentation/user-manual/manual.pdf +BACKUP_TAR_FILE := debian/backup.tar BUILDROOT := $(CURDIR)/debian/tmp ICONS := $(wildcard contrib/dvdisaster*.png) @@ -21,10 +22,17 @@ ICON_SIZES := $(patsubst contrib/dvdisaster%.png,%,$(ICONS)) %: dh $@ +override_dh_update_autotools_config: + dh_update_autotools_config + test -f $(BACKUP_TAR_FILE) || \ + tar cpf $(BACKUP_TAR_FILE) $(MUTABLE_FILES) + +override_dh_clean: + dh_clean + test ! -f $(BACKUP_TAR_FILE) || \ + tar xpf $(BACKUP_TAR_FILE) && rm -f $(BACKUP_TAR_FILE) + override_dh_auto_configure: - for f in $(MUTABLE_FILES); do \ - cp -an $$f $$f.orig; \ - done ./configure \ --prefix=/usr \ --mandir=share/man \ @@ -33,12 +41,6 @@ override_dh_auto_configure: --docsubdir=dvdisaster-doc \ --with-embedded-src-path=no -override_dh_clean: - dh_clean -X.orig - for f in $(MUTABLE_FILES); do \ - test ! -f $$f.orig || mv -f $$f.orig $$f; \ - done - override_dh_auto_build-arch: make all