[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 03/03: Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
From: |
Samuel Thibault |
Subject: |
[hurd] 03/03: Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd |
Date: |
Thu, 20 Mar 2014 02:24:46 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository hurd.
commit 688087668bdb70c17164ae74b5e90bf006f7abd2
Merge: 89fb63f 47fe56c
Author: Samuel Thibault <address@hidden>
Date: Thu Mar 20 02:24:35 2014 +0000
Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
Conflicts:
debian/changelog
debian/changelog | 4 +++-
debian/hurd.hurd-console.init | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --cc debian/changelog
index a2b38e0,aee7ab3..2d82057
--- a/debian/changelog
+++ b/debian/changelog
@@@ -6,13 -4,16 +6,15 @@@ hurd (1:0.5.git20140319-1) unstable; ur
* control: Only Replace/Conflict old login package which was potentially
shipping /bin/login.
* local/securetty: Remove file, let it be installed by the login package.
-
- * debian/patches/rc.patch: Also make /etc/mtab point to /proc/mounts.
+ * patches/rc.patch: Also make /etc/mtab point to /proc/mounts.
* patches/mount.patch: Also ignore exec option.
-
+ * local/runsystem: Allow to pass VGA options from d-i boot menu.
+ * local/finish-install.d/51hurd_config-console: Propagate VGA options to
+ installed system.
+ * debian/hurd.hurd-console.init: Do not make hurd-console depend on $all,
+ and make it start before DMs.
- -- Samuel Thibault <address@hidden> Thu, 20 Mar 2014 00:57:15 +0000
-TODO: force 8/9 width in d-i, and copy to installed system
-
- -- Samuel Thibault <address@hidden> Thu, 06 Feb 2014 10:35:15 +0000
++ -- Samuel Thibault <address@hidden> Thu, 20 Mar 2014 02:24:20 +0000
hurd (1:0.5.git20140203-1) unstable; urgency=low
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git