diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-28 10:30:03 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-28 10:32:18 +0000 |
| commit | c037c23ef09fbe981d8663a6e9644ae1717e1649 (patch) | |
| tree | d614ccb3a56cb15b0febb0e04e9c8f37614fee36 /debian | |
| parent | 6636367748db8d68bf9d699e70c44d641f235d0f (diff) | |
| parent | 80cddc9ba64d1f4a82449680e4adc52918177d1f (diff) | |
Merge branch 'upstream'
Conflicts:
doc/gpl.texi
doc/mach.texi
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/70_dde.patch | 4 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 0316123..15c9005 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gnumach (2:1.4-1) UNRELEASED; urgency=low + + * New upstream release. + - patches/00_clean_gfdl.patch: Drop, upstream documentation does not have + invariant sections any more. + + -- Samuel Thibault <sthibault@debian.org> Sat, 28 Sep 2013 10:24:04 +0000 + gnumach (2:1.3.99.dfsg.git20130610-1) unstable; urgency=low * New upstream snapshot diff --git a/debian/patches/70_dde.patch b/debian/patches/70_dde.patch index 048231b..69a5e2e 100644 --- a/debian/patches/70_dde.patch +++ b/debian/patches/70_dde.patch @@ -130,8 +130,8 @@ index a00a12d..9d635cf 100644 --- a/device/ds_routines.h +++ b/device/ds_routines.h @@ -58,4 +58,7 @@ boolean_t ds_write_done(io_req_t); - - void iowait (io_req_t ior); + vm_size_t size, + mach_port_t *pager); +/* XXX arch-specific */ +extern ipc_port_t intr_rcv_ports[16]; diff --git a/debian/patches/series b/debian/patches/series index 8433870..a95f927 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -00_clean_gfdl.patch 11_ignore_CSIn.patch 12_version_suffix.patch 50_initrd.patch |