[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnumach] 02/03: Merge branch 'master' of git.debian.org:/git/pkg-hurd/g
|
From: |
Samuel Thibault |
|
Subject: |
[gnumach] 02/03: Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach |
|
Date: |
Wed, 01 Jan 2014 16:57:44 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository gnumach.
commit b2b97f7f0f62c2db372c20adc11a4ef29a029699
Merge: 36b54ac a4ef631
Author: Samuel Thibault <address@hidden>
Date: Wed Jan 1 16:49:29 2014 +0000
Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach
Conflicts:
debian/changelog
debian/changelog | 3 ++-
debian/control | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --cc debian/changelog
index d5a158e,b022dd7..97f1bba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,12 @@@
-gnumach (2:1.4-2) UNRELEASED; urgency=low
+gnumach (2:1.4-2) unstable; urgency=medium
- * Bump Standards-Version to 3.9.5 (no changes).
++ * control: Bump Standards-Version to 3.9.5 (no changes).
+ * patches/kentry_data_size.patch: New patch to increase KENTRY_DATA_SIZE.
+ * patches/thread_terminate_release.patch: New patch to add
+ thread_terminate_release RPC.
+ * patches/xen_clock_overflow.patch: New patch to fix Xen clock computation.
- -- Samuel Thibault <address@hidden> Wed, 01 Jan 2014 13:34:07 +0000
+ -- Samuel Thibault <address@hidden> Mon, 28 Oct 2013 09:26:07 +0100
gnumach (2:1.4-1) unstable; urgency=low
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/gnumach.git