diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2007-10-14 14:01:09 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2007-10-14 14:01:09 +0000 |
| commit | 13559d22cfc485904a6d9e24840a94e0f38a2c90 (patch) | |
| tree | a4d51e36f2514e45284641fb79943496f9e190b4 | |
| parent | bump to 1.3.6 (diff) | |
| download | historical-13559d22cfc485904a6d9e24840a94e0f38a2c90.tar.gz historical-13559d22cfc485904a6d9e24840a94e0f38a2c90.tar.bz2 historical-13559d22cfc485904a6d9e24840a94e0f38a2c90.zip | |
Avoid collision with foo2zjs, thanks robbat2 in bug 185486
Package-Manager: portage-2.1.3.12
| -rw-r--r-- | net-print/foomatic-db/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/foomatic-db/Manifest | 16 | ||||
| -rw-r--r-- | net-print/foomatic-db/foomatic-db-20070508.ebuild | 5 |
3 files changed, 17 insertions, 10 deletions
diff --git a/net-print/foomatic-db/ChangeLog b/net-print/foomatic-db/ChangeLog index 4985b608e189..a62a34dbf9f1 100644 --- a/net-print/foomatic-db/ChangeLog +++ b/net-print/foomatic-db/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/foomatic-db # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/ChangeLog,v 1.62 2007/05/11 11:06:18 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/ChangeLog,v 1.63 2007/10/14 14:01:09 genstef Exp $ + + 14 Oct 2007; Stefan Schweizer <genstef@gentoo.org> + foomatic-db-20070508.ebuild: + Avoid collision with foo2zjs, thanks robbat2 in bug 185486 11 May 2007; Denis Dupeyron <calchan@gentoo.org> foomatic-db-20070508.ebuild: diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest index f3a69f5b5031..e987d3489934 100644 --- a/net-print/foomatic-db/Manifest +++ b/net-print/foomatic-db/Manifest @@ -14,14 +14,14 @@ EBUILD foomatic-db-20060720.ebuild 936 RMD160 218535428e8e46b0230ed90b99ccbd4ed6 MD5 638315d87c00baf8244e5300aecf72d7 foomatic-db-20060720.ebuild 936 RMD160 218535428e8e46b0230ed90b99ccbd4ed6994154 foomatic-db-20060720.ebuild 936 SHA256 343d2c206610f56d40eeb507b5c89e4b4fc881346214393054f51b00e0e9b0c0 foomatic-db-20060720.ebuild 936 -EBUILD foomatic-db-20070508.ebuild 951 RMD160 f41dea57b6530ba4a27ec0b62442efa79b3e37f5 SHA1 796fceb9d29936e37932ce46bb16e709201bc789 SHA256 eaf5bc6f43d678aa31b7c393c3775d22613c7b95283b122ed0b6cb2b258ae820 -MD5 5ff838a683eb80a9eb531b160832654c foomatic-db-20070508.ebuild 951 -RMD160 f41dea57b6530ba4a27ec0b62442efa79b3e37f5 foomatic-db-20070508.ebuild 951 -SHA256 eaf5bc6f43d678aa31b7c393c3775d22613c7b95283b122ed0b6cb2b258ae820 foomatic-db-20070508.ebuild 951 -MISC ChangeLog 7846 RMD160 0aacba9cfa0020b317e5bb0b2968d5992450e8d4 SHA1 4e2af76ea748058474b7d70a890abfe8ae3827c8 SHA256 ae90379ef6451b2cc6b025dbf89397606d8a4b0e79ad47a8843eb4246d118b7c -MD5 08fe018955ff60ed33fc252e442f6aee ChangeLog 7846 -RMD160 0aacba9cfa0020b317e5bb0b2968d5992450e8d4 ChangeLog 7846 -SHA256 ae90379ef6451b2cc6b025dbf89397606d8a4b0e79ad47a8843eb4246d118b7c ChangeLog 7846 +EBUILD foomatic-db-20070508.ebuild 1264 RMD160 18a1c8b552d711ebef95e8aefedef81c4f5bb3c2 SHA1 2ab89c8814bb550305593544fa647a5179662cc1 SHA256 382c351b536a738f66281e6a0b9552916ae9be87d2b075b5b51f2c2364424eee +MD5 0429854dcc149384f82d1c10e5ebc293 foomatic-db-20070508.ebuild 1264 +RMD160 18a1c8b552d711ebef95e8aefedef81c4f5bb3c2 foomatic-db-20070508.ebuild 1264 +SHA256 382c351b536a738f66281e6a0b9552916ae9be87d2b075b5b51f2c2364424eee foomatic-db-20070508.ebuild 1264 +MISC ChangeLog 7992 RMD160 0b9c6853499ba8f8eeee9e7f16aeaa65601c645d SHA1 815318df40ca20c98ec77c54e1ddf4594c2adc46 SHA256 f0ce4afffa2a231855263fd4ab809e151f0f439f30c855cc9de435879b7346d7 +MD5 747520165af3678d32077d985c177653 ChangeLog 7992 +RMD160 0b9c6853499ba8f8eeee9e7f16aeaa65601c645d ChangeLog 7992 +SHA256 f0ce4afffa2a231855263fd4ab809e151f0f439f30c855cc9de435879b7346d7 ChangeLog 7992 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 diff --git a/net-print/foomatic-db/foomatic-db-20070508.ebuild b/net-print/foomatic-db/foomatic-db-20070508.ebuild index 857b90b8f0f7..4eb7a80e241b 100644 --- a/net-print/foomatic-db/foomatic-db-20070508.ebuild +++ b/net-print/foomatic-db/foomatic-db-20070508.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20070508.ebuild,v 1.2 2007/05/11 11:06:18 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-20070508.ebuild,v 1.3 2007/10/14 14:01:09 genstef Exp $ DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds" HOMEPAGE="http://www.linuxprinting.org/foomatic.html" @@ -23,4 +23,7 @@ src_compile() { src_install() { emake DESTDIR="${D}" install || die "emake install failed" dodoc ChangeLog README TODO USAGE + + # Avoid collision with foo2zjs, bug 185486 + rm ${D}/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml} } |