Merge ~jelmer/ubuntu/+source/evolution-indicator:lintian-fixes into ubuntu/+source/evolution-indicator:ubuntu/devel

[Jelmer Vernooij]

Fix some issues reported by lintian
* Use correct machine-readable copyright file URI.
* Use secure URI in Vcs control header.
* Trim trailing whitespace.
* Drop unnecessary dependency on dh-autoconf.
* Use secure URI in debian/watch.
* Change priority extra to priority optional.

[Robie Basak (racb)]

Thank you for contributing these changes.

Please note that we don't yet have a process for arranging general sponsorship for MPs submitted through git-ubuntu. As these changes are so trivial, I don't think it's worth me spending time on arranging this right now.

Ideally these would appear in http://reqorts.qa.ubuntu.com/reports/sponsoring/index.html but they currently do not.

A contribution to adjust that report would be welcome.

Alternatively you could file a bug, subscribe ~ubuntu-sponsors and link this MP to it.

Until then I suspect this MP won't get looked at. Sorry!

[Robie Basak (racb)]

Closing, since this MP isn't actionable as-is - see previous comment.

Unmerged commits

9e386f4... by Jelmer Vernooij on 2019-01-19

Change priority extra to priority optional.

Fixes lintian: priority-extra-is-replaced-by-priority-optional
See https://lintian.debian.org/tags/priority-extra-is-replaced-by-priority-optional.html for more details.

a291394... by Jelmer Vernooij on 2019-01-19

Use secure URI in debian/watch.

Fixes lintian: debian-watch-uses-insecure-uri
See https://lintian.debian.org/tags/debian-watch-uses-insecure-uri.html for more details.

6f554be... by Jelmer Vernooij on 2019-01-19

Drop unnecessary dependency on dh-autoconf.

Fixes lintian: useless-autoreconf-build-depends
See https://lintian.debian.org/tags/useless-autoreconf-build-depends.html for more details.

1623ee2... by Jelmer Vernooij on 2019-01-19

Trim trailing whitespace.

Fixes lintian: file-contains-trailing-whitespace
See https://lintian.debian.org/tags/file-contains-trailing-whitespace.html for more details.

1e353b5... by Jelmer Vernooij on 2019-01-19

Use secure URI in Vcs control header.

Fixes lintian: vcs-field-uses-insecure-uri
See https://lintian.debian.org/tags/vcs-field-uses-insecure-uri.html for more details.

aa46de7... by Jelmer Vernooij on 2019-01-19

Use correct machine-readable copyright file URI.
Fixed-Lintian-Tag: out-of-date-copyright-format

fddbdd5... by Jeremy Bícha on 2018-09-04

Import patches-unapplied version 0.2.20-0ubuntu36 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 6eb9b92c3d5d5c918a809f8343f65f5d26f8d6e2

New changelog entries:
  * No-change rebuild against latest evolution

6eb9b92... by Jeremy Bícha on 2018-08-12

Import patches-unapplied version 0.2.20-0ubuntu35 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 2ba1994494dc023ae2d177ca0c395438e5806e4b

New changelog entries:
  * No-change rebuild against latest evolution

2ba1994... by Ken VanDine on 2018-06-25

Import patches-unapplied version 0.2.20-0ubuntu34 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 13882a5f50ea2c96c6438eb620b29f7e192fa0cb

