prep for 0.16.0

oetiker · Nov 8, 2016 · 3b9d567 · 3b9d567
1 parent 90d4472
commit 3b9d567
Show file tree

Hide file tree

Showing 16 changed files with 478 additions and 297 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,130 @@
+commit 979bcf07a51caa2ea04847faf1a51256e9d4aa47
+Author: Dominik Hassler <hadfl@cpan.org>
+Date:   Tue Nov 8 06:25:00 2016 +0100
+
+    - autocreation fixed
+
+commit 1ff27b83565e01dc6d7bc211d193676fbbb17c2b
+Author: Phil Kauffman <kauffman@cs.uchicago.edu>
+Date:   Thu Nov 3 18:17:14 2016 -0500
+
+    Addition of upstart init script.
+
+commit 0280c2c2f5a1e6b1c58b38ad647761449d09c3e0
+Author: Petr Gregor <gregy@gregy.cz>
+Date:   Thu Oct 13 11:34:25 2016 +0200
+
+    adds link to debian packaging files to readme (#235)
+
+    Debian packaging files are in separate repository to ease the work of potential official maintainer.
+
+commit d5be8eb868858092fbc48b718fa64f04b4ecce4d
+Author: Ron van den Dungen <ron@dse.nl>
+Date:   Tue Sep 27 10:54:28 2016 +0200
+
+    Added destination pre and post send/receive commands. (#233)
+
+    * Added destination pre and post send/receive commands.
+
+commit e1e8fa3c16eb9cdd887f32c29c21e6ec33cdf51f
+Author: Dominik Hassler <hadfl@cpan.org>
+Date:   Tue Sep 13 12:31:26 2016 +0200
+
+    - prevent the same retention time more than once in a backup plan
+
+commit 476630b2bea773111c39b4bb6e568027cc7fda3e
+Author: Edouard Renard <renard.edouard@free.fr>
+Date:   Tue Jul 26 15:58:23 2016 +0200
+
+    add possibility to specify delay before sending snaps
+
+    precise backupSet src name in log when waiting before sending
+
+commit 9fe397a226ab9719719d8172626a9338e30cc1b5
+Author: Joel Kuzmarski <leoj3n@gmail.com>
+Date:   Sat Jun 11 16:31:25 2016 -0500
+
+    windoz
+
+    fix typo
+
+commit 16c31a8d31c8822ea992954ab6aac9fd2a9a5fb1
+Author: L.C. Karssen <l.c.karssen@polyomica.com>
+Date:   Sun Jun 12 16:17:33 2016 +0200
+
+    Fix issue #220, detection of zfsutils package in Ubuntu
+
+    This fixes issue #220. Previously, the script automatically added
+    `zfsutils` as dependecy. In Ubuntu 16.04 the package is called
+    zfsutils-linux. This commit runs `lsb_release -r` to get the release
+    number and then checks if it is running on 16.04 or greater to set the
+    correct zfsutils dependency.
+
+    Note, this commit was only tested on an Ubuntu machine. It may need
+    editing for Debian or other distros.
+
+commit fdb0880a40a827dfa04448652bf7559c44198c27
+Author: Lennart C. Karssen <lckarssen@users.noreply.github.com>
+Date:   Sun Jun 12 15:49:03 2016 +0200
+
+    Add missing step to checkinstall README
+
+    After cloning the Git repo, the clone is located in the `znapzend` directory, so the user should first `cd` into it before running the checkinstall script.
+
+commit 98481c98ede965d1fca1da694d52b8b223b72f73
+Author: Tobias Oetiker <tobi@oetiker.ch>
+Date:   Mon Jun 6 08:36:08 2016 +0200
+
+    locking again
+
+commit a2f950d526e84436b7ddf5158f73ec96579b896c
+Author: Tobias Oetiker <tobi@oetiker.ch>
+Date:   Thu Jun 2 08:38:19 2016 +0200
+
+    better locking
+
+commit afd360795a47de00e5b8150e7268c7bb9bf44535
+Author: Tobias Oetiker <tobi@oetiker.ch>
+Date:   Wed Jun 1 15:32:41 2016 +0200
+
+    table lock gets lost when the connection ends
+
+commit 1c7c6488127bc505dbbb92727e3348c35d5947cd
+Author: morph027 <morphsen@gmx.com>
+Date:   Fri May 20 10:41:37 2016 +0200
+
+    update checkinstall README
+
+commit 1915c307060f27e977b3d1ab5fc1d08ea3252ab2
+Author: morph027 <morphsen@gmx.com>
+Date:   Fri May 20 10:40:15 2016 +0200
+
+    added install hooks
+
+commit 024de29243298095463606ad759ed11363bac4f5
+Author: Tobias Oetiker <tobi@oetiker.ch>
+Date:   Wed Jun 1 15:05:56 2016 +0200
+
+    added mysql example
+
+commit 18a64b6041f163403c9ea01ba02bd78517735f77
+Author: Elmar Pruesse <epruesse@users.noreply.github.com>
+Date:   Thu May 5 13:18:42 2016 -0600
+
+    fix spelling typo
+
+commit 019819439faecf5e414987b317bec16fb77144ec
+Author: Tobias Oetiker <tobi@oetiker.ch>
+Date:   Mon May 9 11:35:54 2016 +0200
+
+    add gitter
+
+commit 30664d638081199a256b8a6db06007ff5d51321a
+Author: Tobias Oetiker <tobi@oetiker.ch>
+Date:   Mon May 9 11:31:00 2016 +0200
+
+    prep for 0.15.7
+
 commit 5533b20687e33eee25e4c63885b02334a24bf0d1
 Author: Tobias Oetiker <tobi@oetiker.ch>
 Date:   Fri May 6 10:57:49 2016 +0200

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -3,7 +3,7 @@ znapzend - A ZFS backup system
 Copyright by Dominik Hassler, Tobias Oetiker and the other people listed
 in the AUTHORS file.
 
-2016-05-09
+2016-11-08
 
 All rights reserved.
 

diff --git a/Makefile.am b/Makefile.am
@@ -20,8 +20,8 @@ EXTRA_DIST = VERSION COPYRIGHT README.md LICENSE CHANGES AUTHORS PERL_MODULES $(
 	t/autoscrub.t t/ssh t/znapzend.t t/znapzendztatz.t t/mbuffer \
 	t/zfs t/znapzendzetup.t t/zpool
 
-CHANGES:
-	git log --full-history --simplify-merges --dense --no-merges > CHANGES
+CHANGES: VERSION
+	git log --full-history --simplify-merges --dense --no-merges > $@
 
 YEAR := $(shell date +%Y)
 DATE := $(shell date +%Y-%m-%d)
@@ -63,5 +63,5 @@ install-exec-hook:
 	mkdir -p $(DESTDIR)$(libdir)
 	[ ! -d $(THIRDPARTY_DIR)/lib/perl5 ] || cp -fr $(THIRDPARTY_DIR)/lib/perl5/* $(DESTDIR)$(libdir)
 
-test:
+check:
 	$(PERL) -Ithirdparty/lib/perl5 "-MExtUtils::Command::MM" "-e" "test_harness(0, 'lib','thirdparty/lib/perl5')" t/*.t
diff --git a/Makefile.in b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -19,7 +19,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -81,17 +91,12 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(top_srcdir)/init/znapzend.xml.in $(dist_bin_SCRIPTS) AUTHORS \
-	README conftools/config.guess conftools/config.sub \
-	conftools/install-sh conftools/missing \
-	$(top_srcdir)/conftools/install-sh \
-	$(top_srcdir)/conftools/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(dist_bin_SCRIPTS) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -186,6 +191,12 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/conftools/install-sh \
+	$(top_srcdir)/conftools/missing \
+	$(top_srcdir)/init/znapzend.xml.in AUTHORS README \
+	conftools/config.guess conftools/config.sub \
+	conftools/install-sh conftools/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -305,6 +316,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -353,7 +365,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign --ignore-deps Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -642,15 +653,15 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
@@ -686,17 +697,17 @@ distcheck: dist
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -879,9 +890,11 @@ uninstall-am: uninstall-dist_binSCRIPTS uninstall-imanDATA \
 	uninstall-am uninstall-dist_binSCRIPTS uninstall-imanDATA \
 	uninstall-svcDATA
 
+.PRECIOUS: Makefile
+
 
-CHANGES:
-	git log --full-history --simplify-merges --dense --no-merges > CHANGES
+CHANGES: VERSION
+	git log --full-history --simplify-merges --dense --no-merges > $@
 
 README.md COPYRIGHT: VERSION
 	$(AM_V_GEN)$(PERL) -i -p -e 's/\d{4}-\d{2}-\d{2}/$(DATE)/g;s/[0-4]\.\d+\.\d+/$(PACKAGE_VERSION)/g'  $@
@@ -906,7 +919,7 @@ install-exec-hook:
 	mkdir -p $(DESTDIR)$(libdir)
 	[ ! -d $(THIRDPARTY_DIR)/lib/perl5 ] || cp -fr $(THIRDPARTY_DIR)/lib/perl5/* $(DESTDIR)$(libdir)
 
-test:
+check:
 	$(PERL) -Ithirdparty/lib/perl5 "-MExtUtils::Command::MM" "-e" "test_harness(0, 'lib','thirdparty/lib/perl5')" t/*.t
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-ZnapZend 0.15.7
+ZnapZend 0.16.0
 ===============
 
 [![Build Status](https://travis-ci.org/oetiker/znapzend.svg?branch=master)](https://travis-ci.org/oetiker/znapzend)
@@ -35,10 +35,10 @@ On OmniOS/SmartOS you will need perl and gnu-make
 with that in place you can now utter:
 
 ```sh
-wget https://github.com/oetiker/znapzend/releases/download/v0.15.7/znapzend-0.15.7.tar.gz
-tar zxvf znapzend-0.15.7.tar.gz
-cd znapzend-0.15.7
-./configure --prefix=/opt/znapzend-0.15.7
+wget https://github.com/oetiker/znapzend/releases/download/v0.16.0/znapzend-0.16.0.tar.gz
+tar zxvf znapzend-0.16.0.tar.gz
+cd znapzend-0.16.0
+./configure --prefix=/opt/znapzend-0.16.0
 ```
 
 If configure finds anything noteworthy, it will tell you about it.  If any
@@ -54,7 +54,7 @@ Optionally (but recommended) put symbolic links to the installed binaries in the
 system PATH.
 
 ```sh
-for x in /opt/znapzend-0.15.7/bin/*; do ln -s $x /usr/local/bin; done
+for x in /opt/znapzend-0.16.0/bin/*; do ln -s $x /usr/local/bin; done
 ```
 
 Debian packages
@@ -113,4 +113,4 @@ And if you have a contribution, please send a pull request.
 Enjoy!
 
 Dominik Hassler & Tobi Oetiker
-2016-05-09
+2016-11-08
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.15.7
+0.16.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ znapzend - A ZFS backup system @@
     Copyright by Dominik Hassler, Tobias Oetiker and the other people listed
     in the AUTHORS file.
--05-09
+-11-08
     All rights reserved.
@@ Expand Down @@