public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 815288f06c62ab3d21ea67f9dba1a5777f10a160
Date: Mon, 23 Feb 2015 20:21:36 +0100	[thread overview]
Message-ID: <20150223192137.0C2F721EF6@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1578 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  815288f06c62ab3d21ea67f9dba1a5777f10a160 (commit)
      from  ebbf9286d1003b673990d6377b943278190369c9 (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 815288f06c62ab3d21ea67f9dba1a5777f10a160
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Mon Feb 23 20:06:06 2015 +0100

    util-linux: Conflicts sysvinit <= 2.86-6.

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

Summary of changes:
 util-linux/util-linux.nm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index a8f3629..68c0ef9 100644
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -7,7 +7,7 @@ name       = util-linux
 major_ver  = 2.25
 minor_ver  = 2
 version    = %{major_ver}.%{minor_ver}
-release    = 1
+release    = 2
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Base
@@ -144,7 +144,7 @@ packages
 			coreutils < 8.19
 			setup < 3.0-2
 			util-linux-ng
-			sysvinit <= 2.86-2
+			sysvinit <= 2.86-6
 		end
 
 		preprequires += coreutils


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

                 reply	other threads:[~2015-02-23 19:21 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=20150223192137.0C2F721EF6@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