Merge branch 'telepathy-haze-0.8', rejecting -Wno-deprecated-declarations

6 files changed, 51 insertions, 11 deletions

diff --git a/NEWS b/NEWS
index 844dbf0..76d0eb8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,26 @@
-telepathy-haze 0.7.1 (UNRELEASED)
+telepathy-haze 0.7.1 (2013-09-17)
 =================================
 
-…
+This is a release candidate for telepathy-haze 0.8, recommended for
+use with GNOME 3.10.
+
+Deprecations:
+
+• This will be the last branch with StreamedMedia support. Anyone
+  relying on Haze for audio/video calling is invited to port it to Call1.
+
+Enhancements:
+
+• Support interactive password prompting for protocols like SIPE that
+  have an optional password (fd.o #63326; Stefan Becker, Will Thompson)
+
+Fixes:
+
+• Adapt to Sametime accounts getting a "usersplit" in libpurple 2.10.1
+  (fd.o #44631, Simon McVittie)
+
+• Regression test improvements (fd.o #69269, #65290, #65296, #63119;
+  Will Thompson, Guillaume Desmottes, Simon McVittie)
 
 telepathy-haze 0.7.0 (2012-11-21)
 =================================
diff --git a/configure.ac b/configure.ac
index d3b8f65..39bf08f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,8 @@ AC_PREREQ([2.59])
 
 m4_define([haze_major_version], [0])
 m4_define([haze_minor_version], [7])
-m4_define([haze_micro_version], [0])
-m4_define([haze_nano_version], [1])
+m4_define([haze_micro_version], [1])
+m4_define([haze_nano_version], [0])
 
 m4_define([haze_base_version],
           [haze_major_version.haze_minor_version.haze_micro_version])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0677b8f..af9cb85 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,3 +3,5 @@ SUBDIRS = .
 if WANT_TWISTED_TESTS
 SUBDIRS += twisted
 endif
+
+CLEANFILES = haze-testing.log
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 36ae8bd..81b9118 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -45,6 +45,7 @@ check-twisted: $(BUILT_SOURCES)
 EXTRA_DIST = \
 	$(TWISTED_TESTS) \
 	constants.py \
+	gabbletest.py \
 	hazetest.py \
 	run-test.sh.in \
 	sasl/saslutil.py \
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index db691a5..a8b34c1 100644
--- a/tests/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
@@ -21,4 +21,11 @@ BUILT_SOURCES = $(service_files) $(conf_files)
 EXTRA_DIST = \
 	$(service_in_files) \
 	$(conf_in_files) \
-	exec-with-log.sh
+	exec-with-log.sh \
+	with-session-bus.sh \
+	$(NULL)
+
+CLEANFILES = \
+    $(BUILT_SOURCES) \
+    haze-testing.log \
+    $(NULL)
diff --git a/tools/telepathy.am b/tools/telepathy.am
index 9715026..2b6c430 100644
--- a/tools/telepathy.am
+++ b/tools/telepathy.am
@@ -3,7 +3,7 @@
 dist-hook:
 	chmod u+w ${distdir}/ChangeLog
 	if test -d ${top_srcdir}/.git; then \
-		git log --date=iso $(CHANGELOG_RANGE) > ${distdir}/ChangeLog; \
+		( cd ${top_srcdir} && git log --date=iso $(CHANGELOG_RANGE) ) > ${distdir}/ChangeLog; \
 	fi
 
 distcheck-hook:
@@ -26,11 +26,13 @@ _is-release-check:
 			exit 2; \
 			;; \
 	esac
-	@if ! git diff --no-ext-diff --quiet --exit-code; then \
+	@cd ${top_srcdir} && \
+	if ! git diff --no-ext-diff --quiet --exit-code; then \
 		echo "Hey! Your tree is dirty! No release for you." >&2; \
 		exit 2; \
 	fi
-	@if ! git diff --cached --no-ext-diff --quiet --exit-code; then \
+	@cd ${top_srcdir} && \
+	if ! git diff --cached --no-ext-diff --quiet --exit-code; then \
 		echo "Hey! You have changes staged! No release for you." >&2; \
 		exit 2; \
 	fi
@@ -38,9 +40,16 @@ _is-release-check:
 %.tar.gz.asc: %.tar.gz
 	$(AM_V_GEN)gpg --detach-sign --armor $@
 
-@PACKAGE@-@VERSION@.tar.gz: _is-release-check check distcheck
+@PACKAGE@-@VERSION@.tar.gz:
+	$(MAKE) _is-release-check
+	$(MAKE) check
+	$(MAKE) distcheck
 
-maintainer-prepare-release: _is-release-check check distcheck release-mail
+maintainer-prepare-release:
+	$(MAKE) _is-release-check
+	$(MAKE) all
+	$(MAKE) distcheck
+	$(MAKE) release-mail
 	git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@
 	gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.gz
 
@@ -60,7 +69,9 @@ _maintainer-upload-release: _maintainer-upload-release-check
 	rsync -vzP @PACKAGE@-@VERSION@.tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz
 	rsync -vzP @PACKAGE@-@VERSION@.tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz.asc
 
-maintainer-make-release: maintainer-prepare-release maintainer-upload-release
+maintainer-make-release:
+	$(MAKE) maintainer-prepare-release
+	$(MAKE) maintainer-upload-release
 	@echo "Now:"
 	@echo " • bump the nano-version;"
 	@echo " • push the branch and tags upstream; and"