debian: Sync with Debian

6 files changed, 129 insertions, 64 deletions

diff --git a/debian/ayatana-indicator-display.links b/debian/ayatana-indicator-display.links
deleted file mode 100644
index 794172d..0000000
--- a/debian/ayatana-indicator-display.links
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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-display.service /usr/lib/systemd/user/ayatana-indicators.target.wants/ayatana-indicator-display.service
diff --git a/debian/control b/debian/control
index c9464e8..bc87cf2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,49 +1,47 @@
 Source: ayatana-indicator-display
-Section: x11
-Priority: optional
-Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Build-Depends: cmake,
-               cmake-extras (>= 0.10),
-               dbus,
-               intltool,
-               libayatana-common-dev (>= 0.9.3),
-               libglib2.0-dev (>= 2.36),
-               libgtest-dev,
-               libproperties-cpp-dev,
-               libgeoclue-2-dev,
-               libaccountsservice-dev,
-               libx11-dev,
-               libxrandr-dev,
-               librda-dev,
-# for coverage reports
-               gcovr,
-               lcov,
-# Ubuntu B-Ds, if on Ubuntu
-               gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813) | hello,
-# for tests
-               qtbase5-dev,
-               libqtdbusmock1-dev,
-               libqtdbustest1-dev,
-               cppcheck,
-               googletest | google-mock (>= 1.6.0+svn437),
-# for packaging
-               debhelper (>= 10),
-               dh-systemd | hello,
-# for systemd unit
-               systemd [linux-any],
-Standards-Version: 4.1.1
-Homepage: http://github.com/AyatanaIndicators/ayatana-indicator-display
-Vcs-Git: http://github.com/AyatanaIndicators/ayatana-indicator-display
+Standards-Version: 4.7.4
+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,
+ cppcheck <!nocheck>,
+ dbus,
+ googletest <!nocheck>,
+ intltool,
+ libaccountsservice-dev,
+ libayatana-common-dev,
+ libgeoclue-2-dev,
+ libglib2.0-dev,
+ libgtest-dev <!nocheck>,
+ libgudev-1.0-dev,
+ libproperties-cpp-dev,
+ libqtdbusmock1-dev <!nocheck>,
+ libqtdbustest1-dev <!nocheck>,
+ librda-dev,
+ libxrandr-dev,
+ qtbase5-dev <!nocheck>,
+ systemd-dev [linux-any],
+ xsct <!nocheck>,
 Vcs-Browser: http://github.com/AyatanaIndicators/ayatana-indicator-display
+Vcs-Git: http://github.com/AyatanaIndicators/ayatana-indicator-display.git
+Homepage: https://github.com/AyatanaIndicators/ayatana-indicator-display
 
 Package: ayatana-indicator-display
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ayatana-indicator-common,
-         libglib2.0-bin,
-         libgeoclue-2-0,
-         xsct (>= 1.9),
+Depends:
+ ayatana-indicator-common,
+ xsct,
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Ayatana Indicator for Display configuration
  This Ayatana Indicator is designed to be placed on the right side of a
  panel and give the user easy control for changing their display settings.
+ .
+ Ayatana Indicators are only available on desktop environments that
+ provide a renderer for system indicators (such as MATE, Xfce, Lomiri,
+ etc.).
diff --git a/debian/copyright b/debian/copyright
index 54b1359..d70edae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,86 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: indicator-display
-Source: http://launchpad.net/indicator-display
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://github.com/AyatanaIndicators/ayatana-indicator-display
+Upstream-Name: ayatana-indicator-display
 
-Files: *
+Files: po/*.po
+ po/ayatana-indicator-display.pot
+Copyright: 2017, THE PACKAGE'S COPYRIGHT HOLDER
+  YEAR, THE PACKAGE'S COPYRIGHT HOLDER
+License: GPL-3
+
+Files: .build.yml
+ .travis.yml
+ AUTHORS
+ CMakeLists.txt
+ ChangeLog
+ INSTALL.md
+ NEWS
+ README
+ README.md
+ data/50-org.ayatana.indicator.display.AccountsService.rules
+ data/CMakeLists.txt
+ data/ayatana-indicator-display.conf.in
+ data/ayatana-indicator-display.desktop.in
+ data/ayatana-indicator-display.service.in
+ data/icons/ayatana-indicator-display-brightness-high.svg
+ data/icons/ayatana-indicator-display-brightness-low.svg
+ data/icons/ayatana-indicator-display-colortemp-off.svg
+ data/icons/ayatana-indicator-display-colortemp-on.svg
+ data/org.ayatana.indicator.display
+ data/org.ayatana.indicator.display.AccountsService.policy
+ data/org.ayatana.indicator.display.AccountsService.xml
+ data/org.ayatana.indicator.display.gschema.xml
+ po/CMakeLists.txt
+ po/LINGUAS
+ po/POTFILES.in
+ src/CMakeLists.txt
+ tests/CMakeLists.txt
+ tests/ayatana.cfg
+ tests/manual
+ tests/unit/CMakeLists.txt
+Copyright: 2013-2016, Canonical Ltd.
+  2021-2024, Robert Tari <robert@tari.in>
+License: GPL-3
+Comment:
+ Assuming same license and copyright holdership as found in the
+ project files containing a license header.
+
+Files: src/exporter.h
+ src/indicator.cpp
+ tests/unit/rotation-lock-test.cpp
+ tests/utils/glib-fixture.h
+ tests/utils/test-dbus-fixture.h
+Copyright: 2013, Canonical Ltd.
+  2014, Canonical Ltd.
+  2016, Canonical Ltd.
+License: GPL-3
+
+Files: src/exporter.cpp
+ src/indicator.h
+ src/main.cpp
+ src/service.cpp
+ src/service.h
 Copyright: 2014, Canonical Ltd.
+  2014-2016, Canonical Ltd.
+  2022-2023, Robert Tari
+  2023, Robert Tari
+  2023-2025, Robert Tari
+License: GPL-3
+
+Files: src/solar.c
+ src/solar.h
+Copyright: 2010, Jon Lund Steffensen
+  2023, Robert Tari
+License: GPL-3
+
+Files: update-po.sh
+ update-pot.sh
+Copyright: 2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3
 
 Files: debian/*
 Copyright: 2014, Canonical Ltd.
-  2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+  2017-2026, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3
 
 License: GPL-3
diff --git a/debian/rules b/debian/rules
index 2751ca4..2afbc15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,21 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-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 = \
-    -DENABLE_TESTS=ON \
-    -DENABLE_COVERAGE=OFF \
-    $(NULL)
 
 %:
-	dh $@ --parallel --with systemd
+	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
+	dh_auto_configure -- \
+		-DENABLE_TESTS=$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),OFF,ON) \
+		-DENABLE_COVERAGE=OFF \
+		-DENABLE_LOMIRI_FEATURES=ON \
+		-DENABLE_COLOR_TEMP=ON \
+		$(NULL)
+
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS
 
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=..
diff --git a/debian/source/format b/debian/source/format
index 9f8e9b6..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
\ No newline at end of file
+3.0 (native)
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]