Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

diff --git a/config/menu/EX-apcupsd.menu b/config/menu/EX-apcupsd.menu
new file mode 100644 (file)
index 0000000..5f01dce
--- /dev/null
+++ b/config/menu/EX-apcupsd.menu
@@ -0,0 +1,5 @@
+    $subipfire->{'35.apcupsd'} = {'caption' => $Lang::tr{'apcupsd'},
+                                 'uri' => '/cgi-bin/upsstats.cgi',
+                                 'title' => $Lang::tr{'apcupsd'},
+                                 'enabled' => 1,
+                                 };

diff --git a/config/rootfiles/packages/apcupsd b/config/rootfiles/packages/apcupsd
index f14e64a6deb5552f7367f1c603d68a812892a9ac..f7c9e2d5df493f4987bc3fa7c55c067b2a11bfac 100644 (file)
--- a/config/rootfiles/packages/apcupsd
+++ b/config/rootfiles/packages/apcupsd
@@ -24,3 +24,6 @@ etc/rc.d/rc6.d/K35apcupsd
 srv/web/ipfire/cgi-bin/upsfstats.cgi
 srv/web/ipfire/cgi-bin/upsimage.cgi
 srv/web/ipfire/cgi-bin/upsstats.cgi
+var/ipfire/menu.d/EX-apcupsd.menu
+var/ipfire/langs/de.pl
+var/ipfire/langs/en.pl

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 3aa10368f7f95c57af0122f4f97b2bb1abe39090..2851d603b4d133ee2238657c629d430e9eebcc69 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -333,6 +333,7 @@
 'alt system' => 'System',
 'alt vpn' => 'VPNs',
 'and' => 'Und',
+'apcupsd' => 'APCUPSD',
 'apply' => 'Jetzt anwenden',
 'april' => 'April',
 'archive not exist' => 'Konfigurationsarchiv existiert nicht',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index bef35206453d81a9ab9fbf0416c4e23313bc36a5..f787f6d94fb68981be4ed38d4470633e8f8594fa 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -338,6 +338,7 @@
 'alt vpn' => 'VPNs',
 'and' => 'And',
 'ansi t1.483' => 'TO BE REMOVED',
+'apcupsd' => 'APCUPSD',
 'apply' => 'Apply now',
 'april' => 'April',
 'archive not exist' => 'Configuration archive does not exist',

diff --git a/lfs/apcupsd b/lfs/apcupsd
index 0d6f9a0b34c1e6b4efceb9a354f2f815ab217a0f..de6ee24326d1e45e5834f84e2ee3e777f557da03 100644 (file)
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = apcupsd
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""