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 2.x development tree".

The branch, next has been updated via f3d1635fdddcdf6ac4f199dc041fa06ea7427d49 (commit) via f416ef19bbbf7f3c8d6db318a3a3a8c4caf67d7e (commit) via 5a4f046605dc5f7b6b3a85da9aac80d8f0ec4c31 (commit) from 0aa0cdcde0a2d7d8963bb951c0f21fd1aebb58dd (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 f3d1635fdddcdf6ac4f199dc041fa06ea7427d49 Merge: f416ef1 0aa0cdc Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jun 23 23:14:23 2013 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit f416ef19bbbf7f3c8d6db318a3a3a8c4caf67d7e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jun 23 22:46:50 2013 +0200

mc: update to 4.8.8.

commit 5a4f046605dc5f7b6b3a85da9aac80d8f0ec4c31 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jun 23 22:46:24 2013 +0200

htop: update to 1.0.2.

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

Summary of changes: config/rootfiles/packages/mc | 8 ++++++-- lfs/htop | 8 ++++---- lfs/mc | 12 ++++++------ 3 files changed, 16 insertions(+), 12 deletions(-)

Difference in files: diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index 47109e9..626107b 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -1,10 +1,10 @@ #etc/mc etc/mc/edit.indent.rc etc/mc/filehighlight.ini +etc/mc/mc.default.keymap +etc/mc/mc.emacs.keymap etc/mc/mc.ext etc/mc/mc.keymap -etc/mc/mc.keymap.default -etc/mc/mc.keymap.emacs etc/mc/mc.menu etc/mc/mc.menu.sr etc/mc/mcedit.menu @@ -124,6 +124,7 @@ usr/share/mc/syntax/awk.syntax usr/share/mc/syntax/c.syntax usr/share/mc/syntax/cabal.syntax usr/share/mc/syntax/changelog.syntax +usr/share/mc/syntax/cmake.syntax usr/share/mc/syntax/cs.syntax usr/share/mc/syntax/css.syntax usr/share/mc/syntax/cxx.syntax @@ -134,6 +135,7 @@ usr/share/mc/syntax/debian-control.syntax usr/share/mc/syntax/debian-description.syntax usr/share/mc/syntax/debian-sources-list.syntax usr/share/mc/syntax/diff.syntax +usr/share/mc/syntax/dlink.syntax usr/share/mc/syntax/dos.syntax usr/share/mc/syntax/ebuild.syntax usr/share/mc/syntax/eiffel.syntax @@ -146,10 +148,12 @@ usr/share/mc/syntax/html.syntax usr/share/mc/syntax/idl.syntax usr/share/mc/syntax/ini.syntax usr/share/mc/syntax/j.syntax +usr/share/mc/syntax/jal.syntax usr/share/mc/syntax/java.syntax usr/share/mc/syntax/js.syntax usr/share/mc/syntax/latex.syntax usr/share/mc/syntax/lisp.syntax +usr/share/mc/syntax/lkr.syntax usr/share/mc/syntax/lsm.syntax usr/share/mc/syntax/lua.syntax usr/share/mc/syntax/m4.syntax diff --git a/lfs/htop b/lfs/htop index 967fc8a..c334a91 100644 --- a/lfs/htop +++ b/lfs/htop @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@

include Config

-VER = 1.0 +VER = 1.0.2

THISAPP = htop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 5 +PAK_VER = 6

DEPS = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 325112ca7947ea1f6d6441f631e00384 +$(DL_FILE)_MD5 = 0d01cca8df3349c74569cefebbd9919e

install : $(TARGET)

diff --git a/lfs/mc b/lfs/mc index 32946c1..eb59a44 100644 --- a/lfs/mc +++ b/lfs/mc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,15 +24,15 @@

include Config

-VER = 4.8.4 +VER = 4.8.8

THISAPP = mc-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 6 +PAK_VER = 7

DEPS = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = a8edb8226cb25869f925ecce043faf1e +$(DL_FILE)_MD5 = 14231665535fc80cc654b6ccfd070995

install : $(TARGET)

@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :

$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr \ --sysconfdir=/etc \ --without-x --disable-nls \

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