Merge tag 'debian/7.0' into stretch-bpo

dgit release 7.0 for unstable (sid) [dgit]
[dgit distro=debian]

# gpg: Signature made Thu 04 Oct 2018 12:36:14 PM MST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key

7 files changed, 107 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 84c0d51..c2ddaef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,54 @@
+dgit (7.0) unstable; urgency=medium
+
+  Bugfixes:
+  * dgit: Do not sometimes crash in quilt-fixup if git-debrebase
+    is not installed.  Closes:#910221.
+  * git-debrebase: new-upstream: Drop `sleep 2' (!)
+  * git-debrebase: anchor: Print the anchor, not the breakwater tip (!)
+  * Get rid of perl warning "Statement unlikely to be reached"
+    (introduced in 7.0~pre1).
+  * git-debrebase: merges: Make warnings of lossage less overblown
+
+  i18n (translation):
+  * Support message translation for git-debrebase.  (Re #904883.)
+  * Support document translation.  Closes:#904883.
+  * po: Rename `all-po' target to `pofiles'
+
+  Error message improvements (prompted by i18n work)
+  * Replaced `die' with `confess' in many unexpected syscall errors
+    and internal error cases.
+  * git-debrebase; Print a proper message for failure to opendir
+    the bpd and for failure to chdir to the toplevel.
+
+  Internal changes:
+  * Minor refactoring to support translation.
+  * i18n-diff-auditor: New script to support translation markup.
+
+  Packaging:
+  * Use dh_missing --fail-missing
+  * Add missing build-dependency on xgettext
+
+  Test suite:
+  * gdr-makepatches7: Fixes to dgit/git-debrebase interaction
+  * gdr-makepatches7: Test dgit with missing git-debrebase
+  * Test that the binary packages can be built
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 04 Oct 2018 20:33:12 +0100
+
+dgit (7.0~pre1) experimental; urgency=medium
+
+  * i18n: Support messgae translation for the program dgit.
+    (Working towards #904883.)
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 02 Oct 2018 13:20:24 +0100
+
+dgit (6.12) unstable; urgency=medium
+
+  * test suite: t-check-only-bpd: Check $tmp/.. not .. .  Fixes bogus
+    failure in Ubuntu CI.  Thanks to Mattia Rizzolo for the report.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 28 Sep 2018 18:17:36 +0100
+
 dgit (6.11~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.
diff --git a/debian/control b/debian/control
index 5bc2a65..62a4a11 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Standards-Version: 3.9.4.0
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9), gettext, po4a
 Testsuite: autopkgtest
 Vcs-Git: git://git.chiark.greenend.org.uk/~ianmdlvl/dgit.git
 Vcs-Browser: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/dgit.git/
@@ -11,6 +11,7 @@ Vcs-Browser: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/dgit.git/
 Package: dgit
 Depends: perl, libwww-perl, libdpkg-perl, git-core, devscripts, dpkg-dev,
          ${misc:Depends}, git-buildpackage, liblist-moreutils-perl,
+         liblocale-gettext-perl,
          coreutils (>= 8.23-1~),
          libdigest-sha-perl, dput, curl, apt,
          libjson-perl, ca-certificates,
@@ -28,6 +29,7 @@ Description: git interoperability with the Debian archive
 
 Package: git-debrebase
 Depends: perl, git-core, libdpkg-perl, libfile-fnmatch-perl, devscripts,
+         liblocale-gettext-perl,
          ${misc:Depends}
 Recommends: dgit, git-buildpackage
 Architecture: all
@@ -38,7 +40,8 @@ Description: rebasing git workflow tool for Debian packaging
 Package: dgit-infrastructure
 Depends: ${misc:Depends}, perl, git-core, gpgv, chiark-utils-bin,
          libjson-perl, libdigest-sha-perl, libdbd-sqlite3-perl, sqlite3,
-         libwww-perl, libdpkg-perl
+         libwww-perl, libdpkg-perl,
+         liblocale-gettext-perl
 Recommends: dgit
 Architecture: all
 Priority: extra
diff --git a/debian/copyright b/debian/copyright
index c5b10a1..f5c879d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,9 @@ Integration between git and Debian-style archives
 
 Copyright (C)2013-2018 Ian Jackson
 Copyright (C)2016-2018 Sean Whitton
+Copyright (C)1999-2010 Joey Hess
+Copyright (C)2004-2010 Colin Watson
+
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,6 +27,31 @@ Debian metadata, by Bill Alombert, with a licence statement saying
 it's GPL (implicitly GPLv3 compatible).
 
 
+Some of the i18n build system was copied from the Debian debconf
+package, which has the BSD-2-clause (GPLv3-compatible) licence:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+
+
 Contributions are accepted upstram under the same terms; please sign
 off your patches (by writing an approprite Signed-Off-By tag in your
 commit message or patch submission) to indicate your attestation that
diff --git a/debian/dgit.install b/debian/dgit.install
new file mode 100644
index 0000000..622e876
--- /dev/null
+++ b/debian/dgit.install
@@ -0,0 +1,4 @@
+usr/share/locale/*/LC_MESSAGES/dgit.mo
+
+# usr/share/man/*/man*/dgit*.[1-9]
+# ^ translated manpages.  This has to be un-commented when they appear.
diff --git a/debian/git-debrebase.install b/debian/git-debrebase.install
new file mode 100644
index 0000000..c4db761
--- /dev/null
+++ b/debian/git-debrebase.install
@@ -0,0 +1,4 @@
+usr/share/locale/*/LC_MESSAGES/git-debrebase.mo
+
+# usr/share/man/*/man*/git-debrebase.[1-9]
+# ^ translated manpages.  This has to be un-commented when they appear.
diff --git a/debian/rules b/debian/rules
index baff8f8..da482ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,10 +30,20 @@ override_dh_gencontrol:
 	 v=$$(perl -ne 'print if s/^version:\s+//i' DEBIAN/control); \
 	 perl -i -pe "s/UNRELEASED/$$v/g if m/###substituted###/" usr/bin/dgit
 
+override_dh_auto_clean:
+	dh_auto_clean
+	make -C po clean
+
 globalperl=/usr/share/perl5
 
 override_dh_auto_install: specpkg_install_gdr specpkg_install_infra
 	make install prefix=/usr DESTDIR=debian/dgit
+	make -C po install prefix=/usr DESTDIR=../debian/tmp \
+		SUPPRESS_PO_UPDATE=1 S=''
+	make -C po4a install DESTDIR=../debian/tmp S=''
+
+override_dh_missing:
+	dh_missing --fail-missing
 
 specpkg_install_gdr: p=git-debrebase
 specpkg_install_gdr: pm=GDR
diff --git a/debian/tests/control b/debian/tests/control
index 1d29b2f..6559071 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -24,10 +24,6 @@ Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-fresh gdr-import-dgit
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-debrebase, git-buildpackage
 
-Tests: gdr-newupstream gdr-viagit
-Tests-Directory: tests/tests
-Depends: chiark-utils-bin, faketime, git-debrebase, git-buildpackage
-
 Tests: gitattributes
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, bsdgames, man-db, git-man
@@ -37,6 +33,10 @@ Tests-Directory: tests/tests
 Depends: gnupg, patch, diffutils
 Restrictions: hint-testsuite-triggers
 
+Tests: gdr-newupstream gdr-viagit i18n-messages
+Tests-Directory: tests/tests
+Depends: chiark-utils-bin, faketime, git-debrebase, git-buildpackage
+
 Tests: manpages-format
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, man-db, make, groff, git-debrebase
@@ -55,7 +55,7 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, sbuild, man-db
 Restrictions: x-dgit-schroot-build
 
-Tests: spelling
+Tests: i18n-po4a-uptodate package-build spelling
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime
 Restrictions: x-dgit-git-only