Package: debian-policy
Version: 4.6.1.1
Severity: wishlist
Tags: patch
Hi!
These are the set of changes I keep doing to the debian/copyright
files I end up touching. While some could be characterized as a
subjective style issue, I've tried to give as close as possibly
objective :) rationale for every and each of the changes in the
commit messages which I'll summarize here.
The main drive is for uniformity in formatting (compared to the
recommended GPL notice example), minimization of diff delta on changes
(the same we seem to be converging with wrap-and-sort -sat), making
the notice future-proof (by using an URL instead of a postal address),
and moving the Debian-specific filesystem location reference into a
Comment to not confuse with the actual upstream/in-code notice. Then
there's the placement of the Source field, which I guess is the
possibly more style/subjective one, but that's one that seems to also
be triggering some OCDish button or similar. :)
This change was implemented on top of the spacing and typographical
patches and seems to depend on changes in there.
Thanks,
Guillem
From 600aabb1a2235396db5fce4240ac0751258fcf7f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guil...@debian.org>
Date: Sun, 18 Sep 2022 18:05:57 +0200
Subject: [PATCH 1/6] copyright-format: Place Source field after Format field
These both contain URLs, are the most important references, and nicely
align, so it's nice to get them as early as possible in the file.
---
copyright-format-1.0.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/copyright-format-1.0.xml b/copyright-format-1.0.xml
index d29c490..3d5c672 100644
--- a/copyright-format-1.0.xml
+++ b/copyright-format-1.0.xml
@@ -271,9 +271,9 @@
<section id="example-header-paragraph">
<title>Example header paragraph</title>
<programlisting>Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://www.example.com/software/project
Upstream-Name: SOFTware
-Upstream-Contact: John Doe <john....@example.com>
-Source: https://www.example.com/software/project</programlisting>
+Upstream-Contact: John Doe <john....@example.com></programlisting>
</section>
</section>
@@ -1265,8 +1265,8 @@ also delete it here.</programlisting>
package):
<programlisting><![CDATA[
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: X Solitaire
Source: ftp://ftp.example.com/pub/games
+Upstream-Name: X Solitaire
Files: *
Copyright: 1998 John Doe <j...@example.com>
@@ -1306,9 +1306,9 @@ License: GPL-2+
<literal>planet-venus</literal> package):
<programlisting><![CDATA[
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://www.example.com/code/venus
Upstream-Name: Planet Venus
Upstream-Contact: John Doe <j...@example.com>
-Source: https://www.example.com/code/venus
Files: *
Copyright: 2008, John Doe <j...@example.com>
--
2.37.2
From 3f047d84744ea74a90b3928981c29804d027c9a1 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guil...@debian.org>
Date: Sun, 18 Sep 2022 18:10:59 +0200
Subject: [PATCH 2/6] copyright-format: Wrap and sort -sat copyright entry
lines
Do not place entries on the first line with the field name, and place
one item per line, so that adding or removing entries generates as
minimal a diff as possible, and avoids modifying unrelated lines. Use
a single space so that the indentation is always uniform among all
fields.
---
copyright-format-1.0.xml | 99 ++++++++++++++++++++++++++--------------
debian/copyright | 54 ++++++++++++++--------
2 files changed, 98 insertions(+), 55 deletions(-)
diff --git a/copyright-format-1.0.xml b/copyright-format-1.0.xml
index 3d5c672..cc9aa41 100644
--- a/copyright-format-1.0.xml
+++ b/copyright-format-1.0.xml
@@ -316,20 +316,28 @@ Upstream-Contact: John Doe <john....@example.com></programlisting>
<section id="example-files-paragraph">
<title>Example files paragraphs</title>
-<programlisting>Files: *
-Copyright: 1975-2010 Ulla Upstream
+<programlisting>Files:
+ *
+Copyright:
+ 1975-2010 Ulla Upstream
License: GPL-2+
-Files: debian/*
-Copyright: 2010 Daniela Debianizer
+Files:
+ debian/*
+Copyright:
+ 2010 Daniela Debianizer
License: GPL-2+
-Files: debian/patches/fancy-feature
-Copyright: 2010 Daniela Debianizer
+Files:
+ debian/patches/fancy-feature
+Copyright:
+ 2010 Daniela Debianizer
License: GPL-3+
-Files: */*.1
-Copyright: 2010 Manuela Manpager
+Files:
+ */*.1
+Copyright:
+ 2010 Manuela Manpager
License: GPL-2+</programlisting>
<para>
In this example, copyright in all files is held by the upstream,
@@ -385,8 +393,9 @@ License: GPL-2+</programlisting>
<example>
<title>tri-licensed files</title>
<programlisting>Files: src/js/editline/*
-Copyright: 1993, John Doe
- 1993, Joe Average
+Copyright:
+ 1993 John Doe
+ 1993 Joe Average
License: MPL-1.1 or GPL-2 or LGPL-2.1
License: MPL-1.1
@@ -401,13 +410,17 @@ License: LGPL-2.1
<example>
<title>recurrent license</title>
-<programlisting>Files: src/js/editline/*
-Copyright: 1993, John Doe
- 1993, Joe Average
+<programlisting>Files:
+ src/js/editline/*
+Copyright:
+ 1993 John Doe
+ 1993 Joe Average
License: MPL-1.1
-Files: src/js/fdlibm/*
-Copyright: 1993, J-Random Corporation
+Files:
+ src/js/fdlibm/*
+Copyright:
+ 1993 J-Random Corporation
License: MPL-1.1
License: MPL-1.1
@@ -1268,9 +1281,11 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: ftp://ftp.example.com/pub/games
Upstream-Name: X Solitaire
-Files: *
-Copyright: 1998 John Doe <j...@example.com>
- 1998 Jane Smith <jsm...@example.net>
+Files:
+ *
+Copyright:
+ 1998 John Doe <j...@example.com>
+ 1998 Jane Smith <jsm...@example.net>
License: GPL-2+
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
@@ -1310,41 +1325,55 @@ Source: https://www.example.com/code/venus
Upstream-Name: Planet Venus
Upstream-Contact: John Doe <j...@example.com>
-Files: *
-Copyright: 2008, John Doe <j...@example.com>
- 2007, Jane Smith <jsm...@example.org>
- 2007, Joe Average <j...@example.org>
- 2007, J. Random User <j...@users.example.com>
+Files:
+ *
+Copyright:
+ 2008 John Doe <j...@example.com>
+ 2007 Jane Smith <jsm...@example.org>
+ 2007 Joe Average <j...@example.org>
+ 2007 J. Random User <j...@users.example.com>
License: PSF-2
-Files: debian/*
-Copyright: 2008, Dan Developer <d...@debian.example.com>
+Files:
+ debian/*
+Copyright:
+ 2008 Dan Developer <d...@debian.example.com>
License: permissive
Copying and distribution of this package, with or without
modification, are permitted in any medium without royalty
provided the copyright notice and this notice are
preserved.
-Files: debian/patches/theme-diveintomark.patch
-Copyright: 2008, Joe Hacker <h...@example.org>
+Files:
+ debian/patches/theme-diveintomark.patch
+Copyright:
+ 2008 Joe Hacker <h...@example.org>
License: GPL-2+
-Files: planet/vendor/compat_logging/*
-Copyright: 2002, Mark Smith <msm...@example.org>
+Files:
+ planet/vendor/compat_logging/*
+Copyright:
+ 2002 Mark Smith <msm...@example.org>
License: MIT
[LICENSE TEXT]
-Files: planet/vendor/httplib2/*
-Copyright: 2006, John Brown <br...@example.org>
+Files:
+ planet/vendor/httplib2/*
+Copyright:
+ 2006 John Brown <br...@example.org>
License: MIT2
Unspecified MIT style license.
-Files: planet/vendor/feedparser.py
-Copyright: 2007, Mike Smith <m...@example.org>
+Files:
+ planet/vendor/feedparser.py
+Copyright:
+ 2007 Mike Smith <m...@example.org>
License: PSF-2
-Files: planet/vendor/htmltmpl.py
-Copyright: 2004, Thomas Brown <co...@example.org>
+Files:
+ planet/vendor/htmltmpl.py
+Copyright:
+ 2004 Thomas Brown <co...@example.org>
License: GPL-2+
License: PSF-2
diff --git a/debian/copyright b/debian/copyright
index 402d3bd..6306e34 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,11 +7,13 @@ Comment: Complete copyright notices for all contributors to the various
For a more thorough (but still incomplete) list of contributors who may
have a copyright interest in these documents, see debian/changelog.
-Files: *
-Copyright: 1996, 1997, 1998, Ian Jackson and Christian Schwarz
- 1999, Chris Waters, Joey Hess, and Joost Witteveen
- 1999, 2001, Raphaël Hertzog and Brendan O'Dea
- 1999-2018, many other Debian contributors
+Files:
+ *
+Copyright:
+ 1996, 1997, 1998 Ian Jackson and Christian Schwarz
+ 1999 Chris Waters, Joey Hess, and Joost Witteveen
+ 1999, 2001 Raphaël Hertzog and Brendan O'Dea
+ 1999-2018 many other Debian contributors
License: GPL-2+
Comment: Be aware that the GNU General Public License as applied to
standards documents requires distribution or availability of the rST
@@ -19,16 +21,21 @@ Comment: Be aware that the GNU General Public License as applied to
distributed. This is the same as with the source code of software but is
sometimes surprising for text documents.
-Files: copyright-format*.xml
-Copyright: 2007-2017, many Debian contributors
+Files:
+ copyright-format*.xml
+Copyright:
+ 2007-2017 Many Debian contributors
License: preserve-notice
Copying and distribution of this file, with or without modification, are
permitted in any medium without royalty provided this notice is
preserved.
-Files: debconf_specification.xml debconf/*
-Copyright: 1998, 1998, 2000, Wichert Akkerman and Joey Hess
- 2000-2017, many other Debian contributors
+Files:
+ debconf_specification.xml
+ debconf/*
+Copyright:
+ 1998, 1999, 2000 Wichert Akkerman and Joey Hess
+ 2000-2017 Many other Debian contributors
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -55,11 +62,13 @@ License: BSD-3-clause
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Files: fhs-3.0*
-Copyright: 1994-2004, Daniel Quinlan
- 2001-2004 Paul 'Rusty' Russell
- 2003-2004 Christopher Yeoh
- 2015 The Linux Foundation
+Files:
+ fhs-3.0*
+Copyright:
+ 1994-2004 Daniel Quinlan
+ 2001-2004 Paul 'Rusty' Russell
+ 2003-2004 Christopher Yeoh
+ 2015 The Linux Foundation
License: FHS
Permission is granted to make and distribute verbatim copies of this
standard provided the copyright and this permission notice are preserved
@@ -78,15 +87,20 @@ License: FHS
versions, except that this permission notice may be stated in a
translation approved by the copyright holder.
-Files: policy/images/policy-install.dia policy/images/policy-purge.dia
-Copyright: (C) 2005 Margarita Manterola
+Files:
+ policy/images/policy-install.dia
+ policy/images/policy-purge.dia
+Copyright:
+ 2005 Margarita Manterola
License: GPL-2+
-Files: policy/images/debian-policy-install-conffiles.dia
- policy/images/debian-policy-remove.dia
+Files:
+ policy/images/debian-policy-install-conffiles.dia
policy/images/debian-policy-remove-purge.dia
+ policy/images/debian-policy-remove.dia
policy/images/debian-policy-upgrade.dia*
-Copyright: (C) 2005, 2006 Margarita Manterola
+Copyright:
+ 2005, 2006 Margarita Manterola
License: GPL-2+
License: GPL-2+
--
2.37.2
From 83d5d8a86a72e30e5a42223f781fcb83bcdd0caa Mon Sep 17 00:00:00 2001
From: Guillem Jover <guil...@debian.org>
Date: Sun, 18 Sep 2022 18:47:59 +0200
Subject: [PATCH 3/6] debian/copyright: Merge Files paragraphs with same
license and author
The only difference was the years, but one covers and includes the ones
from the other.
---
debian/copyright | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 6306e34..eef116a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -87,18 +87,13 @@ License: FHS
versions, except that this permission notice may be stated in a
translation approved by the copyright holder.
-Files:
- policy/images/policy-install.dia
- policy/images/policy-purge.dia
-Copyright:
- 2005 Margarita Manterola
-License: GPL-2+
-
Files:
policy/images/debian-policy-install-conffiles.dia
policy/images/debian-policy-remove-purge.dia
policy/images/debian-policy-remove.dia
policy/images/debian-policy-upgrade.dia*
+ policy/images/policy-install.dia
+ policy/images/policy-purge.dia
Copyright:
2005, 2006 Margarita Manterola
License: GPL-2+
--
2.37.2
From fa1c0ea29ae87c8b8e1646deb3fd2738109e7490 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guil...@debian.org>
Date: Sun, 18 Sep 2022 18:23:07 +0200
Subject: [PATCH 4/6] copyright-format: Pack license formatting to match GPL
upstream
The example GPL notice is rather more compact and uses more horizontal
space and thus reduces vertical space. Use the same line wrapping to
achieve the same effect and make it more uniform and compact.
---
copyright-format-1.0.xml | 117 +++++++++++++++++----------------------
debian/copyright | 16 +++---
2 files changed, 59 insertions(+), 74 deletions(-)
diff --git a/copyright-format-1.0.xml b/copyright-format-1.0.xml
index cc9aa41..cc7494c 100644
--- a/copyright-format-1.0.xml
+++ b/copyright-format-1.0.xml
@@ -1216,38 +1216,32 @@ also delete it here.</programlisting>
exception</literal>. A possible <varname>License</varname> field for
such a license is:
<programlisting>License: GPL-2+ with OpenSSL exception
- 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 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.
.
- In addition, as a special exception, the author of this
- program gives permission to link the code of its
- release with the OpenSSL project's "OpenSSL" library (or
- with modified versions of it that use the same license as
- the "OpenSSL" library), and distribute the linked
- executables. You must obey the GNU General Public
- License in all respects for all of the code used other
- than "OpenSSL". If you modify this file, you may extend
- this exception to your version of the file, but you are
- not obligated to do so. If you do not wish to do so,
- delete this exception statement from your version.
+ In addition, as a special exception, the author of this program gives
+ permission to link the code of its release with the OpenSSL project's
+ "OpenSSL" library (or with modified versions of it that use the same
+ license as the "OpenSSL" library), and distribute the linked executables.
+ You must obey the GNU General Public License in all respects for all of
+ the code used other than "OpenSSL". If you modify this file, you may
+ extend this exception to your version of the file, but you are not
+ obligated to do so. If you do not wish to do so, delete this exception
+ statement from your 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.
+ 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 package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
+ 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 full text of the GNU General Public
- License version 2 can be found in the file
- '/usr/share/common-licenses/GPL-2'.</programlisting>
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.</programlisting>
</para>
</section>
@@ -1287,26 +1281,22 @@ Copyright:
1998 John Doe <j...@example.com>
1998 Jane Smith <jsm...@example.net>
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 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.
+ 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 package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
+ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
.
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- '/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.
]]></programlisting>
</para>
</example>
@@ -1339,10 +1329,9 @@ Files:
Copyright:
2008 Dan Developer <d...@debian.example.com>
License: permissive
- Copying and distribution of this package, with or without
- modification, are permitted in any medium without royalty
- provided the copyright notice and this notice are
- preserved.
+ Copying and distribution of this package, with or without modification,
+ are permitted in any medium without royalty provided the copyright notice
+ and this notice are preserved.
Files:
debian/patches/theme-diveintomark.patch
@@ -1380,26 +1369,22 @@ License: PSF-2
[LICENSE TEXT]
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 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.
+ 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 package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
+ 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 full text of the GNU General Public
- License version 2 can be found in the file
- '/usr/share/common-licenses/GPL-2'.]]></programlisting>
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.]]></programlisting>
</para>
</example>
</section>
diff --git a/debian/copyright b/debian/copyright
index eef116a..d80be52 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -99,15 +99,15 @@ Copyright:
License: GPL-2+
License: GPL-2+
- This manual is free software; you may 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 manual is free software; you may 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 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.
+ This 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.
.
A copy of the GNU General Public License is available as
/usr/share/common-licenses/GPL in the Debian distribution or on the World
--
2.37.2
From 05ae78ec7ed867948259f400ba9640542f974c72 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guil...@debian.org>
Date: Sun, 18 Sep 2022 18:26:34 +0200
Subject: [PATCH 5/6] copyright-format: Use the URL format instead of the
postal code for the GPL
While the GPL-2 recommends using a postal address in the notice to
include in source files, this has already changed once, and the GPL-3
already uses this new more future-proof format where the license is
referenced via an URL on the web.
---
copyright-format-1.0.xml | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/copyright-format-1.0.xml b/copyright-format-1.0.xml
index cc7494c..8dece57 100644
--- a/copyright-format-1.0.xml
+++ b/copyright-format-1.0.xml
@@ -1236,9 +1236,8 @@ also delete it here.</programlisting>
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.
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public License
version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.</programlisting>
@@ -1291,9 +1290,8 @@ License: GPL-2+
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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public License
version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.
@@ -1379,9 +1377,8 @@ License: GPL-2+
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.
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public License
version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.]]></programlisting>
--
2.37.2
From fa33ef9631877ec4c76ebe232acf9e1aab1e0cf7 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guil...@debian.org>
Date: Sun, 18 Sep 2022 18:28:30 +0200
Subject: [PATCH 6/6] copyright-format: Split the comment about license
location into its own field
The reference of the GPL about its location on the filesystem is not
part of the GPL notice on the source, so it's confusing to mix this in
the same License field. Instead move it into its own Comment field, as
additional information.
---
copyright-format-1.0.xml | 6 +++---
debian/copyright | 8 +++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/copyright-format-1.0.xml b/copyright-format-1.0.xml
index 8dece57..22ff5f9 100644
--- a/copyright-format-1.0.xml
+++ b/copyright-format-1.0.xml
@@ -1238,7 +1238,7 @@ also delete it here.</programlisting>
.
You should have received a copy of the GNU General Public License
along with this package; if not, see <https://www.gnu.org/licenses/>.
- .
+Comment:
On Debian systems, the full text of the GNU General Public License
version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.</programlisting>
</para>
@@ -1292,7 +1292,7 @@ License: GPL-2+
.
You should have received a copy of the GNU General Public License
along with this package; if not, see <https://www.gnu.org/licenses/>.
- .
+Comment:
On Debian systems, the full text of the GNU General Public License
version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.
]]></programlisting>
@@ -1379,7 +1379,7 @@ License: GPL-2+
.
You should have received a copy of the GNU General Public License
along with this package; if not, see <https://www.gnu.org/licenses/>.
- .
+Comment:
On Debian systems, the full text of the GNU General Public License
version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.]]></programlisting>
</para>
diff --git a/debian/copyright b/debian/copyright
index d80be52..3881773 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -109,6 +109,8 @@ License: GPL-2+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
- A copy of the GNU General Public License is available as
- /usr/share/common-licenses/GPL in the Debian distribution or on the World
- Wide Web at https://www.gnu.org/licenses/.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+Comment:
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in '/usr/share/common-licenses/GPL-2'.
--
2.37.2
