From 5215565b7abac566389d8797ab71268a380d4d22 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Thu, 29 Oct 2015 00:18:45 +0300 Subject: [PATCH] foomatic-db:moved into main for pisi 2.0 --- hardware/printer/foomatic-db/actions.py | 30 +++++ .../printer/foomatic-db/files/cleanup-script | 35 ++++++ .../files/fedora/foomatic-db-device-ids.patch | 110 ++++++++++++++++++ .../files/fedora/foomatic-db-invalid.patch | 23 ++++ hardware/printer/foomatic-db/pspec.xml | 69 +++++++++++ hardware/printer/foomatic-db/translations.xml | 8 ++ 6 files changed, 275 insertions(+) create mode 100644 hardware/printer/foomatic-db/actions.py create mode 100644 hardware/printer/foomatic-db/files/cleanup-script create mode 100644 hardware/printer/foomatic-db/files/fedora/foomatic-db-device-ids.patch create mode 100644 hardware/printer/foomatic-db/files/fedora/foomatic-db-invalid.patch create mode 100644 hardware/printer/foomatic-db/pspec.xml create mode 100644 hardware/printer/foomatic-db/translations.xml diff --git a/hardware/printer/foomatic-db/actions.py b/hardware/printer/foomatic-db/actions.py new file mode 100644 index 0000000000..2cc8c06a6a --- /dev/null +++ b/hardware/printer/foomatic-db/actions.py @@ -0,0 +1,30 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import get +from pisi.actionsapi import autotools + +NoStrip = "/" + +def setup(): + # For gutenprint printers, use gutenprint-ijs-simplified.5.2 + #pisitools.dosed("db/source/printer/*.xml", ">gutenprint<", ">gutenprint-ijs-simplified.5.2<") + + autotools.configure() + + # Cleanup conflicts + #shelltools.cd("db/source") + #shelltools.system("../../cleanup-conflicts") + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + # Fix permissions + #for root, dirs, files in os.walk("%s/usr/share/foomatic/db" % get.installDIR()): + # for name in dirs: + # shelltools.chmod(os.path.join(root, name), 0755) + # for name in files: + # shelltools.chmod(os.path.join(root, name), 0644) diff --git a/hardware/printer/foomatic-db/files/cleanup-script b/hardware/printer/foomatic-db/files/cleanup-script new file mode 100644 index 0000000000..e54e5d1bf7 --- /dev/null +++ b/hardware/printer/foomatic-db/files/cleanup-script @@ -0,0 +1,35 @@ +#!/bin/bash + +# Running this script cleanups XML's which conflicts with other +# packages like foo2zjs, lexmark X125, etc. + +# Remove references to foo2zjs, foo2oak, foo2hp and foo2qpdl (bug #208851). +# Also foo2lava, foo2kyo, foo2xqx (bug #438319). + +# Remove Samsung-CLP-300, Samsung-CLP-315 (bug #625505) +find printer -name '*.xml' |grep -E 'Samsung-CLP-300|Samsung-CLP-315'|xargs rm -vf + +for x in zjs oak oak-z1 hp qpdl lava kyo xqx hiperc slx +do + find printer -name '*.xml' | xargs grep -l "foo2${x}"| xargs rm -vf + rm -f driver/foo2${x}.xml opt/foo2${x}-* +done + +# Same for m2300w/m2400w +find printer -name '*.xml' |xargs grep -l 'm2[34]00w<'|xargs rm -vf +rm -f driver/m2300w.xml driver/m2400w.xml opt/m2300w-* + +# Same for all these. +for x in drv_x125 ml85p pbm2lwxl pbmtozjs bjc800j +do + find printer -name '*.xml' |xargs grep -l "${x}"|xargs rm -vf + rm -vf driver/${x}.xml opt/${x}-* +done + + +# We also have those one in foo2zjs +#source/driver/foo2oak-z1.xml +#source/driver/foo2slx.xml + + + diff --git a/hardware/printer/foomatic-db/files/fedora/foomatic-db-device-ids.patch b/hardware/printer/foomatic-db/files/fedora/foomatic-db-device-ids.patch new file mode 100644 index 0000000000..b1c3bfdbf5 --- /dev/null +++ b/hardware/printer/foomatic-db/files/fedora/foomatic-db-device-ids.patch @@ -0,0 +1,110 @@ +diff -up foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd.device-ids-20120103 foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd +--- foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd.device-ids-20120103 2012-01-03 00:40:44.000000000 +0000 ++++ foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd 2012-02-24 09:33:37.047452635 +0000 +@@ -32,6 +32,7 @@ + *ShortNickName: "Brother MFC-8840D BR-Script3" + *ModelName: "Brother MFC-8840D BR-Script3" + *NickName: "Brother MFC-8840D BR-Script3" ++*1284DeviceID: "MFG:Brother;MDL:MFC-8840D;CMD:HBP,PJL,PCL,PCLXL;" + + *%==== Basic Device Capabilities ============= + *LanguageLevel: "3" +diff -up foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd.device-ids-20120103 foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd +--- foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd.device-ids-20120103 2012-01-03 00:40:44.000000000 +0000 ++++ foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd 2012-02-24 09:33:37.049452637 +0000 +@@ -62,7 +62,7 @@ + *LXCountPIN: "4" + *LXlowPINchar: "0" + *LXhiPINchar: "9" +-*1284DeviceID: "MFG: Lexmark;MDL: Lexmark C543" ++*1284DeviceID: "MFG:Lexmark International;MDL:Lexmark C543;" + *FreeVM: "252000000" + *VMOption 256Meg: "252000000" + *VMOption 320Meg: "312000000" +diff -up foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml +--- foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml.device-ids-20120103 2012-02-24 09:33:36.314452298 +0000 ++++ foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml 2012-02-24 09:33:37.051452638 +0000 +@@ -15,7 +15,7 @@ + + + +- MFG:Brother;MDL:Brother MFC-8840D; ++ MFG:Brother;MDL:MFC-8840D;CMD:HBP,PJL,PCL,PCLXL; + Brother + Brother MFC-8840D + +diff -up foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml +--- foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml.device-ids-20120103 2012-02-24 09:33:36.401452339 +0000 ++++ foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml 2012-02-24 09:33:37.087452655 +0000 +@@ -20,7 +20,7 @@ + SCP,VLINK + Hewlett-Packard DeskJet 720 Series + HEWLETT-PACKARD +- DESKJET 720 ++ DESKJET 720C + + + A +diff -up foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml +--- foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml.device-ids-20120103 2012-02-24 09:33:36.411452343 +0000 ++++ foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml 2012-02-24 09:33:37.089452655 +0000 +@@ -13,6 +13,13 @@ + + + ++ ++ ++ PJL,PML,PCLXL,POSTSCRIPT,PCL ++ Hewlett-Packard ++ HP LaserJet MFP M1522nf MFP ++ ++ + D + pxlmono + +diff -up foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml +--- foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml.device-ids-20120103 2012-02-24 09:34:34.375478948 +0000 ++++ foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml 2012-02-24 09:41:52.635757050 +0000 +@@ -19,10 +19,10 @@ + + + +- MFG:Kyocera;MODEL:Kyocera FS-1118MFP;COMMAND SET: POSTSCRIPT,PJL,PCL +- POSTSCRIPT,PJL,PCL ++ MFG:Kyocera;MODEL:FS-1118MFP;CMD:PCLXL,PostScript Emulation,PCL5E,PJL; ++ CMD:PCLXL,PostScript Emulation,PCL5E,PJL + Kyocera +- Kyocera FS-1118MFP ++ FS-1118MFP + + + A +diff -up foomatic-db-20120103/db/source/printer/Lexmark-C543.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Lexmark-C543.xml +--- foomatic-db-20120103/db/source/printer/Lexmark-C543.xml.device-ids-20120103 2012-02-24 09:33:36.463452367 +0000 ++++ foomatic-db-20120103/db/source/printer/Lexmark-C543.xml 2012-02-24 09:33:37.090452655 +0000 +@@ -15,7 +15,7 @@ + + + +- MFG: Lexmark;MDL: Lexmark C543 ++ MFG:Lexmark International;MDL:Lexmark C543; + Lexmark + Lexmark C543 + +diff -up foomatic-db-20130911/db/source/printer/Brother-HL-2040.xml.device-ids foomatic-db-20130911/db/source/printer/Brother-HL-2040.xml +--- foomatic-db-20130911/db/source/printer/Brother-HL-2040.xml.device-ids 2013-09-11 15:55:21.853642637 +0200 ++++ foomatic-db-20130911/db/source/printer/Brother-HL-2040.xml 2013-09-11 15:53:30.775176972 +0200 +@@ -15,6 +15,13 @@ + + + ++ ++ ++ MFG:Brother;MDL:HL-2040 series;CMD:PJL,HBP; ++ Brother ++ Brother HL-2040 series ++ ++ + B + hl1250 + diff --git a/hardware/printer/foomatic-db/files/fedora/foomatic-db-invalid.patch b/hardware/printer/foomatic-db/files/fedora/foomatic-db-invalid.patch new file mode 100644 index 0000000000..ecfe2007ba --- /dev/null +++ b/hardware/printer/foomatic-db/files/fedora/foomatic-db-invalid.patch @@ -0,0 +1,23 @@ +diff -up foomatic-db-20131218/db/source/driver/Postscript.xml.orig foomatic-db-20131218/db/source/driver/Postscript.xml +--- foomatic-db-20131218/db/source/driver/Postscript.xml.orig 2013-12-18 01:41:18.000000000 +0100 ++++ foomatic-db-20131218/db/source/driver/Postscript.xml 2013-12-18 15:09:08.471674405 +0100 +@@ -358,9 +358,6 @@ + printer/HP-Business_Inkjet_3000 + + +- printer/HP-Business_Inkjet_9100 +- +- + printer/HP-Color_LaserJet_2500 + + +@@ -1066,9 +1063,6 @@ + printer/Oce-3155PS + + +- printer/Oce-3165 +- +- + printer/Oce-3165PS + + diff --git a/hardware/printer/foomatic-db/pspec.xml b/hardware/printer/foomatic-db/pspec.xml new file mode 100644 index 0000000000..2828f4530c --- /dev/null +++ b/hardware/printer/foomatic-db/pspec.xml @@ -0,0 +1,69 @@ + + + + + foomatic-db + http://www.linuxprinting.org/foomatic.html + + PisiLinux Community + admins@pisilinux.org + + GPLv2+ + data + Database of printers and printer drivers + foomatic-db contains the knowledge database for printers which are used by foomatic-db-engine to generate PPD files. + http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20150819.tar.gz + + cleanup-script + + + + + + + fedora/foomatic-db-device-ids.patch + fedora/foomatic-db-invalid.patch + + + + + foomatic-db + + pnm2ppa + + + /usr/share + + + + + + 2015-10-28 + 4.0.20150819 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-05 + 4.0_20130103 + Depend on cups-filters. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-01-24 + 4.0_20130103 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2013-01-03 + 4.0_20130103 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/hardware/printer/foomatic-db/translations.xml b/hardware/printer/foomatic-db/translations.xml new file mode 100644 index 0000000000..590baa2b41 --- /dev/null +++ b/hardware/printer/foomatic-db/translations.xml @@ -0,0 +1,8 @@ + + + + foomatic-db + Yazıcı sürücüleri + Foomatic yazıcı veritabanı ve sürücüleri + +