Merge branch 'jbicha-personal/jbicha/debian-sync-20260821'HEADmain

Attributes GH PR #67: https://github.com/AyatanaIndicators/libayatana-common/pull/67

12 files changed, 96 insertions, 91 deletions

diff --git a/debian/ayatana-indicator-common.install b/debian/ayatana-indicator-common.install
index ad0fa10..ec0cbbf 100755
--- a/debian/ayatana-indicator-common.install
+++ b/debian/ayatana-indicator-common.install
@@ -1,4 +1,4 @@
-#! /usr/bin/dh-exec
+#!/usr/bin/dh-exec
 [linux-any] usr/lib/systemd
-usr/share/locale/
 usr/share/glib-2.0/schemas/
+usr/share/locale/
diff --git a/debian/control b/debian/control
index 8e94ed3..b3f3573 100644
--- a/debian/control
+++ b/debian/control
@@ -1,34 +1,36 @@
 Source: libayatana-common
+Standards-Version: 4.7.4
+Maintainer: Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+Uploaders:
+ Debian UBports Team <team+ubports@tracker.debian.org>,
+ Mike Gabriel <sunweaver@debian.org>,
 Section: libs
-Priority: optional
-Maintainer: Mike Gabriel <sunweaver@debian.org>
-Build-Depends: cmake,
-               cmake-extras,
-               debhelper-compat (= 13),
-               dh-exec,
-               dpkg-dev (>= 1.16.1.1),
-               gobject-introspection,
-               intltool,
-               libgirepository1.0-dev,
-               googletest,
-               libgtest-dev,
-               liblomiri-url-dispatcher-dev,
-               libglib2.0-dev (>= 2.36),
-               pkgconf,
-               systemd-dev [linux-any],
-               valac,
-Standards-Version: 4.7.0
-Rules-Requires-Root: no
-Homepage: https://github.com/AyatanaIndicators/libayatana-common
-Vcs-Git: https://salsa.debian.org/debian-ayatana-team/libayatana-common.git
+Build-Depends:
+ debhelper-compat (= 13),
+ dh-exec,
+ dh-sequence-gir,
+ cmake,
+ cmake-extras,
+ gir1.2-glib-2.0-dev,
+ googletest <!nocheck>,
+ intltool,
+ libglib2.0-dev,
+ libgtest-dev <!nocheck>,
+ liblomiri-url-dispatcher-dev,
+ pkgconf,
+ systemd-dev [linux-any],
+ valac,
 Vcs-Browser: https://salsa.debian.org/debian-ayatana-team/libayatana-common
+Vcs-Git: https://salsa.debian.org/debian-ayatana-team/libayatana-common.git
+Homepage: https://github.com/AyatanaIndicators/libayatana-common
 
 Package: libayatana-common0
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         zenity | lomiri,
 Multi-Arch: same
+Depends:
+ zenity | lomiri,
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Ayatana System Indicators' common API functions (shared library)
  This package contains common API functions used by Ayatana System
  Indicators.
@@ -36,16 +38,16 @@ Description: Ayatana System Indicators' common API functions (shared library)
  This package contains the shared library.
 
 Package: libayatana-common-dev
-Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gir1.2-ayatanacommon-0.1 (= ${binary:Version}),
-         libayatana-common0 (= ${binary:Version}),
-         libgirepository1.0-dev,
-         libglib2.0-dev (>= 2.36),
-         liblomiri-url-dispatcher-dev,
-Provides: ${gir:Provides}
+Section: libdevel
+Depends:
+ libayatana-common0 (= ${binary:Version}),
+ libglib2.0-dev,
+ liblomiri-url-dispatcher-dev,
+ ${gir:Depends},
+ ${misc:Depends},
+Provides:
+ ${gir:Provides},
 Description: Ayatana System Indicators' common API functions (development headers)
  This package contains common API functions used by Ayatana System
  Indicators.
@@ -53,11 +55,12 @@ Description: Ayatana System Indicators' common API functions (development header
  This package contains the development headers.
 
 Package: gir1.2-ayatanacommon-0.1
-Section: introspection
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${gir:Depends},
+Multi-Arch: same
+Section: introspection
+Depends:
+ ${gir:Depends},
+ ${misc:Depends},
 Description: Ayatana System Indicators' common API functions (GObject Introspection)
  This package contains common API functions used by Ayatana System
  Indicators.
@@ -66,18 +69,9 @@ Description: Ayatana System Indicators' common API functions (GObject Introspect
 
 Package: ayatana-indicator-common
 Architecture: all
-Depends: ${misc:Depends},
 Multi-Arch: foreign
