Package: dh-make Version: 0.50 Severity: wishlist Tags: patch
The first patch: - Adjusts the layout of all licence files to canonical format (TOPIC <RET> <INDENT>) etc. The second patch - Applied after the first, simplifies the GPL licenses by replacing the FSF address with the FSF URL pointer. As of 2010 the Web communication is probably faster that asking snail mail. In addition it seems that FSF favors this approach[1] [1] See http://www.gnu.org/copyleft/gpl-howto.html where the current FSF recommended layout reads: "You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>." -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.30-2-amd64 (SMP w/2 CPU cores) Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages dh-make depends on: ii debhelper 7.4.3 helper programs for debian/rules ii dpkg-dev 1.15.5.4 Debian package development tools ii make 3.81-7 An utility for Directing compilati ii perl 5.10.1-8 Larry Wall's Practical Extraction dh-make recommends no packages. Versions of packages dh-make suggests: ii build-essential 11.4 Informational list of build-essent -- no debconf information
>From f9e399603faed3151978faeefb83c19e6a83b52c Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Fri, 11 Dec 2009 12:58:25 +0200 Subject: [PATCH] lib/licenses/: Use canonical layout for all. Use double quotes Signed-off-by: Jari Aalto <[email protected]> --- lib/licenses/apache | 12 +++++++----- lib/licenses/artistic | 12 +++++++----- lib/licenses/blank | 10 ++++++---- lib/licenses/bsd | 14 +++++++------- lib/licenses/gpl2 | 2 +- lib/licenses/gpl3 | 2 +- lib/licenses/lgpl2 | 12 +++++++----- lib/licenses/lgpl3 | 12 +++++++----- 8 files changed, 43 insertions(+), 33 deletions(-) diff --git a/lib/licenses/apache b/lib/licenses/apache index 9a1a11b..75daed4 100644 --- a/lib/licenses/apache +++ b/lib/licenses/apache @@ -2,7 +2,9 @@ This work was packaged for Debian by: #USERNAME# <#EMAIL#> on #DATE# -It was downloaded from <url://example.com> +It was downloaded from: + + <url://example.com> Upstream Author(s): @@ -11,7 +13,7 @@ Upstream Author(s): Copyright: - <Copyright (C) YYYY Name OfAuthor> + <Copyright (C) YYYY Firstname Lastname> <likewise for another author> License: @@ -29,7 +31,7 @@ License: limitations under the License. On Debian systems, the complete text of the Apache version 2.0 license -can be found in `/usr/share/common-licenses/Apache-2.0'. +can be found in "/usr/share/common-licenses/Apache-2.0". The Debian packaging is: @@ -41,8 +43,8 @@ The Debian packaging is: # packaged work, as it may make Debian's contributions unacceptable upstream. # If you just want it to be GPL version 3, leave the following lines in. -and is licensed under the GPL version 3, -see `/usr/share/common-licenses/GPL-3'. +and is licensed under the GPL version 3, +see "/usr/share/common-licenses/GPL-3". # Please also look if there are files or directories which have a # different copyright/license attached and list them here. diff --git a/lib/licenses/artistic b/lib/licenses/artistic index 821c403..2543da7 100644 --- a/lib/licenses/artistic +++ b/lib/licenses/artistic @@ -2,7 +2,9 @@ This work was packaged for Debian by: #USERNAME# <#EMAIL#> on #DATE# -It was downloaded from <url://example.com> +It was downloaded from: + + <url://example.com> Upstream Author(s): @@ -11,7 +13,7 @@ Upstream Author(s): Copyright: - <Copyright (C) YYYY Name OfAuthor> + <Copyright (C) YYYY Firstname Lastname> <likewise for another author> License: @@ -24,7 +26,7 @@ License: OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. On Debian systems, the complete text of the Artistic License -can be found in `/usr/share/common-licenses/Artistic'. +can be found in "/usr/share/common-licenses/Artistic". The Debian packaging is: @@ -36,8 +38,8 @@ The Debian packaging is: # packaged work, as it may make Debian's contributions unacceptable upstream. # If you just want it to be GPL version 3, leave the following lines in. -and is licensed under the GPL version 3, -see `/usr/share/common-licenses/GPL-3'. +and is licensed under the GPL version 3, +see "/usr/share/common-licenses/GPL-3". # Please also look if there are files or directories which have a # different copyright/license attached and list them here. diff --git a/lib/licenses/blank b/lib/licenses/blank index f6128ed..15099f1 100644 --- a/lib/licenses/blank +++ b/lib/licenses/blank @@ -2,7 +2,9 @@ This work was packaged for Debian by: #USERNAME# <#EMAIL#> on #DATE# -It was downloaded from <url://example.com> +It was downloaded from: + + <url://example.com> Upstream Author(s): @@ -11,7 +13,7 @@ Upstream Author(s): Copyright: - <Copyright (C) YYYY Name OfAuthor> + <Copyright (C) YYYY Firstname Lastname> <likewise for another author> License: @@ -28,8 +30,8 @@ The Debian packaging is: # packaged work, as it may make Debian's contributions unacceptable upstream. # If you just want it to be GPL version 3, leave the following lines in. -and is licensed under the GPL version 3, -see `/usr/share/common-licenses/GPL-3'. +and is licensed under the GPL version 3, +see "/usr/share/common-licenses/GPL-3". # Please also look if there are files or directories which have a # different copyright/license attached and list them here. diff --git a/lib/licenses/bsd b/lib/licenses/bsd index dca2770..3f00834 100644 --- a/lib/licenses/bsd +++ b/lib/licenses/bsd @@ -2,7 +2,9 @@ This work was packaged for Debian by: #USERNAME# <#EMAIL#> on #DATE# -It was downloaded from <url://example.com> +It was downloaded from: + + <url://example.com> Upstream Author(s): @@ -11,7 +13,7 @@ Upstream Author(s): Copyright: - <Copyright (C) YYYY Name OfAuthor> + <Copyright (C) YYYY Firstname Lastname> <likewise for another author> License: @@ -32,7 +34,7 @@ License: SUCH DAMAGE. On Debian systems, the complete text of the BSD License can be -found in `/usr/share/common-licenses/BSD'. +found in "/usr/share/common-licenses/BSD". The Debian packaging is: @@ -44,10 +46,8 @@ The Debian packaging is: # packaged work, as it may make Debian's contributions unacceptable upstream. # If you just want it to be GPL version 3, leave the following lines in. -and is licensed under the GPL version 3, -see `/usr/share/common-licenses/GPL-3'. - - +and is licensed under the GPL version 3, +see "/usr/share/common-licenses/GPL-3". # Please also look if there are files or directories which have a # different copyright/license attached and list them here. diff --git a/lib/licenses/gpl2 b/lib/licenses/gpl2 index e6063d1..8cf7287 100644 --- a/lib/licenses/gpl2 +++ b/lib/licenses/gpl2 @@ -39,7 +39,7 @@ License: Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU General -Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. +Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". The Debian packaging is: diff --git a/lib/licenses/gpl3 b/lib/licenses/gpl3 index cffef93..86a2ea4 100644 --- a/lib/licenses/gpl3 +++ b/lib/licenses/gpl3 @@ -32,7 +32,7 @@ License: along with this program. If not, see <http://www.gnu.org/licenses/>. On Debian systems, the complete text of the GNU General -Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. +Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". The Debian packaging is: diff --git a/lib/licenses/lgpl2 b/lib/licenses/lgpl2 index 9bf9e9b..b453b61 100644 --- a/lib/licenses/lgpl2 +++ b/lib/licenses/lgpl2 @@ -2,7 +2,9 @@ This work was packaged for Debian by: #USERNAME# <#EMAIL#> on #DATE# -It was downloaded from <url://example.com> +It was downloaded from: + + <url://example.com> Upstream Author(s): @@ -11,7 +13,7 @@ Upstream Author(s): Copyright: - <Copyright (C) YYYY Name OfAuthor> + <Copyright (C) YYYY Firstname Lastname> <likewise for another author> License: @@ -31,7 +33,7 @@ License: Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU Lesser General -Public License can be found in `/usr/share/common-licenses/LGPL-2'. +Public License can be found in "/usr/share/common-licenses/LGPL-2". The Debian packaging is: @@ -43,8 +45,8 @@ The Debian packaging is: # packaged work, as it may make Debian's contributions unacceptable upstream. # If you just want it to be GPL version 3, leave the following lines in. -and is licensed under the GPL version 3, -see `/usr/share/common-licenses/GPL-3'. +and is licensed under the GPL version 3, +see "/usr/share/common-licenses/GPL-3". # Please also look if there are files or directories which have a # different copyright/license attached and list them here. diff --git a/lib/licenses/lgpl3 b/lib/licenses/lgpl3 index e776c5d..fe8a779 100644 --- a/lib/licenses/lgpl3 +++ b/lib/licenses/lgpl3 @@ -2,7 +2,9 @@ This work was packaged for Debian by: #USERNAME# <#EMAIL#> on #DATE# -It was downloaded from <url://example.com> +It was downloaded from: + + <url://example.com> Upstream Author(s): @@ -11,7 +13,7 @@ Upstream Author(s): Copyright: - <Copyright (C) YYYY Name OfAuthor> + <Copyright (C) YYYY Firstname Lastname> <likewise for another author> License: @@ -31,7 +33,7 @@ License: Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU Lesser General -Public License can be found in `/usr/share/common-licenses/LGPL-3'. +Public License can be found in "/usr/share/common-licenses/LGPL-3". The Debian packaging is: @@ -43,8 +45,8 @@ The Debian packaging is: # packaged work, as it may make Debian's contributions unacceptable upstream. # If you just want it to be GPL version 3, leave the following lines in. -and is licensed under the GPL version 3, -see `/usr/share/common-licenses/GPL-3'. +and is licensed under the GPL version 3, +see "/usr/share/common-licenses/GPL-3". # Please also look if there are files or directories which have a # different copyright/license attached and list them here. -- 1.6.5
>From 0e613ceda8632e62df658312aa046541e01959fd Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Fri, 11 Dec 2009 13:02:53 +0200 Subject: [PATCH] lib/licenses/: (gpl* lgpl*): Replace address with FSF URL Signed-off-by: Jari Aalto <[email protected]> --- lib/licenses/gpl2 | 3 +-- lib/licenses/gpl3 | 2 +- lib/licenses/lgpl2 | 5 ++--- lib/licenses/lgpl3 | 5 ++--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/licenses/gpl2 b/lib/licenses/gpl2 index 8cf7287..0e110d0 100644 --- a/lib/licenses/gpl2 +++ b/lib/licenses/gpl2 @@ -35,8 +35,7 @@ License: 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 + along with this program. If not, see <http://www.gnu.org/licenses/> On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/lib/licenses/gpl3 b/lib/licenses/gpl3 index 86a2ea4..e2fe011 100644 --- a/lib/licenses/gpl3 +++ b/lib/licenses/gpl3 @@ -29,7 +29,7 @@ License: 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/>. + along with this program. If not, see <http://www.gnu.org/licenses/>. On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/lib/licenses/lgpl2 b/lib/licenses/lgpl2 index b453b61..075350d 100644 --- a/lib/licenses/lgpl2 +++ b/lib/licenses/lgpl2 @@ -28,9 +28,8 @@ License: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser 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 program. If not, see <http://www.gnu.org/licenses/>. On Debian systems, the complete text of the GNU Lesser General Public License can be found in "/usr/share/common-licenses/LGPL-2". diff --git a/lib/licenses/lgpl3 b/lib/licenses/lgpl3 index fe8a779..2e3c537 100644 --- a/lib/licenses/lgpl3 +++ b/lib/licenses/lgpl3 @@ -28,9 +28,8 @@ License: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You should have received a copy of the GNU Lesser 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 program. If not, see <http://www.gnu.org/licenses/>. On Debian systems, the complete text of the GNU Lesser General Public License can be found in "/usr/share/common-licenses/LGPL-3". -- 1.6.5
