Merge ~jelmer/ubuntu/+source/android-headers:lintian-fixes into ubuntu/+source/android-headers:ubuntu/devel

[Jelmer Vernooij]

Fix some issues reported by lintian
* Bump debhelper from old 9 to 10.
* Use versioned copyright format URI.
* Change priority extra to priority optional.
* Don't specify --with=quilt, since package uses '3.0 (quilt)' source format.

[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

16b5bc6... by Jelmer Vernooij on 2019-01-19

Don't specify --with=quilt, since package uses '3.0 (quilt)' source format.

Fixes lintian: dh-quilt-addon-but-quilt-source-format
See https://lintian.debian.org/tags/dh-quilt-addon-but-quilt-source-format.html for more details.

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

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

Use versioned copyright format URI.

Fixes lintian: unversioned-copyright-format-uri
See https://lintian.debian.org/tags/unversioned-copyright-format-uri.html for more details.

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

b7d0302... by Simon Fels on 2016-08-16

Import patches-unapplied version 23-0ubuntu4 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: d6f43004636adf9d19b3def95e5ca46a5a4cb64e

New changelog entries:
  [ You-Sheng Yang ]
  * android-19: hardware: align struct size on arm64

d6f4300... by Simon Fels on 2016-04-11

Import patches-unapplied version 23-0ubuntu3 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: 472b165e930bbbd4e4d181445a4002e3468896f1

New changelog entries:
  * debian/control: add appropriate Pre-Depends on dpkg for mainscript
    helper.
  * debian/control: fix link to vcs
  * Patch 21-23 to fix ABI problems when we mix softfp and hardfp
    binaries (LP: #1548954). This was discovered while fixing a
    problem with the Android Audio HAL API.

472b165... by Chris Halse Rogers on 2016-01-29

Import patches-unapplied version 23-0ubuntu2 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: ab4f0e4947acad6978d7184f8e8ac5b4165bb9c4

New changelog entries:
  * debian/android-headers.{preinst,postinst,postrm}: Use
    dpkg-maintscript-helper to switch /usr/include/android to a symlink.
    (LP: #1539338)
  * debian/control: add appropriate Pre-Depends on dpkg for mainscript helper.

ab4f0e4... by Simon Fels on 2016-01-11

Import patches-unapplied version 23-0ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: da322b2078b19cd6f1b63b0d5c4466aa5d0996cc

New changelog entries:
  * New upstream release which now includes multiple sets of header files
    divided by the Android API levels we care about.
  * All header sets are now installed in their corresponding debian package
    android-headers-<API level>. The former android-headers package is now
    a transitional one depending on android-headers-19 and installing proper
    symlinks to allow all current users to still build without any changes.
  * Install proper pkgconfig configuration files for all header sets so that
    users can now select which of those to use a build time.
  [ Yuan-Chen Cheng ]
  * add android-config.h and vibrator.h required by new libhybris
  * catch up extract-headers.sh (not in released file list)

da322b2... by Ricardo Salveti on 2015-04-09

Import patches-unapplied version 4.4.2-2-0ubuntu4 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 5563f66d921e4b24336e91ef1fd1e830635316b5

New changelog entries:
  * debian/patches/updating_hwcomposer_android5.patch:
    - Updating hwcomposer headers so we can use hwcomposer 1.4

5563f66... by Mathieu Trudel-Lapierre on 2014-12-08

Import patches-unapplied version 4.4.2-2-0ubuntu3 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 70c09484d6cc430e5f27e894373bf9a36e1bd2dc

New changelog entries:
  * debian/patches/wifi_compat_check_avail.patch: add declaration for new
    method to check that the wifi compat HAL layer is available:
    wifi_compat_check_availability().

diff --git a/debian/changelog b/debian/changelog
index 5d8b15b..1906221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+android-headers (23-0ubuntu5) UNRELEASED; urgency=medium
+
+  * Bump debhelper from old 9 to 10.
+  * Use versioned copyright format URI.
+  * Change priority extra to priority optional.
+  * Don't specify --with=quilt, since package uses '3.0 (quilt)' source
+    format.
+
+ -- Jelmer Vernooij <[e-mail]>  Sat, 19 Jan 2019 02:50:18 +0000
+
 android-headers (23-0ubuntu4) yakkety; urgency=medium
 
   [ You-Sheng Yang ]
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 aaca249..e5722cb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: android-headers
-Priority: extra
+Priority: optional
 Section: libdevel
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 9), quilt
+Build-Depends: debhelper (>= 10~), quilt
 Standards-Version: 3.9.6
 Vcs-Git: https://git.launchpad.net/android-headers
 Vcs-Browser: https://git.launchpad.net/android-headers
diff --git a/debian/copyright b/debian/copyright
index b19af0d..5eafb78 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: android-headers
 Source: https://android.googlesource.com/
 
diff --git a/debian/rules b/debian/rules
index 1e4efc0..657234c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,4 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with quilt
+	dh $@