[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 01/01: Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
|
From: |
Samuel Thibault |
|
Subject: |
[hurd] 01/01: Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd |
|
Date: |
Wed, 20 Nov 2013 23:29:45 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository hurd.
commit 29d4c2d2bb9c320e25f62717d2fabb31498e2f36
Merge: 84364bf 5ff53dc
Author: Samuel Thibault <address@hidden>
Date: Wed Nov 20 23:29:37 2013 +0000
Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
Conflicts:
debian/changelog
debian/changelog | 8 ++
debian/patches/exec_filename_fix.patch | 147 ++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 156 insertions(+)
diff --cc debian/changelog
index 4fcba2e,d035979..805092e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,12 +1,12 @@@
+ hurd (1:0.5.git20131101-2) UNRELEASED; urgency=low
+
+ [ Justus Winter ]
+ * patches/exec_filename_fix.patch: Fix passing path in hurdish
+ fakeroot/chroot.
+
+ -- Samuel Thibault <address@hidden> Tue, 19 Nov 2013 00:21:47 +0100
+
-hurd (1:0.5.git20131101-1) UNRELEASED; urgency=low
+hurd (1:0.5.git20131101-1) unstable; urgency=low
[ Samuel Thibault ]
* New upstream snapshot.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git