Thanks both.

Please find attached a new d/copyright file together with the diff. I have tried
to take your comments into account and make the file more complete and
consistent without introducing a level of specificity which may not be
warranted.

Any comments?

Thanks.

Mark
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: sysvinit
Upstream-Contact: [email protected]
Source: https://download.savannah.gnu.org/releases/sysvinit/

Files: *
Copyright: 1989, 1991 Free Software Foundation, Inc.
           1997-2005 Miquel van Smoorenburg <[email protected]>
           1998 Danek Duvall
           2003 Theodore Ts'o
           2009, 2011, 2012 the sysvinit's copyright holder
           2010 Michael Krapp
           2011 SuSE LINUX Products GmbH
           2017-2019 Jesse Smith
License: GPL-2.0+

Files: debian/*
Copyright: 1996-2004 Miquel van Smoorenburg <[email protected]>
           2005-2010, 2014 Petter Reinholdtsen <[email protected]>
           2006 Henrique de Moraes Holschuh <[email protected]>
           2006 Thomas Hood <[email protected]>
           2006-2007 Steinar H. Gunderson <[email protected]>
           2009 Software in the Public Interest
           2009 Hideki Yamane <[email protected]>
           2009 Free Software Foundation, Inc.
           2009 Clytie Siddall <[email protected]>
           2009-2020 Adriano Rafael Gomes <[email protected]>
           2010-2012 Christian Perrier <[email protected]>
           2010-2019 Joe Hansen <[email protected]>
           2011, 2016 Ben Hutchings <[email protected]>
           2011-2013 Roger Leigh <[email protected]>
           2012 Martin Bagge <[email protected]>
           2012 Debian French l10n Team
           2012-2013 Steve Langasek <[email protected]>
           2014 Robert Millan <[email protected]>
           2014 Thomas Goirand <[email protected]>
           2014-2018 Michael Biebl <[email protected]>
           2015 Adam Conrad <[email protected]>
           2015-2016 Andreas Henriksson <[email protected]>
           2015-2016 Martin Pitt <[email protected]>
           2017 Ian Jackson <[email protected]>
           2018 Dmitry Bogatov <[email protected]>
           2018 Vincenzo (KatolaZ) Nicosia <[email protected]>
           2021 Mark Hindley <[email protected]>
License: GPL-2.0+

Files: contrib/sysd2v.sh
Copyright: 2019 Trek http://www.trek.eu.org/devel/sysd2v
License: GPL-3.0

Files: doc/Install
       man/fstab-decode.8
       man/initctl.5
       src/fstab-decode.c
       src/runlevellog.h
       src/runlevellog.c
Copyright: 2006 Red Hat, Inc.
           2018 Jesse Smith
License: GPL-2.0

License: GPL-2.0+
 This program 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; either version 2 of the License, or (at your option) any later 
version.
 .
 This program 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 program; if not, write to the Free Software Foundation, Inc., 51 Franklin 
Street, Fifth Floor, Boston, MA 02110-1301, USA.
 .
 On Debian systems you can find a local copy of the GNU General Public License
 in /usr/share/common-licenses/GPL-2.

License: GPL-3.0
 This program 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 3.
 .
 This program 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 program. If not, see <https://www.gnu.org/licenses/>.
 .
 On Debian systems you can find a local copy of the GNU General Public License
 in /usr/share/common-licenses/GPL-3.

License: GPL-2.0
 This program 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.
 .
 This program 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 program; if not, write to the Free Software Foundation, Inc., 51 Franklin 
Street, Fifth Floor, Boston, MA 02110-1301, USA.
 .
 On Debian systems you can find a local copy of the GNU General Public License
 in /usr/share/common-licenses/GPL-2.
>From 63452055cdc44f37cd4ad9f268d700c83ee68b36 Mon Sep 17 00:00:00 2001
From: Mark Hindley <[email protected]>
Date: Sun, 10 Jul 2022 17:21:09 +0100
Subject: [PATCH] d/copyright: add missing entries and sort by date (Closes:
 #1014511).

---
 debian/copyright | 113 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 77 insertions(+), 36 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index c40ba6b4..f5110a68 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,45 +4,86 @@ Upstream-Contact: [email protected]
 Source: https://download.savannah.gnu.org/releases/sysvinit/
 
 Files: *
-Copyright: 1997-2005 Miquel van Smoorenburg <[email protected]>
-License: GPL-2+
+Copyright: 1989, 1991 Free Software Foundation, Inc.
+	   1997-2005 Miquel van Smoorenburg <[email protected]>
+	   1998 Danek Duvall
+           2003 Theodore Ts'o
+	   2009, 2011, 2012 the sysvinit's copyright holder
+           2010 Michael Krapp
+           2011 SuSE LINUX Products GmbH
+           2017-2019 Jesse Smith
+License: GPL-2.0+
 
 Files: debian/*
-License: GPL-2+
-Copyright: 2015      Adam Conrad <[email protected]>
-           2018      Dmitry Bogatov <[email protected]>
-           2018      Vincenzo (KatolaZ) Nicosia <[email protected]>
-           2006      Henrique de Moraes Holschuh <[email protected]>
-           2017      Ian Jackson <[email protected]>
-           2014      Petter Reinholdtsen <[email protected]>
-           2014      Robert Millan <[email protected]>
-           2014      Thomas Goirand <[email protected]>
-           2006      Thomas Hood <[email protected]>
-           2015-2016 Andreas Henriksson <[email protected]>
-           2011,2016 Ben Hutchings <[email protected]>
+Copyright: 1996-2004 Miquel van Smoorenburg <[email protected]>
+           2005-2010, 2014 Petter Reinholdtsen <[email protected]>
+           2006 Henrique de Moraes Holschuh <[email protected]>
+           2006 Thomas Hood <[email protected]>
+           2006-2007 Steinar H. Gunderson <[email protected]>
+           2009 Software in the Public Interest
+           2009 Hideki Yamane <[email protected]>
+	   2009 Free Software Foundation, Inc.
+	   2009 Clytie Siddall <[email protected]>
+           2009-2020 Adriano Rafael Gomes <[email protected]>
            2010-2012 Christian Perrier <[email protected]>
-           2015-2016 Martin Pitt <[email protected]>
-           2014-2018 Michael Biebl <[email protected]>
-           1996-2004 Miquel van Smoorenburg <[email protected]>
-           2005-2006 Petter Reinholdtsen <[email protected]>
-           2006-2010 Petter Reinholdtsen <[email protected]>
+           2010-2019 Joe Hansen <[email protected]>
+           2011, 2016 Ben Hutchings <[email protected]>
            2011-2013 Roger Leigh <[email protected]>
-           2006-2007 Steinar H. Gunderson <[email protected]>
+           2012 Martin Bagge <[email protected]>
+           2012 Debian French l10n Team
            2012-2013 Steve Langasek <[email protected]>
+           2014 Robert Millan <[email protected]>
+           2014 Thomas Goirand <[email protected]>
+           2014-2018 Michael Biebl <[email protected]>
+	   2015 Adam Conrad <[email protected]>
+           2015-2016 Andreas Henriksson <[email protected]>
+           2015-2016 Martin Pitt <[email protected]>
+           2017 Ian Jackson <[email protected]>
+           2018 Dmitry Bogatov <[email protected]>
+           2018 Vincenzo (KatolaZ) Nicosia <[email protected]>
+	   2021 Mark Hindley <[email protected]>
+License: GPL-2.0+
+
+Files: contrib/sysd2v.sh
+Copyright: 2019 Trek http://www.trek.eu.org/devel/sysd2v
+License: GPL-3.0
 
-License: GPL-2+
- This program 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; either version 2
- of the License, or (at your option) any later version.
- .
- This program 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 program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian system, copy of GNU Lesser General Public License version 2
- is also located at `/usr/share/common-licenses/GPL-2'
+Files: doc/Install
+       man/fstab-decode.8
+       man/initctl.5
+       src/fstab-decode.c
+       src/runlevellog.h
+       src/runlevellog.c
+Copyright: 2006 Red Hat, Inc.
+           2018 Jesse Smith
+License: GPL-2.0
+
+License: GPL-2.0+
+ This program 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; either version 2 of the License, or (at your option) any later version.
+ .
+ This program 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 program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems you can find a local copy of the GNU General Public License
+ in /usr/share/common-licenses/GPL-2.
+
+License: GPL-3.0
+ This program 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 3.
+ .
+ This program 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 program. If not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems you can find a local copy of the GNU General Public License
+ in /usr/share/common-licenses/GPL-3.
+
+License: GPL-2.0
+ This program 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.
+ .
+ This program 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 program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems you can find a local copy of the GNU General Public License
+ in /usr/share/common-licenses/GPL-2.
-- 
2.35.1

Reply via email to