[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, 08 Mar 2016 23:44:48 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository hurd.
commit 6ea2e8828875f01d3057136b2bcc364a68645db4
Merge: f2c31b4 8436f4a
Author: Samuel Thibault <address@hidden>
Date: Wed Mar 9 00:44:35 2016 +0100
Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd
debian/changelog | 18 ++++++++++++++----
debian/control | 4 ++--
debian/patches/cross-fix.diff | 21 ---------------------
debian/patches/netdde_log.patch | 13 +++++++++++++
debian/patches/parallel_build.diff | 24 ------------------------
debian/patches/series | 5 ++---
debian/patches/using_std.patch | 21 +++++++++++++++++++++
eth-multiplexer/Makefile | 2 +-
libbpf/Makefile | 2 --
libdiskfs/dir-lookup.c | 17 +++++++++--------
libmachdev/Makefile | 2 +-
libnetfs/dir-lookup.c | 11 +++++++++--
libps/fmt.c | 2 +-
libtreefs/dir-lookup.c | 11 +++++++++--
sutils/Makefile | 4 ++--
15 files changed, 84 insertions(+), 73 deletions(-)
diff --cc debian/changelog
index e0e5fd6,13d0991..82f5925
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,13 +1,15 @@@
- hurd (1:0.7.git20160223-3) UNRELEASED; urgency=medium
+ hurd (1:0.7.git20160228-2) UNRELEASED; urgency=medium
+ * control: Make hurd-dev provides libdde-linux26-dev (but not at stage3).
++ * patches/libports-iterate-refcount.patch: New patch to avoid a crash in
++ libports.
+
+ -- Samuel Thibault <address@hidden> Sun, 28 Feb 2016 20:35:20 +0000
+
+ hurd (1:0.7.git20160228-1) unstable; urgency=medium
+
+ * New upstream snapshot.
+ - patches/parallel_build.diff,cross-fix.diff: Drop, merged upstream.
* control: Fix spurious build of hurd-headers-dev and libihash-dev in
unstaged
builds.
* rules: Fix cross-build of libdde-linux26.
diff --cc debian/patches/series
index 8206323,b4af055..4198bd7
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -25,7 -25,5 +25,6 @@@ dl_origin.patc
cross-link.patch
procfs-compatible
crash-logging.patch
- parallel_build.diff
- cross-fix.diff
+ using_std.patch
+ netdde_log.patch
+libports-iterate-refcount.patch
-
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git