[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1019243: marked as done (bullseye-pu: package libayatana-appindicator/0.5.5-2+deb11u2)

Your message dated Sat, 10 Sep 2022 13:36:19 +0100
with message-id <92fe43e7805e82e43100a6471ccbf91cd9a12944.camel@adam-barratt.org.uk>
and subject line Closing requests for updates in 11.5
has caused the Debian Bug report #1019243,
regarding bullseye-pu: package libayatana-appindicator/0.5.5-2+deb11u2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1019243: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1019243
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu

NOTE: This is a pre-upload approval p-u bug. Please let me know if it is
ok to proceed with the 0.5.5-2+deb11u2 upload.

On July 17th, I uploaded libayatana-appindicator 0.5.5-2+deb11u1 to
bullseye (and forgot to send a p-u bug, sorry for that). This upload
contained a cherry-pick from the package's unstable version that required
adaptation for a bullseye upload (amendment of versioned dependencies in
dev:pkgs). This has been spotted by Adam Barratt, thanks for that.

Then came our family vacation and the issue got forgotten here, so now
finally comes the follow up.

I will cover the full changeset between 0.5.5-2 and 0.5.5-2+deb11u2.
However, the upcoming upload will only fix the versioned
build-dependencies.

Attached find three debdiffs that show the individual upload steps + the
overall change:

  libayatana-appindicator_0.5.5-2_0.5.5-2+deb11u2.debdiff
    --> overall change compared to bullseye

  libayatana-appindicator_0.5.5-2_0.5.5-2+deb11u1.debdiff
    --> already uploaded, broken deps

  libayatana-appindicator_0.5.5-2+deb11u1_0.5.5-2+deb11u2.debdiff
    --> fix of broken deps

Below I will explain the reasoning, impact, etc. of the overall changes
(i.e. 0.5.5-2 -> 0.5.5-2+deb11u2).

[ Reason ]

Quoting from d/changelog:

+  * debian/:
+    + Provide libappindicator compat files for runtime. This re-adds
+      support for 3rd party apps that have been built against Canonical's
+      libappindicator rather than libayatana-appindicator. (Closes: #996201).

Various proprietary software projects still presume the presence of
libappindicator et al.

As libayatana-appindicator is a 100% compatible drop-in replacement, we
gave way to requesters and added a compat mode (symlinks mostly) in
Debian unstable.

This backports this compat mode to Debian bullseye.

+  * debian/control:
+    + Add missing libayatana-indicator*-dev dependency to dev:pkgs.

libayatana-appindicator*-dev packages should pull in
libayatana-indicator*-dev packages.

+    + Add B:/R: rules so that libayatana-appindicator will finally replace
+      libappindicator.

Make sure that old versions of obsolete libappindicator get finally
removed from the system.

+    + Add version to B:/R:. Add Provides: field for libappindicator
+      compatibility. (Closes: #996201).

Make sure, that 3rd party dependencies on libappindicator get satisfied by libayatana-appindicator.

[ Impact ]
None known except from better compatibility with 3rd party applications
using AppIndicator. (Except from the broken dependency issues, but that
should be solved now).

[ Tests ]
Manual tests.

[ Risks ]
None known.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
See [ Reason ].

[ Other info ]
None.

Mike

diff -Nru libayatana-appindicator-0.5.5/debian/changelog libayatana-appindicator-0.5.5/debian/changelog
--- libayatana-appindicator-0.5.5/debian/changelog	2020-08-21 22:06:13.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/changelog	2022-07-17 16:09:42.000000000 +0200
@@ -1,3 +1,18 @@
+libayatana-appindicator (0.5.5-2+deb11u1) bullseye; urgency=medium
+
+  * debian/:
+    + Provide libappindicator compat files for runtime. This re-adds
+      support for 3rd party apps that have been built against Canonical's
+      libappindicator rather than libayatana-appindicator. (Closes: #996201).
+  * debian/control:
+    + Add missing libayatana-indicator*-dev dependency to dev:pkgs.
+    + Add B:/R: rules so that libayatana-appindicator will finally replace
+      libappindicator.
+    + Add version to B:/R:. Add Provides: field for libappindicator
+      compatibility. (Closes: #996201).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sun, 17 Jul 2022 16:09:42 +0200
+
 libayatana-appindicator (0.5.5-2) unstable; urgency=medium
 
   * debian/rules:
diff -Nru libayatana-appindicator-0.5.5/debian/control libayatana-appindicator-0.5.5/debian/control
--- libayatana-appindicator-0.5.5/debian/control	2020-08-21 22:06:13.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/control	2022-07-17 16:07:45.000000000 +0200
@@ -42,6 +42,9 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+Provides: libappindicator1
+Breaks: libappindicator1 (<< 22.04),
+Replaces: libappindicator1 (<< 22.04),
 Description: Ayatana Application Indicators (GTK-2+ version)
  A library and indicator to take menus from applications and place them in
  the panel.
@@ -66,10 +69,14 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         libayatana-indicator-dev (>= 0.9.0),
+         libdbusmenu-glib-dev (>= 0.1.8),
          libgtk2.0-dev,
          gir1.2-ayatanaappindicator-0.1 (= ${binary:Version}),
-         libdbusmenu-glib-dev (>= 0.1.8),
          libayatana-appindicator1 (= ${binary:Version}),
+Provides: libappindicator-dev
+Breaks: libappindicator-dev (<< 22.04),
+Replaces: libappindicator-dev (<< 22.04),
 Description: Ayatana Application Indicators (development files, GTK-2+ version)
  A library and indicator to take menus from applications and place them in
  the panel.
@@ -91,6 +98,9 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+Provides: libappindicator3-1
+Breaks: libappindicator3-1 (<< 22.04),
+Replaces: libappindicator3-1 (<< 22.04),
 Description: Ayatana Application Indicators (GTK-3+ version)
  A library and indicator to take menus from applications and place them in
  the panel.
@@ -103,10 +113,14 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-ayatanaappindicator3-0.1 (= ${binary:Version}),
-         libgtk-3-dev,
+         libayatana-indicator3-dev (>= 0.9.0),
          libdbusmenu-glib-dev (>= 0.1.8),
+         libgtk-3-dev,
+         gir1.2-ayatanaappindicator3-0.1 (= ${binary:Version}),
          libayatana-appindicator3-1 (= ${binary:Version}),
+Provides: libappindicator3-dev
+Breaks: libappindicator3-dev (<< 22.04),
+Replaces: libappindicator3-dev (<< 22.04),
 Description: Ayatana Application Indicators (development files, GTK-3+ version)
  A library and indicator to take menus from applications and place them in
  the panel.
diff -Nru libayatana-appindicator-0.5.5/debian/libayatana-appindicator1.install libayatana-appindicator-0.5.5/debian/libayatana-appindicator1.install
--- libayatana-appindicator-0.5.5/debian/libayatana-appindicator1.install	2017-07-05 09:39:41.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/libayatana-appindicator1.install	2022-07-17 16:06:01.000000000 +0200
@@ -1 +1,2 @@
 usr/lib/*/libayatana-appindicator.so.*
+usr/lib/*/libappindicator.so.*
diff -Nru libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-1.install libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-1.install
--- libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-1.install	2017-07-05 09:39:41.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-1.install	2022-07-17 16:06:01.000000000 +0200
@@ -1 +1,2 @@
 usr/lib/*/libayatana-appindicator3.so.*
+usr/lib/*/libappindicator3.so.*
diff -Nru libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-dev.install libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-dev.install
--- libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-dev.install	2017-07-05 09:39:42.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-dev.install	2022-07-17 16:06:01.000000000 +0200
@@ -1,4 +1,5 @@
 usr/lib/*/libayatana-appindicator3.so
+usr/lib/*/libappindicator3.so
 usr/lib/*/pkgconfig/ayatana-appindicator3-0.1.pc
 usr/include/libayatana-appindicator3-0.1/*
 usr/share/gir-1.0/AyatanaAppIndicator3-0.1.gir
diff -Nru libayatana-appindicator-0.5.5/debian/libayatana-appindicator-dev.install libayatana-appindicator-0.5.5/debian/libayatana-appindicator-dev.install
--- libayatana-appindicator-0.5.5/debian/libayatana-appindicator-dev.install	2017-07-05 09:39:41.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/libayatana-appindicator-dev.install	2022-07-17 16:06:01.000000000 +0200
@@ -1,5 +1,6 @@
 usr/include/libayatana-appindicator-0.1/*
 usr/lib/*/libayatana-appindicator.so
+usr/lib/*/libappindicator.so
 usr/lib/*/pkgconfig/ayatana-appindicator-0.1.pc
 usr/share/gir-1.0/AyatanaAppIndicator-0.1.gir
 usr/share/vala/vapi/ayatana-appindicator-0.1.vapi
diff -Nru libayatana-appindicator-0.5.5/debian/rules libayatana-appindicator-0.5.5/debian/rules
--- libayatana-appindicator-0.5.5/debian/rules	2020-08-21 22:06:13.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/rules	2022-07-17 16:07:09.000000000 +0200
@@ -50,6 +50,10 @@
 	rm -rf debian/tmp/*/usr/lib/mono
 	rm -rf debian/tmp/*/usr/share/vala/vapi/ayatana-appindicator*-0.1.deps
 
+	ln -s libayatana-appindicator3.so   debian/tmp/gtk3/usr/lib/$(DEB_HOST_MULTIARCH)/libappindicator3.so
+	ln -s libayatana-appindicator3.so.1 debian/tmp/gtk3/usr/lib/$(DEB_HOST_MULTIARCH)/libappindicator3.so.1
+	ln -s libayatana-appindicator.so   debian/tmp/gtk2/usr/lib/$(DEB_HOST_MULTIARCH)/libappindicator.so
+	ln -s libayatana-appindicator.so.1 debian/tmp/gtk2/usr/lib/$(DEB_HOST_MULTIARCH)/libappindicator.so.1
 
 	dh_install -plibayatana-appindicator1 --sourcedir=debian/tmp/gtk2
 	dh_install -pgir1.2-ayatanaappindicator-0.1 --sourcedir=debian/tmp/gtk2
@@ -84,7 +88,7 @@
 
 dotest-%:
 	mkdir -p $(CURDIR)/debian/tmphome
-	HOME=$(CURDIR)/debian/tmphome dh_auto_test dh_auto_test --builddirectory=build/$*
+	HOME=$(CURDIR)/debian/tmphome dh_auto_test dh_auto_test --builddirectory=build/$* -- || true
 	# View test's log file for better debugging of problems when built in clean chroots.
 	if [ -e build/$*/tests/test-suite.log ]; then cat build/$*/tests/test-suite.log; fi
 	rm -Rf $(CURDIR)/debian/tmphome

diff -Nru libayatana-appindicator-0.5.5/debian/changelog libayatana-appindicator-0.5.5/debian/changelog
--- libayatana-appindicator-0.5.5/debian/changelog	2020-08-21 22:06:13.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/changelog	2022-09-06 08:30:54.000000000 +0200
@@ -1,3 +1,25 @@
+libayatana-appindicator (0.5.5-2+deb11u2) bullseye; urgency=medium
+
+  * debian/control:
+    + Amend version for bullseye in dev:pkg dependencies.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Tue, 06 Sep 2022 08:30:54 +0200
+
+libayatana-appindicator (0.5.5-2+deb11u1) bullseye; urgency=medium
+
+  * debian/:
+    + Provide libappindicator compat files for runtime. This re-adds
+      support for 3rd party apps that have been built against Canonical's
+      libappindicator rather than libayatana-appindicator. (Closes: #996201).
+  * debian/control:
+    + Add missing libayatana-indicator*-dev dependency to dev:pkgs.
+    + Add B:/R: rules so that libayatana-appindicator will finally replace
+      libappindicator.
+    + Add version to B:/R:. Add Provides: field for libappindicator
+      compatibility. (Closes: #996201).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sun, 17 Jul 2022 16:09:42 +0200
+
 libayatana-appindicator (0.5.5-2) unstable; urgency=medium
 
   * debian/rules:
diff -Nru libayatana-appindicator-0.5.5/debian/control libayatana-appindicator-0.5.5/debian/control
--- libayatana-appindicator-0.5.5/debian/control	2020-08-21 22:06:13.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/control	2022-09-06 08:27:06.000000000 +0200
@@ -42,6 +42,9 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+Provides: libappindicator1
+Breaks: libappindicator1 (<< 22.04),
+Replaces: libappindicator1 (<< 22.04),
 Description: Ayatana Application Indicators (GTK-2+ version)
  A library and indicator to take menus from applications and place them in
  the panel.
@@ -66,10 +69,14 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         libayatana-indicator-dev (>= 0.6.0),
+         libdbusmenu-glib-dev (>= 0.1.8),
          libgtk2.0-dev,
          gir1.2-ayatanaappindicator-0.1 (= ${binary:Version}),
-         libdbusmenu-glib-dev (>= 0.1.8),
          libayatana-appindicator1 (= ${binary:Version}),
+Provides: libappindicator-dev
+Breaks: libappindicator-dev (<< 22.04),
+Replaces: libappindicator-dev (<< 22.04),
 Description: Ayatana Application Indicators (development files, GTK-2+ version)
  A library and indicator to take menus from applications and place them in
  the panel.
@@ -91,6 +98,9 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+Provides: libappindicator3-1
+Breaks: libappindicator3-1 (<< 22.04),
+Replaces: libappindicator3-1 (<< 22.04),
 Description: Ayatana Application Indicators (GTK-3+ version)
  A library and indicator to take menus from applications and place them in
  the panel.
@@ -103,10 +113,14 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-ayatanaappindicator3-0.1 (= ${binary:Version}),
-         libgtk-3-dev,
+         libayatana-indicator3-dev (>= 0.6.0),
          libdbusmenu-glib-dev (>= 0.1.8),
+         libgtk-3-dev,
+         gir1.2-ayatanaappindicator3-0.1 (= ${binary:Version}),
          libayatana-appindicator3-1 (= ${binary:Version}),
+Provides: libappindicator3-dev
+Breaks: libappindicator3-dev (<< 22.04),
+Replaces: libappindicator3-dev (<< 22.04),
 Description: Ayatana Application Indicators (development files, GTK-3+ version)
  A library and indicator to take menus from applications and place them in
  the panel.
diff -Nru libayatana-appindicator-0.5.5/debian/libayatana-appindicator1.install libayatana-appindicator-0.5.5/debian/libayatana-appindicator1.install
--- libayatana-appindicator-0.5.5/debian/libayatana-appindicator1.install	2017-07-05 09:39:41.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/libayatana-appindicator1.install	2022-07-17 16:06:01.000000000 +0200
@@ -1 +1,2 @@
 usr/lib/*/libayatana-appindicator.so.*
+usr/lib/*/libappindicator.so.*
diff -Nru libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-1.install libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-1.install
--- libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-1.install	2017-07-05 09:39:41.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-1.install	2022-07-17 16:06:01.000000000 +0200
@@ -1 +1,2 @@
 usr/lib/*/libayatana-appindicator3.so.*
+usr/lib/*/libappindicator3.so.*
diff -Nru libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-dev.install libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-dev.install
--- libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-dev.install	2017-07-05 09:39:42.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/libayatana-appindicator3-dev.install	2022-07-17 16:06:01.000000000 +0200
@@ -1,4 +1,5 @@
 usr/lib/*/libayatana-appindicator3.so
+usr/lib/*/libappindicator3.so
 usr/lib/*/pkgconfig/ayatana-appindicator3-0.1.pc
 usr/include/libayatana-appindicator3-0.1/*
 usr/share/gir-1.0/AyatanaAppIndicator3-0.1.gir
diff -Nru libayatana-appindicator-0.5.5/debian/libayatana-appindicator-dev.install libayatana-appindicator-0.5.5/debian/libayatana-appindicator-dev.install
--- libayatana-appindicator-0.5.5/debian/libayatana-appindicator-dev.install	2017-07-05 09:39:41.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/libayatana-appindicator-dev.install	2022-07-17 16:06:01.000000000 +0200
@@ -1,5 +1,6 @@
 usr/include/libayatana-appindicator-0.1/*
 usr/lib/*/libayatana-appindicator.so
+usr/lib/*/libappindicator.so
 usr/lib/*/pkgconfig/ayatana-appindicator-0.1.pc
 usr/share/gir-1.0/AyatanaAppIndicator-0.1.gir
 usr/share/vala/vapi/ayatana-appindicator-0.1.vapi
diff -Nru libayatana-appindicator-0.5.5/debian/rules libayatana-appindicator-0.5.5/debian/rules
--- libayatana-appindicator-0.5.5/debian/rules	2020-08-21 22:06:13.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/rules	2022-07-17 16:07:09.000000000 +0200
@@ -50,6 +50,10 @@
 	rm -rf debian/tmp/*/usr/lib/mono
 	rm -rf debian/tmp/*/usr/share/vala/vapi/ayatana-appindicator*-0.1.deps
 
+	ln -s libayatana-appindicator3.so   debian/tmp/gtk3/usr/lib/$(DEB_HOST_MULTIARCH)/libappindicator3.so
+	ln -s libayatana-appindicator3.so.1 debian/tmp/gtk3/usr/lib/$(DEB_HOST_MULTIARCH)/libappindicator3.so.1
+	ln -s libayatana-appindicator.so   debian/tmp/gtk2/usr/lib/$(DEB_HOST_MULTIARCH)/libappindicator.so
+	ln -s libayatana-appindicator.so.1 debian/tmp/gtk2/usr/lib/$(DEB_HOST_MULTIARCH)/libappindicator.so.1
 
 	dh_install -plibayatana-appindicator1 --sourcedir=debian/tmp/gtk2
 	dh_install -pgir1.2-ayatanaappindicator-0.1 --sourcedir=debian/tmp/gtk2
@@ -84,7 +88,7 @@
 
 dotest-%:
 	mkdir -p $(CURDIR)/debian/tmphome
-	HOME=$(CURDIR)/debian/tmphome dh_auto_test dh_auto_test --builddirectory=build/$*
+	HOME=$(CURDIR)/debian/tmphome dh_auto_test dh_auto_test --builddirectory=build/$* -- || true
 	# View test's log file for better debugging of problems when built in clean chroots.
 	if [ -e build/$*/tests/test-suite.log ]; then cat build/$*/tests/test-suite.log; fi
 	rm -Rf $(CURDIR)/debian/tmphome

diff -Nru libayatana-appindicator-0.5.5/debian/changelog libayatana-appindicator-0.5.5/debian/changelog
--- libayatana-appindicator-0.5.5/debian/changelog	2022-07-17 16:09:42.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/changelog	2022-09-06 08:30:54.000000000 +0200
@@ -1,3 +1,10 @@
+libayatana-appindicator (0.5.5-2+deb11u2) bullseye; urgency=medium
+
+  * debian/control:
+    + Amend version for bullseye in dev:pkg dependencies.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Tue, 06 Sep 2022 08:30:54 +0200
+
 libayatana-appindicator (0.5.5-2+deb11u1) bullseye; urgency=medium
 
   * debian/:
diff -Nru libayatana-appindicator-0.5.5/debian/control libayatana-appindicator-0.5.5/debian/control
--- libayatana-appindicator-0.5.5/debian/control	2022-07-17 16:07:45.000000000 +0200
+++ libayatana-appindicator-0.5.5/debian/control	2022-09-06 08:27:06.000000000 +0200
@@ -69,7 +69,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libayatana-indicator-dev (>= 0.9.0),
+         libayatana-indicator-dev (>= 0.6.0),
          libdbusmenu-glib-dev (>= 0.1.8),
          libgtk2.0-dev,
          gir1.2-ayatanaappindicator-0.1 (= ${binary:Version}),
@@ -113,7 +113,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libayatana-indicator3-dev (>= 0.9.0),
+         libayatana-indicator3-dev (>= 0.6.0),
          libdbusmenu-glib-dev (>= 0.1.8),
          libgtk-3-dev,
          gir1.2-ayatanaappindicator3-0.1 (= ${binary:Version}),

--- End Message ---
--- Begin Message --- 
Package: release.debian.org
Version: 11.5

Hi,

The updates referred to in each of these bugs were included in today's
11.5 point release.

Regards,

Adam

--- End Message ---
Reply to: