From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 b651586493b8075b24a4cf2c4da05c3a1a76341b
Date: Fri, 24 Aug 2012 16:14:36 +0200
Message-ID: <20120824141436.9155220085@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2727840097981415238=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2727840097981415238==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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  b651586493b8075b24a4cf2c4da05c3a1a76341b (commit)
       via  d378829f3eb1e845eb72c22af49f191fa768ed54 (commit)
       via  6bea011ac961ea1bf1c52961e63f7997888d9194 (commit)
      from  d23fc9122091aea3581571e1367d4696d834cd1c (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 b651586493b8075b24a4cf2c4da05c3a1a76341b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Aug 24 16:14:16 2012 +0200

    apcupsd: Bump package release number.

commit d378829f3eb1e845eb72c22af49f191fa768ed54
Author: Przemek Zdroik <zdroyer(a)gmail.com>
Date:   Thu Aug 23 14:54:48 2012 +0200

    apcupsd: including multimon.cgi in the package (in order to allow monitor=
ing more than one ups)

commit 6bea011ac961ea1bf1c52961e63f7997888d9194
Author: Przemek Zdroik <zdroyer(a)gmail.com>
Date:   Thu Aug 23 17:00:43 2012 +0200

    apcupsd: updated to version 3.14.10 (directly from sf.net)

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

Summary of changes:
 config/rootfiles/packages/apcupsd |    2 +-
 lfs/apcupsd                       |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/packages/apcupsd b/config/rootfiles/packages/ap=
cupsd
index 7a5df79..d65f012 100644
--- a/config/rootfiles/packages/apcupsd
+++ b/config/rootfiles/packages/apcupsd
@@ -16,7 +16,7 @@ sbin/apcaccess
 sbin/apctest
 sbin/apcupsd
 sbin/smtp
-#srv/web/ipfire/cgi-bin/multimon.cgi
+srv/web/ipfire/cgi-bin/multimon.cgi
 srv/web/ipfire/cgi-bin/upsfstats.cgi
 srv/web/ipfire/cgi-bin/upsimage.cgi
 srv/web/ipfire/cgi-bin/upsstats.cgi
diff --git a/lfs/apcupsd b/lfs/apcupsd
index 5638cab..db14e14 100644
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 3.14.4
+VER        =3D 3.14.10
=20
 THISAPP    =3D apcupsd-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D apcupsd
-PAK_VER    =3D 4
+PAK_VER    =3D 5
=20
 DEPS       =3D ""
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 78811129db1a882b9a2b9afd540470b3
+$(DL_FILE)_MD5 =3D 5928822d855c5cf7ac29655e3e0b8c23
=20
 install : $(TARGET)
=20


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

--===============2727840097981415238==--