debian: Sync with Debian

5 files changed, 71 insertions, 80 deletions

diff --git a/debian/control b/debian/control
index 0e9bd17..6744531 100644
--- a/debian/control
+++ b/debian/control
@@ -1,33 +1,38 @@
 Source: ayatana-indicator-bluetooth
-Section: misc
-Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Build-Depends: debhelper-compat (= 13),
-               cmake,
-               cmake-extras (>= 0.10),
-               intltool,
-               libayatana-common-dev (>= 0.9.3),
-               libglib2.0-dev (>= 2.32.0),
-               libnotify-dev,
-               systemd-dev [linux-any],
-               valac (>= 0.20),
 Standards-Version: 4.7.4
-Rules-Requires-Root: no
+Maintainer: Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+Uploaders:
+ Mike Gabriel <sunweaver@debian.org>,
+ Debian UBports Team <team+ubports@tracker.debian.org>,
+Section: misc
+Build-Depends:
+ debhelper-compat (= 13),
+ cmake,
+ cmake-extras,
+ intltool,
+ libayatana-common-dev,
+ libglib2.0-dev,
+ libnotify-dev,
+ systemd-dev [linux-any],
+ valac,
+Vcs-Browser: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth
+Vcs-Git: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth.git
 Homepage: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth
-Vcs-Git: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-bluetooth.git
-Vcs-Browser: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-bluetooth/
 
 Package: ayatana-indicator-bluetooth
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         bluez (>= 5),
-         ayatana-indicator-common,
-Suggests: unity-control-center | mate-control-center | gnome-control-center | lomiri-system-settings,
-          blueman | blueman-manager | lomiri-system-settings | gnome-bluetooth,
-Replaces: gnome-bluetooth (<< 3.6.1-0ubuntu2),
-          indicator-bluetooth,
-Breaks: gnome-bluetooth (<< 3.6.1-0ubuntu2),
-        indicator-bluetooth,
+Depends:
+ ayatana-indicator-common,
+ bluez,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ blueman | lomiri-system-settings | gnome-bluetooth-sendto,
+ unity-control-center | mate-control-center | gnome-control-center | lomiri-system-settings,
+Breaks:
+ indicator-bluetooth,
+Replaces:
+ indicator-bluetooth,
 Description: Ayatana Indicator for managing Bluetooth devices
  This Ayatana Indicator exposes bluetooth functionality via the system
  indicator API and provides fast user controls for Bluetooth devices.
diff --git a/debian/copyright b/debian/copyright
index 4d0bef3..b0139dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ayatana-indicator-bluetooth
-Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Source: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth
+Upstream-Name: ayatana-indicator-bluetooth
 
 Files: config.h.in
  src/bluetooth.vala
@@ -103,40 +102,6 @@ Copyright: 2013, Canonical Ltd.
   2020-2026, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3 or BSD-2-clause or BSD-3-clause
 
-License: GPL-3
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 3 of the License.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-License: LGPL-2
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; version 2
- of the License.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 31 Milk Street, # 960789, Boston, MA 02196  USA
- .
- On Debian systems, the complete text of the GNU Library General Public
- License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
-
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -181,3 +146,37 @@ License: BSD-3-clause
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: GPL-3
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 3 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: LGPL-2
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; version 2
+ of the License.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 31 Milk Street, # 960789, Boston, MA 02196  USA
+ .
+ On Debian systems, the complete text of the GNU Library General Public
+ License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
diff --git a/debian/rules b/debian/rules
index 0a263ad..51631df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,34 +1,18 @@
 #!/usr/bin/make -f
 
-NULL =
-
-export DPKG_GENSYMBOLS_CHECK_LEVEL=4
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
-DEB_CMAKE_EXTRA_FLAGS = \
-    -DCMAKE_INSTALL_LOCALSTATEDIR="/var" \
-    -DENABLE_TESTS=ON \
-    -DENABLE_COVERAGE=OFF \
-    $(NULL)
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
-
-override_dh_missing:
-	dh_missing --fail-missing
+	dh_auto_configure -- \
+		-DCMAKE_INSTALL_LOCALSTATEDIR="/var" \
+		-DENABLE_TESTS=$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),OFF,ON) \
+		-DENABLE_COVERAGE=OFF
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
-# For live test logs:
-#override_dh_auto_test:
-#	ARGS=-V dh_auto_test
-
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=..
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..c62ae4e
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# Debian UBports Team intentionally uses get-orig-source
+source: debian-rules-contains-unnecessary-get-orig-source-target [debian/rules]
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 9b05c23..cbaf640 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,3 +1,4 @@
+---
 Bug-Database: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/issues
 Bug-Submit: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/issues/new
 Donation: https://ubports.com/donate