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 | 9d42502c462e7dba1bfdbf572a3cbae115095b37 (patch) | |
| tree | c79e1979298c89b180bc0913c081cbd0333359a4 /net-print/foomatic-db | |
| parent | bump to 1.3.6 (diff) | |
| download | gentoo-2-9d42502c462e7dba1bfdbf572a3cbae115095b37.tar.gz gentoo-2-9d42502c462e7dba1bfdbf572a3cbae115095b37.tar.bz2 gentoo-2-9d42502c462e7dba1bfdbf572a3cbae115095b37.zip | |
Avoid collision with foo2zjs, thanks robbat2 in bug 185486
(Portage version: 2.1.3.12)
Diffstat (limited to 'net-print/foomatic-db')
| -rw-r--r-- | net-print/foomatic-db/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/foomatic-db/foomatic-db-20070508.ebuild | 5 |
2 files changed, 9 insertions, 2 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/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} } |