diff -Nru dh-make-1.20140617/debian/changelog dh-make-1.20150601/debian/changelog --- dh-make-1.20140617/debian/changelog 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/debian/changelog 2015-06-03 12:06:03.000000000 +0000 @@ -1,5 +1,26 @@ +dh-make (1.20150601) unstable; urgency=medium + + [ Paul Wise ] + * Add files named like NEWS.md to the docs too + * Use multi-arch paths in the library template + * Do not distribute static libraries by default since they lead to the + possiblity of GPL violation and are not needed in most cases. + + [ Yann Dirson ] + * Fix sample Vcs-Browser URLs. Closes: #756332 + + [ Craig Small ] + * export DH_VERBOSE in rules Closes: #786459 + * Update urls to use https where possible Closes: #775040 + * Remove first person in templates Closes: #752120 + * Fix awkward wording in license templates Closes: #754991 + * improve emacs lisp handling Closes: #774545 + + -- Craig Small Wed, 03 Jun 2015 22:03:52 +1000 + dh-make (1.20140617) unstable; urgency=medium + [ Craig Small ] * New numbering scheme * Updated to standards version 3.9.5 Closes: #748336 * fix lintian "vcs-field-not-canonical" warning Closes: #750005 diff -Nru dh-make-1.20140617/debian/control dh-make-1.20150601/debian/control --- dh-make-1.20140617/debian/control 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/debian/control 2015-06-03 12:06:03.000000000 +0000 @@ -3,9 +3,9 @@ Priority: optional Maintainer: Craig Small Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.5 -Vcs-Git: git://git.debian.org/collab-maint/dh-make.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/dh-make.git;a=summary +Standards-Version: 3.9.6 +Vcs-Git: git://anonscm.debian.org/collab-maint/dh-make.git +Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/dh-make.git;a=summary Package: dh-make Architecture: all diff -Nru dh-make-1.20140617/debian/copyright dh-make-1.20150601/debian/copyright --- dh-make-1.20140617/debian/copyright 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/debian/copyright 2015-06-03 12:06:03.000000000 +0000 @@ -1,9 +1,9 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: dh-make -Source: http://git.debian.org/?p=collab-maint/dh-make.git;a=summary +Source: https://anonscm.debian.org/cgit/collab-maint/dh-make.git/ Files: * -Copyright: 1998-2011 Craig Small +Copyright: 1998-2015 Craig Small License: GPL-3.0+ with template 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 diff -Nru dh-make-1.20140617/dh_make dh-make-1.20150601/dh_make --- dh-make-1.20140617/dh_make 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/dh_make 2015-06-03 12:06:03.000000000 +0000 @@ -16,8 +16,8 @@ # Some important parameters our $DHLIB="/usr/share/debhelper/dh_make"; -our $POLICY_VERSION="3.9.5"; -our $DH_MAKE_VERSION="1.20140617"; +our $POLICY_VERSION="3.9.6"; +our $DH_MAKE_VERSION="1.201501"; my %PACKAGE_CLASSES = ( 's' => 'Single', 'l' => 'Library', 'm' => 'Multi-Binary', 'k' => 'Kernel Module', 'n' => 'Kernel Patch', 'i' => 'Independent' ); @@ -137,7 +137,7 @@ sub show_version { print "dh_make - prepare Debian packaging for an original source archive, version $main::DH_MAKE_VERSION\n\n"; - print "Copyright (C) 1998-2013 Craig Small \n"; + print "Copyright (C) 1998-2015 Craig Small \n"; print "This is free software; see the source for copying conditions. There is NO\n"; print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; } @@ -395,7 +395,7 @@ For dh_make to find the package name and version, the current directory needs to be in the format of -. Alternatively use the -p flag using the format _ to override it. -I cannot understand the directory name or you have an invalid directory name! +The directory name you have specified is invalid! Your current directory is $pwd, perhaps you could try going to directory where the sources are? @@ -562,7 +562,7 @@ } } # Figure out where documentation is -our @DOCS= split / |\n/, qx(ls -1 N[Ee][Ww][Ss] *[Ff][Aa][Qq]* *.[Tt][Xx][Tt] README* *.README [rR]eadme* *.[rR]eadme [Bb][Uu][Gg][Ss] *[tT][oO][dD][oO]* 2>/dev/null | egrep -v '^CMakeLists?.txt'); +our @DOCS= split / |\n/, qx(ls -1 N[Ee][Ww][Ss]* *[Ff][Aa][Qq]* *.[Tt][Xx][Tt] README* *.README [rR]eadme* *.[rR]eadme [Bb][Uu][Gg][Ss]* *[tT][oO][dD][oO]* 2>/dev/null | egrep -v '^CMakeLists?.txt'); # What are our info files our @INFOS= split / |\n/, qx(find . -regex '.*\\.info\\(-[0-9]+\\)?'); # Figure out where is the first changelog, assign other similar files to docs diff -Nru dh-make-1.20140617/lib/debian/postinst.ex dh-make-1.20150601/lib/debian/postinst.ex --- dh-make-1.20140617/lib/debian/postinst.ex 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debian/postinst.ex 2015-06-03 12:06:03.000000000 +0000 @@ -14,7 +14,7 @@ # * `abort-deconfigure' `in-favour' # `removing' # -# for details, see http://www.debian.org/doc/debian-policy/ or +# for details, see https://www.debian.org/doc/debian-policy/ or # the debian-policy package diff -Nru dh-make-1.20140617/lib/debian/postrm.ex dh-make-1.20150601/lib/debian/postrm.ex --- dh-make-1.20140617/lib/debian/postrm.ex 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debian/postrm.ex 2015-06-03 12:06:03.000000000 +0000 @@ -15,7 +15,7 @@ # * `abort-upgrade' # * `disappear' # -# for details, see http://www.debian.org/doc/debian-policy/ or +# for details, see https://www.debian.org/doc/debian-policy/ or # the debian-policy package diff -Nru dh-make-1.20140617/lib/debian/preinst.ex dh-make-1.20150601/lib/debian/preinst.ex --- dh-make-1.20140617/lib/debian/preinst.ex 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debian/preinst.ex 2015-06-03 12:06:03.000000000 +0000 @@ -10,7 +10,7 @@ # * `install' # * `upgrade' # * `abort-upgrade' -# for details, see http://www.debian.org/doc/debian-policy/ or +# for details, see https://www.debian.org/doc/debian-policy/ or # the debian-policy package diff -Nru dh-make-1.20140617/lib/debian/prerm.ex dh-make-1.20150601/lib/debian/prerm.ex --- dh-make-1.20140617/lib/debian/prerm.ex 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debian/prerm.ex 2015-06-03 12:06:03.000000000 +0000 @@ -13,7 +13,7 @@ # * `deconfigure' `in-favour' # `removing' # -# for details, see http://www.debian.org/doc/debian-policy/ or +# for details, see https://www.debian.org/doc/debian-policy/ or # the debian-policy package diff -Nru dh-make-1.20140617/lib/debiani/control dh-make-1.20150601/lib/debiani/control --- dh-make-1.20140617/lib/debiani/control 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debiani/control 2015-06-03 12:06:03.000000000 +0000 @@ -6,7 +6,7 @@ Standards-Version: #POLICY# Homepage: #Vcs-Git: git://anonscm.debian.org/collab-maint/#PACKAGE#.git -#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/#PACKAGE#.git;a=summary +#Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/#PACKAGE#.git;a=summary Package: #PACKAGE# Architecture: all diff -Nru dh-make-1.20140617/lib/debiani/rules.dh7 dh-make-1.20150601/lib/debiani/rules.dh7 --- dh-make-1.20140617/lib/debiani/rules.dh7 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debiani/rules.dh7 2015-06-03 12:06:03.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f # See debhelper(7) (uncomment to enable) # output every command that modifies files on the build system. -#DH_VERBOSE = 1 +#export DH_VERBOSE = 1 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* DPKG_EXPORT_BUILDFLAGS = 1 @@ -21,8 +21,8 @@ %: dh $@ #DH7_ADDON# -# debmake generated override targets -# This is example for Cmake (See http://bugs.debian.org/641051 ) +# dh_make generated override targets +# This is example for Cmake (See https://bugs.debian.org/641051 ) #override_dh_auto_configure: # dh_auto_configure -- \ # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) diff -Nru dh-make-1.20140617/lib/debiank/control dh-make-1.20150601/lib/debiank/control --- dh-make-1.20140617/lib/debiank/control 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debiank/control 2015-06-03 12:06:03.000000000 +0000 @@ -6,7 +6,7 @@ Standards-Version: #POLICY# Homepage: #Vcs-Git: git://anonscm.debian.org/collab-maint/#PACKAGE#.git -#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/#PACKAGE#.git;a=summary +#Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/#PACKAGE#.git;a=summary Package: #PACKAGE#-utils Architecture: any diff -Nru dh-make-1.20140617/lib/debiank/package-modules-_KVERS_.postinst.modules.in.ex dh-make-1.20150601/lib/debiank/package-modules-_KVERS_.postinst.modules.in.ex --- dh-make-1.20140617/lib/debiank/package-modules-_KVERS_.postinst.modules.in.ex 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debiank/package-modules-_KVERS_.postinst.modules.in.ex 2015-06-03 12:06:03.000000000 +0000 @@ -12,7 +12,7 @@ # * `abort-deconfigure' `in-favour' # `removing' # -# for details, see http://www.debian.org/doc/debian-policy/ or +# for details, see https://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in diff -Nru dh-make-1.20140617/lib/debianl/control dh-make-1.20150601/lib/debianl/control --- dh-make-1.20140617/lib/debianl/control 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debianl/control 2015-06-03 12:06:03.000000000 +0000 @@ -6,7 +6,7 @@ Section: libs Homepage: #Vcs-Git: git://anonscm.debian.org/collab-maint/#PACKAGE#.git -#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/#PACKAGE#.git;a=summary +#Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/#PACKAGE#.git;a=summary Package: #PACKAGE#-dev Section: libdevel diff -Nru dh-make-1.20140617/lib/debianl/package1.install dh-make-1.20150601/lib/debianl/package1.install --- dh-make-1.20140617/lib/debianl/package1.install 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debianl/package1.install 2015-06-03 12:06:03.000000000 +0000 @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff -Nru dh-make-1.20140617/lib/debianl/package-dev.install dh-make-1.20150601/lib/debianl/package-dev.install --- dh-make-1.20140617/lib/debianl/package-dev.install 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debianl/package-dev.install 2015-06-03 12:06:03.000000000 +0000 @@ -1,5 +1,4 @@ usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/pkgconfig/* +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* usr/share/pkgconfig/* diff -Nru dh-make-1.20140617/lib/debianl/rules.dh7 dh-make-1.20150601/lib/debianl/rules.dh7 --- dh-make-1.20140617/lib/debianl/rules.dh7 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debianl/rules.dh7 2015-06-03 12:06:03.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f # See debhelper(7) (uncomment to enable) # output every command that modifies files on the build system. -#DH_VERBOSE = 1 +#export DH_VERBOSE = 1 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* DPKG_EXPORT_BUILDFLAGS = 1 @@ -21,8 +21,8 @@ %: dh $@ #DH7_ADDON# -# debmake generated override targets -# This is example for Cmake (See http://bugs.debian.org/641051 ) +# dh_make generated override targets +# This is example for Cmake (See https://bugs.debian.org/641051 ) #override_dh_auto_configure: # dh_auto_configure -- \ # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) diff -Nru dh-make-1.20140617/lib/debianm/control dh-make-1.20150601/lib/debianm/control --- dh-make-1.20140617/lib/debianm/control 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debianm/control 2015-06-03 12:06:03.000000000 +0000 @@ -6,7 +6,7 @@ Standards-Version: #POLICY# Homepage: #Vcs-Git: git://anonscm.debian.org/collab-maint/#PACKAGE#.git -#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/#PACKAGE#.git;a=summary +#Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/#PACKAGE#.git;a=summary Package: #PACKAGE# Architecture: any diff -Nru dh-make-1.20140617/lib/debianm/rules.dh7 dh-make-1.20150601/lib/debianm/rules.dh7 --- dh-make-1.20140617/lib/debianm/rules.dh7 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debianm/rules.dh7 2015-06-03 12:06:03.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f # See debhelper(7) (uncomment to enable) # output every command that modifies files on the build system. -#DH_VERBOSE = 1 +#export DH_VERBOSE = 1 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* DPKG_EXPORT_BUILDFLAGS = 1 @@ -21,8 +21,8 @@ %: dh $@ #DH7_ADDON# -# debmake generated override targets -# This is example for Cmake (See http://bugs.debian.org/641051 ) +# dh_make generated override targets +# This is example for Cmake (See https://bugs.debian.org/641051 ) #override_dh_auto_configure: # dh_auto_configure -- \ # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) diff -Nru dh-make-1.20140617/lib/debiann/control dh-make-1.20150601/lib/debiann/control --- dh-make-1.20140617/lib/debiann/control 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debiann/control 2015-06-03 12:06:03.000000000 +0000 @@ -6,7 +6,7 @@ Standards-Version: #POLICY# Homepage: #Vcs-Git: git://anonscm.debian.org/collab-maint/#PACKAGE#.git -#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/#PACKAGE#.git;a=summary +#Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/#PACKAGE#.git;a=summary Package: #PACKAGE# Architecture: all diff -Nru dh-make-1.20140617/lib/debiann/rules.dh7 dh-make-1.20150601/lib/debiann/rules.dh7 --- dh-make-1.20140617/lib/debiann/rules.dh7 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debiann/rules.dh7 2015-06-03 12:06:03.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f # See debhelper(7) (uncomment to enable) # output every command that modifies files on the build system. -#DH_VERBOSE = 1 +#export DH_VERBOSE = 1 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* DPKG_EXPORT_BUILDFLAGS = 1 @@ -21,8 +21,8 @@ %: dh $@ #DH7_ADDON# -# debmake generated override targets -# This is example for Cmake (See http://bugs.debian.org/641051 ) +# dh_make generated override targets +# This is example for Cmake (See https://bugs.debian.org/641051 ) #override_dh_auto_configure: # dh_auto_configure -- \ # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) diff -Nru dh-make-1.20140617/lib/debians/control dh-make-1.20150601/lib/debians/control --- dh-make-1.20140617/lib/debians/control 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debians/control 2015-06-03 12:06:03.000000000 +0000 @@ -6,7 +6,7 @@ Standards-Version: #POLICY# Homepage: #Vcs-Git: git://anonscm.debian.org/collab-maint/#PACKAGE#.git -#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/#PACKAGE#.git;a=summary +#Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/#PACKAGE#.git;a=summary Package: #PACKAGE# Architecture: any diff -Nru dh-make-1.20140617/lib/debians/rules.dh7 dh-make-1.20150601/lib/debians/rules.dh7 --- dh-make-1.20140617/lib/debians/rules.dh7 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/debians/rules.dh7 2015-06-03 12:06:03.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f # See debhelper(7) (uncomment to enable) # output every command that modifies files on the build system. -#DH_VERBOSE = 1 +#export DH_VERBOSE = 1 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* DPKG_EXPORT_BUILDFLAGS = 1 @@ -21,8 +21,8 @@ %: dh $@ #DH7_ADDON# -# debmake generated override targets -# This is example for Cmake (See http://bugs.debian.org/641051 ) +# dh_make generated override targets +# This is example for Cmake (See https://bugs.debian.org/641051 ) #override_dh_auto_configure: # dh_auto_configure -- \ # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) diff -Nru dh-make-1.20140617/lib/emacs/control dh-make-1.20150601/lib/emacs/control --- dh-make-1.20140617/lib/emacs/control 1970-01-01 00:00:00.000000000 +0000 +++ dh-make-1.20150601/lib/emacs/control 2015-06-03 12:06:03.000000000 +0000 @@ -0,0 +1,15 @@ +Source: #PACKAGE# +Section: lisp +Priority: optional +Maintainer: #USERNAME# <#EMAIL#> +Build-Depends: #BUILD_DEPS# +Standards-Version: #POLICY# +Homepage: +#Vcs-Git: git://anonscm.debian.org/collab-maint/#PACKAGE#.git +#Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/#PACKAGE#.git/ + +Package: #PACKAGE# +Architecture: all +Depends: ${misc:Depends}, emacsen-common (>= 2.0.8), emacs | emacsen, +Description: + diff -Nru dh-make-1.20140617/lib/emacs/emacsen-compat dh-make-1.20150601/lib/emacs/emacsen-compat --- dh-make-1.20140617/lib/emacs/emacsen-compat 1970-01-01 00:00:00.000000000 +0000 +++ dh-make-1.20150601/lib/emacs/emacsen-compat 2015-06-03 12:06:03.000000000 +0000 @@ -0,0 +1 @@ +0 diff -Nru dh-make-1.20140617/lib/licenses/apache dh-make-1.20150601/lib/licenses/apache --- dh-make-1.20140617/lib/licenses/apache 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/licenses/apache 2015-06-03 12:06:03.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: #PACKAGE# Source: @@ -16,7 +16,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at . - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -29,5 +29,5 @@ # Please also look if there are files or directories which have a # different copyright/license attached and list them here. -# Please avoid to pick license terms that are more restrictive than the +# Please avoid picking licenses with terms that are more restrictive than the # packaged work, as it may make Debian's contributions unacceptable upstream. diff -Nru dh-make-1.20140617/lib/licenses/artistic dh-make-1.20150601/lib/licenses/artistic --- dh-make-1.20140617/lib/licenses/artistic 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/licenses/artistic 2015-06-03 12:06:03.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: #PACKAGE# Source: @@ -24,5 +24,5 @@ # Please also look if there are files or directories which have a # different copyright/license attached and list them here. -# Please avoid to pick license terms that are more restrictive than the +# Please avoid picking licenses with terms that are more restrictive than the # packaged work, as it may make Debian's contributions unacceptable upstream. diff -Nru dh-make-1.20140617/lib/licenses/blank dh-make-1.20150601/lib/licenses/blank --- dh-make-1.20140617/lib/licenses/blank 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/licenses/blank 2015-06-03 12:06:03.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: #PACKAGE# Source: @@ -27,12 +27,12 @@ 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 + along with this program. If not, see . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". # Please also look if there are files or directories which have a # different copyright/license attached and list them here. -# Please avoid to pick license terms that are more restrictive than the +# Please avoid picking licenses with terms that are more restrictive than the # packaged work, as it may make Debian's contributions unacceptable upstream. diff -Nru dh-make-1.20140617/lib/licenses/bsd dh-make-1.20150601/lib/licenses/bsd --- dh-make-1.20140617/lib/licenses/bsd 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/licenses/bsd 2015-06-03 12:06:03.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: #PACKAGE# Source: @@ -38,5 +38,5 @@ # Please also look if there are files or directories which have a # different copyright/license attached and list them here. -# Please avoid to pick license terms that are more restrictive than the +# Please avoid picking licenses with terms that are more restrictive than the # packaged work, as it may make Debian's contributions unacceptable upstream. diff -Nru dh-make-1.20140617/lib/licenses/gpl2 dh-make-1.20150601/lib/licenses/gpl2 --- dh-make-1.20140617/lib/licenses/gpl2 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/licenses/gpl2 2015-06-03 12:06:03.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: #PACKAGE# Source: @@ -23,12 +23,12 @@ 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 + along with this program. If not, see . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". # Please also look if there are files or directories which have a # different copyright/license attached and list them here. -# Please avoid to pick license terms that are more restrictive than the +# Please avoid picking licenses with terms that are more restrictive than the # packaged work, as it may make Debian's contributions unacceptable upstream. diff -Nru dh-make-1.20140617/lib/licenses/gpl3 dh-make-1.20150601/lib/licenses/gpl3 --- dh-make-1.20140617/lib/licenses/gpl3 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/licenses/gpl3 2015-06-03 12:06:03.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: #PACKAGE# Source: @@ -23,12 +23,12 @@ 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 . + along with this program. If not, see . . On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/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. -# Please avoid to pick license terms that are more restrictive than the +# Please avoid picking licenses with terms that are more restrictive than the # packaged work, as it may make Debian's contributions unacceptable upstream. diff -Nru dh-make-1.20140617/lib/licenses/lgpl2 dh-make-1.20150601/lib/licenses/lgpl2 --- dh-make-1.20140617/lib/licenses/lgpl2 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/licenses/lgpl2 2015-06-03 12:06:03.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: #PACKAGE# Source: @@ -23,12 +23,12 @@ Lesser 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 . + along with this program. If not, see . . On Debian systems, the complete text of the GNU Lesser General Public License can be found in "/usr/share/common-licenses/LGPL-2". # Please also look if there are files or directories which have a # different copyright/license attached and list them here. -# Please avoid to pick license terms that are more restrictive than the +# Please avoid picking licenses with terms that are more restrictive than the # packaged work, as it may make Debian's contributions unacceptable upstream. diff -Nru dh-make-1.20140617/lib/licenses/lgpl3 dh-make-1.20150601/lib/licenses/lgpl3 --- dh-make-1.20140617/lib/licenses/lgpl3 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/licenses/lgpl3 2015-06-03 12:06:03.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: #PACKAGE# Source: @@ -23,12 +23,12 @@ Lesser 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 . + along with this program. If not, see . . On Debian systems, the complete text of the GNU Lesser General Public License can be found in "/usr/share/common-licenses/LGPL-3". # Please also look if there are files or directories which have a # different copyright/license attached and list them here. -# Please avoid to pick license terms that are more restrictive than the +# Please avoid picking licenses with terms that are more restrictive than the # packaged work, as it may make Debian's contributions unacceptable upstream. diff -Nru dh-make-1.20140617/lib/licenses/mit dh-make-1.20150601/lib/licenses/mit --- dh-make-1.20140617/lib/licenses/mit 2014-06-17 12:00:39.000000000 +0000 +++ dh-make-1.20150601/lib/licenses/mit 2015-06-03 12:06:03.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: #PACKAGE# Source: @@ -32,5 +32,5 @@ # Please also look if there are files or directories which have a # different copyright/license attached and list them here. -# Please avoid to pick license terms that are more restrictive than the +# Please avoid picking licenses with terms that are more restrictive than the # packaged work, as it may make Debian's contributions unacceptable upstream.