Use https:// URLs and update FSF address

diff --git a/debian/changelog b/debian/changelog
index 8ce7ef52cde6cce56d38d6f3a10c51e888f12447..004b2ab6f4295528ea02d449ff2ea9cd1938595b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ emacs (1:26.1+1-3.1) UNRELEASED; urgency=medium
 
   * Clean-up debian/control.
 
+  * Use https:// URLs and update FSF address.
+
  -- Andreas Beckmann <anbe@debian.org>  Sun, 27 Jan 2019 16:56:15 +0100
 
 emacs (1:26.1+1-3) unstable; urgency=medium

diff --git a/debian/control b/debian/control
index aaafacb89a63d7abb5e5cde83c0c363c88c31713..b3896aa00f2d2b1dbe52c5390dfbea6db92debed 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, lib
  libacl1-dev,
  liboss4-salsa-dev [hurd-i386 kfreebsd-i386 kfreebsd-amd64],
  zlib1g-dev
-Homepage: http://www.gnu.org/software/emacs/
+Homepage: https://www.gnu.org/software/emacs/
 Standards-Version: 3.7.2
 Vcs-Browser: https://salsa.debian.org/rlb/deb-emacs
 Vcs-Git: https://salsa.debian.org/rlb/deb-emacs.git

diff --git a/debian/copyright b/debian/copyright
index f1b2ec8d11b12dcf357b07bc4f1a811e450efa1a..f0b227ebf49eaac18b8d7a864a219af3f37a6d1e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -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: Emacs
 Upstream-Contact: bug-gnu-emacs@gnu.org
 Upstream-Contact: emacs-devel@gnu.org
@@ -81,7 +81,7 @@ License:
 
 Files: debian/rules
 License: GPL plus Ian
-  This file is licensed under the terms of the Gnu Public License.
+  This file is licensed under the terms of the GNU General Public License.
   With the one additional provision that Ian Jackson's name may not be
   removed from the file.
 
@@ -385,8 +385,8 @@ License: pkg.m4 license
 
   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., 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  02110-1301, USA.
 
   As a special exception to the GNU General Public License, if you
   distribute this file as part of a program that contains a

diff --git a/debian/copyright.in b/debian/copyright.in
index 4608e35c3efe6e482a873ce97c021361dd7fe2c8..b27c000260fbab9ec08e053548246806cb99d2ad 100644 (file)
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -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: Emacs
 Upstream-Contact: bug-gnu-emacs@gnu.org
 Upstream-Contact: emacs-devel@gnu.org
@@ -81,7 +81,7 @@ License:
 
 Files: debian/rules
 License: GPL plus Ian
-  This file is licensed under the terms of the Gnu Public License.
+  This file is licensed under the terms of the GNU General Public License.
   With the one additional provision that Ian Jackson's name may not be
   removed from the file.
 
@@ -385,8 +385,8 @@ License: pkg.m4 license
 
   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., 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  02110-1301, USA.
 
   As a special exception to the GNU General Public License, if you
   distribute this file as part of a program that contains a