Merge branch 'upstream'

Conflicts:
	debian/README.Debian
	debian/changelog
	debian/control
	debian/copyright
	debian/foomatic-filters.config
	debian/foomatic-filters.postinst
	debian/foomatic-filters.postrm
	debian/foomatic-filters.templates
	debian/parseconfig.pl
	debian/po/de.po
	debian/po/fr.po
	debian/po/ja.po
	debian/po/nl.po
	debian/po/pt_BR.po
	debian/po/templates.pot
	debian/po/tr.po
	debian/rules

1 files changed, 0 insertions, 29 deletions

diff --git a/debian/control b/debian/control
deleted file mode 100644
index 22babf0..0000000
--- a/debian/control
+++ /dev/null
@@ -1,29 +0,0 @@
-Source: foomatic-filters
-Section: text
-Priority: optional
-Maintainer: Chris Lawrence <lawrencc@debian.org>
-Build-Depends: debhelper (>> 4), po-debconf
-Homepage: http://www.openprinting.org/
-Standards-Version: 3.7.3
-
-Package: foomatic-filters
-Architecture: all
-Pre-Depends: bash (>= 2.05)
-Depends: ${perl:Depends}, ${misc:Depends}, ucf (>= 0.30)
-Recommends: cupsys-client | lpr | lprng | pdq | rlpr, gs-esp | gs, cupsys | enscript | a2ps | mpage, foomatic-db-engine
-Conflicts: foomatic-bin (<< 2.9), cupsomatic-ppd (<< 20030507), gs (<< 8.0), gs-aladdin (<< 8.0)
-Replaces: foomatic-bin (<< 2.9), cupsomatic-ppd
-Description: OpenPrinting printer support - filters
- Foomatic is a printer database designed to make it easier to set up
- common printers for use with UNIX-like other operating systems.
- It provides the "glue" between a print spooler (like CUPS or lpr) and
- the printer, by processing files sent to the printer.
- .
- This package consists of filter scripts used by the printer spoolers
- to convert the incoming PostScript data into the printer's native
- format using a printer-specific, but spooler-independent PPD file.
- You will need to install the foomatic-db-engine package and its
- dependencies for this package to be useful.
- .
- For use with CUPS, you will need both the cupsys and cupsys-client
- packages installed on your system.