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 7a7d1fdc77082e905cccf695c5cde49596a31d7b (commit) via 60a9c985c2439c5028e12e0548e7cb097d3e9d7b (commit) from a48c328e9c19a513233f0a75824fcc3c1987e121 (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 7a7d1fdc77082e905cccf695c5cde49596a31d7b Merge: 60a9c98 a48c328 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 13 15:54:59 2011 +0100

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

commit 60a9c985c2439c5028e12e0548e7cb097d3e9d7b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 13 15:54:10 2011 +0100

xorg-x11-drv-intel: Fix build.

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

Summary of changes: pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)

Difference in files: diff --git a/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm b/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm index 8543e41..1c82190 100644 --- a/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm +++ b/pkgs/xorg-x11-drv-intel/xorg-x11-drv-intel.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = xorg-x11-drv-intel PKG_VER = 2.12.0 -PKG_REL = 0 +PKG_REL = 1

PKG_MAINTAINER = Stefan Schantl stefan.schantl@ipfire.org PKG_GROUP = X/Driver @@ -34,9 +34,10 @@ PKG_URL = http://www.x.org/ PKG_LICENSE = MIT PKG_SUMMARY = Xorg X11 intel video driver.

-PKG_BUILD_DEPS += autoconf automake libdrm-devel libudev-devel libXvMC-devel \ - libxcb-devel libtool mesa-devel pkg-config xcb-util-devel \ - xorg-x11-proto-devel xorg-x11-server-devel xorg-x11-util-macros +PKG_BUILD_DEPS += autoconf automake libdrm-devel libudev-devel libX11-devel \ + libXvMC-devel libxcb-devel libtool mesa-devel pkg-config \ + xcb-util-devel xorg-x11-proto-devel xorg-x11-server-devel \ + xorg-x11-util-macros

define PKG_DESCRIPTION X.Org X11 intel video driver.

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