[gnumach] 53/56: 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 a92253e0505827d8cc1e4da703834eb7e791aadf
Merge: c3f7ec9 1b954eb
Author: Samuel Thibault <address@hidden>
Date:   Sat Sep 28 10:39:26 2013 +0000

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

 debian/changelog            |   15 ++++++++++++++-
 debian/control              |    6 +++---
 debian/patches/70_dde.patch |    3 ---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 694406f,d336538..cc2d094
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,20 +1,24 @@@
 -gnumach (2:1.3.99.dfsg.git20130624-2) UNRELEASED; urgency=low
 +gnumach (2:1.4-1) UNRELEASED; urgency=low
  
+   [ Samuel Thibault ]
 +  * New upstream release.
 +    - patches/00_clean_gfdl.patch: Drop, upstream documentation does not have
 +      invariant sections any more.
 +    - rules (clean): Remove generated documentation.
+   * Bump Standards-Version to 3.9.4 (no changes).
+   * patches/70_dde.patch: Fix experimental.defs creation.
  
-  -- Samuel Thibault <address@hidden>  Sat, 28 Sep 2013 10:24:04 +0000
+   [ Pino Toscano ]
+   * Update Vcs-* headers.
+ 
+  -- Samuel Thibault <address@hidden>  Sat, 13 Jul 2013 18:38:14 +0200
+ 
+ gnumach (2:1.3.99.dfsg.git20130624-1) unstable; urgency=low
+ 
+   * New upstream snapshot
+     - Fix partitioning reloading.
+ 
+  -- Samuel Thibault <address@hidden>  Mon, 24 Jun 2013 15:22:49 +0200
  
  gnumach (2:1.3.99.dfsg.git20130610-1) unstable; urgency=low
  

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