-Breaks: ayatana-indicator-application (<< 0.8.0),
-        ayatana-indicator-datetime (<< 0.8.0),
-        ayatana-indicator-display (<< 0.8.0),
-        ayatana-indicator-keyboard (<< 0.7.90),
-        ayatana-indicator-messages (<< 0.8.0),
-        ayatana-indicator-notifications (<< 0.8.0),
-        ayatana-indicator-printers (<< 0.8.0),
-        ayatana-indicator-power (<< 2.1.0),
-        ayatana-indicator-session (<< 0.8.0),
-        ayatana-indicator-sound (<< 0.8.0),
+Depends:
+ ${misc:Depends},
 Description: Ayatana System Indicators' common files
  This package has files needed to work with the Ayatana Indicators. This
  includes the systemd ayatana-indicators.target and GSetting schemas
diff --git a/debian/copyright b/debian/copyright
index 3cb955a..f3a0afd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: libayatana-common
-Upstream-Contact: Marius Gripsgard <marius@ubports.com>
-                  Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Source: https://github.com/AyatanaIndicators/libayatana-common
+Upstream-Name: libayatana-common
 
 Files: src/utils.c
  src/utils.h
@@ -63,22 +61,6 @@ Copyright: 2021, Marius Gripsgard <marius@ubports.com>
   2021-2025, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3
 
-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: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -100,3 +82,19 @@ License: BSD-2-clause
  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".
diff --git a/debian/copyright.in b/debian/copyright.in
index 84afa2c..8b2b43b 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -149,8 +149,7 @@ Files: AUTHORS
  data/org.ayatana.common.gschema.xml
  debian/ayatana-indicator-common.install
  debian/control
- debian/files
- debian/gir1.2-ayatanacommon-0.0.install
+ debian/gir1.2-ayatanacommon-0.1.install
  debian/libayatana-common-dev.install
  debian/libayatana-common0.install
  debian/libayatana-common0.symbols
@@ -215,7 +214,9 @@ License: UNKNOWN
  FIXME
 
 Files: debian/changelog
-Copyright: attributions.
+Copyright: attribution for debian/.
+  attributions for debian/.
+  attributions.
 License: UNKNOWN
  FIXME
 
@@ -223,4 +224,3 @@ Files: ChangeLog
 Copyright: headers (18179a1)
 License: UNKNOWN
  FIXME
-
diff --git a/debian/libayatana-common-dev.install b/debian/libayatana-common-dev.install
index 954378f..267f47e 100644
--- a/debian/libayatana-common-dev.install
+++ b/debian/libayatana-common-dev.install
@@ -1,5 +1,5 @@
 usr/include
-usr/lib/*/pkgconfig/libayatana-common.pc
 usr/lib/*/libayatana-common.so
+usr/lib/*/pkgconfig/libayatana-common.pc
 usr/share/gir-1.0/
 usr/share/vala/vapi/
diff --git a/debian/libayatana-common0.docs b/debian/libayatana-common0.docs
new file mode 100644
index 0000000..8913f46
--- /dev/null
+++ b/debian/libayatana-common0.docs
@@ -0,0 +1,2 @@
+NEWS
+README.md
diff --git a/debian/rules b/debian/rules
index 6f43f32..49477fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,29 +3,16 @@
 NULL=
 
 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 \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_LOMIRI_FEATURES=ON \
-    $(NULL)
 
 %:
-	dh $@ --with gir
+	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		$(DEB_CMAKE_EXTRA_FLAGS)
+		-DENABLE_TESTS=$(if $(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)),OFF,ON) \
+		-DENABLE_COVERAGE=OFF \
+		-DENABLE_LOMIRI_FEATURES=ON \
 		$(NULL)
 
-override_dh_missing:
-	dh_missing --fail-missing
-
-#override_dh_installchangelogs:
-#	dh_installchangelogs NEWS
-
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=..
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
new file mode 100644
index 0000000..8424db4
--- /dev/null
+++ b/debian/salsa-ci.yml
@@ -0,0 +1,3 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
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/tests/control b/debian/tests/control
new file mode 100644
index 0000000..45b5378
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,8 @@
+Tests: python-gi-test
+Depends:
+ gir1.2-ayatanacommon-0.1,
+ python3,
+ python3-gi,
+Restrictions:
+ allow-stderr,
+ superficial,
diff --git a/debian/tests/python-gi-test b/debian/tests/python-gi-test
new file mode 100755
index 0000000..9754ea1
--- /dev/null
+++ b/debian/tests/python-gi-test
@@ -0,0 +1,10 @@
+#!/usr/bin/python3
+#
+# Make sure gobject introspection works
+
+import gi
+
+gi.require_version('AyatanaCommon', '0.1')
+from gi.repository import AyatanaCommon
+
+assert AyatanaCommon.utils_is_gnome() in (True, False)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 9b8dc1d..bea4988 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,3 +1,4 @@
+---
 Bug-Database: https://github.com/AyatanaIndicators/libayatana-common/issues
 Bug-Submit: https://github.com/AyatanaIndicators/libayatana-common/issues/new
 Donation: https://ubports.com/donate