From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 10 Jul 2011 19:24:00 +0000 (+0200)
Subject: systemd: Update to 29.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4f22872c1b928e7dcef064caa2d522a1754bb92;p=ipfire-3.x.git

systemd: Update to 29.
---

diff --git a/pkgs/systemd/patches/systemd-28-no-manpages.patch b/pkgs/systemd/patches/systemd-29-no-manpages.patch
similarity index 89%
rename from pkgs/systemd/patches/systemd-28-no-manpages.patch
rename to pkgs/systemd/patches/systemd-29-no-manpages.patch
index 9685c60cc..f935d257a 100644
--- a/pkgs/systemd/patches/systemd-28-no-manpages.patch
+++ b/pkgs/systemd/patches/systemd-29-no-manpages.patch
@@ -1,7 +1,7 @@
 diff -Nur a/Makefile.am b/Makefile.am
---- a/Makefile.am	2011-05-26 19:18:54.000000000 +0200
-+++ b/Makefile.am	2011-06-04 20:56:50.863488131 +0200
-@@ -567,79 +567,13 @@
+--- a/Makefile.am	2011-06-16 13:17:51.000000000 +0200
++++ b/Makefile.am	2011-07-10 19:09:54.169403422 +0200
+@@ -565,79 +565,13 @@
  	src/readahead-common.h \
  	src/ask-password-api.h
  
@@ -49,13 +49,13 @@ diff -Nur a/Makefile.am b/Makefile.am
 -	man/modules-load.d.5 \
 -	man/sysctl.d.5 \
 -        man/systemd-ask-password.1
-+MANPAGES = #
++MANPAGES =
  
 -if ENABLE_BINFMT
 -MANPAGES += \
 -	man/binfmt.d.5
 -endif
-+MANPAGES_ALIAS = #
++MANPAGES_ALIAS =
  
 -MANPAGES_ALIAS = \
 -	man/reboot.8 \
@@ -77,11 +77,11 @@ diff -Nur a/Makefile.am b/Makefile.am
 -dist_man_MANS = \
 -	$(MANPAGES) \
 -	$(MANPAGES_ALIAS)
-+dist_man_MANS = #
++dist_man_MANS =
  
 -nodist_man_MANS = \
 -	man/systemd.special.7
-+nodist_man_MANS = #
++nodist_man_MANS =
  
  XML_FILES = \
  	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
diff --git a/pkgs/systemd/systemd.nm b/pkgs/systemd/systemd.nm
index 843845d15..0b92e3249 100644
--- a/pkgs/systemd/systemd.nm
+++ b/pkgs/systemd/systemd.nm
@@ -25,8 +25,8 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = systemd
-PKG_VER        = 28
-PKG_REL        = 3
+PKG_VER        = 29
+PKG_REL        = 1
 
 PKG_MAINTAINER = Stefan Schantl <stefan.schantl@ipfire.org>
 PKG_GROUPS     = System/Base