This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 3cfb2e8c30f9676bab2332424f5b6e935cd5ab8e (commit) via 62b480b564da6c13bf0ac06ba012b1a52b2d8310 (commit) via 7f6789e7f6b3cedf4e89e95eaff3c68eec14eed7 (commit) via 8c7f742969980d51071cddb9c4b9a4e937da60ef (commit) via eea49f68b8749f5b92e7f9f5120de0050c8d5260 (commit) from d34a422afbf823a9b11fc69db4c45c9f6ea36bc7 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 3cfb2e8c30f9676bab2332424f5b6e935cd5ab8e Merge: 7f6789e 62b480b Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 2 13:17:51 2011 +0200
Merge remote-tracking branch 'trikolon/qemu-kvm'
commit 62b480b564da6c13bf0ac06ba012b1a52b2d8310 Author: Ben Schweikert trikolon@ipfire.org Date: Mon May 2 10:06:52 2011 +0200
Qemu: Fix missing dependencies and updated to version 0.14.0.
commit 7f6789e7f6b3cedf4e89e95eaff3c68eec14eed7 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 1 23:56:49 2011 +0200
systemd: Cleanup build file.
commit 8c7f742969980d51071cddb9c4b9a4e937da60ef Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 1 23:56:29 2011 +0200
libcgroup: Cleanup build file.
commit eea49f68b8749f5b92e7f9f5120de0050c8d5260 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 1 23:56:09 2011 +0200
vala: Cleanup package and fix build.
-----------------------------------------------------------------------
Summary of changes: pkgs/libcgroup/libcgroup.nm | 4 ++-- pkgs/qemu/qemu.nm | 4 ++-- pkgs/systemd/systemd.nm | 5 +++-- pkgs/vala/vala.nm | 11 ++++++----- 4 files changed, 13 insertions(+), 11 deletions(-)
Difference in files: diff --git a/pkgs/libcgroup/libcgroup.nm b/pkgs/libcgroup/libcgroup.nm index cc0f692..89ec0c4 100644 --- a/pkgs/libcgroup/libcgroup.nm +++ b/pkgs/libcgroup/libcgroup.nm @@ -26,10 +26,10 @@ include $(PKGROOT)/Include
PKG_NAME = libcgroup PKG_VER = 0.35.1 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = -PKG_GROUP = Development/Libraries +PKG_GROUPS = Development/Libraries PKG_URL = http://libcg.sourceforge.net/ PKG_LICENSE = LGPLv2+ PKG_SUMMARY = Tools and libraries to control and monitor control groups. diff --git a/pkgs/qemu/qemu.nm b/pkgs/qemu/qemu.nm index 1e4fb2d..bda63da 100644 --- a/pkgs/qemu/qemu.nm +++ b/pkgs/qemu/qemu.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = qemu-kvm -PKG_VER = 0.14.0-rc1 +PKG_VER = 0.14.0 PKG_REL = 0
PKG_MAINTAINER = @@ -35,7 +35,7 @@ PKG_LICENSE = GPLv2+ PKG_SUMMARY = QEMU is a generic and open source machine emulator and virtualizer.
PKG_BUILD_DEPS+= libcurl-devel libuuid-devel gnutls-devel ncurses-devel \ - pciutils-devel sdl-devel + pciutils-devel sdl-devel zlib-devel
define PKG_DESCRIPTION QEMU is a processor emulator that relies on dynamic binary translation \ diff --git a/pkgs/systemd/systemd.nm b/pkgs/systemd/systemd.nm index 88c25f9..9ea2a18 100644 --- a/pkgs/systemd/systemd.nm +++ b/pkgs/systemd/systemd.nm @@ -27,10 +27,9 @@ include $(PKGROOT)/Include PKG_NAME = systemd PKG_VER = 24 PKG_REL = 1 -PKG_CONFLICTS += upstart
PKG_MAINTAINER = Stefan Schantl stefan.schantl@ipfire.org -PKG_GROUP = System/Base +PKG_GROUPS = System/Base PKG_URL = http://www.freedesktop.org/wiki/Software/systemd PKG_LICENSE = GPLv2+ PKG_SUMMARY = A System and Service Manager. @@ -43,6 +42,8 @@ define PKG_DESCRIPTION SysV and LSB init scripts. endef
+PKG_CONFLICTS += upstart + PKG_TARBALL = $(THISAPP).tar.bz2
PKG_PACKAGES += $(PKG_NAME)-units $(PKG_NAME)-devel diff --git a/pkgs/vala/vala.nm b/pkgs/vala/vala.nm index 4bb903f..f75c4f4 100644 --- a/pkgs/vala/vala.nm +++ b/pkgs/vala/vala.nm @@ -26,10 +26,10 @@ include $(PKGROOT)/Include
PKG_NAME = vala PKG_VER = 0.11.2 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = -PKG_GROUP = Development/Languages +PKG_GROUPS = Development/Languages PKG_URL = http://live.gnome.org/Vala PKG_LICENSE = LGPLv2+ and BSD PKG_SUMMARY = A modern programming language. @@ -48,7 +48,8 @@ endef
PKG_TARBALL = $(THISAPP).tar.bz2
-define STAGE_TEST - cd $(DIR_APP) && make check -endef +# Disabled as it does total rubbish. +#define STAGE_TEST +# cd $(DIR_APP) && make check +#endef
hooks/post-receive -- IPFire 3.x development tree