From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 1 May 2011 13:47:09 +0000 (+0200)
Subject: Fix merge error.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d34a422afbf823a9b11fc69db4c45c9f6ea36bc7;p=ipfire-3.x.git

Fix merge error.
---

diff --git a/pkgs/core/systemd/systemd-no-manpages.patch b/pkgs/core/systemd/systemd-no-manpages.patch
deleted file mode 100644
index a185fdeb7..000000000
--- a/pkgs/core/systemd/systemd-no-manpages.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nur a/Makefile b/Makefile
---- a/Makefile	2010-11-19 13:26:11.000000000 +0100
-+++ b/Makefile	2010-11-19 13:27:31.000000000 +0100
-@@ -525,11 +525,11 @@
- man/init.1: man/systemd.1
- 
- dist_man_MANS = \
--	$(MANPAGES) \
--	$(MANPAGES_ALIAS)
-+#	$(MANPAGES) \
-+#	$(MANPAGES_ALIAS)
- 
- nodist_man_MANS = \
--	man/systemd.special.7
-+#	man/systemd.special.7
- 
- XML_FILES = \
- 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
-@@ -538,10 +538,10 @@
- 	${patsubst %.1,%.xml.in,${patsubst %.3,%.xml.in,${patsubst %.5,%.xml.in,${patsubst %.7,%.xml.in,${patsubst %.8,%.xml.in,$(nodist_man_MANS)}}}}}
- 
- dist_noinst_DATA = \
--	${XML_FILES:.xml=.html}
-+#	${XML_FILES:.xml=.html}
- 
- nodist_noinst_DATA = \
--	${XML_IN_FILES:.xml.in=.html}
-+#	${XML_IN_FILES:.xml.in=.html}
- 
- EXTRA_DIST += \
- 	$(XML_FILES) \
diff --git a/pkgs/core/systemd/systemd.nm b/pkgs/core/systemd/systemd.nm
deleted file mode 100644
index aa4c9c16a..000000000
--- a/pkgs/core/systemd/systemd.nm
+++ /dev/null
@@ -1,61 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt                 #
-#                                                                             #
-# This program 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 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include $(PKGROOT)/Include
-
-PKG_NAME       = systemd
-PKG_VER        = 13
-PKG_REL        = 0
-
-PKG_MAINTAINER = Stefan Schantl <stefan.schantl@ipfire.org>
-PKG_GROUP      = System/Base
-PKG_URL        = http://www.freedesktop.org/wiki/Software/systemd
-PKG_LICENSE    = GPLv2+
-PKG_SUMMARY    = systemd is a System and Session Manager.
-
-PKG_BUILD_DEPS+= autoconf automake dbus-devel dbus-glib-devel \
-	libcap-devel libcgroup-devel libudev-devel libtool \
-	pkg-config vala vala-devel
-
-define PKG_DESCRIPTION
-	systemd is a replacement of the old sysvinit and provides also \
-	a Session Manager for it's started services.
-endef
-
-PKG_TARBALL    = $(THISAPP).tar.bz2
-
-define STAGE_PREPARE_CMDS
-	cd $(DIR_APP) && ./autogen.sh ac
-endef
-
-define STAGE_CONFIGURE_CMDS
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SOURCE)/*.patch
-endef
-
-CONFIGURE_OPTIONS += \
-	--sbindir=/sbin \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--disable-gtk \
-	--with-distro=other
diff --git a/pkgs/core/libcgroup/libcgroup.nm b/pkgs/libcgroup/libcgroup.nm
similarity index 100%
rename from pkgs/core/libcgroup/libcgroup.nm
rename to pkgs/libcgroup/libcgroup.nm
diff --git a/pkgs/core/vala/vala.nm b/pkgs/vala/vala.nm
similarity index 100%
rename from pkgs/core/vala/vala.nm
rename to pkgs/vala/vala.nm