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 268216c9dd19b25a3e3e2116f09ab3fda569a5de (commit) via c4ffb117df69b9e8c24cfa955ca792c5fb943efd (commit) via 39f68abb2b09a05d175933edb58c7384d78ca15b (commit) via 179fb1108a7d8b130655692bf1f31d074a4fb829 (commit) from 93c77304611ec32f68b44d7be2b327f6b919d14e (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 268216c9dd19b25a3e3e2116f09ab3fda569a5de Merge: c4ffb11 39f68ab Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 13 14:15:57 2011 +0200
Merge remote-tracking branch 'stevee/updates'
commit c4ffb117df69b9e8c24cfa955ca792c5fb943efd Merge: 93c7730 179fb11 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 13 14:15:00 2011 +0200
Merge remote-tracking branch 'stevee/qtermwidget'
commit 39f68abb2b09a05d175933edb58c7384d78ca15b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jun 12 22:06:15 2011 +0200
iptables: Update to 1.4.11.1.
There are a lot of changes since the last version, especially at the binary - please double check all changes.
Fixes #202.
commit 179fb1108a7d8b130655692bf1f31d074a4fb829 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jun 11 22:57:03 2011 +0200
qtermwidget: Fix build error.
Fixes #189
-----------------------------------------------------------------------
Summary of changes: pkgs/iptables/iptables.nm | 8 ++++---- pkgs/qtermwidget/qtermwidget.nm | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-)
Difference in files: diff --git a/pkgs/iptables/iptables.nm b/pkgs/iptables/iptables.nm index 43749f4..579b771 100644 --- a/pkgs/iptables/iptables.nm +++ b/pkgs/iptables/iptables.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = iptables -PKG_VER = 1.4.10 +PKG_VER = 1.4.11.1 PKG_REL = 1
PKG_BUILD_DEPS+= libselinux-devel @@ -65,7 +65,7 @@ CONFIGURE_OPTIONS += \
define STAGE_PREPARE_CMDS # Make more space for target name on output. - cd $(DIR_APP) && sed -e "s/%-9s/%-18s/g" -i ip{,6}tables.c + cd $(DIR_APP)/iptables && sed -e "s/%-9s/%-18s/g" -i ip{,6}tables.c endef
define STAGE_INSTALL_CMDS @@ -84,8 +84,8 @@ define STAGE_INSTALL_CMDS ln -svf ../../lib/libip4tc.so.0 $(BUILDROOT)/usr/lib/libip4tc.so ln -svf ../../lib/libip6tc.so.0 $(BUILDROOT)/usr/lib/libip6tc.so ln -svf ../../lib/libipq.so.0 $(BUILDROOT)/usr/lib/libipq.so - ln -svf ../../lib/libxtables.so.5 $(BUILDROOT)/usr/lib/libxtables.so + ln -svf ../../lib/libxtables.so.6 $(BUILDROOT)/usr/lib/libxtables.so
# Replace absolute symlink - ln -svf ../sbin/iptables-multi $(BUILDROOT)/bin/iptables-xml + ln -svf ../sbin/xtables-multi $(BUILDROOT)/bin/iptables-xml endef diff --git a/pkgs/qtermwidget/qtermwidget.nm b/pkgs/qtermwidget/qtermwidget.nm index 07a4a91..d34b190 100644 --- a/pkgs/qtermwidget/qtermwidget.nm +++ b/pkgs/qtermwidget/qtermwidget.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = qtermwidget PKG_VER = 0.1 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUPS = /Tools @@ -34,8 +34,7 @@ PKG_URL = http://qtermwidget.sourceforge.net/ PKG_LICENSE = GPLv2 PKG_SUMMARY = A QT4 terminal emulation widget.
-PKG_BUILD_DEPS+= gcc-c++ python-devel qt -PKG_DEPS += +PKG_BUILD_DEPS+= gcc-c++ python-devel qt-devel
define PKG_DESCRIPTION QTermWidget is an opensource project based on KDE4 Konsole \ @@ -51,6 +50,9 @@ PKG_PACKAGES += $(PKG_NAME_REAL)-devel DIR_APP = $(DIR_SRC)/$(PKG_NAME)
define STAGE_BUILD + # XXX Do we have to set this flag here ? + cd $(DIR_APP) && export QMAKESPEC=linux-g++ + cd $(DIR_APP) && qmake
cd $(DIR_APP) && make #$(PARALLELISMFLAGS)
hooks/post-receive -- IPFire 3.x development tree