From 67376d6a03a49eec1fdcb2c07509a6994d089e69 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 25 Oct 2020 16:14:34 +0100 Subject: Switch over from Ubuntu System Indicator to Ayatana System Indicator. --- debian/ayatana-indicator-bluetooth.links | 3 +++ debian/changelog | 6 ++++++ debian/control | 35 +++++++++++++++----------------- debian/rules | 8 +++++--- debian/watch | 2 +- 5 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 debian/ayatana-indicator-bluetooth.links (limited to 'debian') diff --git a/debian/ayatana-indicator-bluetooth.links b/debian/ayatana-indicator-bluetooth.links new file mode 100644 index 0000000..40d2c98 --- /dev/null +++ b/debian/ayatana-indicator-bluetooth.links @@ -0,0 +1,3 @@ +# Because dh-systemd does not support user units for compat levels below 12, we manually make the WantedBy link +# FIXME: drop this once we bump DH compat level to 12 or higher +/usr/lib/systemd/user/ayatana-indicator-bluetooth.service /usr/lib/systemd/user/ayatana-indicators.target.wants/ayatana-indicator-bluetooth.service diff --git a/debian/changelog b/debian/changelog index 5449352..a979863 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ayatana-indicator-bluetooth (0.8.0-0) unstable; urgency=medium + + * Port from Ubuntu Indicators to Ayatana Indicators. + + -- Mike Gabriel Sun, 25 Oct 2020 16:38:02 +0100 + indicator-bluetooth (0.0.7+ubports1) xenial; urgency=medium * Update Jenkinsfile for xenial diff --git a/debian/control b/debian/control index 1a4d509..0af5bc0 100644 --- a/debian/control +++ b/debian/control @@ -1,34 +1,31 @@ -Source: indicator-bluetooth +Source: ayatana-indicator-bluetooth Section: gnome -Priority: extra -Maintainer: Ubuntu Desktop Team +Priority: optional +Maintainer: Mike Gabriel Build-Depends: debhelper (>= 9.0), dh-autoreconf, - dh-translations, + dh-systemd, gnome-common, - libglib2.0-dev, + libglib2.0-dev (>= 2.32.0), liburl-dispatcher1-dev, - systemd, - valac (>=0.18), -Standards-Version: 3.9.4 -Homepage: https://launchpad.net/indicator-bluetooth -# If you aren't a member of ~indicator-applet-developers but need to upload -# packaging changes, just go ahead. ~indicator-applet-developers will notice -# and sync up the code again. -Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-bluetooth/trunk -Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-bluetooth/trunk/files + systemd [linux-any], + valac (>= 0.20), +Standards-Version: 4.1.1 +Homepage: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth +Vcs-Git: git://github.com:AyatanaIndicators/ayatana-indicator-bluetooth.git +Vcs-Browser: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth.git -Package: indicator-bluetooth +Package: ayatana-indicator-bluetooth Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, bluez (>= 5), unity-control-center | gnome-control-center | ubuntu-system-settings, - gnome-bluetooth | ubuntu-system-settings, - indicator-common, + gnome-bluetooth | ubuntu-system-settings | blueman-manager, + ayatana-indicator-common, Replaces: gnome-bluetooth (<< 3.6.1-0ubuntu2) Breaks: gnome-bluetooth (<< 3.6.1-0ubuntu2) -Description: System bluetooth indicator. - System bluetooth indicator which provides fast user controls for Bluetooth +Description: Ayatana system bluetooth indicator + Ayatana system bluetooth indicator which provides fast user controls for Bluetooth devices. diff --git a/debian/rules b/debian/rules index ca87700..d63d8ab 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,16 @@ #!/usr/bin/make -f +NULL = + export DPKG_GENSYMBOLS_CHECK_LEVEL=4 %: - dh $@ --with translations,autoreconf + dh $@ --parallel --fail-missing --with systemd override_dh_autoreconf: NOCONFIGURE=1 dh_autoreconf ./autogen.sh override_dh_install: - find debian/indicator-bluetooth/usr/lib -name *.la -delete - find debian/indicator-bluetooth/usr/lib -name *.a -delete + find debian/ayatana-indicator-bluetooth/usr/lib -name *.la -delete + find debian/ayatana-indicator-bluetooth/usr/lib -name *.a -delete dh_install --fail-missing diff --git a/debian/watch b/debian/watch index d75864c..87170a6 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -https://launchpad.net/indicator-bluetooth/+download .*/indicator-bluetooth-([0-9.]+)\.tar\.xz +https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/archive/([0-9.]+)\.tar\.gz -- cgit v1.2.3