[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d34a422afbf823a9b11fc69db4c45c9f6ea36bc7
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 d34a422afbf823a9b11fc69db4c45c9f6ea36bc7 (commit) via 504f1644ea38e966ce3ff8e356a1564664b7d51c (commit) from 539ff310f3a4c84a1346a8c9cc6f6aaa8483c543 (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 d34a422afbf823a9b11fc69db4c45c9f6ea36bc7 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 1 15:47:09 2011 +0200
Fix merge error.
commit 504f1644ea38e966ce3ff8e356a1564664b7d51c Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 1 15:45:01 2011 +0200
elfutils: The -devel package should also install elfutils.
-----------------------------------------------------------------------
Summary of changes: pkgs/core/systemd/systemd-no-manpages.patch | 31 -------------- pkgs/core/systemd/systemd.nm | 61 --------------------------- pkgs/elfutils/elfutils.nm | 4 +- pkgs/{core => }/libcgroup/libcgroup.nm | 0 pkgs/{core => }/vala/vala.nm | 0 5 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 pkgs/core/systemd/systemd-no-manpages.patch delete mode 100644 pkgs/core/systemd/systemd.nm rename pkgs/{core => }/libcgroup/libcgroup.nm (100%) rename pkgs/{core => }/vala/vala.nm (100%)
Difference in files: diff --git a/pkgs/core/libcgroup/libcgroup.nm b/pkgs/core/libcgroup/libcgroup.nm deleted file mode 100644 index cc0f692..0000000 --- a/pkgs/core/libcgroup/libcgroup.nm +++ /dev/null @@ -1,66 +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 = libcgroup -PKG_VER = 0.35.1 -PKG_REL = 0 - -PKG_MAINTAINER = -PKG_GROUP = Development/Libraries -PKG_URL = http://libcg.sourceforge.net/ -PKG_LICENSE = LGPLv2+ -PKG_SUMMARY = Tools and libraries to control and monitor control groups. - -PKG_PACKAGES += $(PKG_NAME_REAL)-devel - -PKG_BUILD_DEPS+= bison gcc-c++ flex - -define PKG_DESCRIPTION - Control groups infrastructure. The tools and library help manipulate, \ - control, administrate and monitor control groups and the associated \ - controllers. -endef - -PKG_TARBALL = $(THISAPP).tar.bz2 - -CONFIGURE_OPTIONS += \ - --libdir=/lib \ - --disable-pam \ - --disable-tools \ - --disable-daemon - -#define STAGE_TEST -# cd $(DIR_APP) && make check -#endef - -define STAGE_INSTALL_CMDS - rm -rf $(BUILDROOT)/etc - - -mkdir -pv $(BUILDROOT)/usr/lib - rm -vf $(BUILDROOT)/lib/libcgroup.so - ln -svf ../../lib/libcgroup.so.1 $(BUILDROOT)/usr/lib/libcgroup.so -endef - diff --git a/pkgs/core/systemd/systemd-no-manpages.patch b/pkgs/core/systemd/systemd-no-manpages.patch deleted file mode 100644 index a185fde..0000000 --- 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 aa4c9c1..0000000 --- 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/vala/vala.nm b/pkgs/core/vala/vala.nm deleted file mode 100644 index 4bb903f..0000000 --- a/pkgs/core/vala/vala.nm +++ /dev/null @@ -1,54 +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 = vala -PKG_VER = 0.11.2 -PKG_REL = 0 - -PKG_MAINTAINER = -PKG_GROUP = Development/Languages -PKG_URL = http://live.gnome.org/Vala -PKG_LICENSE = LGPLv2+ and BSD -PKG_SUMMARY = A modern programming language. - -PKG_PACKAGES += $(PKG_NAME_REAL)-devel - -PKG_BUILD_DEPS+= bison dbus dbus-glib-devel flex pkg-config -PKG_DEPS += glib2 - -define PKG_DESCRIPTION - Vala is a new programming language that aims to bring modern \ - programming language features to GNOME developers without imposing \ - any additional runtime requirements and without using a different \ - ABI compared to applications and libraries written in C. -endef - -PKG_TARBALL = $(THISAPP).tar.bz2 - -define STAGE_TEST - cd $(DIR_APP) && make check -endef - diff --git a/pkgs/elfutils/elfutils.nm b/pkgs/elfutils/elfutils.nm index 69392c7..002adc9 100644 --- a/pkgs/elfutils/elfutils.nm +++ b/pkgs/elfutils/elfutils.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = elfutils PKG_VER = 0.152 -PKG_REL = 1 +PKG_REL = 2
PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUPS = Development/Libraries @@ -48,7 +48,7 @@ PKG_TARBALL = $(THISAPP).tar.bz2
PKG_PACKAGES += $(PKG_NAME)-devel $(PKG_NAME)-libs
-PKG_DEPS-$(PKG_NAME)-devel = $(PKG_NAME)-libs +PKG_DEPS-$(PKG_NAME)-devel = $(PKG_NAME) $(PKG_NAME)-libs
CONFIGURE_OPTIONS += \ --program-prefix=eu- diff --git a/pkgs/libcgroup/libcgroup.nm b/pkgs/libcgroup/libcgroup.nm new file mode 100644 index 0000000..cc0f692 --- /dev/null +++ b/pkgs/libcgroup/libcgroup.nm @@ -0,0 +1,66 @@ +############################################################################### +# # +# 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 = libcgroup +PKG_VER = 0.35.1 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Libraries +PKG_URL = http://libcg.sourceforge.net/ +PKG_LICENSE = LGPLv2+ +PKG_SUMMARY = Tools and libraries to control and monitor control groups. + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +PKG_BUILD_DEPS+= bison gcc-c++ flex + +define PKG_DESCRIPTION + Control groups infrastructure. The tools and library help manipulate, \ + control, administrate and monitor control groups and the associated \ + controllers. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +CONFIGURE_OPTIONS += \ + --libdir=/lib \ + --disable-pam \ + --disable-tools \ + --disable-daemon + +#define STAGE_TEST +# cd $(DIR_APP) && make check +#endef + +define STAGE_INSTALL_CMDS + rm -rf $(BUILDROOT)/etc + + -mkdir -pv $(BUILDROOT)/usr/lib + rm -vf $(BUILDROOT)/lib/libcgroup.so + ln -svf ../../lib/libcgroup.so.1 $(BUILDROOT)/usr/lib/libcgroup.so +endef + diff --git a/pkgs/vala/vala.nm b/pkgs/vala/vala.nm new file mode 100644 index 0000000..4bb903f --- /dev/null +++ b/pkgs/vala/vala.nm @@ -0,0 +1,54 @@ +############################################################################### +# # +# 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 = vala +PKG_VER = 0.11.2 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Languages +PKG_URL = http://live.gnome.org/Vala +PKG_LICENSE = LGPLv2+ and BSD +PKG_SUMMARY = A modern programming language. + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +PKG_BUILD_DEPS+= bison dbus dbus-glib-devel flex pkg-config +PKG_DEPS += glib2 + +define PKG_DESCRIPTION + Vala is a new programming language that aims to bring modern \ + programming language features to GNOME developers without imposing \ + any additional runtime requirements and without using a different \ + ABI compared to applications and libraries written in C. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +define STAGE_TEST + cd $(DIR_APP) && make check +endef +
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org