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 fbcf3f8272c2553155346d4da05e641cec0d2107 (commit) via eabd0eadccee163cb2c2d8102b8159cc6bbe9ee0 (commit) via 43798bc01ed700c28b11d073c577563b7d067685 (commit) via 69f855735d77a495c3b653d863278f84339068d5 (commit) from 4ea11fef92f2d78f60f64700d047bd3e90940db4 (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 fbcf3f8272c2553155346d4da05e641cec0d2107 Merge: eabd0ea 4ea11fe Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jan 8 14:59:26 2011 +0100

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

commit eabd0eadccee163cb2c2d8102b8159cc6bbe9ee0 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jan 4 23:33:59 2011 +0100

radvd: Fix build error with flex library.

commit 43798bc01ed700c28b11d073c577563b7d067685 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jan 4 23:30:32 2011 +0100

Revert "flex: Remove unneeded library." plus more.

This reverts commit 4c8e2fc43ab3f70fcb764d460f0bfb50ade798d1.

Adds a development package with the library.

commit 69f855735d77a495c3b653d863278f84339068d5 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jan 4 23:20:39 2011 +0100

lldpd: Fix build.

Had wrong dependency to libxml2.

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

Summary of changes: pkgs/core/flex/flex.nm | 6 +++--- pkgs/core/lldpd/lldpd.nm | 2 +- pkgs/core/radvd/radvd.nm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)

Difference in files: diff --git a/pkgs/core/flex/flex.nm b/pkgs/core/flex/flex.nm index 0dd33fb..726fe38 100644 --- a/pkgs/core/flex/flex.nm +++ b/pkgs/core/flex/flex.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = flex PKG_VER = 2.5.35 -PKG_REL = 1 +PKG_REL = 2

PKG_MAINTAINER = PKG_GROUP = Development/Tools @@ -51,6 +51,8 @@ endef

PKG_TARBALL = $(THISAPP).tar.bz2

+PKG_PACKAGES += $(PKG_NAME)-devel + CONFIGURE_OPTIONS += \ --mandir=/usr/share/man

@@ -62,6 +64,4 @@ define STAGE_INSTALL_CMDS echo "#!/bin/sh" > $(BUILDROOT)/usr/bin/lex echo "exec /usr/bin/flex -l "$$@"" >> $(BUILDROOT)/usr/bin/lex chmod 755 $(BUILDROOT)/usr/bin/lex - - rm -rvf $(BUILDROOT)/usr/{include,lib} endef diff --git a/pkgs/core/lldpd/lldpd.nm b/pkgs/core/lldpd/lldpd.nm index a9f29cb..78a10db 100644 --- a/pkgs/core/lldpd/lldpd.nm +++ b/pkgs/core/lldpd/lldpd.nm @@ -34,7 +34,7 @@ PKG_URL = https://trac.luffy.cx/lldpd/ PKG_LICENSE = GPL PKG_SUMMARY = Utilities for the Link Layer Discovery Protocol.

-PKG_DEPS += libxml2 +PKG_BUILD_DEPS+= libxml2-devel pkg-config

define PKG_DESCRIPTION The LLDPD project aims to provide a comprehensive implementation of \ diff --git a/pkgs/core/radvd/radvd.nm b/pkgs/core/radvd/radvd.nm index c549b2b..97d0c88 100644 --- a/pkgs/core/radvd/radvd.nm +++ b/pkgs/core/radvd/radvd.nm @@ -34,7 +34,7 @@ PKG_URL = http://flex.sourceforge.net/ PKG_LICENSE = BSD with advertising PKG_SUMMARY = A Router Advertisement daemon.

-PKG_BUILD_DEPS+= flex bison +PKG_BUILD_DEPS+= flex flex-devel bison

define PKG_DESCRIPTION radvd is the router advertisement daemon for IPv6. It listens to \

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