From ffac819a3de4e8abc5eba8322024b2fc308fa9bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 22 Jan 2015 22:57:15 +0100 Subject: Rewrite debian/copyright, some typos --- debian/changelog | 8 +++--- debian/copyright | 61 ++++++++++++++++++++---------------------- debian/patches/0500-paps.patch | 2 +- 3 files changed, 35 insertions(+), 36 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7613c53..2b6b577 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -foomatic-filters (4.0.17-6) UNRELEASED; urgency=medium +foomatic-filters (4.0.17-6) unstable; urgency=low * New debian/patches/0500-paps.patch: cherry-pick from upstream to add paps as default filter that functional with utf-8 (Closes: #769842). @@ -6,10 +6,12 @@ foomatic-filters (4.0.17-6) UNRELEASED; urgency=medium * debian/control: - Add paps as default filter to the Recommends of foomatic-filters. - Bump Standards-Version to 3.9.6 (no changes required). - * Add year 2015 to debian/copyright. + * debian/copyright: + - Add year 2015. + - Rewrite to correct the order. * Remove debian/source/options because compression xz is standard now. - -- Jörg Frings-Fürst Thu, 22 Jan 2015 21:00:16 +0100 + -- Jörg Frings-Fürst Thu, 22 Jan 2015 22:47:56 +0100 foomatic-filters (4.0.17-5) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index 97a3176..51f355a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,6 +3,11 @@ Upstream-Name: foomatic-filters Upstream-Contact: Mailinglist Source: http://www.openprinting.org/download/foomatic/ +Files: * +Copyright: 2008-2015 Till Kamppeter + 2008 Lars Uebernickel +License: GPL-2.0+ + Files: test/tcm.sh test/tetapi.sh Copyright: 1990 X/Open Company Limited (X/Open) @@ -11,37 +16,6 @@ Copyright: 1990 X/Open Company Limited (X/Open) 1990 Open Software Foundation (OSF)] License: MIT -License: MIT - All rights reserved. No part of this source code may be reproduced, - stored in a retrieval system, or transmitted, in any form or by any - means, electronic, mechanical, photocopying, recording or otherwise, - except as stated in the end-user licence agreement, without the prior - permission of the copyright owners. - . - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose and without fee is hereby granted, provided - that the above copyright notice appear in all copies and that both that - copyright notice and this permission notice appear in supporting - documentation, and that the name of OSF, UI or X/Open not be used in - advertising or publicity pertaining to distribution of the software - without specific, written prior permission. OSF, UI and X/Open make - no representations about the suitability of this software for any purpose. - It is provided "as is" without express or implied warranty. - . - OSF, UI and X/Open DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - EVENT SHALL OSF, UI or X/Open BE LIABLE FOR ANY SPECIAL, INDIRECT OR - CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF - USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. - - -Files: * -Copyright: 2008-2015 Till Kamppeter - 2008 Lars Uebernickel -License: GPL-2.0+ - Files: test/shfuncs.sh test/lsbfuncs.sh Copyright: 1998-2001 The Open Group / owners @@ -74,4 +48,27 @@ License: GPL-2.0+ License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. - +License: MIT + All rights reserved. No part of this source code may be reproduced, + stored in a retrieval system, or transmitted, in any form or by any + means, electronic, mechanical, photocopying, recording or otherwise, + except as stated in the end-user licence agreement, without the prior + permission of the copyright owners. + . + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of OSF, UI or X/Open not be used in + advertising or publicity pertaining to distribution of the software + without specific, written prior permission. OSF, UI and X/Open make + no representations about the suitability of this software for any purpose. + It is provided "as is" without express or implied warranty. + . + OSF, UI and X/Open DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL OSF, UI or X/Open BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. diff --git a/debian/patches/0500-paps.patch b/debian/patches/0500-paps.patch index 06d402f..39cccd4 100644 --- a/debian/patches/0500-paps.patch +++ b/debian/patches/0500-paps.patch @@ -160,7 +160,7 @@ Index: trunk/foomatic-rip.1.in +auto-detects which program is installed, but manual configuration is +also possible. + -+.Topic ++.P + +Recommended is \fBa2ps\fR because it detects many file types (text, most +image formats) and together with \fBImageMagick(1)\fR (for images) and -- cgit v1.2.3