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, 27 deletions

diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 4c6c8ae..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,27 +0,0 @@
-This package was debianized by Chris Lawrence <lawrencc@debian.org> on
-Sun, 13 Apr 2003 20:44:09 -0500.
-
-It was downloaded from http://www.openprinting.org/download/foomatic/
-
-Upstream Authors:
-  Original founder: Grant Taylor <gtaylor@picante.com>
-  Current maintainer: Till Kamppeter <till.kamppeter@gmail.com>
-
-Copyright:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc.,  51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-