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 8e72a7c5978061f0cc0c6f3f5f23def7559623e1 (commit) via 2a102ca9c6c7955aa6154d5769afa62db68d8f52 (commit) via 54f4ff79c803895aee23b7ebef1590fd5f67b3e2 (commit) via 6764945a26b7fa9271184bc770e8538e094afb2e (commit) via b38b08f1ebbb778d3b319807bd4adf7afdad33f6 (commit) via 354c6166b97cb1c815a7a57772432950a74e8602 (commit) via 6e20be98f8c4dbcaa58898e3c51d947d048b16a0 (commit) via 7c67838f988be4c778d975bc18d66766b9a4a51d (commit) from 766d95bfda1ef85442d8fa9fc1c468dff6b34563 (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 8e72a7c5978061f0cc0c6f3f5f23def7559623e1 Merge: 2a102ca 766d95b Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 23 00:33:33 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 2a102ca9c6c7955aa6154d5769afa62db68d8f52 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 23 00:26:16 2011 +0100
python-dbus: Fix build dependencies (dbus-devel).
commit 54f4ff79c803895aee23b7ebef1590fd5f67b3e2 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 23 00:25:38 2011 +0100
intltool: Fix build dependencies (perl-XML-Parser).
commit 6764945a26b7fa9271184bc770e8538e094afb2e Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 23 00:25:10 2011 +0100
dbus-glib: Add runtime dependency glib2-devel for devel package.
commit b38b08f1ebbb778d3b319807bd4adf7afdad33f6 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 23 00:24:46 2011 +0100
cups: Remove non-ascii characters from description.
commit 354c6166b97cb1c815a7a57772432950a74e8602 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 23 00:24:25 2011 +0100
avahi: Fix build dependencies (perl-XML-Parser).
commit 6e20be98f8c4dbcaa58898e3c51d947d048b16a0 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Feb 22 16:54:34 2011 +0100
libuser: Buildfix.
commit 7c67838f988be4c778d975bc18d66766b9a4a51d Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 21 14:00:33 2011 +0100
build-essentials: Remove ccache because the buildsystem decides whether to install it or not.
-----------------------------------------------------------------------
Summary of changes: pkgs/core/avahi/avahi.nm | 5 +++-- pkgs/core/build-essentials/build-essentials.nm | 6 +++--- pkgs/core/cups/cups.nm | 2 +- pkgs/core/dbus-glib/dbus-glib.nm | 3 ++- pkgs/core/intltool/intltool.nm | 4 ++-- pkgs/core/libuser/libuser.nm | 4 ++-- pkgs/core/python-dbus/python-dbus.nm | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-)
Difference in files: diff --git a/pkgs/core/avahi/avahi.nm b/pkgs/core/avahi/avahi.nm index 2459b4f..68c2293 100644 --- a/pkgs/core/avahi/avahi.nm +++ b/pkgs/core/avahi/avahi.nm @@ -44,8 +44,9 @@ define PKG_DESCRIPTION convenient endef
-PKG_BUILD_DEPS+= dbus-devel dbus-glib-devel gcc-c++ gettext libdaemon-devel \ - intltool perl perl-xml-parser pkg-config python-devel python-dbus +PKG_BUILD_DEPS+= dbus-devel dbus-glib-devel expat-devel gcc-c++ gettext \ + libdaemon-devel intltool perl perl-XML-Parser pkg-config python-devel \ + python-dbus
PKG_TARBALL = $(THISAPP).tar.gz
diff --git a/pkgs/core/build-essentials/build-essentials.nm b/pkgs/core/build-essentials/build-essentials.nm index d383d4e..63bf21e 100644 --- a/pkgs/core/build-essentials/build-essentials.nm +++ b/pkgs/core/build-essentials/build-essentials.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 5 +PKG_REL = 6 PKG_ARCH = noarch
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org @@ -36,8 +36,8 @@ PKG_LICENSE = GPL PKG_SUMMARY = Elementary scripts for the build system.
PKG_BUILD_DEPS = -PKG_DEPS += bash bzip2 ccache coreutils cpio diffutils file findutils \ - gawk grep gzip make patch sed system-release tar which xz +PKG_DEPS += bash bzip2 coreutils cpio diffutils file findutils gawk \ + grep gzip make patch sed system-release tar which xz
define PKG_DESCRIPTION This package contains elementary scripts for the pakfire build system. diff --git a/pkgs/core/cups/cups.nm b/pkgs/core/cups/cups.nm index f792714..d347228 100644 --- a/pkgs/core/cups/cups.nm +++ b/pkgs/core/cups/cups.nm @@ -42,7 +42,7 @@ PKG_DEPS += ghostscript
define PKG_DESCRIPTION CUPS is the standards-based, open source printing system developed \ - by Apple Inc. for Mac OS® X and other UNIX®-like operating systems. + by Apple Inc. for Mac OS(R) X and other UNIX(R)-like operating systems. endef
PKG_TARBALL = $(THISAPP)-source.tar.bz2 diff --git a/pkgs/core/dbus-glib/dbus-glib.nm b/pkgs/core/dbus-glib/dbus-glib.nm index f5051bb..47af08c 100644 --- a/pkgs/core/dbus-glib/dbus-glib.nm +++ b/pkgs/core/dbus-glib/dbus-glib.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = dbus-glib PKG_VER = 0.82 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -35,6 +35,7 @@ PKG_LICENSE = GPLv2+ AFL PKG_SUMMARY = Glib bindings for D-Bus.
PKG_BUILD_DEPS+= dbus dbus-devel expat-devel gettext glib2-devel pkg-config +PKG_DEPS-$(PKG_NAME)-devel = glib2-devel
define PKG_DESCRIPTION D-Bus add-on library to integrate the standard D-Bus library with \ diff --git a/pkgs/core/intltool/intltool.nm b/pkgs/core/intltool/intltool.nm index ecbf249..65876e8 100644 --- a/pkgs/core/intltool/intltool.nm +++ b/pkgs/core/intltool/intltool.nm @@ -41,8 +41,8 @@ define PKG_DESCRIPTION them in the po files. endef
-PKG_BUILD_DEPS+= expat-devel gettext perl-xml-parser -PKG_DEPS += gettext perl-xml-parser +PKG_BUILD_DEPS+= expat-devel gettext perl-XML-Parser +PKG_DEPS += gettext perl-XML-Parser
PKG_TARBALL = $(THISAPP).tar.bz2
diff --git a/pkgs/core/libuser/libuser.nm b/pkgs/core/libuser/libuser.nm index 5363c6a..3858fad 100644 --- a/pkgs/core/libuser/libuser.nm +++ b/pkgs/core/libuser/libuser.nm @@ -34,8 +34,8 @@ PKG_URL = https://fedorahosted.org/libuser/ PKG_LICENSE = LGPLv2+ PKG_SUMMARY = A user and group account administration library.
-PKG_BUILD_DEPS+= glib2-devel libselinux-devel openldap-devel pkg-config\ - popt-devel python-devel +PKG_BUILD_DEPS+= cyrus-sasl-devel glib2-devel libselinux-devel openldap-devel \ + pam-devel pkg-config popt-devel python-devel
define PKG_DESCRIPTION The libuser library implements a standardized interface for \ diff --git a/pkgs/core/python-dbus/python-dbus.nm b/pkgs/core/python-dbus/python-dbus.nm index f777ce9..e798d3f 100644 --- a/pkgs/core/python-dbus/python-dbus.nm +++ b/pkgs/core/python-dbus/python-dbus.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.freedesktop.org/software/dbus/ PKG_LICENSE = MIT PKG_SUMMARY = Dbus Python Bindings.
-PKG_BUILD_DEPS+= dbus-glib-devel pkg-config python-devel +PKG_BUILD_DEPS+= dbus-devel dbus-glib-devel pkg-config python-devel
define PKG_DESCRIPTION D-Bus python bindings for use with python programs.
hooks/post-receive -- IPFire 3.x development tree