[git.ipfire.org] IPFire 3.x development tree branch, master, updated. ee3660e475eb9cd68c604dd5121b87db368e151b

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. ee3660e475eb9cd68c604dd5121b87db368e151b

[git]

[-- Attachment #1: Type: text/plain, Size: 1786 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  ee3660e475eb9cd68c604dd5121b87db368e151b (commit)
       via  825eefc9bb8f0710a0c640396b53317f6810d824 (commit)
      from  c65ff857436490237f4dbada82cf368122751a28 (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 ee3660e475eb9cd68c604dd5121b87db368e151b
Merge: c65ff85 825eefc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Mar 1 19:49:18 2015 +0100

    Merge remote-tracking branch 'stevee/man-db-10729'

commit 825eefc9bb8f0710a0c640396b53317f6810d824
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Mar 1 19:15:57 2015 +0100

    man-db: Systemd timer file requires systemd newer than 204.
    
    Fixes #10729.

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

Summary of changes:
 man-db/man-db.nm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/man-db/man-db.nm b/man-db/man-db.nm
index a36ea98..93ab669 100644
--- a/man-db/man-db.nm
+++ b/man-db/man-db.nm
@@ -5,7 +5,7 @@
 
 name       = man-db
 version    = 2.7.1
-release    = 1
+release    = 2
 
 groups     = Documentation
 url        = http://savannah.nongnu.org/projects/man-db
@@ -62,6 +62,10 @@ packages
 			xz
 		end
 
+		conflicts
+			systemd <= 204
+		end
+
 		# This package also should be known as man.
 		provides
 			man


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