merge of 3805b1ac03600e59e510185d77bdb91333134e1f

     and 8e96e2bb9c496749e3561f9bbb1bd1de9ae3258e

diff --git a/packages/ipac-ng/.mtn2git_empty b/packages/ipac-ng/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/ipac-ng/ipac-ng-1.30/.mtn2git_empty b/packages/ipac-ng/ipac-ng-1.30/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff b/packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff
deleted file mode 100644 (file)
index 1f2aa13..0000000
--- a/packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.o      2004-10-10 14:14:59.022179096 +0200
-+++ Makefile.in        2004-10-10 14:15:18.952149280 +0200
-@@ -93,7 +93,7 @@
-       
- 
- subst: subst.c
--      $(CC) $(CFLAGS) -o subst subst.c
-+      $(BUILD_CC) $(BUILD_CFLAGS) -o subst subst.c
- 
- fetchipac: fetchipac.o storagetable.o billtable.o agenttable.o batch.tab.o libipac.a batch.yy.o\
-                    conffile.tab.o conffile.yy.o\

diff --git a/packages/ipac-ng/ipac-ng_1.30.bb b/packages/ipac-ng/ipac-ng_1.30.bb
deleted file mode 100644 (file)
index 3315c44..0000000
--- a/packages/ipac-ng/ipac-ng_1.30.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "IPAC-NG is the iptables/ipchains based IP accounting package for Linux"
-HOMEPAGE = "http://ipac-ng.sourceforge.net/"
-SRC_URI = "${SOURCEFORGE_MIRROR}/ipac-ng/ipac-ng-${PV}.tar.bz2 \
-       file://makefile-build-cc.diff;patch=1;pnum=0"
-RDEPENDS = "perl libgd-perl"
-LICENSE = "GPL"
-
-inherit autotools
-
-do_configure() {
-       oe_runconf
-}
-
-do_install_append() {
-       install -d ${D}${sysconfdir}/ipac-ng
-       install -m 644 ${S}/doc/ipac.conf.sample ${D}${sysconfdir}/ipac-ng
-       install -m 644 ${S}/doc/rules.conf.sample ${D}${sysconfdir}/ipac-ng
-}

diff --git a/packages/mono/.mtn2git_empty b/packages/mono/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mono/files/.mtn2git_empty b/packages/mono/files/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/mono/files/install-lossage.patch b/packages/mono/files/install-lossage.patch
deleted file mode 100644 (file)
index 51fcdbb..0000000
--- a/packages/mono/files/install-lossage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mono-1.0/runtime/net_1_1/Makefile.am.old   2004-07-21 20:30:21.101405400 +0100
-+++ mono-1.0/runtime/net_1_1/Makefile.am       2004-07-21 20:31:05.209699920 +0100
-@@ -91,8 +91,8 @@
-       @if test -n '$(gac_assemblies)'; then \
-         for i in ''$(gac_assemblies); do \
-           echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \
--          MONO_PATH=$(srcdir) \
--            $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \
-+          cd $(srcdir); MONO_PATH=$(srcdir) \
-+            $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \
-         done; fi
- 
- uninstall-local:

diff --git a/packages/mono/files/libtool-lossage.patch b/packages/mono/files/libtool-lossage.patch
deleted file mode 100644 (file)
index ac6f0f8..0000000
--- a/packages/mono/files/libtool-lossage.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- mono-1.0/libgc/acinclude.m4.old    2004-07-21 19:10:53.059455128 +0100
-+++ mono-1.0/libgc/acinclude.m4        2004-07-21 19:10:56.881874032 +0100
-@@ -46,4 +46,3 @@
- ${GC_ALPHA_VERSION:+alpha=}$GC_ALPHA_VERSION)
- ])
- 
--sinclude(libtool.m4)

diff --git a/packages/mono/mono-native_1.0.bb b/packages/mono/mono-native_1.0.bb
deleted file mode 100644 (file)
index c0e649f..0000000
--- a/packages/mono/mono-native_1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SECTION = "unknown"
-require mono_${PV}.bb
-S = "${WORKDIR}/mono-${PV}"
-DEPENDS = "glib-2.0-native"
-
-inherit native

diff --git a/packages/mono/mono_1.0.bb b/packages/mono/mono_1.0.bb
deleted file mode 100644 (file)
index 4aa543b..0000000
--- a/packages/mono/mono_1.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "unknown"
-DEPENDS = "mono-native glib-2.0"
-LICENSE = "GPL LGPL X11"
-SRC_URI = "http://mono2.ximian.com/archive/1.0/mono-1.0.tar.gz \
-       file://libtool-lossage.patch;patch=1 \
-       file://install-lossage.patch;patch=1"
-
-EXTRA_OECONF_arm = "--without-nptl"
-
-inherit autotools
-
-do_configure_prepend() {
-       rm -f libgc/libtool.m4
-}
-
-do_install() {
-       oe_runmake 'DESTDIR=${D}' mono_runtime='mint' install
-}

diff --git a/removal.txt b/removal.txt
index 3877cdd..f16f7c7 100644 (file)
--- a/removal.txt
+++ b/removal.txt
@@ -19,18 +19,6 @@ Maintainer:     none
 Reason:         Unfetchable, obsoleted by IT2006 release.
 Proposed by:    Marcin 'Hrw' Juszkiewicz
 
-Package Name:   mono
-Removal Date:   2006-12-15
-Maintainer:     None
-Reason:         Obsolete version - 1.2 is current, 1.0 is not fetchable
-Proposed by:    Marcin 'Hrw' Juszkiewicz
- 
-Package Name:   ipac-ng
-Removal Date:   2006-12-15
-Maintainer:     None
-Reason:         Depends on libgd-perl which is not in metada
-Proposed by:    Marcin 'Hrw' Juszkiewicz
- 
 Package Name:   task-bootstrap*
 Removal Date:   2006-12-22
 Maintainer:     None