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 b751ad81814bd71d9ddf32607c992dbbddfd417c (commit) via ad8cad552baa2561f7c8cacc52ae14242a36abfb (commit) via 1abbf741cc7985ccaf9671102af8e80dffa0846f (commit) via 2aa5f6100defbf9db5ea0cb8b4c5ce00d6cf40d8 (commit) from 5532265c3ca1c01cd0a2d3b2a893b5fbac606faa (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 b751ad81814bd71d9ddf32607c992dbbddfd417c Merge: 5532265 ad8cad5 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jun 28 00:49:44 2011 +0200

Merge branch 'master' into next

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

Summary of changes: config/cfgroot/graphs.pl | 6 +++--- config/rootfiles/core/50/filelists/files | 1 + .../34 => core/50}/filelists/smartmontools | 0 langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + lfs/smartmontools | 6 +++--- 6 files changed, 9 insertions(+), 6 deletions(-) copy config/rootfiles/{oldcore/34 => core/50}/filelists/smartmontools (100%)

Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 1961246..5eb96d8 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -257,11 +257,11 @@ sub updateloadgraph { "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE", "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE", "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE", - "AREA:load1".$color{"color13"}."A0:1 Minute:", + "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":", "GPRINT:load1:LAST:%5.2lf", - "AREA:load5".$color{"color18"}."A0:5 Minuten:", + "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":", "GPRINT:load5:LAST:%5.2lf", - "AREA:load15".$color{"color14"}."A0:15 Minuten:", + "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":", "GPRINT:load15:LAST:%5.2lf\j", "LINE1:load5".$color{"color13"}, "LINE1:load1".$color{"color18"}, diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files index dca50be..400eafa 100644 --- a/config/rootfiles/core/50/filelists/files +++ b/config/rootfiles/core/50/filelists/files @@ -2,3 +2,4 @@ etc/system-release var/ipfire/langs/ etc/rc.d/init.d/console usr/local/sbin/setup +var/ipfire/graphs.pl diff --git a/config/rootfiles/core/50/filelists/smartmontools b/config/rootfiles/core/50/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/core/50/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 2c95922..d97dee0 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1159,6 +1159,7 @@ 'min delay' => 'Minimale Verzögerung', 'min size' => 'Min. Objektgröße (kB):', 'minimal' => 'Minimal', +'minute' => 'Minute', 'minutes' => 'Minuten', 'misc-options' => 'Sonstige Optionen', 'missing dat' => 'Verschlüsseltes Archiv wurde nicht gefunden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 92d9f8f..67451be 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1186,6 +1186,7 @@ 'min delay' => 'Minimum delay', 'min size' => 'Min object size (KB):', 'minimal' => 'Minimal', +'minute' => 'Minute', 'minutes' => 'Minutes', 'misc-options' => 'Miscellaneous options', 'missing dat' => 'Encrypted archive not found', diff --git a/lfs/smartmontools b/lfs/smartmontools index 5530f21..3f92cb7 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 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 = 5.40 +VER = 5.41

THISAPP = smartmontools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

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

-$(DL_FILE)_MD5 = 0f0be0239914ad87830a4fff594bda5b +$(DL_FILE)_MD5 = 4577886bea79d4ff12bd9a7d323ce692

install : $(TARGET)

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