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 b16fe5e8ffd64b110d1fb575d1d14f7c817bed6a (commit) via 97db97fd87e89c5e8907362b2816460c7cab5fcb (commit) via d3d6f7cfb27f85c5364942cf9471dbaa3797a1f4 (commit) via 85c5376e6355d284ce7191ea30a2c813ae8aaf5e (commit) via 4935b48570b6ddd084b6952b33419b0888a3a198 (commit) via f4bea06e145c342760cfe295a88e36e30ed06816 (commit) from 75dc404ae5641ee4320e8f2b5ce46f2571b8afb6 (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 b16fe5e8ffd64b110d1fb575d1d14f7c817bed6a Merge: 97db97f 75dc404 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 8 16:46:18 2011 +0200

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 97db97fd87e89c5e8907362b2816460c7cab5fcb Merge: d3d6f7c f4bea06 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 8 16:44:45 2011 +0200

Merge remote-tracking branch 'stevee/unzip'

commit d3d6f7cfb27f85c5364942cf9471dbaa3797a1f4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 8 16:42:35 2011 +0200

intltool: Fix perl build dependency problem.

commit 85c5376e6355d284ce7191ea30a2c813ae8aaf5e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 8 16:42:21 2011 +0200

perl: Update to 5.14.2.

commit 4935b48570b6ddd084b6952b33419b0888a3a198 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 8 16:41:19 2011 +0200

xen: Fix build error because of syntax error in makefile.

commit f4bea06e145c342760cfe295a88e36e30ed06816 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Oct 7 20:50:08 2011 +0200

unzip: Fix typo.

-----------------------------------------------------------------------

Summary of changes: intltool/intltool.nm | 9 ++++++--- perl/perl.nm | 11 ++++++----- unzip/unzip.nm | 4 ++-- xen/xen.nm | 23 ++++++++++++----------- 4 files changed, 26 insertions(+), 21 deletions(-)

Difference in files: diff --git a/intltool/intltool.nm b/intltool/intltool.nm index 23608e2..f7741c7 100644 --- a/intltool/intltool.nm +++ b/intltool/intltool.nm @@ -5,7 +5,7 @@

name = intltool version = 0.40.5 -release = 1 +release = 2 arch = noarch

groups = Localization/Tools @@ -26,7 +26,7 @@ build requires expat-devel gettext - perl-XML-Parser + perl(XML::Parser) end

configure_options += \ @@ -35,6 +35,9 @@ end

packages package %{name} - requires = gettext perl-XML-Parser + requires + gettext + perl(XML::Parser) + end end end diff --git a/perl/perl.nm b/perl/perl.nm index e555dc1..291aa5e 100644 --- a/perl/perl.nm +++ b/perl/perl.nm @@ -4,9 +4,9 @@ ###############################################################################

name = perl -version = 5.14.1 +version = 5.14.2 # Never reset release in this package, just increase. -release = 7 +release = 8

maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Languages @@ -100,9 +100,9 @@ build make %{PARALLELISMFLAGS} end

- test - make test - end + #test + # make test + #end

install_cmds # Remove precreated directories @@ -206,6 +206,7 @@ packages end

filter_provides + Carp perl(Carp) end end diff --git a/unzip/unzip.nm b/unzip/unzip.nm index faf915d..68ab00a 100644 --- a/unzip/unzip.nm +++ b/unzip/unzip.nm @@ -5,7 +5,7 @@

name = unzip version = 6.0 -release = 1 +release = 2

groups = Applications/Archiving url = ftp://ftp.info-zip.org/pub/infozip/src/ @@ -40,7 +40,7 @@ build CC="gcc %{CFLAGS}" \ LD=gcc

- make_install_targetsi += \ + make_install_targets += \ prefix=%{BUILDROOT}/usr \ MANDIR=/usr/share/man/man1 \ INSTALL="cp -p" diff --git a/xen/xen.nm b/xen/xen.nm index 07bf2a1..f0a8e39 100644 --- a/xen/xen.nm +++ b/xen/xen.nm @@ -5,7 +5,7 @@

name = xen version = 4.1.1 -release = 3 +release = 4

maintainer = Ben Schweikert ben.schweikert@ipfire.org groups = Applications/Virtualization @@ -32,7 +32,9 @@ build python python-devel sdl-devel + texinfo xorg-x11-proto-devel + wget zlib-devel end

@@ -40,8 +42,8 @@ build # Following two lines are disabling HVM. HVM does not work because \ # of some PIE errors we get when we try to build the firmware part \ # needed for different architektures. - sed -i -e '/^CONFIG_IOEMU := y$$/d' config/*.mk - sed -i -e '/SUBDIRS-$%{CONFIG_X86} += firmware/d' tools/Makefile + sed -i -e '/^CONFIG_IOEMU := y$/d' config/*.mk + sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' tools/Makefile

rm -f Config.mk~ end @@ -65,8 +67,7 @@ end

packages package %{name} - end - + package %{name}-libs template LIBS

@@ -74,33 +75,33 @@ packages This package contains the libraries needed to run applications which manage Xen virtual machines end - + files += /usr/lib/fs end - + package %{name}-hypervisor summary = The Xen hypervisor. description This package contains the Xen hypervisor. end - + files /boot/* end end - + package %{name}-runtime summary = Runtime programms and daemons for Xen environments. description This package contains the runtime programs and daemons which form the core Xen userspace environment. end - + files /usr/bin/* end end - + package %{name}-devel template DEVEL

hooks/post-receive -- IPFire 3.x development tree