[gnumach] 04/05: Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository gnumach.

commit 98dc0112d0b7b8a851b487b6905a0dd6e5bfa2e4
Merge: c8c3d61 9a599b9
Author: Samuel Thibault <address@hidden>
Date:   Fri Mar 11 22:27:01 2016 +0000

    Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach

 debian/changelog            | 1 +
 debian/control              | 2 +-
 debian/patches/70_dde.patch | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 9b644a7,664418d..491a780
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,12 @@@
 -gnumach (2:1.6+git20160114-2) UNRELEASED; urgency=medium
 +gnumach (2:1.6+git20160311-1) unstable; urgency=medium
  
 +  * New upstream snapshot.
 +  * patches/70_dde.patch: Update.
 +  * control: bump dpkg-dev and debhelper versions for restriction formulas
 +    support.
+   * control: Bump Standards-Version to 3.9.7 (no change).
  
 - -- Samuel Thibault <address@hidden>  Tue, 02 Feb 2016 01:23:39 +0100
 + -- Samuel Thibault <address@hidden>  Fri, 11 Mar 2016 21:45:02 +0000
  
  gnumach (2:1.6+git20160114-1) unstable; urgency=medium
  
diff --cc debian/control
index 0c67047,6512c4b..ae39155
--- a/debian/control
+++ b/debian/control
@@@ -6,9 -6,9 +6,9 @@@ Uploaders: Samuel Thibault <address@hidden
  Homepage: http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-hurd/gnumach.git
  Vcs-Git: git://anonscm.debian.org/pkg-hurd/gnumach.git
 -Build-Depends: debhelper (>= 7), mig (>= 1.4-2) <!stage1>, sharutils,
 - autoconf, automake, texinfo
 +Build-Depends: debhelper (>= 9.20141010), mig (>= 1.4-2) <!stage1>, sharutils,
 + autoconf, automake, texinfo, dpkg-dev (>= 1.17.14)
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  
  Package: gnumach
  Architecture: any-i386

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/gnumach.git