diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-14 16:01:08 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-14 16:01:08 +0200 |
| commit | f14dc48c6c1df8301b1a0e9f009f50c90d3ab27e (patch) | |
| tree | 22003145ddae067158a9f99e4c2e5a0fd2fec2c7 /debian/changelog | |
| parent | 32a90b0a2211131ee6c5cffb9bf2c25fcb440667 (diff) | |
| parent | a01ec9bf136466835c505602d31aa4c324a643de (diff) | |
Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach
Conflicts:
debian/changelog
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 0428415..2d42901 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,22 @@ -gnumach (2:1.3.99.dfsg.git20120610-2) UNRELEASED; urgency=low +gnumach (2:1.3.99.dfsg.git20120710-2) UNRELEASED; urgency=low * patches/60_bigmem.patch: Also set Xen to 2/2 memory model. -- Samuel Thibault <sthibault@debian.org> Sat, 14 Jul 2012 15:59:33 +0200 +gnumach (2:1.3.99.dfsg.git20120710-1) unstable; urgency=low + + * New upstream snaphsot + + -- Samuel Thibault <sthibault@debian.org> Tue, 10 Jul 2012 01:59:41 +0000 + gnumach (2:1.3.99.dfsg.git20120610-1) unstable; urgency=low * New upstream snapshot. - * rules: Disable net, pcmcia and wireless groups + * patches/12_version_suffix.patch: New patch to append suffix to Mach version. + * rules: + - Disable net, pcmcia and wireless groups + - Add version suffixes. * control: - Do not provide nic-modules, nic-pcmcia-modules, nic-wireless-modules and pcmcia-modules any more. |