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 696c8a02e64af5a919a72b4d4713b061356621a6 (commit) via a4f22872c1b928e7dcef064caa2d522a1754bb92 (commit) from 63c28eecda75db7a22842c8bfbe17085bb44ee6f (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 696c8a02e64af5a919a72b4d4713b061356621a6 Merge: 63c28ee a4f2287 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 17 14:03:31 2011 +0200

Merge remote-tracking branch 'stevee/updates'

commit a4f22872c1b928e7dcef064caa2d522a1754bb92 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jul 10 21:24:00 2011 +0200

systemd: Update to 29.

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

Summary of changes: ...manpages.patch => systemd-29-no-manpages.patch} | 14 +++++++------- pkgs/systemd/systemd.nm | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) rename pkgs/systemd/patches/{systemd-28-no-manpages.patch => systemd-29-no-manpages.patch} (89%)

Difference in files: diff --git a/pkgs/systemd/patches/systemd-28-no-manpages.patch b/pkgs/systemd/patches/systemd-28-no-manpages.patch deleted file mode 100644 index 9685c60..0000000 --- a/pkgs/systemd/patches/systemd-28-no-manpages.patch +++ /dev/null @@ -1,87 +0,0 @@ -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 @@ - src/readahead-common.h \ - src/ask-password-api.h - --MANPAGES = \ -- man/systemd.1 \ -- man/systemctl.1 \ -- man/systemadm.1 \ -- man/systemd-cgls.1 \ -- man/systemd-nspawn.1 \ -- man/systemd-tmpfiles.8 \ -- man/systemd-notify.1 \ -- man/sd_notify.3 \ -- man/sd_readahead.3 \ -- man/sd_booted.3 \ -- man/sd_listen_fds.3 \ -- man/sd_is_fifo.3 \ -- man/systemd.unit.5 \ -- man/systemd.service.5 \ -- man/systemd.socket.5 \ -- man/systemd.mount.5 \ -- man/systemd.automount.5 \ -- man/systemd.swap.5 \ -- man/systemd.timer.5 \ -- man/systemd.path.5 \ -- man/systemd.target.5 \ -- man/systemd.device.5 \ -- man/systemd.snapshot.5 \ -- man/systemd.exec.5 \ -- man/daemon.7 \ -- man/sd-daemon.7 \ -- man/sd-readahead.7 \ -- man/runlevel.8 \ -- man/telinit.8 \ -- man/halt.8 \ -- man/shutdown.8 \ -- man/pam_systemd.8 \ -- man/systemd.conf.5 \ -- man/tmpfiles.d.5 \ -- man/hostname.5 \ -- man/machine-id.5 \ -- man/vconsole.conf.5 \ -- man/locale.conf.5 \ -- man/os-release.5 \ -- man/machine-info.5 \ -- man/modules-load.d.5 \ -- man/sysctl.d.5 \ -- man/systemd-ask-password.1 -+MANPAGES = # - --if ENABLE_BINFMT --MANPAGES += \ -- man/binfmt.d.5 --endif -+MANPAGES_ALIAS = # - --MANPAGES_ALIAS = \ -- man/reboot.8 \ -- man/poweroff.8 \ -- man/sd_is_socket.3 \ -- man/sd_is_socket_unix.3 \ -- man/sd_is_socket_inet.3 \ -- man/sd_notifyf.3 \ -- man/init.1 -- --man/reboot.8: man/halt.8 --man/poweroff.8: man/halt.8 --man/sd_is_socket.3: man/sd_is_fifo.3 --man/sd_is_socket_unix.3: man/sd_is_fifo.3 --man/sd_is_socket_inet.3: man/sd_is_fifo.3 --man/sd_notifyf.3: man/sd_notify.3 --man/init.1: man/systemd.1 -- --dist_man_MANS = \ -- $(MANPAGES) \ -- $(MANPAGES_ALIAS) -+dist_man_MANS = # - --nodist_man_MANS = \ -- man/systemd.special.7 -+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/patches/systemd-29-no-manpages.patch b/pkgs/systemd/patches/systemd-29-no-manpages.patch new file mode 100644 index 0000000..f935d25 --- /dev/null +++ b/pkgs/systemd/patches/systemd-29-no-manpages.patch @@ -0,0 +1,87 @@ +diff -Nur a/Makefile.am b/Makefile.am +--- 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 + +-MANPAGES = \ +- man/systemd.1 \ +- man/systemctl.1 \ +- man/systemadm.1 \ +- man/systemd-cgls.1 \ +- man/systemd-nspawn.1 \ +- man/systemd-tmpfiles.8 \ +- man/systemd-notify.1 \ +- man/sd_notify.3 \ +- man/sd_readahead.3 \ +- man/sd_booted.3 \ +- man/sd_listen_fds.3 \ +- man/sd_is_fifo.3 \ +- man/systemd.unit.5 \ +- man/systemd.service.5 \ +- man/systemd.socket.5 \ +- man/systemd.mount.5 \ +- man/systemd.automount.5 \ +- man/systemd.swap.5 \ +- man/systemd.timer.5 \ +- man/systemd.path.5 \ +- man/systemd.target.5 \ +- man/systemd.device.5 \ +- man/systemd.snapshot.5 \ +- man/systemd.exec.5 \ +- man/daemon.7 \ +- man/sd-daemon.7 \ +- man/sd-readahead.7 \ +- man/runlevel.8 \ +- man/telinit.8 \ +- man/halt.8 \ +- man/shutdown.8 \ +- man/pam_systemd.8 \ +- man/systemd.conf.5 \ +- man/tmpfiles.d.5 \ +- man/hostname.5 \ +- man/machine-id.5 \ +- man/vconsole.conf.5 \ +- man/locale.conf.5 \ +- man/os-release.5 \ +- man/machine-info.5 \ +- man/modules-load.d.5 \ +- man/sysctl.d.5 \ +- man/systemd-ask-password.1 ++MANPAGES = + +-if ENABLE_BINFMT +-MANPAGES += \ +- man/binfmt.d.5 +-endif ++MANPAGES_ALIAS = + +-MANPAGES_ALIAS = \ +- man/reboot.8 \ +- man/poweroff.8 \ +- man/sd_is_socket.3 \ +- man/sd_is_socket_unix.3 \ +- man/sd_is_socket_inet.3 \ +- man/sd_notifyf.3 \ +- man/init.1 +- +-man/reboot.8: man/halt.8 +-man/poweroff.8: man/halt.8 +-man/sd_is_socket.3: man/sd_is_fifo.3 +-man/sd_is_socket_unix.3: man/sd_is_fifo.3 +-man/sd_is_socket_inet.3: man/sd_is_fifo.3 +-man/sd_notifyf.3: man/sd_notify.3 +-man/init.1: man/systemd.1 +- +-dist_man_MANS = \ +- $(MANPAGES) \ +- $(MANPAGES_ALIAS) ++dist_man_MANS = + +-nodist_man_MANS = \ +- man/systemd.special.7 ++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 843845d..0b92e32 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

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