[systemd-commits] 2 commits - configure.ac Makefile.am units/gentoo

[Lennart Poettering]

 Makefile.am              |   12 ------------
 configure.ac             |    2 +-
 units/gentoo/Makefile    |    1 -
 units/gentoo/xdm.service |   17 -----------------
 4 files changed, 1 insertion(+), 31 deletions(-)

New commits:
commit d2ffe6deac67d83ea1c707812967a22e185bdc0a
Author: Gustavo Sverzut Barbieri <barbieri at profusion.mobi>
Date:   Wed Nov 24 23:17:53 2010 -0200

    units: Remove Gentoo specific xdm.service
    
    That unity pulls in OpenRC which in turn pulls in most of legacy
    system that causes lots of troubles as it is too smart, thus not
    recommended.
    
    Moreover, SystemD developers seems to agree that a service file per DM
    is the best approach, so having gdm.service, kdm.service, slim.service
    is better than a single wrapper for them.

diff --git a/Makefile.am b/Makefile.am
index d7a279c..471954b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -334,10 +334,6 @@ dist_systemunit_DATA += \
 	units/fedora/plymouth-halt.service
 endif
 
-if TARGET_GENTOO
-dist_systemunit_DATA += \
-	units/gentoo/xdm.service
-endif
 
 if TARGET_ARCH
 dist_systemunit_DATA += \
@@ -1309,14 +1305,6 @@ if TARGET_FEDORA
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
-if TARGET_GENTOO
-	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f display-manager.service && \
-		$(LN_S) xdm.service display-manager.service )
-	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-		rm -f display-manager.service && \
-		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
-endif
 if TARGET_DEBIAN_OR_UBUNTU
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f runlevel5.target && \
diff --git a/units/gentoo/Makefile b/units/gentoo/Makefile
deleted file mode 120000
index 50be211..0000000
--- a/units/gentoo/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../../src/Makefile
\ No newline at end of file
diff --git a/units/gentoo/xdm.service b/units/gentoo/xdm.service
deleted file mode 100644
index b94c6a8..0000000
--- a/units/gentoo/xdm.service
+++ /dev/null
@@ -1,17 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Display Manager
-After=syslog.target dbus.target hald.service
-
-[Service]
-ExecStart=/etc/init.d/xdm start
-
-[Install]
-Alias=display-manager.service
-WantedBy=graphical.target

commit 9b8a535f4d54708a1172199cffcf62ad7d490235
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Nov 24 23:41:37 2010 +0100

    bump version in preparation for release

diff --git a/configure.ac b/configure.ac
index f9f5eee..d72927e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT([systemd],[13],[systemd-devel at lists.freedesktop.org])
+AC_INIT([systemd],[14],[systemd-devel at lists.freedesktop.org])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])