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 3d61530e65f89028b6711ab06bb2f3d9fd08e305 (commit) via eb571950e254f675f9f39c8564ec4b699b01eae4 (commit) via bc1a6c1d001b0da6f2d20fd0203a1ed215b04f0c (commit) from beb394aee6f65ecba65b1796286b5e3bd3df6691 (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 3d61530e65f89028b6711ab06bb2f3d9fd08e305 Merge: eb57195 beb394a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 27 20:49:32 2011 +0100

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

Conflicts: pkgs/ppl/patches/ppl-0.10.2-Makefile.patch pkgs/ppl/patches/ppl-0.10.2-gmp-build-fix.patch pkgs/ppl/patches/ppl-0.10.2-m4-update.patch

commit eb571950e254f675f9f39c8564ec4b699b01eae4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 27 20:47:36 2011 +0100

ppl: Update to 0.11.2.

commit bc1a6c1d001b0da6f2d20fd0203a1ed215b04f0c Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 27 20:46:50 2011 +0100

cryptsetup-luks: Fix build dependencies.

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

Summary of changes: pkgs/cryptsetup-luks/cryptsetup-luks.nm | 4 ++-- pkgs/ppl/patches/ppl-0.10.2-Makefile.patch | 12 ------------ pkgs/ppl/ppl.nm | 6 +++--- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 pkgs/ppl/patches/ppl-0.10.2-Makefile.patch

Difference in files: diff --git a/pkgs/cryptsetup-luks/cryptsetup-luks.nm b/pkgs/cryptsetup-luks/cryptsetup-luks.nm index fb95aea..aa06032 100644 --- a/pkgs/cryptsetup-luks/cryptsetup-luks.nm +++ b/pkgs/cryptsetup-luks/cryptsetup-luks.nm @@ -34,8 +34,8 @@ PKG_URL = http://cryptsetup.googlecode.com/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = A utility for setting up encrypted filesystems.

-PKG_BUILD_DEPS+= e2fsprogs-devel libdevmapper-devel libgcrypt-devel \ - libgpg-error-devel popt-devel +PKG_BUILD_DEPS+= libdevmapper-devel libgcrypt-devel \ + libgpg-error-devel libuuid-devel popt-devel

define PKG_DESCRIPTION This package contains cryptsetup, a utility for setting up \ diff --git a/pkgs/ppl/patches/ppl-0.10.2-Makefile.patch b/pkgs/ppl/patches/ppl-0.10.2-Makefile.patch deleted file mode 100644 index 307e5c7..0000000 --- a/pkgs/ppl/patches/ppl-0.10.2-Makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur ppl-0.10.1/Watchdog/doc/Makefile.in ppl-0.10.1-patched/Watchdog/doc/Makefile.in ---- ppl-0.10.1/Watchdog/doc/Makefile.in 2000-04-11 10:36:59.000000000 +0100 -+++ ppl-0.10.1-patched/Watchdog/doc/Makefile.in 2009-04-11 17:53:10.000000000 +0100 -@@ -163,7 +163,7 @@ - debug_flag = @debug_flag@ - - # All the documentation in docdir. --docdir = @docdir@ -+docdir = @docdir@/pwl - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ diff --git a/pkgs/ppl/ppl.nm b/pkgs/ppl/ppl.nm index eac4af9..f37768b 100644 --- a/pkgs/ppl/ppl.nm +++ b/pkgs/ppl/ppl.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include

PKG_NAME = ppl -PKG_VER = 0.10.2 -PKG_REL = 0 +PKG_VER = 0.11.2 +PKG_REL = 1

PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUP = Development/Libraries @@ -50,7 +50,7 @@ define PKG_DESCRIPTION applications using the PPL through its C and C++ interfaces. endef

-PKG_TARBALL = $(THISAPP).tar.gz +PKG_TARBALL = $(THISAPP).tar.lzma

PKG_PACKAGES += $(PKG_NAME_REAL)-devel

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