[texlive-bin] 04/05: Merge remote-tracking branch 'origin/master'

[Norbert Preining <preining@debian.org>]

This is an automated email from the git hooks/post-receive script.

preining pushed a commit to branch master
in repository texlive-bin.

commit fdbca168c221a01cc587c7cbb90cf9c8519d5452
Merge: 013d270 6c60783
Author: Norbert Preining <preining@debian.org>
Date:   Mon Aug 7 23:45:25 2017 +0900

    Merge remote-tracking branch 'origin/master'

 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 3f894f0,6316236..19ab85b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,18 @@@
 -texlive-bin (2017.20170613.44572-3) unstable; urgency=medium
++texlive-bin (2017.20170613.44572-4) UNRELEASED; urgency=medium
+ 
+   * fix typo in breaks (Closes: #867675)
 -  * bump standards version, no changes necessary
+ 
+  -- Norbert Preining <preining@debian.org>  Sun, 09 Jul 2017 22:54:57 +0900
+ 
 +texlive-bin (2017.20170613.44572-3) unstable; urgency=medium
 +
 +  * fix FTBFS with gcc7 (Closes: #870796)
 +    Thanks Werner Fink for the patch and Hironobu Yamashita for pointing
 +    me at it.
 +  * bump standards version, no changes necessary
 +
 + -- Norbert Preining <preining@debian.org>  Mon, 07 Aug 2017 23:23:43 +0900
 +
  texlive-bin (2017.20170613.44572-2) unstable; urgency=medium
  
    * upload to unstable

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-bin.git