New changelog entries:
  * debian/patches/desktop_file_rename.patch
    - Handle desktop file rename to org.gnome.Evolution.desktop (LP: #1778544)

13882a5... by Jeremy Bícha on 2018-03-12

Import patches-unapplied version 0.2.20-0ubuntu33 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: cd95340a35859c5d6a3ad16f0afbf5f7a97cb8dc

New changelog entries:
  * No-change rebuild against latest evolution

diff --git a/debian/changelog b/debian/changelog
index eec5333..f93ec01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+evolution-indicator (0.2.20-0ubuntu37) UNRELEASED; urgency=medium
+
+  * Use correct machine-readable copyright file URI.
+  * Use secure URI in Vcs control header.
+  * Trim trailing whitespace.
+  * Drop unnecessary dependency on dh-autoconf.
+  * Use secure URI in debian/watch.
+  * Change priority extra to priority optional.
+
+ -- Jelmer Vernooij <[e-mail]>  Sat, 19 Jan 2019 02:56:58 +0000
+
 evolution-indicator (0.2.20-0ubuntu36) cosmic; urgency=medium
 
   * No-change rebuild against latest evolution
@@ -82,7 +93,7 @@ evolution-indicator (0.2.20-0ubuntu24) yakkety; urgency=medium
 evolution-indicator (0.2.20-0ubuntu22) xenial; urgency=medium
 
   * debian/control,
-    debian/patches/gtkhtml_is_deprecated.patch: don't use gtkhtml 
+    debian/patches/gtkhtml_is_deprecated.patch: don't use gtkhtml
     it's deprecated and not used by the current evolution version
 
  -- Sebastien Bacher <[e-mail]>  Tue, 15 Dec 2015 11:11:59 +0100
@@ -127,11 +138,11 @@ evolution-indicator (0.2.20-0ubuntu15) trusty; urgency=medium
 evolution-indicator (0.2.20-0ubuntu13) trusty; urgency=medium
 
   * debian/patches/evolution-indicator-eds3.6_v2.patch:
-    - use correct GList type, should fix segfault issues, 
+    - use correct GList type, should fix segfault issues,
       thanks Xavier Claessens (lp: #1194005)
 
   [ Iain Lane ]
-  * Build-Depend on evolution 3.10 
+  * Build-Depend on evolution 3.10
 
  -- Sebastien Bacher <[e-mail]>  Mon, 03 Feb 2014 16:28:00 +0000
 
@@ -179,7 +190,7 @@ evolution-indicator (0.2.20-0ubuntu9) raring; urgency=low
 evolution-indicator (0.2.20-0ubuntu8) quantal; urgency=low
 
   * debian/control
-    - added build depends for libebackend1.2-dev, libcamel1.2-dev, and 
+    - added build depends for libebackend1.2-dev, libcamel1.2-dev, and
       libsoup2.4-dev
     - bumped build depends for evolution-dev to >= 3.4
   * debian/patches/02_evo_3_4_build_fixes.patch
@@ -219,7 +230,7 @@ evolution-indicator (0.2.20-0ubuntu5) precise; urgency=low
 evolution-indicator (0.2.20-0ubuntu4) precise; urgency=low
 
   * debian/control
-    - depend on evolution so evolution-indicator will get removed if 
+    - depend on evolution so evolution-indicator will get removed if
       evolution is uninstalled (LP: #663988)
 
  -- Ken VanDine <[e-mail]>  Tue, 13 Dec 2011 09:59:18 -0500
@@ -238,7 +249,7 @@ evolution-indicator (0.2.20-0ubuntu2) oneiric; urgency=low
 
 evolution-indicator (0.2.20-0ubuntu1) oneiric; urgency=low
 
-  * New upstream release, fix an untranslatable string bug 
+  * New upstream release, fix an untranslatable string bug
     (lp: #437963)
 
  -- Sebastien Bacher <[e-mail]>  Fri, 09 Sep 2011 11:27:29 +0200
@@ -292,7 +303,7 @@ evolution-indicator (0.2.14-0ubuntu2) natty; urgency=low
   * src/evolution-indicator.c
     - Added unread counter to the unity launcher
   * src/evolution-indicator.c
-    - simplify and fix handling POP accounts. Setting a POP account to IMAP 
+    - simplify and fix handling POP accounts. Setting a POP account to IMAP
       and back to POP would cause evolution to crash (LP: #643321)
 
  -- Ken VanDine <[e-mail]>  Thu, 24 Feb 2011 00:04:38 -0500
@@ -365,7 +376,7 @@ evolution-indicator (0.2.6-0ubuntu2) lucid; urgency=low
 
 evolution-indicator (0.2.6-0ubuntu1) lucid; urgency=low
 
-  * New upstream version 
+  * New upstream version
 
  -- Sebastien Bacher <[e-mail]>  Thu, 21 Jan 2010 22:21:09 +0100
 
@@ -380,7 +391,7 @@ evolution-indicator (0.2.4-0ubuntu5) lucid; urgency=low
 
   * debian/rules:
     - use the upstream evolution desktop entry there
-    
+
   [ Ken VanDine ]
   * debian/preinst:
     - fixed the version compare to be friendly on new installs
@@ -403,10 +414,10 @@ evolution-indicator (0.2.4-0ubuntu3) karmic-proposed; urgency=low
 
 evolution-indicator (0.2.4-0ubuntu2) karmic; urgency=low
 
-  * debian/rules: 
-    - Moved the indicator launcher to /usr/share (LP: #434097) 
+  * debian/rules:
+    - Moved the indicator launcher to /usr/share (LP: #434097)
   * debian/postinst:
-    - remove the old indicator from /etc and remove the directory 
+    - remove the old indicator from /etc and remove the directory
       if it is empty
 
  -- Ken VanDine <[e-mail]>  Thu, 24 Sep 2009 15:14:30 -0400
diff --git a/debian/control b/debian/control
index dd0e1fc..e7e1edb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: evolution-indicator
 Section: gnome
-Priority: extra
+Priority: optional
 Maintainer: Ubuntu Core Developers <[e-mail]>
-Build-Depends: debhelper (>= 9), 
-  autotools-dev, 
+Build-Depends: debhelper (>= 10),
+  autotools-dev,
   gnome-pkg-tools (>= 0.10),
   libglib2.0-dev (>= 2.15.5),
   libpango1.0-dev (>= 1.18.0),
@@ -22,12 +22,11 @@ Build-Depends: debhelper (>= 9),
   libcamel1.2-dev (>= 3.4),
   libsoup2.4-dev,
   libunity-dev (>= 5.0.0),
-  libmessaging-menu-dev,
-  dh-autoreconf
+  libmessaging-menu-dev
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/evolution-indicator
 X-Ubuntu-Use-Langpack: yes
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/evolution-indicator/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/evolution-indicator/ubuntu
 
 Package: evolution-indicator
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index d478b4a..3447e48 100644
--- 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: evolution-indicator
 Upstream-Contact: Canonical Ltd.
 Source: http://launchpad.net/evolution-indicator
diff --git a/debian/rules b/debian/rules
index 5911fdb..b4b6b6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
-#!/usr/bin/make -f 
+#!/usr/bin/make -f
 
 %:
-	dh $@ --with autoreconf
+	dh $@
 
 override_dh_makeshlibs:
 	dh_makeshlibs -X*
diff --git a/debian/watch b/debian/watch
index 5a86de2..80eb957 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://launchpad.net/evolution-indicator/+download .*/evolution-indicator-([0-9.]+)\.tar\.gz
+https://launchpad.net/evolution-indicator/+download .*/evolution-indicator-([0-9.]+)\.tar\.gz