diff -Nru backup-manager-0.7.12/debian/changelog backup-manager-0.7.12/debian/changelog --- backup-manager-0.7.12/debian/changelog 2016-07-20 11:01:00.000000000 +0000 +++ backup-manager-0.7.12/debian/changelog 2016-08-23 10:51:26.000000000 +0000 @@ -1,3 +1,11 @@ +backup-manager (0.7.12-4) unstable; urgency=medium + + * Add myself as the main maintainer. (Closes: 784851) + * Add new patch: Force-gzip-to-ignore-the-filename-and-timestamp.patch. + Thanks to Santiago Vila for the report and fix (Closes: 831759) + + -- Maximiliano Curia Tue, 23 Aug 2016 12:51:17 +0200 + backup-manager (0.7.12-3) unstable; urgency=medium * Add gnupg buid dependency. diff -Nru backup-manager-0.7.12/debian/control backup-manager-0.7.12/debian/control --- backup-manager-0.7.12/debian/control 2016-07-20 11:01:00.000000000 +0000 +++ backup-manager-0.7.12/debian/control 2016-08-23 10:51:26.000000000 +0000 @@ -8,7 +8,7 @@ texlive-latex-extra, texlive-latex-recommended Build-Depends: dar, debhelper (>=9), gnupg, po-debconf, rsync -Maintainer: Debian QA Group +Maintainer: Maximiliano Curia Standards-Version: 3.9.7 Vcs-Browser: https://anonscm.debian.org/git/collab-maint/backup-manager.git Vcs-Git: https://anonscm.debian.org/git/collab-maint/backup-manager.git diff -Nru backup-manager-0.7.12/debian/patches/0001-debian-backup-manager.conf.tpl.patch backup-manager-0.7.12/debian/patches/0001-debian-backup-manager.conf.tpl.patch --- backup-manager-0.7.12/debian/patches/0001-debian-backup-manager.conf.tpl.patch 2016-07-20 11:01:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/0001-debian-backup-manager.conf.tpl.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -From: Alexis Sukrieh -Date: Thu, 26 Nov 2015 14:32:16 -0800 -Forwarded: not-needed -Subject: debian-backup-manager.conf.tpl - -The configuration file has some changes for the postinst phase needs. - -TODO: the Debian package should support BM_TARBALL_TARGETS. ---- - backup-manager.conf.tpl | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/backup-manager.conf.tpl b/backup-manager.conf.tpl -index b67c1da..9756baa 100644 ---- a/backup-manager.conf.tpl -+++ b/backup-manager.conf.tpl -@@ -93,13 +93,14 @@ export BM_ARCHIVE_METHOD="tarball" - # tar, tar.gz, tar.bz2 - - # Uncomment the following line if you want to enable encryption --# export BM_ENCRYPTION_METHOD="gpg" -+# available method: gpg -+export BM_ENCRYPTION_METHOD="" - - # The encryption will be made using a GPG ID - # Examples: - # export BM_ENCRYPTION_RECIPIENT="0x1EE5DD34" - # export BM_ENCRYPTION_RECIPIENT="Alexis Sukrieh" --# export BM_ENCRYPTION_RECIPIENT="sukria@sukria.net" -+export BM_ENCRYPTION_RECIPIENT="" - - - ############################################################## -@@ -142,17 +143,16 @@ export BM_TARBALL_DUMPSYMLINKS="false" - - # It's recommanded to use BM_TARBALL_TARGETS[] though. - # Warning! You *must not* use both variables at the same time. -+# NOTE: The Debian package will only update BM_TARBALL_DIRECTORIES - - # Paths without spaces in their name: --# export BM_TARBALL_DIRECTORIES="/etc /boot" -+export BM_TARBALL_DIRECTORIES="/etc /boot" - - # If one or more of the targets contain a space, use the array: --declare -a BM_TARBALL_TARGETS -- --BM_TARBALL_TARGETS[0]="/etc" --BM_TARBALL_TARGETS[1]="/boot" -- --export BM_TARBALL_TARGETS -+# declare -a BM_TARBALL_TARGETS -+# BM_TARBALL_TARGETS[0]="/etc" -+# BM_TARBALL_TARGETS[1]="/boot" -+# export BM_TARBALL_TARGETS - - # Files to exclude when generating tarballs, you can put absolute - # or relative paths, Bash wildcards are possible. diff -Nru backup-manager-0.7.12/debian/patches/0002-debian-no-unused-confvars.patch backup-manager-0.7.12/debian/patches/0002-debian-no-unused-confvars.patch --- backup-manager-0.7.12/debian/patches/0002-debian-no-unused-confvars.patch 2016-07-20 11:01:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/0002-debian-no-unused-confvars.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From: Sven Joachim -Date: Thu, 26 Nov 2015 14:32:16 -0800 -Subject: debian-no-unused-confvars - -Remove a configuration variable that is not used anywhere (as of version -0.7.10.1). ---- - backup-manager.conf.tpl | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/backup-manager.conf.tpl b/backup-manager.conf.tpl -index 9756baa..1487f72 100644 ---- a/backup-manager.conf.tpl -+++ b/backup-manager.conf.tpl -@@ -42,11 +42,6 @@ export BM_ARCHIVE_CHMOD="660" - # Number of days we have to keep an archive (Time To Live) - export BM_ARCHIVE_TTL="5" - --# At which frequency will you build your archives? --# You can choose either "daily" or "hourly". --# This should match your CRON configuration. --export BM_ARCHIVE_FREQUENCY="daily" -- - # Do you want to purge only the top-level directory or all - # directories under BM_REPOSITORY_ROOT? - export BM_REPOSITORY_RECURSIVEPURGE="false" diff -Nru backup-manager-0.7.12/debian/patches/0004-debian-version.patch backup-manager-0.7.12/debian/patches/0004-debian-version.patch --- backup-manager-0.7.12/debian/patches/0004-debian-version.patch 2016-07-20 11:01:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/0004-debian-version.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: Alexis Sukrieh -Date: Thu, 26 Nov 2015 14:32:16 -0800 -Forwarded: not-needed -Subject: debian-version - -backup-manager's version string includes "-debian" We want people to know that -it differs from upstream. ---- - backup-manager | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/backup-manager b/backup-manager -index 5439d89..62b9adc 100755 ---- a/backup-manager -+++ b/backup-manager -@@ -26,7 +26,7 @@ - set -e - - RELEASE="true" --VERSION="0.7.12" -+VERSION="0.7.12-debian1" - - #Set prefix for paths - BIN_PREFIX=/usr/bin diff -Nru backup-manager-0.7.12/debian/patches/0005-debian-user-guide-location.patch backup-manager-0.7.12/debian/patches/0005-debian-user-guide-location.patch --- backup-manager-0.7.12/debian/patches/0005-debian-user-guide-location.patch 2016-07-20 11:01:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/0005-debian-user-guide-location.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From: Sven Joachim -Date: Thu, 26 Nov 2015 14:32:16 -0800 -Bug-Debian: http://bugs.debian.org/433011 -Bug-Debian: http://bugs.debian.org/528161 -Subject: debian-user-guide-location - -The user guide is installed in /usr/share/backup-manager-doc. This is the -recommended canonical Debian location. ---- - doc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/Makefile b/doc/Makefile -index 207f21b..10aeaff 100644 ---- a/doc/Makefile -+++ b/doc/Makefile -@@ -1,7 +1,7 @@ - - BASE = user-guide - SOURCE = $(BASE).sgml --DEST = $(DESTDIR)/usr/share/backup-manager/doc -+DEST = $(DESTDIR)/usr/share/doc/backup-manager-doc - - all: pdf txt html - install: all diff -Nru backup-manager-0.7.12/debian/patches/0006-fix-tar-errors.patch backup-manager-0.7.12/debian/patches/0006-fix-tar-errors.patch --- backup-manager-0.7.12/debian/patches/0006-fix-tar-errors.patch 2016-07-20 11:01:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/0006-fix-tar-errors.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -From: Alexey Salmin -Date: Thu, 26 Nov 2015 14:32:16 -0800 -Bug: http://bugzilla.backup-manager.org/show_bug.cgi?id=219 -Bug-Debian: http://bugs.debian.org/532976 -Subject: fix-tar-errors - -A bug that treats tar warnings as errors has been fixed. ---- - lib/backup-methods.sh | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lib/backup-methods.sh b/lib/backup-methods.sh -index 67d3929..328bdf5 100644 ---- a/lib/backup-methods.sh -+++ b/lib/backup-methods.sh -@@ -636,7 +636,12 @@ function build_clear_archive - - # the common commandline - *) -- BM__CURRENT_COMMAND="generic" -+ # tar, tar.gz, tar.bz2, tar.whatever -+ if [[ "${BM_TARBALL_FILETYPE:0:3}" == "tar" ]] ; then -+ BM__CURRENT_COMMAND="tar" -+ else -+ BM__CURRENT_COMMAND="generic" -+ fi - debug "$command $file_to_create \"$target\" > $logfile 2>&1" - tail_logfile "$logfile" - debug "$command $file_to_create \"$target\"" diff -Nru backup-manager-0.7.12/debian/patches/0007-fix-sanitize-messages.patch backup-manager-0.7.12/debian/patches/0007-fix-sanitize-messages.patch --- backup-manager-0.7.12/debian/patches/0007-fix-sanitize-messages.patch 2016-07-20 11:01:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/0007-fix-sanitize-messages.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -From: "Georgios M. Zarkadas" -Date: Thu, 26 Nov 2015 14:32:16 -0800 -Subject: fix-sanitize-messages - -Sanitize logging system's variables first to ensure errors and warnings are -properly reported / logged. ---- - lib/sanitize.sh | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/lib/sanitize.sh b/lib/sanitize.sh -index ade5e0f..a65c760 100644 ---- a/lib/sanitize.sh -+++ b/lib/sanitize.sh -@@ -121,6 +121,15 @@ function replace_deprecated_booleans() - - # First of all replace yes/no booleans with true/false ones. - replace_deprecated_booleans -+# Then ensure that logging facility has sane values, so that subsequent -+# errors and warnings in configuration keys indeed get reported. -+confkey_require "BM_LOGGER" "true" -+if [[ "$BM_LOGGER" = "true" ]]; then -+ confkey_require "BM_LOGGER_FACILITY" "user" -+ confkey_require "BM_LOGGER_LEVEL" "warning" -+fi -+# Now we can sanitize rest configuration keys. -+ - confkey_handle_deprecated "BM_ARCHIVES_REPOSITORY" "BM_REPOSITORY_ROOT" - confkey_require "BM_REPOSITORY_ROOT" "/var/archives" - -@@ -289,12 +298,6 @@ if [[ -z "$BM_ARCHIVE_STRICTPURGE" ]]; then - confkey_require "BM_ARCHIVE_STRICTPURGE" "true" - fi - --confkey_require "BM_LOGGER" "true" --if [[ "$BM_LOGGER" = "true" ]]; then -- confkey_require "BM_LOGGER_FACILITY" "user" -- confkey_require "BM_LOGGER_LEVEL" "warning" --fi -- - if [[ $nb_warnings -gt 0 ]]; then - warning "When validating the configuration file \$conffile, \$nb_warnings warnings were found." - fi diff -Nru backup-manager-0.7.12/debian/patches/0017-removed-duplicate-setting-of-_PREFIX-variables.patch backup-manager-0.7.12/debian/patches/0017-removed-duplicate-setting-of-_PREFIX-variables.patch --- backup-manager-0.7.12/debian/patches/0017-removed-duplicate-setting-of-_PREFIX-variables.patch 2016-07-20 11:01:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/0017-removed-duplicate-setting-of-_PREFIX-variables.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: Dima Kogan -Date: Thu, 26 Nov 2015 21:04:18 -0800 -Subject: removed duplicate setting of _PREFIX variables - ---- - backup-manager | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/backup-manager b/backup-manager -index 62b9adc..0b8b7f1 100755 ---- a/backup-manager -+++ b/backup-manager -@@ -33,11 +33,6 @@ BIN_PREFIX=/usr/bin - LIB_PREFIX=/usr/lib - VAR_PREFIX=/var/lib - --#Set prefix for paths --BIN_PREFIX=/usr/bin --LIB_PREFIX=/usr/lib --VAR_PREFIX=/var/lib -- - # All the paths we provide - libdir="$LIB_PREFIX/backup-manager" - vardir="$VAR_PREFIX/backup-manager" diff -Nru backup-manager-0.7.12/debian/patches/0018-backup-manager-looks-for-its-binaries-in-usr.patch backup-manager-0.7.12/debian/patches/0018-backup-manager-looks-for-its-binaries-in-usr.patch --- backup-manager-0.7.12/debian/patches/0018-backup-manager-looks-for-its-binaries-in-usr.patch 2016-07-20 11:01:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/0018-backup-manager-looks-for-its-binaries-in-usr.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -From: Dima Kogan -Date: Thu, 26 Nov 2015 21:04:46 -0800 -Forwarded: not-needed -Subject: backup-manager looks for its binaries in /usr - ---- - Makefile | 7 +------ - backup-manager | 2 +- - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/Makefile b/Makefile -index 6c9e20b..86c676a 100644 ---- a/Makefile -+++ b/Makefile -@@ -38,7 +38,7 @@ BINDIR=$(PREFIX)/bin - SBINDIR=$(PREFIX)/sbin - VARDIR=$(PREFIX)/var - --LIBDIR=$(DESTDIR)/$(PREFIX)/lib/backup-manager -+LIBDIR=$(DESTDIR)/$(PREFIX)/share/backup-manager - CONTRIB=$(LIBDIR)/contrib - SHAREDIR=$(DESTDIR)/$(PREFIX)/share/backup-manager - SHFILES=\ -@@ -109,11 +109,6 @@ install_bin: - install -o root -g 0 -m 0755 backup-manager-upload $(DESTDIR)/$(BINDIR) - install -o root -g 0 -m 0644 backup-manager.conf.tpl $(SHAREDIR) - -- # Set PREFIX to backup-manager binary -- sed "s#^BIN_PREFIX=.*#BIN_PREFIX=$(DESTDIR)/$(BINDIR)#" -i $(DESTDIR)/$(SBINDIR)/backup-manager -- sed "s#^LIB_PREFIX=.*#LIB_PREFIX=$(DESTDIR)/$(PREFIX)/lib#" -i $(DESTDIR)/$(SBINDIR)/backup-manager -- sed "s#^VAR_PREFIX=.*#VAR_PREFIX=$(VARDIR)#" -i $(DESTDIR)/$(SBINDIR)/backup-manager -- - mkdir -p $(PERL5DIR) - mkdir -p $(PERL5DIR)/BackupManager - install -o root -g 0 -m 0644 BackupManager/*.pm $(PERL5DIR)/BackupManager -diff --git a/backup-manager b/backup-manager -index 0b8b7f1..c689bff 100755 ---- a/backup-manager -+++ b/backup-manager -@@ -30,7 +30,7 @@ VERSION="0.7.12-debian1" - - #Set prefix for paths - BIN_PREFIX=/usr/bin --LIB_PREFIX=/usr/lib -+LIB_PREFIX=/usr/share - VAR_PREFIX=/var/lib - - # All the paths we provide diff -Nru backup-manager-0.7.12/debian/patches/backup-manager-looks-for-its-binaries-in-usr.patch backup-manager-0.7.12/debian/patches/backup-manager-looks-for-its-binaries-in-usr.patch --- backup-manager-0.7.12/debian/patches/backup-manager-looks-for-its-binaries-in-usr.patch 1970-01-01 00:00:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/backup-manager-looks-for-its-binaries-in-usr.patch 2016-08-23 10:51:26.000000000 +0000 @@ -0,0 +1,48 @@ +From: Dima Kogan +Date: Thu, 26 Nov 2015 21:04:46 -0800 +Subject: backup-manager looks for its binaries in /usr + +Forwarded: not-needed +--- + Makefile | 7 +------ + backup-manager | 2 +- + 2 files changed, 2 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 6c9e20b..86c676a 100644 +--- a/Makefile ++++ b/Makefile +@@ -38,7 +38,7 @@ BINDIR=$(PREFIX)/bin + SBINDIR=$(PREFIX)/sbin + VARDIR=$(PREFIX)/var + +-LIBDIR=$(DESTDIR)/$(PREFIX)/lib/backup-manager ++LIBDIR=$(DESTDIR)/$(PREFIX)/share/backup-manager + CONTRIB=$(LIBDIR)/contrib + SHAREDIR=$(DESTDIR)/$(PREFIX)/share/backup-manager + SHFILES=\ +@@ -109,11 +109,6 @@ install_bin: + install -o root -g 0 -m 0755 backup-manager-upload $(DESTDIR)/$(BINDIR) + install -o root -g 0 -m 0644 backup-manager.conf.tpl $(SHAREDIR) + +- # Set PREFIX to backup-manager binary +- sed "s#^BIN_PREFIX=.*#BIN_PREFIX=$(DESTDIR)/$(BINDIR)#" -i $(DESTDIR)/$(SBINDIR)/backup-manager +- sed "s#^LIB_PREFIX=.*#LIB_PREFIX=$(DESTDIR)/$(PREFIX)/lib#" -i $(DESTDIR)/$(SBINDIR)/backup-manager +- sed "s#^VAR_PREFIX=.*#VAR_PREFIX=$(VARDIR)#" -i $(DESTDIR)/$(SBINDIR)/backup-manager +- + mkdir -p $(PERL5DIR) + mkdir -p $(PERL5DIR)/BackupManager + install -o root -g 0 -m 0644 BackupManager/*.pm $(PERL5DIR)/BackupManager +diff --git a/backup-manager b/backup-manager +index 0b8b7f1..c689bff 100755 +--- a/backup-manager ++++ b/backup-manager +@@ -30,7 +30,7 @@ VERSION="0.7.12-debian1" + + #Set prefix for paths + BIN_PREFIX=/usr/bin +-LIB_PREFIX=/usr/lib ++LIB_PREFIX=/usr/share + VAR_PREFIX=/var/lib + + # All the paths we provide diff -Nru backup-manager-0.7.12/debian/patches/debian-backup-manager.conf.tpl.patch backup-manager-0.7.12/debian/patches/debian-backup-manager.conf.tpl.patch --- backup-manager-0.7.12/debian/patches/debian-backup-manager.conf.tpl.patch 1970-01-01 00:00:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/debian-backup-manager.conf.tpl.patch 2016-08-23 10:51:26.000000000 +0000 @@ -0,0 +1,57 @@ +From: Alexis Sukrieh +Date: Thu, 26 Nov 2015 14:32:16 -0800 +Subject: debian-backup-manager.conf.tpl + +The configuration file has some changes for the postinst phase needs. + +TODO: the Debian package should support BM_TARBALL_TARGETS. +Forwarded: not-needed +--- + backup-manager.conf.tpl | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/backup-manager.conf.tpl b/backup-manager.conf.tpl +index b67c1da..9756baa 100644 +--- a/backup-manager.conf.tpl ++++ b/backup-manager.conf.tpl +@@ -93,13 +93,14 @@ export BM_ARCHIVE_METHOD="tarball" + # tar, tar.gz, tar.bz2 + + # Uncomment the following line if you want to enable encryption +-# export BM_ENCRYPTION_METHOD="gpg" ++# available method: gpg ++export BM_ENCRYPTION_METHOD="" + + # The encryption will be made using a GPG ID + # Examples: + # export BM_ENCRYPTION_RECIPIENT="0x1EE5DD34" + # export BM_ENCRYPTION_RECIPIENT="Alexis Sukrieh" +-# export BM_ENCRYPTION_RECIPIENT="sukria@sukria.net" ++export BM_ENCRYPTION_RECIPIENT="" + + + ############################################################## +@@ -142,17 +143,16 @@ export BM_TARBALL_DUMPSYMLINKS="false" + + # It's recommanded to use BM_TARBALL_TARGETS[] though. + # Warning! You *must not* use both variables at the same time. ++# NOTE: The Debian package will only update BM_TARBALL_DIRECTORIES + + # Paths without spaces in their name: +-# export BM_TARBALL_DIRECTORIES="/etc /boot" ++export BM_TARBALL_DIRECTORIES="/etc /boot" + + # If one or more of the targets contain a space, use the array: +-declare -a BM_TARBALL_TARGETS +- +-BM_TARBALL_TARGETS[0]="/etc" +-BM_TARBALL_TARGETS[1]="/boot" +- +-export BM_TARBALL_TARGETS ++# declare -a BM_TARBALL_TARGETS ++# BM_TARBALL_TARGETS[0]="/etc" ++# BM_TARBALL_TARGETS[1]="/boot" ++# export BM_TARBALL_TARGETS + + # Files to exclude when generating tarballs, you can put absolute + # or relative paths, Bash wildcards are possible. diff -Nru backup-manager-0.7.12/debian/patches/debian-no-unused-confvars.patch backup-manager-0.7.12/debian/patches/debian-no-unused-confvars.patch --- backup-manager-0.7.12/debian/patches/debian-no-unused-confvars.patch 1970-01-01 00:00:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/debian-no-unused-confvars.patch 2016-08-23 10:51:26.000000000 +0000 @@ -0,0 +1,26 @@ +From: Sven Joachim +Date: Thu, 26 Nov 2015 14:32:16 -0800 +Subject: debian-no-unused-confvars + +Remove a configuration variable that is not used anywhere (as of version +0.7.10.1). +--- + backup-manager.conf.tpl | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/backup-manager.conf.tpl b/backup-manager.conf.tpl +index 9756baa..1487f72 100644 +--- a/backup-manager.conf.tpl ++++ b/backup-manager.conf.tpl +@@ -42,11 +42,6 @@ export BM_ARCHIVE_CHMOD="660" + # Number of days we have to keep an archive (Time To Live) + export BM_ARCHIVE_TTL="5" + +-# At which frequency will you build your archives? +-# You can choose either "daily" or "hourly". +-# This should match your CRON configuration. +-export BM_ARCHIVE_FREQUENCY="daily" +- + # Do you want to purge only the top-level directory or all + # directories under BM_REPOSITORY_ROOT? + export BM_REPOSITORY_RECURSIVEPURGE="false" diff -Nru backup-manager-0.7.12/debian/patches/debian-user-guide-location.patch backup-manager-0.7.12/debian/patches/debian-user-guide-location.patch --- backup-manager-0.7.12/debian/patches/debian-user-guide-location.patch 1970-01-01 00:00:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/debian-user-guide-location.patch 2016-08-23 10:51:26.000000000 +0000 @@ -0,0 +1,26 @@ +From: Sven Joachim +Date: Thu, 26 Nov 2015 14:32:16 -0800 +Subject: debian-user-guide-location + +The user guide is installed in /usr/share/backup-manager-doc. This is the +recommended canonical Debian location. + +Bug-Debian: http://bugs.debian.org/433011 +Bug-Debian: http://bugs.debian.org/528161 +--- + doc/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/Makefile b/doc/Makefile +index 207f21b..10aeaff 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -1,7 +1,7 @@ + + BASE = user-guide + SOURCE = $(BASE).sgml +-DEST = $(DESTDIR)/usr/share/backup-manager/doc ++DEST = $(DESTDIR)/usr/share/doc/backup-manager-doc + + all: pdf txt html + install: all diff -Nru backup-manager-0.7.12/debian/patches/debian-version.patch backup-manager-0.7.12/debian/patches/debian-version.patch --- backup-manager-0.7.12/debian/patches/debian-version.patch 1970-01-01 00:00:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/debian-version.patch 2016-08-23 10:51:26.000000000 +0000 @@ -0,0 +1,25 @@ +From: Alexis Sukrieh +Date: Thu, 26 Nov 2015 14:32:16 -0800 +Subject: debian-version + +backup-manager's version string includes "-debian" We want people to know that +it differs from upstream. + +Forwarded: not-needed +--- + backup-manager | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/backup-manager b/backup-manager +index 5439d89..62b9adc 100755 +--- a/backup-manager ++++ b/backup-manager +@@ -26,7 +26,7 @@ + set -e + + RELEASE="true" +-VERSION="0.7.12" ++VERSION="0.7.12-debian1" + + #Set prefix for paths + BIN_PREFIX=/usr/bin diff -Nru backup-manager-0.7.12/debian/patches/fix-sanitize-messages.patch backup-manager-0.7.12/debian/patches/fix-sanitize-messages.patch --- backup-manager-0.7.12/debian/patches/fix-sanitize-messages.patch 1970-01-01 00:00:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/fix-sanitize-messages.patch 2016-08-23 10:51:26.000000000 +0000 @@ -0,0 +1,43 @@ +From: "Georgios M. Zarkadas" +Date: Thu, 26 Nov 2015 14:32:16 -0800 +Subject: fix-sanitize-messages + +Sanitize logging system's variables first to ensure errors and warnings are +properly reported / logged. +--- + lib/sanitize.sh | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/lib/sanitize.sh b/lib/sanitize.sh +index ade5e0f..a65c760 100644 +--- a/lib/sanitize.sh ++++ b/lib/sanitize.sh +@@ -121,6 +121,15 @@ function replace_deprecated_booleans() + + # First of all replace yes/no booleans with true/false ones. + replace_deprecated_booleans ++# Then ensure that logging facility has sane values, so that subsequent ++# errors and warnings in configuration keys indeed get reported. ++confkey_require "BM_LOGGER" "true" ++if [[ "$BM_LOGGER" = "true" ]]; then ++ confkey_require "BM_LOGGER_FACILITY" "user" ++ confkey_require "BM_LOGGER_LEVEL" "warning" ++fi ++# Now we can sanitize rest configuration keys. ++ + confkey_handle_deprecated "BM_ARCHIVES_REPOSITORY" "BM_REPOSITORY_ROOT" + confkey_require "BM_REPOSITORY_ROOT" "/var/archives" + +@@ -289,12 +298,6 @@ if [[ -z "$BM_ARCHIVE_STRICTPURGE" ]]; then + confkey_require "BM_ARCHIVE_STRICTPURGE" "true" + fi + +-confkey_require "BM_LOGGER" "true" +-if [[ "$BM_LOGGER" = "true" ]]; then +- confkey_require "BM_LOGGER_FACILITY" "user" +- confkey_require "BM_LOGGER_LEVEL" "warning" +-fi +- + if [[ $nb_warnings -gt 0 ]]; then + warning "When validating the configuration file \$conffile, \$nb_warnings warnings were found." + fi diff -Nru backup-manager-0.7.12/debian/patches/fix-tar-errors.patch backup-manager-0.7.12/debian/patches/fix-tar-errors.patch --- backup-manager-0.7.12/debian/patches/fix-tar-errors.patch 1970-01-01 00:00:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/fix-tar-errors.patch 2016-08-23 10:51:26.000000000 +0000 @@ -0,0 +1,30 @@ +From: Alexey Salmin +Date: Thu, 26 Nov 2015 14:32:16 -0800 +Subject: fix-tar-errors + +A bug that treats tar warnings as errors has been fixed. + +Bug: http://bugzilla.backup-manager.org/show_bug.cgi?id=219 +Bug-Debian: http://bugs.debian.org/532976 +--- + lib/backup-methods.sh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/lib/backup-methods.sh b/lib/backup-methods.sh +index 67d3929..328bdf5 100644 +--- a/lib/backup-methods.sh ++++ b/lib/backup-methods.sh +@@ -636,7 +636,12 @@ function build_clear_archive + + # the common commandline + *) +- BM__CURRENT_COMMAND="generic" ++ # tar, tar.gz, tar.bz2, tar.whatever ++ if [[ "${BM_TARBALL_FILETYPE:0:3}" == "tar" ]] ; then ++ BM__CURRENT_COMMAND="tar" ++ else ++ BM__CURRENT_COMMAND="generic" ++ fi + debug "$command $file_to_create \"$target\" > $logfile 2>&1" + tail_logfile "$logfile" + debug "$command $file_to_create \"$target\"" diff -Nru backup-manager-0.7.12/debian/patches/Force-gzip-to-ignore-the-filename-and-timestamp.patch backup-manager-0.7.12/debian/patches/Force-gzip-to-ignore-the-filename-and-timestamp.patch --- backup-manager-0.7.12/debian/patches/Force-gzip-to-ignore-the-filename-and-timestamp.patch 1970-01-01 00:00:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/Force-gzip-to-ignore-the-filename-and-timestamp.patch 2016-08-23 10:51:26.000000000 +0000 @@ -0,0 +1,41 @@ +From: Maximiliano Curia +Date: Tue, 23 Aug 2016 12:15:34 +0200 +Subject: Force gzip to ignore the filename and timestamp + +By default gzip stores the filename and timestamp of the contained file, +this prohibits any posibility of detecting dupes (when the files are not +generated in the same second as done by the current dupes test). +--- + lib/backup-methods.sh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/lib/backup-methods.sh b/lib/backup-methods.sh +index 328bdf5..5ac5c80 100644 +--- a/lib/backup-methods.sh ++++ b/lib/backup-methods.sh +@@ -859,9 +859,11 @@ function backup_method_tarball() + debug "backup_method_tarball ($method)" + + info "Using method \"\$method\"." +- ++ local oldgzip="$GZIP" ++ export GZIP="-n" ++ + # build the command line +- case $BM_TARBALL_FILETYPE in ++ case $BM_TARBALL_FILETYPE in + tar|tar.bz2|tar.gz) + dumpsymlinks="$(__get_flags_tar_dump_symlinks)" + ;; +@@ -879,9 +881,9 @@ function backup_method_tarball() + else + __make_remote_tarball_archives + fi +- ++ GZIP="$oldgzip" + # Handle errors +- # since version 0.8, BM's follows up its process even if errors were triggered ++ # since version 0.8, BM's follows up its process even if errors were triggered + # during the archive generation. + if [[ $nb_err -eq 1 ]]; then + warning "1 error occurred during the tarball generation." diff -Nru backup-manager-0.7.12/debian/patches/removed-duplicate-setting-of-_PREFIX-variables.patch backup-manager-0.7.12/debian/patches/removed-duplicate-setting-of-_PREFIX-variables.patch --- backup-manager-0.7.12/debian/patches/removed-duplicate-setting-of-_PREFIX-variables.patch 1970-01-01 00:00:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/removed-duplicate-setting-of-_PREFIX-variables.patch 2016-08-23 10:51:26.000000000 +0000 @@ -0,0 +1,24 @@ +From: Dima Kogan +Date: Thu, 26 Nov 2015 21:04:18 -0800 +Subject: removed duplicate setting of _PREFIX variables + +--- + backup-manager | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/backup-manager b/backup-manager +index 62b9adc..0b8b7f1 100755 +--- a/backup-manager ++++ b/backup-manager +@@ -33,11 +33,6 @@ BIN_PREFIX=/usr/bin + LIB_PREFIX=/usr/lib + VAR_PREFIX=/var/lib + +-#Set prefix for paths +-BIN_PREFIX=/usr/bin +-LIB_PREFIX=/usr/lib +-VAR_PREFIX=/var/lib +- + # All the paths we provide + libdir="$LIB_PREFIX/backup-manager" + vardir="$VAR_PREFIX/backup-manager" diff -Nru backup-manager-0.7.12/debian/patches/series backup-manager-0.7.12/debian/patches/series --- backup-manager-0.7.12/debian/patches/series 2016-07-20 11:01:00.000000000 +0000 +++ backup-manager-0.7.12/debian/patches/series 2016-08-23 10:51:26.000000000 +0000 @@ -1,9 +1,10 @@ -0001-debian-backup-manager.conf.tpl.patch -0002-debian-no-unused-confvars.patch -0004-debian-version.patch -0005-debian-user-guide-location.patch -0006-fix-tar-errors.patch -0007-fix-sanitize-messages.patch -0017-removed-duplicate-setting-of-_PREFIX-variables.patch -0018-backup-manager-looks-for-its-binaries-in-usr.patch +debian-backup-manager.conf.tpl.patch +debian-no-unused-confvars.patch +debian-version.patch +debian-user-guide-location.patch +fix-tar-errors.patch +fix-sanitize-messages.patch +removed-duplicate-setting-of-_PREFIX-variables.patch +backup-manager-looks-for-its-binaries-in-usr.patch Fix-pattern-generation.patch +Force-gzip-to-ignore-the-filename-and-timestamp.patch