From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3f9e64bf89d675b3677c0c0e37e3bffdafa4408f
Date: Fri, 27 Apr 2012 12:01:59 +0200 [thread overview]
Message-ID: <20120427100200.D384420188@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1986 bytes --]
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 3f9e64bf89d675b3677c0c0e37e3bffdafa4408f (commit)
from c6952ba1b11313bba4810090c57ba6a8fa286746 (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 3f9e64bf89d675b3677c0c0e37e3bffdafa4408f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 27 12:01:12 2012 +0200
network+initscripts: Fix hard coded dependency /usr/bin/ipcalc.
-----------------------------------------------------------------------
Summary of changes:
initscripts/initscripts.nm | 6 +++++-
network/network.nm | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm
index ede6bd9..0737268 100644
--- a/initscripts/initscripts.nm
+++ b/initscripts/initscripts.nm
@@ -6,7 +6,7 @@
name = initscripts
epoch = 1
version = 2.99
-release = 15
+release = 16
groups = System/Boot
url =
@@ -73,6 +73,10 @@ packages
util-linux
end
+ provides
+ /bin/ipcalc
+ end
+
conflicts
filesystem < 002
end
diff --git a/network/network.nm b/network/network.nm
index 717dbe2..a356254 100644
--- a/network/network.nm
+++ b/network/network.nm
@@ -6,7 +6,7 @@
name = network
epoch = 1
version = 003
-release = 1
+release = 2
arch = noarch
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -49,7 +49,7 @@ packages
tunctl
vlan
wpa_supplicant
- /bin/ipcalc
+ /usr/bin/ipcalc
/usr/bin/logger
end
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2012-04-27 10:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120427100200.D384420188@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox