diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-28 10:39:26 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-28 10:39:26 +0000 |
| commit | f966eb26edd102d2cc16ad1625d9bf6cdadb8430 (patch) | |
| tree | ad58601d1b583323b7c456755c7fbf402fd675e2 | |
| parent | 62f96ef747efc2494f0720552afa2a8bbe7ddd06 (diff) | |
| parent | 43f76a844a02dcc5df450a632bd5e35cf5bae0a6 (diff) | |
Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach
Conflicts:
debian/changelog
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/patches/70_dde.patch | 3 |
3 files changed, 17 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 694406f..cc2d094 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,24 @@ gnumach (2:1.4-1) UNRELEASED; urgency=low + [ Samuel Thibault ] * New upstream release. - patches/00_clean_gfdl.patch: Drop, upstream documentation does not have invariant sections any more. - rules (clean): Remove generated documentation. + * Bump Standards-Version to 3.9.4 (no changes). + * patches/70_dde.patch: Fix experimental.defs creation. + + [ Pino Toscano ] + * Update Vcs-* headers. + + -- Samuel Thibault <sthibault@debian.org> Sat, 13 Jul 2013 18:38:14 +0200 + +gnumach (2:1.3.99.dfsg.git20130624-1) unstable; urgency=low + + * New upstream snapshot + - Fix partitioning reloading. - -- Samuel Thibault <sthibault@debian.org> Sat, 28 Sep 2013 10:24:04 +0000 + -- Samuel Thibault <sthibault@debian.org> Mon, 24 Jun 2013 15:22:49 +0200 gnumach (2:1.3.99.dfsg.git20130610-1) unstable; urgency=low diff --git a/debian/control b/debian/control index d4fd299..0ebbdc9 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,11 @@ Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org> Uploaders: Guillem Jover <guillem@debian.org>, Samuel Thibault <sthibault@debian.org> Homepage: http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html -Vcs-Browser: http://git.debian.org/?p=pkg-hurd/gnumach.git -Vcs-Git: git://git.debian.org/pkg-hurd/gnumach.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-hurd/gnumach.git +Vcs-Git: git://anonscm.debian.org/pkg-hurd/gnumach.git Build-Depends: debhelper (>= 7), mig, sharutils, autoconf, automake -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Package: gnumach Architecture: any-i386 diff --git a/debian/patches/70_dde.patch b/debian/patches/70_dde.patch index 69a5e2e..9d4a3bd 100644 --- a/debian/patches/70_dde.patch +++ b/debian/patches/70_dde.patch @@ -347,9 +347,6 @@ index 0000000..6fca328 +#define KERNEL_SERVER 1 + +#include <mach/experimental.defs> -diff --git a/include/device/intr.defs b/include/device/intr.defs -new file mode 100644 -index 0000000..368b96c --- /dev/null +++ b/include/mach/experimental.defs @@ -0,0 +1,100 @@ |