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 dcc3c9bd46292cfbd066d37a5b174751258e314a (commit) via d0ed853af959e48642fe1a163f9fd8a5fe214657 (commit) via ef52f65972b8f73a078e8a79a6f2aac5cb3989a9 (commit) from 65e01fdf664f69888eefd29c0fa169b8606b43a1 (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 dcc3c9bd46292cfbd066d37a5b174751258e314a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 6 22:14:21 2011 +0100

grub: Fix for spaces in --class parameter.

This caused a crash in the menu.

commit d0ed853af959e48642fe1a163f9fd8a5fe214657 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 6 19:13:30 2011 +0100

system-release: Rebuild because of DISTRO_SLOGAN.

commit ef52f65972b8f73a078e8a79a6f2aac5cb3989a9 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 6 17:45:47 2011 +0100

build-essentials: Remove cpio and add pkgconfig as build dependency.

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

Summary of changes: pkgs/build-essentials/build-essentials.nm | 6 ++-- pkgs/grub/grub.nm | 2 +- .../grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0 | 39 ++++++++++++++++++++ pkgs/system-release/system-release.nm | 2 +- 4 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 pkgs/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0

Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index 363477d..b70c0b4 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 3 +PKG_REL = 4 PKG_EPOCH = 1 PKG_ARCH = noarch

@@ -37,8 +37,8 @@ PKG_LICENSE = GPL PKG_SUMMARY = Elementary scripts for the build system.

PKG_BUILD_DEPS = -PKG_DEPS += bash bzip2 coreutils cpio diffutils file findutils gawk \ - grep gzip make patch sed system-release tar which xz +PKG_DEPS += bash bzip2 coreutils diffutils file findutils gawk \ + grep gzip make patch pkgconfig sed system-release tar which xz

define PKG_DESCRIPTION This package contains elementary scripts for the pakfire build system. diff --git a/pkgs/grub/grub.nm b/pkgs/grub/grub.nm index ecb3590..f390c25 100644 --- a/pkgs/grub/grub.nm +++ b/pkgs/grub/grub.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = grub PKG_VER = 1.98 -PKG_REL = 5 +PKG_REL = 6

PKG_MAINTAINER = PKG_GROUP = System/Boot diff --git a/pkgs/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0 b/pkgs/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0 new file mode 100644 index 0000000..d3d0727 --- /dev/null +++ b/pkgs/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0 @@ -0,0 +1,39 @@ +=== modified file 'util/grub.d/10_hurd.in' +--- util/grub.d/10_hurd.in 2010-02-03 00:24:07 +0000 ++++ util/grub.d/10_hurd.in 2010-04-08 09:54:44 +0000 +@@ -27,7 +27,7 @@ + OS=GNU + else + OS="${GRUB_DISTRIBUTOR} GNU/Hurd" +- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}" ++ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}" + fi + + at_least_one=false + +=== modified file 'util/grub.d/10_kfreebsd.in' +--- util/grub.d/10_kfreebsd.in 2010-02-03 00:24:07 +0000 ++++ util/grub.d/10_kfreebsd.in 2010-04-08 09:54:44 +0000 +@@ -30,7 +30,7 @@ + case "${GRUB_DISTRIBUTOR}" in + Debian) + OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD" +- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') --class gnu-kfreebsd --class gnu ${CLASS}" ++ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) --class gnu-kfreebsd --class gnu ${CLASS}" + ;; + *) + OS="FreeBSD" + +=== modified file 'util/grub.d/10_linux.in' +--- util/grub.d/10_linux.in 2010-02-26 13:32:24 +0000 ++++ util/grub.d/10_linux.in 2010-04-08 09:54:44 +0000 +@@ -31,7 +31,7 @@ + OS=GNU/Linux + else + OS="${GRUB_DISTRIBUTOR} GNU/Linux" +- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}" ++ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}" + fi + + # loop-AES arranges things so that /dev/loop/X can be our root device, but + diff --git a/pkgs/system-release/system-release.nm b/pkgs/system-release/system-release.nm index 84bc8eb..4193efa 100644 --- a/pkgs/system-release/system-release.nm +++ b/pkgs/system-release/system-release.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = system-release PKG_VER = $(DISTRO_VERSION) -PKG_REL = 1 +PKG_REL = 2 PKG_EPOCH = 1 PKG_ARCH = noarch

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