Make lintian happier. am: 760224b918 am: d42eb80650 am: eb423d7495

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1708472

Change-Id: I55fa1e41c1d3c6e46d86de32092b4bddff41390a

9 files changed, 20 insertions, 7 deletions

diff --git a/debian/compat b/debian/compat
index f599e28b8..b1bd38b62 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+13
diff --git a/debian/control b/debian/control
index 28fcef21f..94a03bb38 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: perfetto
 Section: kernel
 Priority: optional
 Maintainer: Sami Kyostila <skyostil@google.com>
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 13),
   generate-ninja,
   git,
   libprotoc-dev,
@@ -11,14 +11,15 @@ Build-Depends: debhelper (>= 10),
   python3,
   zlib1g-dev,
   zlib1g
-Standards-Version: 3.9.8
+Standards-Version: 4.5.1
 Homepage: https://perfetto.dev
 Vcs-Git: https://android.googlesource.com/platform/external/perfetto/
 Vcs-Browser: https://android.googlesource.com/platform/external/perfetto/
+Rules-Requires-Root: no
 
 Package: perfetto
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, zlib1g
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, zlib1g
 Description: Performance instrumentation and logging framework
  Perfetto is a performance instrumentation and logging framework for POSIX
  systems.
diff --git a/debian/copyright b/debian/copyright
index e23f57db5..7b7058c56 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,12 @@ Source: https://android.googlesource.com/platform/external/perfetto/
 
 Files: *
 Copyright: Copyright (C) 2017 The Android Open Source Project
-License: Apache 2
+License: Apache-2
  Licensed under the Apache License, Version 2.0 (the "License");
  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
+      /usr/share/common-licenses/Apache-2.0
  .
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/debian/postinst b/debian/postinst
index 7d7e26662..e6cdff56a 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,3 +3,5 @@ set -e
 adduser --home /nonexistent --quiet --system --no-create-home --group traced
 addgroup --quiet --system traced-consumer
 usermod -a -G traced-consumer traced
+
+#DEBHELPER#
diff --git a/debian/postrm b/debian/postrm
index 20c97672b..efa15906d 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,3 +1,5 @@
 #!/bin/sh
 set -e
 rm -f /tmp/perfetto-consumer /tmp/perfetto-producer
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 2b0e32c28..a081c5caf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
 #!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 %:
 	dh $@
 
@@ -24,7 +29,7 @@ override_dh_auto_configure:
 	  enable_perfetto_unittests=false perfetto_use_system_protobuf=true\
 	  perfetto_use_system_zlib=true perfetto_enable_git_rev_version_header=false\
 	  extra_cflags=\"${CFLAGS}\" extra_cxxflags=\"${CXXFLAGS}\"\
-	  extra_ldflags=\"${CXXFLAGS}\" cc=\"${CC}\" cxx=\"${CXX}\"\
+	  extra_ldflags=\"${LDFLAGS}\" cc=\"${CC}\" cxx=\"${CXX}\"\
 	  ${MAYBE_HOST_CPU}"
 
 override_dh_auto_build:
diff --git a/debian/traced-perf.service b/debian/traced-perf.service
index b04463b99..73bffb94f 100644
--- a/debian/traced-perf.service
+++ b/debian/traced-perf.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Perfetto sampling and profiling data source
+Documentation=https://perfetto.dev/docs/
 
 [Service]
 ExecStart=/usr/sbin/traced_perf
diff --git a/debian/traced-probes.service b/debian/traced-probes.service
index 81a23f7ce..1d853b0a7 100644
--- a/debian/traced-probes.service
+++ b/debian/traced-probes.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Perfetto data sources for system tracing (ftrace and /proc pollers)
+Documentation=https://perfetto.dev/docs/
 
 [Service]
 ExecStart=/usr/sbin/traced_probes
diff --git a/debian/traced.service b/debian/traced.service
index 6eb7d8a4f..4ca8d7a7c 100644
--- a/debian/traced.service
+++ b/debian/traced.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Perfetto tracing service daemon
+Documentation=https://perfetto.dev/docs/
 
 [Service]
 ExecStart=/usr/sbin/traced \