This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository hurd.
commit 51498fecedb3fdb0647987da2f3c93a149a39a0e Merge: e1002d6 5473b7b Author: Samuel Thibault <[email protected]> Date: Tue Jan 14 02:00:56 2014 +0000 Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd Conflicts: debian/changelog debian/patches/series debian/changelog | 3 +- debian/patches/series | 4 + debian/patches/xkb-compat.patch | 746 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 752 insertions(+), 1 deletion(-) diff --cc debian/changelog index 2e04091,9589718..9bb0240 --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,13 +1,17 @@@ -hurd (1:0.5.git20131101-2) UNRELEASED; urgency=low - - [ Justus Winter ] - * patches/exec_filename_fix.patch: Fix passing path in hurdish - fakeroot/chroot. +hurd (1:0.5.git20140113-1) unstable; urgency=low [ Samuel Thibault ] + * New upstream snapshot. + - refresh patches. + * patches/libports_revert_stacksize.patch: New patch to revert upstream + cleanup. + * patches/xkb-compat.patch: Replace default compat with explicit content. + [ Justus Winter ] + * patches/exec_filename_fix.patch: Fix passing path in hurdish + fakeroot/chroot. + - -- Samuel Thibault <[email protected]> Tue, 14 Jan 2014 00:40:23 +0000 + -- Samuel Thibault <[email protected]> Tue, 19 Nov 2013 00:21:47 +0100 hurd (1:0.5.git20131101-1) unstable; urgency=low diff --cc debian/patches/series index 043bf2a,68dd21e..e8cc0d3 --- a/debian/patches/series +++ b/debian/patches/series @@@ -42,4 -42,4 +42,8 @@@ exec_filename_fix.patc mount-loop.patch proc_set_init_task.patch newRPC.patch ++<<<<<<< HEAD +libports_revert_stacksize.patch ++======= + xkb-compat.patch ++>>>>>>> 5473b7b628a8b0764d1c33d4a28d6d01e4b6cc0c -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
