Reverted hplip package split and prepared compilation of full version.

diff --git a/lfs/hplip_full b/lfs/hplip
similarity index 98%
rename from lfs/hplip_full
rename to lfs/hplip
index 7f70fc6d8f45593e36439358c2d5d728bdff48ed..c96cb726b805ca063bd6872b2a2b82ca50878fe6 100644 (file)
--- a/lfs/hplip_full
+++ b/lfs/hplip
@@ -24,9 +24,9 @@
 
 include Config
 
-PKG_NAME   = hplip_full
+PKG_NAME   = hplip
 PKG_VER    = 3.9.8
-PKG_REL    = 0
+PKG_REL    = 1
 
 THISAPP    = $(PKG_NAME)-$(PKG_VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ CORE       = no
 EXTRA      = yes
 DEBUG      = no
 BUILD_DEPS =
-DEPS       = cups
+DEPS       = cups sane
 
 URL        = http://hplipopensource.com/hplip-web/index.html
 LICENSE    = GPLv2+

diff --git a/lfs/hplip_lite b/lfs/hplip_lite
deleted file mode 100644 (file)
index 34e6737..0000000
--- a/lfs/hplip_lite
+++ /dev/null
@@ -1,96 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  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   = hplip_full
-PKG_VER    = 3.9.8
-PKG_REL    = 0
-
-THISAPP    = $(PKG_NAME)-$(PKG_VER)
-DL_FILE    = $(THISAPP).tar.gz
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-
-OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-MAINTAINER =
-GROUP      = Applications/Printing
-CORE       = no
-EXTRA      = yes
-DEBUG      = no
-BUILD_DEPS =
-DEPS       = cups
-
-URL        = http://hplipopensource.com/hplip-web/index.html
-LICENSE    = GPLv2+
-SHORT_DESC = HP Printer/Scanner Library (full version)
-
-define LONG_DESC
-       HPLIP (Hewlett-Packard Linux Imaging & Printing) is an HP-developed \
-       solution for printing, scanning, and faxing with HP inkjet and laser based \
-       printers in Linux. The HPLIP project provides printing support for 1,924 \
-       printer models. \
-       This is the full version including printer/scanner support.
-endef
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE) 
-
-download: $(objects)
-
-info:
-       $(DO_PKG_INFO)
-
-install: $(OBJECT)
-
-packages: $(PACKAGES)
-
-$(PACKAGES): $(OBJECT)
-       @$(DO_PACKAGE)
-
-$(objects):
-       @$(LOAD)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(OBJECT): $(objects)
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && \
-               ./configure \
-                       $(CONFIGURE_ARCH) \
-                       --prefix=/usr \
-                       --sysconfdir=/etc \
-                       --enable-hpijs-only-build \
-                       --disable-network-build \
-                       --disable-scan-build
-       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-       cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)