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 fd3fed9807d05fe87ac353ba501be920c55c3e25 (commit) via 91bfc58e63df754542ceb0e650df9ed2403f2d06 (commit) from 2160c286e3963da6bc1c974ac8f1b65009daa71b (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 fd3fed9807d05fe87ac353ba501be920c55c3e25 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 26 17:38:11 2011 +0200
openldap: Update to 2.4.25.
commit 91bfc58e63df754542ceb0e650df9ed2403f2d06 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 26 17:37:52 2011 +0200
build-essentials: Remove leading epoch when epoch equals zero.
-----------------------------------------------------------------------
Summary of changes: pkgs/build-essentials/build-essentials.nm | 2 +- pkgs/build-essentials/buildsystem/Constants | 5 ++++- pkgs/openldap/openldap.nm | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-)
Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index e226c9e..67b5e89 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 = 16 +PKG_REL = 17 PKG_EPOCH = 1 PKG_ARCH = noarch
diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants index a649885..e506d6a 100644 --- a/pkgs/build-essentials/buildsystem/Constants +++ b/pkgs/build-essentials/buildsystem/Constants @@ -106,9 +106,12 @@ PKG_EPOCH = 0 PKG_RELEASE = $(PKG_REL).$(DISTRO_DISTTAG) PKG_ARCH = $(DISTRO_ARCH)
+# Helper variable that says if EPOCH was set to another value than 0. +HAVE_EPOCH = $(filter-out $(EPOCH),0) + # Shortcut to package name + version THISAPP = $(PKG_NAME)-$(PKG_VER) -THISVER = $(PKG_EPOCH):$(PKG_VER)-$(PKG_RELEASE) +THISVER = $(if $(HAVE_EPOCH),$(PKG_EPOCH):)$(PKG_VER)-$(PKG_RELEASE)
# All packages depend on gcc and headers by default. PKG_BUILD_DEPS+= gcc glibc-devel kernel-headers diff --git a/pkgs/openldap/openldap.nm b/pkgs/openldap/openldap.nm index a62ce67..5ed2e94 100644 --- a/pkgs/openldap/openldap.nm +++ b/pkgs/openldap/openldap.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include
PKG_NAME = openldap -PKG_VER = 2.4.21 -PKG_REL = 2 +PKG_VER = 2.4.25 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUPS = System/Daemons
hooks/post-receive -- IPFire 3.x development tree