On 05-Apr-2017, Ben Finney wrote: > Instead, the GNU GPL (version 3 §1) defines “source code” as the > “preferred form of the work for making modifications to it”.
The attached patch series is from my repository at <URL:https://anonscm.debian.org/git/users/bignose/debian/devscripts.git>, the ‘wip/issue/859617/preferred-form-for-modification’ branch. -- \ “… one of the main causes of the fall of the Roman Empire was | `\ that, lacking zero, they had no way to indicate successful | _o__) termination of their C programs.” —Robert Firth | Ben Finney <bign...@debian.org>
From a1e3825b765bcf7c53d094a1d5b73e360c279a50 Mon Sep 17 00:00:00 2001
From: Ben Finney <ben+deb...@benfinney.id.au>
Date: Wed, 5 Apr 2017 19:37:23 +1000
Subject: [PATCH 1/5] Document the change made in this branch.
---
debian/changelog | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 4015df8b..e09d002c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,12 @@ devscripts (2.17.6) UNRELEASED; urgency=medium
bts chdist debcommit dscverify grep-excuses
namecheck rc-alert svnpath wnpp-alert
- -- Osamu Aoki <os...@debian.org> Fri, 31 Mar 2017 02:03:30 +0900
+ [ Ben Finney ]
+ * suspicious-source: Correct references to GNU GPL definition of the
+ source form of a work.
+ Closes: bug#859617.
+
+ --
devscripts (2.17.5) unstable; urgency=medium
--
2.11.0
From 0ffd51e43cdc9d294a6765f025b3afa537ff632d Mon Sep 17 00:00:00 2001 From: Ben Finney <ben+deb...@benfinney.id.au> Date: Wed, 5 Apr 2017 19:24:54 +1000 Subject: [PATCH 2/5] =?UTF-8?q?Correct=20=E2=80=9Cpreferred=20form=20of=20?= =?UTF-8?q?the=20work=20for=20making=20changes=20to=20it=E2=80=9D=20in=20m?= =?UTF-8?q?anpage.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The phrase “preferred form of modification” does not refer to a form of the work. It also does not match the GNU GPL's definition of “source”. Instead, the GNU GPL (version 3 §1) defines “source code” as the “preferred form of the work for making modifications to it”. --- doc/suspicious-source.1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/suspicious-source.1 b/doc/suspicious-source.1 index 0cd5b188..045a0c64 100644 --- a/doc/suspicious-source.1 +++ b/doc/suspicious-source.1 @@ -15,18 +15,18 @@ .TH SUSPICIOUS\-SOURCE 1 "Debian Utilities" "DEBIAN" .SH NAME -suspicious\-source \- search for files that are not the GPL's -"preferred form of modification" +suspicious\-source \- search for files that do not meet the GPL's +definition of "source" for a work .SH SYNOPSIS \fBsuspicious\-source\fP [\fIoptions\fR] .SH DESCRIPTION -\fBsuspicious\-source\fP is a script that outputs a list of files which -are not common source files. -This should be run in the root of a source tree to find files which might -not be the "preferred form of modification" that the GPL and other licenses -require. +\fBsuspicious\-source\fP outputs a list of files which are probably not +the source form of a work. +This should be run in the root of a source tree to find files which +might not be, in the definition from the GNU GPL, the "preferred form +of the work for making modifications to it". .PP The files inside version control system directories (like \fI.bzr/\fR or \fICVS/\fR) are not considered. -- 2.11.0
From 5732dc105cd6eaa98cc08cffb1666d0f9016e95b Mon Sep 17 00:00:00 2001 From: Ben Finney <ben+deb...@benfinney.id.au> Date: Wed, 5 Apr 2017 19:29:06 +1000 Subject: [PATCH 3/5] Correct the text in the PO template and object files. This also removes the now-obsolete translations of the changed text. --- po4a/po/de.po | 19 ++++++------------- po4a/po/devscripts.pot | 12 ++++++------ po4a/po/fr.po | 19 ++++++------------- 3 files changed, 18 insertions(+), 32 deletions(-) diff --git a/po4a/po/de.po b/po4a/po/de.po index d177e0f6..e98ab907 100644 --- a/po4a/po/de.po +++ b/po4a/po/de.po @@ -18279,11 +18279,9 @@ msgstr "SUSPICIOUS-SOURCE" #. type: Plain text #: ../doc/suspicious-source.1:20 msgid "" -"suspicious-source - search for files that are not the GPL's \"preferred form " -"of modification\"" +"suspicious-source - search for files that do not meet the GPL's definition " +"of \"source\" for a work" msgstr "" -"suspicious-source - sucht nach Dateien, die nicht die von der GPL " -"»bevorzugte Form von Änderungen« sind." #. type: Plain text #: ../doc/suspicious-source.1:23 @@ -18293,16 +18291,11 @@ msgstr "B<suspicious-source> [I<Optionen>]" #. type: Plain text #: ../doc/suspicious-source.1:30 msgid "" -"B<suspicious-source> is a script that outputs a list of files which are not " -"common source files. This should be run in the root of a source tree to " -"find files which might not be the \"preferred form of modification\" that " -"the GPL and other licenses require." +"B<suspicious-source> outputs a list of files which are probably not the " +"source form of a work. This should be run in the root of a source tree to " +"find files which might not be, in the definition from the GNU GPL, the " +"\"preferred form of the work for making modifications to it\"." msgstr "" -"B<suspicious-source> ist ein Skript, das eine Liste von Dateien ausgibt, bei " -"denen es sich um keine üblichen Quelldateien handelt. Dies sollte auf der " -"obersten Ebene des Quellverzeichnisbaums ausgeführt werden, um die Dateien " -"zu finden, die möglicherweise nicht die »bevorzugte Form von Änderungen« " -"sind, die die GPL oder andere Lizenzen verlangen." #. type: Plain text #: ../doc/suspicious-source.1:33 diff --git a/po4a/po/devscripts.pot b/po4a/po/devscripts.pot index 27696aad..f920dbef 100644 --- a/po4a/po/devscripts.pot +++ b/po4a/po/devscripts.pot @@ -14328,8 +14328,8 @@ msgstr "" #. type: Plain text #: ../doc/suspicious-source.1:20 msgid "" -"suspicious-source - search for files that are not the GPL's \"preferred form " -"of modification\"" +"suspicious-source - search for files that do not meet the GPL's definition " +"of \"source\" for a work" msgstr "" #. type: Plain text @@ -14340,10 +14340,10 @@ msgstr "" #. type: Plain text #: ../doc/suspicious-source.1:30 msgid "" -"B<suspicious-source> is a script that outputs a list of files which are not " -"common source files. This should be run in the root of a source tree to " -"find files which might not be the \"preferred form of modification\" that " -"the GPL and other licenses require." +"B<suspicious-source> outputs a list of files which are probably not the " +"source form of a work. This should be run in the root of a source tree to " +"find files which might not be, in the definition from the GNU GPL, the " +"\"preferred form of the work for making modifications to it\"." msgstr "" #. type: Plain text diff --git a/po4a/po/fr.po b/po4a/po/fr.po index d679ba09..0fa6e73b 100644 --- a/po4a/po/fr.po +++ b/po4a/po/fr.po @@ -18411,11 +18411,9 @@ msgstr "SUSPICIOUS-SOURCE" #. type: Plain text #: ../doc/suspicious-source.1:20 msgid "" -"suspicious-source - search for files that are not the GPL's \"preferred form " -"of modification\"" +"suspicious-source - search for files that do not meet the GPL's definition " +"of \"source\" for a work" msgstr "" -"suspicious-source - Rechercher des fichiers qui ne sont pas sous la « forme " -"la plus adéquate pour les modifications » demandée par la GPL" #. type: Plain text #: ../doc/suspicious-source.1:23 @@ -18425,16 +18423,11 @@ msgstr "B<suspicious-source> [I<options>]" #. type: Plain text #: ../doc/suspicious-source.1:30 msgid "" -"B<suspicious-source> is a script that outputs a list of files which are not " -"common source files. This should be run in the root of a source tree to " -"find files which might not be the \"preferred form of modification\" that " -"the GPL and other licenses require." +"B<suspicious-source> outputs a list of files which are probably not the " +"source form of a work. This should be run in the root of a source tree to " +"find files which might not be, in the definition from the GNU GPL, the " +"\"preferred form of the work for making modifications to it\"." msgstr "" -"B<suspicious-source> affiche une liste de fichiers qui ne sont pas des " -"fichiers source usuels. Elle devrait être exécutée depuis le répertoire " -"racine d'une arborescence source pour trouver les fichiers qui risquent de " -"ne pas être sous la « forme la plus adéquate pour les modifications » comme " -"exigé par la GPL et d'autres licences." #. type: Plain text #: ../doc/suspicious-source.1:33 -- 2.11.0
From 900e9c20719402b17e7ff7f6b8acf1b264168843 Mon Sep 17 00:00:00 2001 From: Ben Finney <ben+deb...@benfinney.id.au> Date: Wed, 5 Apr 2017 19:31:25 +1000 Subject: [PATCH 4/5] Add my attempt at French translation. --- po4a/po/fr.po | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/po4a/po/fr.po b/po4a/po/fr.po index 0fa6e73b..109913c9 100644 --- a/po4a/po/fr.po +++ b/po4a/po/fr.po @@ -18414,6 +18414,8 @@ msgid "" "suspicious-source - search for files that do not meet the GPL's definition " "of \"source\" for a work" msgstr "" +"suspicious-source - Rechercher des fichiers qui ne sont pas sous la « forme " +"la plus adéquate pour les modifications » demandée par la GPL" #. type: Plain text #: ../doc/suspicious-source.1:23 @@ -18428,6 +18430,11 @@ msgid "" "find files which might not be, in the definition from the GNU GPL, the " "\"preferred form of the work for making modifications to it\"." msgstr "" +"B<suspicious-source> affiche une liste de fichiers qui ne sont pas des " +"fichiers source usuels. Elle devrait être exécutée depuis le répertoire " +"racine d'une arborescence source pour trouver les fichiers qui risquent de " +"ne pas être sous la « forme la plus adéquate pour les modifications » comme " +"exigé par la GPL et d'autres licences." #. type: Plain text #: ../doc/suspicious-source.1:33 -- 2.11.0
From 0db71a5812b6d73a097807823f83d0cd6d42a74c Mon Sep 17 00:00:00 2001 From: Ben Finney <ben+deb...@benfinney.id.au> Date: Wed, 5 Apr 2017 19:31:40 +1000 Subject: [PATCH 5/5] Add my attempt at German translation. --- po4a/po/de.po | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/po4a/po/de.po b/po4a/po/de.po index e98ab907..3d063736 100644 --- a/po4a/po/de.po +++ b/po4a/po/de.po @@ -18282,6 +18282,8 @@ msgid "" "suspicious-source - search for files that do not meet the GPL's definition " "of \"source\" for a work" msgstr "" +"suspicious-source - sucht nach Dateien, die nicht die von der GPL " +"»Quelltext« sind." #. type: Plain text #: ../doc/suspicious-source.1:23 @@ -18296,6 +18298,11 @@ msgid "" "find files which might not be, in the definition from the GNU GPL, the " "\"preferred form of the work for making modifications to it\"." msgstr "" +"B<suspicious-source> ist ein Skript, das eine Liste von Dateien ausgibt, bei " +"denen es sich um keine üblichen Quelldateien handelt. Dies sollte auf der " +"obersten Ebene des Quellverzeichnisbaums ausgeführt werden, um die Dateien " +"zu finden, die möglicherweise nicht die »diejenige Form des Werkes, die für " +"Bearbeitungen vorzugsweise verwendet wird« sind." #. type: Plain text #: ../doc/suspicious-source.1:33 -- 2.11.0
signature.asc
Description: PGP signature
