Control: tags -1 + patch

On Sat, 2012-11-03 at 01:47 -0400, Michael Gilbert wrote:
> reopen 682752
> thanks
> 
> This still affects unstable.

The change that was meant to fix this bug is in
  
http://anonscm.debian.org/loggerhead/pkg-cups/cups-filters/debian-trunk/revision/62/debian/copyright
however the copyright file was updated for 1.0.20 with another addition
for 1.0.22 so it is not completely correct for 1.0.18.

Attached is a patch to fix the 1.0.18-2 debian/copyright file. It is
loosely based on the changes from experimental but should be mostly
valid for 1.0.18. It is probably not perfect (I haven't done a
exhaustive review) but at least it is a big improvement and should fix
the reported problems.

The copyright file can probably be further simplified by aggregating
copyright years and first having a Files: * section that lists the
global license and copyright holders and after that only list the
exceptions.

-- 
-- arthur - adej...@debian.org - http://people.debian.org/~adejong --
--- debian/copyright.orig	2012-11-10 15:36:53.000000000 +0100
+++ debian/copyright	2012-11-10 17:18:35.000000000 +0100
@@ -5,25 +5,47 @@
 
 Files: AUTHORS.txt
  CHANGES.txt
- acloacl.m4
- configure
- install-sh
- debian/*
-Copyright: 2012, Till Kamppeter <till.kamppe...@gmail.com>
+ INSTALL.txt
+ Makedefs.in
+ Makefile
+ README.txt
+ config.h.in
+ configure.in
+Copyright: 2007-2011 Apple Inc.
+           1997-2007 Easy Software Products
+License: GPL-2
+
+Files: aclocal.m4
+Copyright: 1996-2009 Free Software Foundation, Inc.
+           2004 Scott James Remnant <sc...@netsplit.com>
+License: GPL2+
+
+Files: configure
+Copyright: 1999-2009 Free Software Foundation, Inc.
+License:
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+
+Files: install-sh
+Copyright: 2008-2009 Apple Inc.
+           1991 Massachusetts Institute of Technology
+License: MIT
+
+Files: debian/*
+Copyright: 1999-2003 Jeff Licquia <licq...@debian.org>
+           2003-2007 Kenshi Muto <km...@debian.org>
+           2007-2012 Martiin Pitt <mp...@debian.org>
+           2012 Till Kamppeter <till.kamppe...@gmail.com>
+           2009 Canonical Ltd.
 License: GPL-2+
 
-Files: debian/local/textonly* debian/local/text.convs
+Files: filter/textonly
+ ppd/textonly.ppd
 Copyright: 2003-2006 Red Hat, Inc.
- 2003-2006 Tim Waugh <twa...@redhat.com>
-License: GPL-2
+           2003-2006 Tim Waugh <twa...@redhat.com>
+License: GPL-2+
 
-Files: config.h.in
- configure.in
- INSTALL.txt
- LICENSE.txt
- README.txt
- Makedefs.in
- Makefile
+Files:
  backend/*
  config-scripts/*
  scripting/*
@@ -41,22 +63,25 @@
  filter/pcl-common.h
  filter/pcl.h
  filter/pdftops.c
- filter/pdfutils.c
- filter/pdfutils.h
  filter/rastertoescpx.c
  filter/rastertopclx.c
  filter/textcommon.c
  filter/textcommon.h
-Copyright: 2007-2011, Apple Inc.
- 1997-2007, Easy Software Products.
+Copyright: 2007-2011 Apple Inc.
+           1997-2007 Easy Software Products.
+           2012 Till Kamppeter <till.kamppe...@gmail.com>
 License: GPL-2
 
 Files: cupsfilters/*
-Copyright: 2007-2011, Apple Inc.
- 1997-2007, Easy Software Products.
+Copyright: 2007-2011 Apple Inc.
+           1997-2007 Easy Software Products
 License: LGPL-2
 
 Files: filter/fontembed/*
+Copyright: 2008, 2012 Tobias Hoffmann
+License: MIT
+
+Files:
  filter/pdf.utf-8.heavy
  filter/pdf.utf-8.simple
  filter/pdfutils.c
@@ -64,19 +89,23 @@
  filter/test_pdf1.c
  filter/test_pdf2.c
  filter/texttopdf.c
-Copyright: 2008, Tobias Hoffmann.
- 2007, Apple Inc.
- 1993-2007, Easy Software Products.
+Copyright: 2008-2012 Tobias Hoffmann
+           2007 Apple Inc.
+           1993-2007 Easy Software Products
 License: GPL-2
 
-Files: filter/pstopdf.in
+Files: fontembed/*
+Copyright: 2008, 2012 Tobias Hoffmann
+License: MIT
+
+Files: filter/pstopdf
 Copyright: 2003, Robert Sander <robert.san...@epigenomics.com>
  2008-2012, Till Kamppeter <till.kamppe...@gmail.com>
 License: GPL-2
 
 Files: filter/imagetopdf.c
-Copyright: 1993-2006, Easy Software Products.
- 2006-2007, BBR Inc.
+Copyright: 1993-2006 Easy Software Products
+           2006-2007 BBR Inc.
 License: GPL-2
 
 Files: filter/banner.c
@@ -93,19 +122,25 @@
  filter/testprint
  filter/topsecret
  filter/unclassified
-Copyright: 2012, Canonical Ltd.
+Copyright: 2012 Canonical Ltd.
 License: GPL-3
 
-Files: pdftoopvp/*
- pdftopdf/*
- filter/pdftoraster.cxx
- ppd/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd
-Copyright: Copyright 2006-2011, BBR Inc. All rights reserved.
+Files: filter/pdftoraster.cxx
+Copyright: 2008-2011 BBR Inc.
+License: Expat
+
+Files: filter/PDFError.h
+Copyright: 2012 BBR Inc.
 License: Expat
 
+Files: filter/pdftopdf/*
+Copyright: 2006-2011 BBR Inc.
+           2012 Tobias Hoffmann
+License: MIT
+
 Files: filter/pdftoijs.cxx
-Copyright: 2008, BBR Inc. All rights reserved.
- 2008, Tobias Hoffmann
+Copyright: 2008 BBR Inc.
+           2008 Tobias Hoffmann
 License: Expat
 
 License: GPL-2
@@ -189,3 +224,14 @@
  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: MIT
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, 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 M.I.T. not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission.  M.I.T. makes no representations about the
+ suitability of this software for any purpose.  It is provided "as is"
+ without express or implied warranty.

Attachment: signature.asc
Description: This is a digitally signed message part

  • Bug#682752: Arthur de Jong

Reply via email to