diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-19 16:56:04 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-19 16:56:04 +0100 |
| commit | f60d60e8ed05d959191489c38d0a54f66d9e8b97 (patch) | |
| tree | f88e0e1fab19fd2ce66890d6b163485db3dbdf06 /debian/changelog | |
| parent | 4aabe7e914ddcf1b4109fa96381a920ea5a097c9 (diff) | |
| parent | da6adddc287a5fb95d2aaad699dcd46d13d2db0a (diff) | |
Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach
Conflicts:
debian/patches/10_cdromlock.patch
debian/patches/13_ide_dma.patch
debian/patches/24_pci_irq_fix.patch
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index f8f8d73..a8f4e6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ -gnumach (2:1.3.99.dfsg.git20120710-2) UNRELEASED; urgency=low +gnumach (2:1.3.99.dfsg.git20120923-1) unstable; urgency=low + * New upstream snapshot + - patches/10_cdromlock.patch: Remove, merged upstream + - patches/13_ide_dma.patch: Remove, merged upstream + - patches/24_pci_irq_fix.patch: Remove, merged upstream + - patches/70_dde.patch: Refresh. * patches/60_bigmem.patch: Also set Xen to 2/2 memory model. * patches/40_iopl_mem.patch: Remove * control: Break xserver before 1.9.99.1. |