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 ba6ae15dc0298db9a50fd53e4955163be9914768 (commit) via f30eba1969c7187c0d8ea62086af486eb4926049 (commit) via 837311002dfeb02682d624f153af12fdda8ca7f1 (commit) via 20c47b224454f76ea3ed0b0ca6a34031252fcd2a (commit) from 063749e48c928aae1fa3d40ea3fe952f9e212d1a (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 ba6ae15dc0298db9a50fd53e4955163be9914768 Merge: f30eba1 8373110 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 6 22:05:37 2011 +0200

Merge remote-tracking branch 'stevee/newt'

commit f30eba1969c7187c0d8ea62086af486eb4926049 Merge: 20c47b2 063749e Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 6 22:05:33 2011 +0200

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

commit 837311002dfeb02682d624f153af12fdda8ca7f1 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Jul 6 22:01:26 2011 +0200

newt: Exclude python module from package.

Fixes #210.

commit 20c47b224454f76ea3ed0b0ca6a34031252fcd2a Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 6 21:39:41 2011 +0200

build-essentials: Add /usr/lib/python* to possibly orphaned directories.

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

Summary of changes: pkgs/build-essentials/build-essentials.nm | 2 +- pkgs/build-essentials/buildsystem-tools/cleanup | 7 +++++++ .../buildsystem-tools/functions-constants | 1 + .../buildsystem-tools/functions-directories | 18 +++++++++++------- pkgs/newt/newt.nm | 10 +++++++--- 5 files changed, 27 insertions(+), 11 deletions(-) create mode 100755 pkgs/build-essentials/buildsystem-tools/cleanup

Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index 3164b8e..1034d6b 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 = 18 +PKG_REL = 19 PKG_EPOCH = 1 PKG_ARCH = noarch

diff --git a/pkgs/build-essentials/buildsystem-tools/cleanup b/pkgs/build-essentials/buildsystem-tools/cleanup new file mode 100755 index 0000000..49e7c1b --- /dev/null +++ b/pkgs/build-essentials/buildsystem-tools/cleanup @@ -0,0 +1,7 @@ +#!/bin/bash + +dirname=$(dirname ${0}) + +. ${dirname}/common-functions + +directory_remove_orphans $@ diff --git a/pkgs/build-essentials/buildsystem-tools/functions-constants b/pkgs/build-essentials/buildsystem-tools/functions-constants index 396e045..80256f9 100644 --- a/pkgs/build-essentials/buildsystem-tools/functions-constants +++ b/pkgs/build-essentials/buildsystem-tools/functions-constants @@ -17,4 +17,5 @@ for i in $(seq 0 9); do ORPHAN_CANDIDATES="${ORPHAN_CANDIDATES} /usr/share/man/man${i}" done ORPHAN_CANDIDATES="${ORPHAN_CANDIDATES} /usr/lib/pkgconfig" +ORPHAN_CANDIDATES="${ORPHAN_CANDIDATES} /usr/lib/python*"

diff --git a/pkgs/build-essentials/buildsystem-tools/functions-directories b/pkgs/build-essentials/buildsystem-tools/functions-directories index 5b0867b..e779d75 100644 --- a/pkgs/build-essentials/buildsystem-tools/functions-directories +++ b/pkgs/build-essentials/buildsystem-tools/functions-directories @@ -10,15 +10,19 @@ function directory_remove_orphans() { log DEBUG "Removing orphans in ${basedir}"

local dir - for dir in ${ORPHAN_CANDIDATES}; do - dir="${basedir}/${dir}" + local dir_pattern + for dir_pattern in ${ORPHAN_CANDIDATES}; do + dir=$(echo ${basedir}/${dir_pattern})

- [ -d "${dir}" ] || continue + for dir in ${dir}; do + echo "DIR ${dir}" >&2 + [ -d "${dir}" ] || continue

- if dir_is_empty ${dir}; then - log DEBUG " Found orphaned directory: ${dir}" - rm -rf ${dir} - fi + if dir_is_empty ${dir}; then + log DEBUG " Found orphaned directory: ${dir}" + rm -rf ${dir} + fi + done done }

diff --git a/pkgs/newt/newt.nm b/pkgs/newt/newt.nm index 9e5f3e5..65d41d0 100644 --- a/pkgs/newt/newt.nm +++ b/pkgs/newt/newt.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = newt PKG_VER = 0.52.10 -PKG_REL = 0 +PKG_REL = 1

PKG_MAINTAINER = PKG_GROUPS = System/Libraries @@ -34,8 +34,14 @@ PKG_URL = https://fedorahosted.org/releases/n/e/newt/ PKG_LICENSE = LGPLv2 PKG_SUMMARY = A library for text mode user interfaces.

+PKG_PACKAGES += newt-devel newt-python PKG_BUILD_DEPS+= popt-devel python-devel slang-devel

+PKG_SUMMARY-newt-python = Python bindings for newt. +PKG_DESCRIPTION-newt-python = $(PKG_SUMMARY-newt-python) +PKG_PROVIDES-newt-python += python-newt python-snack +PKG_FILES-newt-python = /usr/lib/python*/site-packages/*snack* + define PKG_DESCRIPTION Newt is a programming library for color text mode, widget based user \ interfaces. Newt can be used to add stacked windows, entry widgets, \ @@ -48,8 +54,6 @@ endef

PKG_TARBALL = $(THISAPP).tar.gz

-PKG_PACKAGES += $(PKG_NAME)-devel - CONFIGURE_OPTIONS += \ --without-gpm-support \ --without-tcl

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