From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Jan 2009 21:36:24 +0000 (+0100)
Subject: Remove python-iconv module, which only was needed by pyfire.translate.
X-Git-Tag: v3.0-alpha1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0bfb0c87c984df0a624a7c902db03fb1f7dc9c2;p=ipfire-3.x.git

Remove python-iconv module, which only was needed by pyfire.translate.
---

diff --git a/lfs/python-iconv b/lfs/python-iconv
deleted file mode 100644
index a7bfc9dd0..000000000
--- a/lfs/python-iconv
+++ /dev/null
@@ -1,65 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 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 Config
-
-PKG_NAME   = iconvmodule
-VER        = 1.0-ipfire-1
-
-THISAPP    = $(PKG_NAME)-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-
-OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-info:
-	$(DO_PKG_INFO)
-
-install: $(OBJECT)
-
-download : $(objects)
-
-$(objects) :
-	@$(LOAD)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(OBJECT):
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-
-	cd $(DIR_APP) && make install
-
-	$(PYTHON_COMPILE)
-
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 3d00af451..4ba7767a6 100755
--- a/make.sh
+++ b/make.sh
@@ -204,7 +204,6 @@ ipfire_build() {
 	ipfire_make python
 	ipfire_make python-dbus
 	ipfire_make python-urlgrabber
-	ipfire_make python-iconv
 	ipfire_make python-IPy
 	ipfire_make libxml2
 	ipfire_make libxslt
diff --git a/src/rootfiles/core/python-iconv b/src/rootfiles/core/python-iconv
deleted file mode 100644
index 8456100c9..000000000
--- a/src/rootfiles/core/python-iconv
+++ /dev/null
@@ -1,5 +0,0 @@
-#usr/lib/python2.6/site-packages/iconv-1.0-py2.6.egg-info
-usr/lib/python2.6/site-packages/iconv.so
-usr/lib/python2.6/site-packages/iconvcodec.py
-#usr/lib/python2.6/site-packages/iconvcodec.pyc
-usr/lib/python2.6/site-packages/iconvcodec.pyo