From patchwork Tue Aug 25 09:50:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3407 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPx6Yxxz3x24 for ; Tue, 25 Aug 2020 09:51:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BbPPn4XHNzwc; Tue, 25 Aug 2020 09:50:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BbPPl5nJrz30XQ; Tue, 25 Aug 2020 09:50:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BbPPj5XgBz30Wd for ; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BbPPj4Y9Wzv9; Tue, 25 Aug 2020 09:50:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XM9NwZrYodu+ZtMbQBh7DDY5oR1Ath74P8pEGQTVplA=; b=cAm0aSmzjYXZGdLXNolI2edHvRpx9S+ss7sM6q+Dr/qwTWHe2eLO6l24frguQhmhuHBM2J 4CsbHuF/1xRag9Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1598349049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XM9NwZrYodu+ZtMbQBh7DDY5oR1Ath74P8pEGQTVplA=; b=Az4bEWi0Zp/Wm1tr+xZsGUJWwzbJbIHIRLXfoes2wtHUErcJ7/iaHVO3MFxBPYt53VV24C csuq04DSxX9+KS1YkUOULK+IW2hl/Z4HGSBwWvKjeF82fAYnh7vlq2jNIGd2i4tUryZn82 nmyAkNn0y4OGZp2vTWZOoFxlGkbA037EdClcm/bRDT3/rWeNP9q3OW2SC4xQJLH42VihHD tzaQPxMqsHqIPVMgaKx7Qa05WCoR6ZMacAYU95LpJcPcl2HewI4ydCiKRX7DgDJrzE/CFe TRfIpwrsHSMuSpWerdWOdF1l2ijdsfSUDtIkUxnRck7Hj8ihkMiugCjJpOYl1g== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 11/12] foomatic: Drop files that are now provided by cups-filter Date: Tue, 25 Aug 2020 09:50:39 +0000 Message-Id: <20200825095040.3854-11-michael.tremer@ipfire.org> In-Reply-To: <20200825095040.3854-1-michael.tremer@ipfire.org> References: <20200825095040.3854-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/packages/foomatic | 5 ----- lfs/foomatic | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/config/rootfiles/packages/foomatic b/config/rootfiles/packages/foomatic index b60408ca8..735913449 100644 --- a/config/rootfiles/packages/foomatic +++ b/config/rootfiles/packages/foomatic @@ -11,12 +11,8 @@ usr/bin/foomatic-ppd-options usr/bin/foomatic-ppd-to-xml usr/bin/foomatic-ppdfile usr/bin/foomatic-printjob -usr/bin/foomatic-rip usr/bin/foomatic-searchprinter -usr/lib/cups/backend/beh usr/lib/cups/driver/foomatic -usr/lib/cups/filter/foomatic-ppdfile -usr/lib/cups/filter/foomatic-rip #usr/lib/perl5/site_perl/5.30.0/Foomatic usr/lib/perl5/site_perl/5.30.0/Foomatic/DB.pm usr/lib/perl5/site_perl/5.30.0/Foomatic/Defaults.pm @@ -8009,7 +8005,6 @@ usr/share/foomatic/xmlschema/types.xsd #usr/share/man/man1/foomatic-ppd-options.1 #usr/share/man/man1/foomatic-ppdfile.1 #usr/share/man/man1/foomatic-printjob.1 -#usr/share/man/man1/foomatic-rip.1 #usr/share/man/man8/foomatic-addpjloptions.8 #usr/share/man/man8/foomatic-getpjloptions.8 #usr/share/man/man8/foomatic-kitload.8 diff --git a/lfs/foomatic b/lfs/foomatic index 1288277e4..9c47228da 100644 --- a/lfs/foomatic +++ b/lfs/foomatic @@ -35,7 +35,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/foomatic-filters-$(VER_FILTERS) TARGET = $(DIR_INFO)/$(THISAPP) PROG = foomatic -PAK_VER = 4 +PAK_VER = 5 DEPS = cups ghostscript libtiff hplip @@ -116,9 +116,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /etc/foomatic echo "cups" > /etc/foomatic/defaultspooler - -mkdir -pv /usr/lib/cups/filter - ln -svf ../../../bin/foomatic-rip /usr/lib/cups/filter/foomatic-rip - ln -svf ../../../bin/foomatic-ppdfile /usr/lib/cups/filter/foomatic-ppdfile - @rm -rf $(DIR_SRC)/foomatic-* @$(POSTBUILD)