[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 02/02: Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
|
From: |
Samuel Thibault |
|
Subject: |
[hurd] 02/02: Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd |
|
Date: |
Tue, 17 Sep 2013 17:46:08 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository hurd.
commit ee4588a1d015f6111bfe4da0d71d80c3a502717c
Merge: ffb70c0 5eeb651
Author: Samuel Thibault <address@hidden>
Date: Tue Sep 17 19:45:51 2013 +0200
Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
Conflicts:
debian/changelog
TODO | 4 -
config.make.in | 13 +
configure.ac | 15 +-
console-client/Makefile | 4 +-
console-client/console.c | 115 +-
console/pager.c | 10 +-
daemons/console-run.c | 5 +-
debian/changelog | 26 +-
debian/control | 4 +-
debian/hurd-dev.lintian-overrides | 1 +
debian/hurd-doc.docs | 2 +-
debian/hurd.hurd-console.init | 123 ++
debian/hurd.lintian-overrides | 2 +-
debian/patches/exec_filename_exec.patch | 23 +-
debian/patches/exec_filename_fs.patch | 6 +-
debian/patches/ext2fs_large_stores.patch | 2274 ----------------------
debian/patches/ext2fs_large_stores_pthread.patch | 344 ----
debian/patches/hurd_console_startup.patch | 32 -
debian/patches/mount-f.patch | 88 -
debian/patches/mount-ignore-mounted-all.patch | 32 -
debian/patches/mount-n.patch | 37 -
debian/patches/mount-remount.patch | 67 -
debian/patches/mount-t-auto.patch | 86 -
debian/patches/mount-test-opts.patch | 209 +-
debian/patches/newRPC.patch | 100 +
debian/patches/procfs-default.patch | 48 -
debian/patches/procfs-get-options.patch | 73 -
debian/patches/procfs-update.patch | 143 --
debian/patches/proxy-defpager.diff | 4 +-
debian/patches/rc.patch | 19 +-
debian/patches/run.patch | 8 +-
debian/patches/series | 17 +-
debian/patches/sutils-multiple-none.patch | 40 -
debian/patches/sutils-types.patch | 150 --
debian/patches/umount.patch | 382 ----
debian/rules | 2 +-
devnode/devnode.c | 10 +
exec/Makefile | 12 +-
exec/exec.c | 933 +--------
exec/main.c | 3 +-
exec/priv.h | 43 +-
ext2fs/balloc.c | 31 +-
ext2fs/ext2fs.c | 6 +-
ext2fs/ext2fs.h | 145 +-
ext2fs/getblk.c | 21 +-
ext2fs/hyper.c | 35 +-
ext2fs/ialloc.c | 37 +-
ext2fs/inode.c | 40 +-
ext2fs/pager.c | 467 ++++-
ext2fs/pokel.c | 39 +-
ext2fs/truncate.c | 9 +-
fatfs/pager.c | 11 +-
hurd/fsys.defs | 22 +-
hurd/fsys_reply.defs | 12 +-
hurd/process.defs | 32 +-
hurd/process_reply.defs | 134 +-
hurd/process_request.defs | 33 +-
include/pids.h | 29 +
init/init.c | 24 +-
isofs/pager.c | 12 +-
libdiskfs/Makefile | 5 +-
libdiskfs/boot-start.c | 3 +-
libdiskfs/dead-name.c | 4 +-
libdiskfs/dir-lookup.c | 26 +-
libdiskfs/disk-pager.c | 6 +-
libdiskfs/diskfs-pager.h | 3 +-
libdiskfs/diskfs.h | 11 +-
libdiskfs/file-set-trans.c | 19 +-
libdiskfs/fsys-get-children.c | 99 +
libdiskfs/fsys-get-source.c | 34 +
libdiskfs/fsys-getroot.c | 3 +-
libdiskfs/get-source.c | 28 +
libdiskfs/init-startup.c | 10 +-
libdiskfs/peropen-make.c | 8 +
libdiskfs/peropen-rele.c | 1 +
libfshelp/Makefile | 3 +-
libfshelp/fshelp.h | 33 +-
libfshelp/translator-list.c | 169 ++
libihash/ihash.h | 17 +
libnetfs/Makefile | 7 +-
{libdiskfs => libnetfs}/dead-name.c | 12 +-
libnetfs/dir-lookup.c | 26 +-
libnetfs/file-get-transcntl.c | 52 +
libnetfs/file-get-translator.c | 14 +
libnetfs/file-set-translator.c | 17 +-
libnetfs/fsstubs.c | 8 -
libnetfs/fsys-get-children.c | 112 ++
libnetfs/fsys-get-source.c | 34 +
libnetfs/fsys-getroot.c | 6 +-
libnetfs/get-source.c | 28 +
libnetfs/init-startup.c | 14 +
libnetfs/make-peropen.c | 8 +
libnetfs/netfs.h | 10 +-
libnetfs/release-peropen.c | 1 +
libpager/data-request.c | 3 +-
libpager/data-return.c | 79 +-
libpager/pager-create.c | 4 +-
libpager/pager.h | 23 +-
libpager/priv.h | 1 +
libshouldbeinlibc/Makefile | 4 +-
libshouldbeinlibc/nullauth.c | 47 +
libshouldbeinlibc/nullauth.h | 31 +
libstore/Makefile | 4 -
{exec => libstore}/crypt.h | 0
{exec => libstore}/do-bunzip2.c | 0
{exec => libstore}/gzip.h | 0
{exec => libstore}/inflate.c | 0
{exec => libstore}/tailor.h | 0
{exec => libstore}/unzip.c | 0
{exec => libstore}/util.c | 0
libtrivfs/Makefile | 5 +-
libtrivfs/fsys-get-children.c | 35 +
libtrivfs/fsys-get-source.c | 33 +
libtrivfs/get-source.c | 28 +
libtrivfs/startup.c | 19 +
libtrivfs/trivfs.h | 8 +-
mach-defpager/main.c | 13 +
pfinet/main.c | 3 +-
pfinet/tunnel.c | 13 +-
proc/exc-reply.defs | 36 -
proc/info.c | 2 +-
proc/main.c | 3 +-
proc/mgt.c | 77 +-
proc/pgrp.c | 7 +-
proc/proc.h | 6 +-
procfs/ChangeLog | 6 +
procfs/main.c | 165 +-
procfs/process.c | 24 +-
procfs/rootdir.c | 49 +-
storeio/pager.c | 9 +-
sutils/fstab.c | 115 +-
tmpfs/pager-stubs.c | 8 +
tmpfs/tmpfs.c | 6 +
trans/Makefile | 8 +-
trans/mtab.c | 800 ++++++++
trans/null.c | 5 +
trans/symlink.c | 28 +
ufs/pager.c | 11 +-
utils/Makefile | 13 +-
utils/fakeroot.sh | 10 +-
utils/match-options.c | 68 +
utils/match-options.h | 33 +
utils/mount.c | 122 +-
utils/nullauth.c | 90 +
utils/remap.sh | 8 +-
utils/umount.c | 357 ++++
146 files changed, 4563 insertions(+), 5335 deletions(-)
diff --cc debian/changelog
index dfa3b2e,34f6fcc..6592c16
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,27 +1,33 @@@
- hurd (20130727-2) UNRELEASED; urgency=low
++hurd (20130916-2) UNRELEASED; urgency=low
+
+ * control, hurd.install.in, rules: Remove ufs parts.
+
+ -- Samuel Thibault <address@hidden> Tue, 17 Sep 2013 19:42:22 +0200
+
+ hurd (20130916-1) unstable; urgency=low
+
+ * New upstream snapshot. Closes: Bug#701516, Bug#313560.
+ - patches/{ext2fs_large_stores.patch, ext2fs_large_stores_pthread.patch,
+ mount-n.patch, mount-f.patch, mount-remount.patch, procfs-update.patch,
+ procfs-default.patch, procfs-get-options.patch, sutils-types.patch,
+ mount-ignore-mounted-all.patch, mount-t-auto.patch,
+ sutils-multiple-none.patch, umount.patch}: Remove, merged upstream.
+ - patches/{exec_filename_exec.patch, exec_filename_fs.patch,
+ mount-test-opts.patch, proxy-defpager.diff}: Refresh.
+ * patches/rc.patch: point /run/mtab to /proc/mounts.
+ * rules, control: Switch to makeinfo.
+ * Refresh lintian overrides.
+
+ [ Justus Winter ]
+ * hurd.hurd-console.init: Add an initscript for hurd-console.
+ * patches/hurd_console_startup.patch: Drop, this is no longer necessary with
+ the initscript in place.
+ * control: Add build dependency on libdaemon
+ * patches/newRPC.patch: New patch to fix link until libc gets rebuilt
+ against new .defs.
+
+ -- Samuel Thibault <address@hidden> Mon, 16 Sep 2013 14:30:13 +0000
+
hurd (20130727-1) unstable; urgency=low
[ Samuel Thibault ]
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git