Merge ~jelmer/ubuntu/+source/adium-theme-ubuntu:lintian-fixes into ubuntu/+source/adium-theme-ubuntu:ubuntu/devel

[Jelmer Vernooij]

Fix some issues reported by lintian
* Use secure URI in debian/watch.
* Bump debhelper from old 9 to 10.
* Change priority extra to priority optional.
* Trim trailing whitespace.
* Use secure URI in Homepage field.

[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

3ec9134... by Jelmer Vernooij on 2019-01-19

Use secure URI in Homepage field.

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

7da151d... 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.

7e6fb0b... 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.

729ee26... by Jelmer Vernooij on 2019-01-19

Bump debhelper from old 9 to 10.

Fixes lintian: package-uses-old-debhelper-compat-version
See https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html for more details.

455faab... 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.

116249d... by Matthias Klose on 2017-09-21

Import patches-unapplied version 0.3.4-0ubuntu4 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 68f145965a2fe44f4e43cb7c1ff8a0096a3eb4f6

New changelog entries:
  * The package uses python only as a build and install tool. Drop any
    python references from the binary package.
  * Bump debhelper and standards versions.

68f1459... by Sebastien Bacher on 2017-09-21

Import patches-unapplied version 0.3.4-0ubuntu3 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: c4b05d5dbb056b52234bb7c589e51d4c73acce13

New changelog entries:
  * Build with python3

c4b05d5... by Andrej Shadura on 2016-04-11

Import patches-unapplied version 0.3.4-0ubuntu2 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: 806d3a6c519df0d9d329a411fe99a193b185ca5f

New changelog entries:
  * Non-maintainer upload.
  * Switch to 3.0 (quilt) source package format.
  * Update the theme to work with recent Empathy (LP: #1235472).
  * Use dh-python, update Standards-Version.
  * Patch setup.py to install things into the right places.

806d3a6... by Ken VanDine on 2014-02-25

Import patches-unapplied version 0.3.4-0ubuntu1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: a814fe1330c1d16a06703f069e50e4dbbbc04795

New changelog entries:
  * Fix for automatic scrolling to new messages broken with newer
    webkit versions, thanks to Timo Kluck (LP: #1269978)

a814fe1... by Matthias Klose on 2014-02-23

Import patches-unapplied version 0.3.3-0ubuntu2 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: b87374d34ac5c2d018276b23748b0ff1a0bef44f

New changelog entries:
  * Rebuild to drop files installed into /usr/share/pyshared.

diff --git a/debian/changelog b/debian/changelog
index e37a294..1e4f4ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,19 @@
+adium-theme-ubuntu (0.3.4-0ubuntu5) UNRELEASED; urgency=medium
+
+  * Use secure URI in debian/watch.
+  * Bump debhelper from old 9 to 10.
+  * Change priority extra to priority optional.
+  * Trim trailing whitespace.
+  * Use secure URI in Homepage field.
+
+ -- Jelmer Vernooij <[e-mail]>  Sat, 19 Jan 2019 02:49:54 +0000
+
 adium-theme-ubuntu (0.3.4-0ubuntu4) artful; urgency=medium
 
   * The package uses python only as a build and install tool. Drop any
     python references from the binary package.
   * Bump debhelper and standards versions.
- 
+
  -- Matthias Klose <[e-mail]>  Thu, 21 Sep 2017 16:14:44 +0200
 
 adium-theme-ubuntu (0.3.4-0ubuntu3) artful; urgency=medium
@@ -24,7 +34,7 @@ adium-theme-ubuntu (0.3.4-0ubuntu2) yakkety; urgency=medium
 
 adium-theme-ubuntu (0.3.4-0ubuntu1) trusty; urgency=medium
 
-  * Fix for automatic scrolling to new messages broken with newer 
+  * Fix for automatic scrolling to new messages broken with newer
     webkit versions, thanks to Timo Kluck (LP: #1269978)
 
  -- Ken VanDine <[e-mail]>  Tue, 25 Feb 2014 09:21:46 -0500
@@ -38,7 +48,7 @@ adium-theme-ubuntu (0.3.3-0ubuntu2) trusty; urgency=medium
 adium-theme-ubuntu (0.3.3-0ubuntu1) raring-proposed; urgency=low
 
   * New upstream release.
-    - Avoid an infinite loop in scrolling to the bottom of a 
+    - Avoid an infinite loop in scrolling to the bottom of a
       window. (LP: #959084)
 
  -- Ken VanDine <[e-mail]>  Mon, 29 Oct 2012 11:10:44 +0100
@@ -51,7 +61,7 @@ adium-theme-ubuntu (0.3.2-0ubuntu1) precise; urgency=low
   * debian/control
     - bump standards version to 3.9.2
   * debian/rules
-    - use dh_python2 
+    - use dh_python2
 
  -- Ken VanDine <[e-mail]>  Mon, 23 Jan 2012 11:09:21 -0500
 
@@ -74,16 +84,16 @@ adium-theme-ubuntu (0.3-0ubuntu2) natty; urgency=low
 adium-theme-ubuntu (0.3-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
-    - History shown in Empathy chat window should be different 
+    - History shown in Empathy chat window should be different
       from new messages (LP: #531811)
-    - In chat rooms, empathy should not scroll to the bottom whenever 
+    - In chat rooms, empathy should not scroll to the bottom whenever
       a new message is received. (LP: #542806)
-    - Merged patch from Omer Akram, we shouldn't hard code font 
+    - Merged patch from Omer Akram, we shouldn't hard code font
       sizes (LP: #531835)
   * debian/control
     - Set Vcs-Bzr
   * debian/copyright
-    - Dropped reference to the deprecated BSD license file, the contents are 
+    - Dropped reference to the deprecated BSD license file, the contents are
       included in the copyright file
 
  -- Ken VanDine <[e-mail]>  Wed, 11 Aug 2010 19:04:05 -0400
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 067d482..62c5c2e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,16 @@
 Source: adium-theme-ubuntu
 Section: gnome
-Priority: extra
+Priority: optional
 Maintainer: Ubuntu Artwork Team <[e-mail]>
 Build-Depends:
-    debhelper (>= 9),
+    debhelper (>= 10~),
     dh-python,
     python3-setuptools (>= 0.6.24),
     python3-all (>= 2.6.6-3),
     python3-distutils-extra
 Standards-Version: 4.0.0
 XS-Python-Version: current
-Homepage: http://launchpad.net/adium-theme-ubuntu
+Homepage: https://launchpad.net/adium-theme-ubuntu
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-art-pkg/adium-theme-ubuntu/ubuntu
 
 Package: adium-theme-ubuntu
@@ -19,5 +19,5 @@ Depends:
     ${shlibs:Depends},
     ${misc:Depends}
 Description: Adium message style for Ubuntu
- Adium message style for Ubuntu, to be used in an instant messenger that 
+ Adium message style for Ubuntu, to be used in an instant messenger that
  supports Adium message styles, such as Empathy.
diff --git a/debian/watch b/debian/watch
index 34d2c88..28a184a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://launchpad.net/adium-theme-ubuntu/+download  .*/adium-theme-ubuntu-([0-9.]+).tar.gz
+https://launchpad.net/adium-theme-ubuntu/+download  .*/adium-theme-ubuntu-([0-9.]+).tar.gz