[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 03/04: Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
|
From: |
Samuel Thibault |
|
Subject: |
[hurd] 03/04: Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd |
|
Date: |
Sat, 15 Feb 2014 08:49:28 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository hurd.
commit 1fd461867bc8b99a6f1cf1fabd6ba7099d9b3b28
Merge: 9848780 e9b0c4c
Author: Samuel Thibault <address@hidden>
Date: Sat Feb 15 08:48:53 2014 +0000
Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
Conflicts:
debian/changelog
debian/changelog | 1 +
debian/patches/{mount-loop.patch => mount.patch} | 9 +++++----
debian/patches/series | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --cc debian/changelog
index dd5198c,a8465f0..084755f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,9 @@@
hurd (1:0.5.git20140206-2) UNRELEASED; urgency=medium
+ * debian/patches/rc.patch: Also make /etc/mtab point to /proc/mounts.
+ * patches/mount.patch: Also ignore exec option.
- -- Samuel Thibault <address@hidden> Sat, 08 Feb 2014 21:23:02 +0100
+ -- Samuel Thibault <address@hidden> Thu, 13 Feb 2014 23:04:13 +0000
hurd (1:0.5.git20140206-1) unstable; urgency=medium
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git