[Pkg-ayatana-devel] Bug#1054900: libunity: please consider upgrading to 3.0 source format

Bastian Germann bage at debian.org
Sat Mar 23 20:07:02 GMT 2024


I am uploading a NMU to DELAYED/10 in order to fix this.
The debdiff is attached.
-------------- next part --------------
diff -Nru libunity-7.1.4+19.04.20190319/bindings/python/scope-runner-dbus.py libunity-7.1.4+19.04.20190319/bindings/python/scope-runner-dbus.py
--- libunity-7.1.4+19.04.20190319/bindings/python/scope-runner-dbus.py	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/bindings/python/scope-runner-dbus.py	2019-03-19 10:17:56.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 
 # Copyright (C) 2013 Canonical
 #
diff -Nru libunity-7.1.4+19.04.20190319/debian/changelog libunity-7.1.4+19.04.20190319/debian/changelog
--- libunity-7.1.4+19.04.20190319/debian/changelog	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/debian/changelog	2024-03-23 18:57:44.000000000 +0000
@@ -1,3 +1,14 @@
+libunity (7.1.4+19.04.20190319-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Do not mark libunity9 as Multi-Arch: same (Closes: #1037202)
+  * Drop B-D autotools-dev, dh-autoreconf (implied by debhelper compat)
+  * Move from pkg-config to pkgconf
+  * d/copyright: Use standard format specifier
+  * Convert to source format 3.0 (Closes: #1054900)
+
+ -- Bastian Germann <bage at debian.org>  Sat, 23 Mar 2024 18:57:44 +0000
+
 libunity (7.1.4+19.04.20190319-6) unstable; urgency=medium
 
   * debian/control:
diff -Nru libunity-7.1.4+19.04.20190319/debian/clean libunity-7.1.4+19.04.20190319/debian/clean
--- libunity-7.1.4+19.04.20190319/debian/clean	1970-01-01 00:00:00.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/debian/clean	2024-03-23 18:57:44.000000000 +0000
@@ -0,0 +1,8 @@
+examples/launcher.c
+extras/UnityExtras-7.0.gir
+extras/unity-extra-preview-player-client.c
+extras/unity-extra-utils.c
+extras/unity-extras-internal.h
+extras/unity-extras-internal.vapi
+extras/unity-extras.h
+extras/unity-extras.vapi
diff -Nru libunity-7.1.4+19.04.20190319/debian/control libunity-7.1.4+19.04.20190319/debian/control
--- libunity-7.1.4+19.04.20190319/debian/control	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/debian/control	2024-03-23 18:57:44.000000000 +0000
@@ -3,12 +3,9 @@
 Priority: optional
 Maintainer: Ayatana Packagers <pkg-ayatana-devel at lists.alioth.debian.org>
 Build-Depends: debhelper-compat (= 12),
-               dh-autoreconf,
                dh-python,
                gnome-common,
-               quilt,
-               autotools-dev,
-               pkg-config,
+               pkgconf,
                intltool,
                valac (>= 0.31.1),
                libglib2.0-dev (>= 2.32.1),
@@ -31,7 +28,6 @@
 Package: libunity9
 Section: libs
 Architecture: any
-Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
diff -Nru libunity-7.1.4+19.04.20190319/debian/copyright libunity-7.1.4+19.04.20190319/debian/copyright
--- libunity-7.1.4+19.04.20190319/debian/copyright	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/debian/copyright	2024-03-23 18:57:44.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libunity
 Source: https://launchpad.net/libunity/+download
 
diff -Nru libunity-7.1.4+19.04.20190319/debian/patches/debian.patch libunity-7.1.4+19.04.20190319/debian/patches/debian.patch
--- libunity-7.1.4+19.04.20190319/debian/patches/debian.patch	1970-01-01 00:00:00.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/debian/patches/debian.patch	2024-03-23 18:57:44.000000000 +0000
@@ -0,0 +1,153 @@
+--- libunity-7.1.4+19.04.20190319.orig/extras/Makefile.am
++++ libunity-7.1.4+19.04.20190319/extras/Makefile.am
+@@ -24,6 +24,7 @@ libunity_extras_la_VALAFLAGS = \
+   --library unity-extras \
+   --internal-vapi=unity-extras-internal.vapi \
+   --internal-header=unity-extras-internal.h \
++  --shared-library=libunity-extras.so.9 \
+   --thread \
+   --use-header \
+   --vapidir $(top_srcdir)/vapi \
+@@ -82,7 +83,6 @@ $(libunity_la_GENERATED): libunity_la_va
+ 
+ libunity_extras_la_vala.stamp: $(libunity_extras_la_VALASOURCES)
+ 	$(AM_V_GEN) $(VALAC) $(libunity_extras_la_VALAFLAGS) $^
+-	@sed -i -e 's/<namespace name="UnityExtras" version="@GIR_VERSION@" c:prefix="Unity">/<namespace name="UnityExtras" version="@GIR_VERSION@" c:prefix="UnityExtras" shared-library="libunity-extras.so. at LIBUNITY_LT_CURRENT@">/g' UnityExtras- at GIR_VERSION@.gir
+ 	@sed -i -e 's/"Extras/"/g;s/"extras_/"/' UnityExtras- at GIR_VERSION@.gir
+ 	@sed -i -e 's/<parameter name="scope_creation_cb" transfer-ownership="none"/<parameter name="scope_creation_cb" transfer-ownership="none" scope="call"/' UnityExtras- at GIR_VERSION@.gir
+ 	@touch $@
+@@ -97,12 +97,19 @@ CLEANFILES += \
+ # Compile .typelib from .gir
+ ##
+ if HAVE_INTROSPECTION
+--include $(INTROSPECTION_MAKEFILE)
+-INTROSPECTION_GIRS =
+-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+-
+ typelibdir = $(libdir)/girepository-1.0
+ typelib_DATA = $(extrasgir_DATA:.gir=.typelib)
+ 
++# Extract dlname from libunity.la
++# This is what g-ir-scanner does.
++libunity_extra_dlname = \
++	`$(SED) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libunity-extras.la`
++INTROSPECTION_COMPILER_ARGS= \
++	--includedir=$(srcdir) \
++	-l $(libunity_extra_dlname)
++$(extrasgir_DATA): libunity_extras_la_vala.stamp
++$(typelib_DATA): $(extrasgir_DATA) libunity-extras.la
++	@INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^
++
+ CLEANFILES += $(typelib_DATA)
+ endif
+--- libunity-7.1.4+19.04.20190319.orig/protocol/protocol-icon.vala
++++ libunity-7.1.4+19.04.20190319/protocol/protocol-icon.vala
+@@ -185,7 +185,7 @@ public class AnnotatedIcon : Object, GLi
+   }
+ 
+   /* Added to GIcon interface in 2.37 */
+-  private Variant serialize ()
++  private Variant? serialize ()
+   {
+     Variant? ret = null;
+     return ret;
+--- libunity-7.1.4+19.04.20190319.orig/src/Makefile.am
++++ libunity-7.1.4+19.04.20190319/src/Makefile.am
+@@ -75,6 +75,7 @@ libunity_la_VALAFLAGS = \
+   --library unity \
+   --internal-vapi=unity-internal.vapi \
+   --internal-header=unity-internal.h \
++  --shared-library=libunity.so.9 \
+   --target-glib=2.32 \
+   --thread \
+   --use-header \
+@@ -135,21 +136,8 @@ libunity_la_GENERATED = \
+ 
+ $(libunity_la_GENERATED): libunity_la_vala.stamp
+ 
+-#
+-# The reason for the first 'sed' below is:
+-# https://bugzilla.gnome.org/show_bug.cgi?id=642576
+-#
+-# The second is there because forced cname in Vala is not properly propagated
+-# into the gir file. Need https://bugzilla.gnome.org/show_bug.cgi?id=681356
+-#
+-# And the third because we need to specify scope manually.
+-#
+ libunity_la_vala.stamp: $(libunity_la_VALASOURCES)
+ 	$(AM_V_GEN) $(VALAC) $(libunity_la_VALAFLAGS) $^
+-	@sed -i -e 's/<namespace name="Unity" version="@GIR_VERSION@" c:prefix="Unity">/<namespace name="Unity" version="@GIR_VERSION@" c:prefix="Unity" shared-library="libunity.so. at LIBUNITY_LT_CURRENT@">/g' Unity- at GIR_VERSION@.gir
+-	@sed -i -e 's/emit_preview_ready/preview_ready/g' Unity- at GIR_VERSION@.gir
+-	@sed -i -e 's/<parameter name="async_callback" transfer-ownership="none" /<parameter name="async_callback" transfer-ownership="none" scope="async" /g' Unity- at GIR_VERSION@.gir
+-	@sed -i -e 's/<record name="ScopeResult">/<record name="ScopeResult" c:type="UnityScopeResult" glib:type-name="UnityScopeResult" glib:get-type="unity_scope_result_get_type">/;s/<record name="SearchContext">/<record name="SearchContext" c:type="UnitySearchContext" glib:type-name="UnitySearchContext" glib:get-type="unity_search_context_get_type">/' Unity- at GIR_VERSION@.gir
+ 	@touch $@
+ 
+ BUILT_SOURCES += libunity_la_vala.stamp
+@@ -169,12 +157,19 @@ CLEANFILES += \
+ # Compile .typelib from .gir
+ ##
+ if HAVE_INTROSPECTION
+--include $(INTROSPECTION_MAKEFILE)
+-INTROSPECTION_GIRS =
+-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+-
+ typelibdir = $(libdir)/girepository-1.0
+ typelib_DATA = $(unitygir_DATA:.gir=.typelib)
+ 
++# Extract dlname from libunity.la
++# This is what g-ir-scanner does.
++libunity_dlname = \
++	`$(SED) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libunity.la`
++INTROSPECTION_COMPILER_ARGS= \
++	--includedir=$(srcdir) \
++	-l $(libunity_dlname)
++$(unitygir_DATA): libunity_la_vala.stamp
++$(typelib_DATA): $(unitygir_DATA) libunity.la
++	@INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^
++
+ CLEANFILES += $(typelib_DATA)
+ endif
+--- libunity-7.1.4+19.04.20190319.orig/src/unity-aggregator-scope.vala
++++ libunity-7.1.4+19.04.20190319/src/unity-aggregator-scope.vala
+@@ -51,7 +51,7 @@ public abstract class AggregatorScope :
+    */
+   public abstract int category_index_for_scope_id (string scope_id);
+ 
+-  public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
++  protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
+   {
+     Object (dbus_path: dbus_path_, id: id_, is_master: true,
+             merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints);
+--- libunity-7.1.4+19.04.20190319.orig/src/unity-deprecated-scope.vala
++++ libunity-7.1.4+19.04.20190319/src/unity-deprecated-scope.vala
+@@ -61,7 +61,7 @@ public abstract class DeprecatedScopeBas
+   internal CategorySet _categories;
+   internal FilterSet _filters;
+    
+-  public DeprecatedScopeBase (string dbus_path_, string id_)
++  protected DeprecatedScopeBase (string dbus_path_, string id_)
+   {
+     Object (dbus_path: dbus_path_, id: id_);
+   }
+--- libunity-7.1.4+19.04.20190319.orig/src/unity-scope-channel.vala
++++ libunity-7.1.4+19.04.20190319/src/unity-scope-channel.vala
+@@ -312,7 +312,7 @@ internal class ScopeChannel : Object
+           DBusSignalFlags.NONE, this.owner_changed);
+     }
+ 
+-    private void owner_changed (DBusConnection con, string sender_name,
++    private void owner_changed (DBusConnection con, string? sender_name,
+                                 string obj_path, string ifc_name,
+                                 string sig_name, Variant parameters)
+     {
+--- libunity-7.1.4+19.04.20190319.orig/tools/preview-renderer.vala
++++ libunity-7.1.4+19.04.20190319/tools/preview-renderer.vala
+@@ -63,7 +63,7 @@ namespace Unity.Tester {
+      */
+     public abstract class GridRenderer: PreviewRenderer
+     {
+-        public GridRenderer()
++        protected GridRenderer()
+         {
+             Object();
+         }
diff -Nru libunity-7.1.4+19.04.20190319/debian/patches/series libunity-7.1.4+19.04.20190319/debian/patches/series
--- libunity-7.1.4+19.04.20190319/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/debian/patches/series	2024-03-23 18:57:44.000000000 +0000
@@ -0,0 +1 @@
+debian.patch
diff -Nru libunity-7.1.4+19.04.20190319/debian/rules libunity-7.1.4+19.04.20190319/debian/rules
--- libunity-7.1.4+19.04.20190319/debian/rules	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/debian/rules	2024-03-23 18:57:44.000000000 +0000
@@ -7,7 +7,7 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
 %:
-	dh $@ --with python3,autoreconf
+	dh $@ --with python3
 
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
diff -Nru libunity-7.1.4+19.04.20190319/debian/source/format libunity-7.1.4+19.04.20190319/debian/source/format
--- libunity-7.1.4+19.04.20190319/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/debian/source/format	2024-03-23 18:57:44.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru libunity-7.1.4+19.04.20190319/examples/merge-strategy.py libunity-7.1.4+19.04.20190319/examples/merge-strategy.py
--- libunity-7.1.4+19.04.20190319/examples/merge-strategy.py	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/examples/merge-strategy.py	2019-03-19 10:17:56.000000000 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python2
+#! /usr/bin/python
 
 from gi.repository import GObject, GLib, Dee, Unity
 
diff -Nru libunity-7.1.4+19.04.20190319/extras/Makefile.am libunity-7.1.4+19.04.20190319/extras/Makefile.am
--- libunity-7.1.4+19.04.20190319/extras/Makefile.am	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/extras/Makefile.am	2019-03-19 10:17:56.000000000 +0000
@@ -24,7 +24,6 @@
   --library unity-extras \
   --internal-vapi=unity-extras-internal.vapi \
   --internal-header=unity-extras-internal.h \
-  --shared-library=libunity-extras.so.9 \
   --thread \
   --use-header \
   --vapidir $(top_srcdir)/vapi \
@@ -83,6 +82,7 @@
 
 libunity_extras_la_vala.stamp: $(libunity_extras_la_VALASOURCES)
 	$(AM_V_GEN) $(VALAC) $(libunity_extras_la_VALAFLAGS) $^
+	@sed -i -e 's/<namespace name="UnityExtras" version="@GIR_VERSION@" c:prefix="Unity">/<namespace name="UnityExtras" version="@GIR_VERSION@" c:prefix="UnityExtras" shared-library="libunity-extras.so. at LIBUNITY_LT_CURRENT@">/g' UnityExtras- at GIR_VERSION@.gir
 	@sed -i -e 's/"Extras/"/g;s/"extras_/"/' UnityExtras- at GIR_VERSION@.gir
 	@sed -i -e 's/<parameter name="scope_creation_cb" transfer-ownership="none"/<parameter name="scope_creation_cb" transfer-ownership="none" scope="call"/' UnityExtras- at GIR_VERSION@.gir
 	@touch $@
@@ -97,19 +97,12 @@
 # Compile .typelib from .gir
 ##
 if HAVE_INTROSPECTION
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(extrasgir_DATA:.gir=.typelib)
 
-# Extract dlname from libunity.la
-# This is what g-ir-scanner does.
-libunity_extra_dlname = \
-	`$(SED) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libunity-extras.la`
-INTROSPECTION_COMPILER_ARGS= \
-	--includedir=$(srcdir) \
-	-l $(libunity_extra_dlname)
-$(extrasgir_DATA): libunity_extras_la_vala.stamp
-$(typelib_DATA): $(extrasgir_DATA) libunity-extras.la
-	@INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^
-
 CLEANFILES += $(typelib_DATA)
 endif
diff -Nru libunity-7.1.4+19.04.20190319/protocol/protocol-icon.vala libunity-7.1.4+19.04.20190319/protocol/protocol-icon.vala
--- libunity-7.1.4+19.04.20190319/protocol/protocol-icon.vala	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/protocol/protocol-icon.vala	2019-03-19 10:17:56.000000000 +0000
@@ -185,7 +185,7 @@
   }
 
   /* Added to GIcon interface in 2.37 */
-  private Variant? serialize ()
+  private Variant serialize ()
   {
     Variant? ret = null;
     return ret;
diff -Nru libunity-7.1.4+19.04.20190319/src/Makefile.am libunity-7.1.4+19.04.20190319/src/Makefile.am
--- libunity-7.1.4+19.04.20190319/src/Makefile.am	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/src/Makefile.am	2019-03-19 10:17:56.000000000 +0000
@@ -75,7 +75,6 @@
   --library unity \
   --internal-vapi=unity-internal.vapi \
   --internal-header=unity-internal.h \
-  --shared-library=libunity.so.9 \
   --target-glib=2.32 \
   --thread \
   --use-header \
@@ -136,8 +135,21 @@
 
 $(libunity_la_GENERATED): libunity_la_vala.stamp
 
+#
+# The reason for the first 'sed' below is:
+# https://bugzilla.gnome.org/show_bug.cgi?id=642576
+#
+# The second is there because forced cname in Vala is not properly propagated
+# into the gir file. Need https://bugzilla.gnome.org/show_bug.cgi?id=681356
+#
+# And the third because we need to specify scope manually.
+#
 libunity_la_vala.stamp: $(libunity_la_VALASOURCES)
 	$(AM_V_GEN) $(VALAC) $(libunity_la_VALAFLAGS) $^
+	@sed -i -e 's/<namespace name="Unity" version="@GIR_VERSION@" c:prefix="Unity">/<namespace name="Unity" version="@GIR_VERSION@" c:prefix="Unity" shared-library="libunity.so. at LIBUNITY_LT_CURRENT@">/g' Unity- at GIR_VERSION@.gir
+	@sed -i -e 's/emit_preview_ready/preview_ready/g' Unity- at GIR_VERSION@.gir
+	@sed -i -e 's/<parameter name="async_callback" transfer-ownership="none" /<parameter name="async_callback" transfer-ownership="none" scope="async" /g' Unity- at GIR_VERSION@.gir
+	@sed -i -e 's/<record name="ScopeResult">/<record name="ScopeResult" c:type="UnityScopeResult" glib:type-name="UnityScopeResult" glib:get-type="unity_scope_result_get_type">/;s/<record name="SearchContext">/<record name="SearchContext" c:type="UnitySearchContext" glib:type-name="UnitySearchContext" glib:get-type="unity_search_context_get_type">/' Unity- at GIR_VERSION@.gir
 	@touch $@
 
 BUILT_SOURCES += libunity_la_vala.stamp
@@ -157,19 +169,12 @@
 # Compile .typelib from .gir
 ##
 if HAVE_INTROSPECTION
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(unitygir_DATA:.gir=.typelib)
 
-# Extract dlname from libunity.la
-# This is what g-ir-scanner does.
-libunity_dlname = \
-	`$(SED) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libunity.la`
-INTROSPECTION_COMPILER_ARGS= \
-	--includedir=$(srcdir) \
-	-l $(libunity_dlname)
-$(unitygir_DATA): libunity_la_vala.stamp
-$(typelib_DATA): $(unitygir_DATA) libunity.la
-	@INTROSPECTION_COMPILER@ $(INTROSPECTION_COMPILER_ARGS) -o $@ $^
-
 CLEANFILES += $(typelib_DATA)
 endif
diff -Nru libunity-7.1.4+19.04.20190319/src/unity-aggregator-scope.vala libunity-7.1.4+19.04.20190319/src/unity-aggregator-scope.vala
--- libunity-7.1.4+19.04.20190319/src/unity-aggregator-scope.vala	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/src/unity-aggregator-scope.vala	2019-03-19 10:17:56.000000000 +0000
@@ -51,7 +51,7 @@
    */
   public abstract int category_index_for_scope_id (string scope_id);
 
-  protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
+  public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
   {
     Object (dbus_path: dbus_path_, id: id_, is_master: true,
             merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints);
diff -Nru libunity-7.1.4+19.04.20190319/src/unity-deprecated-scope.vala libunity-7.1.4+19.04.20190319/src/unity-deprecated-scope.vala
--- libunity-7.1.4+19.04.20190319/src/unity-deprecated-scope.vala	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/src/unity-deprecated-scope.vala	2019-03-19 10:17:56.000000000 +0000
@@ -61,7 +61,7 @@
   internal CategorySet _categories;
   internal FilterSet _filters;
    
-  protected DeprecatedScopeBase (string dbus_path_, string id_)
+  public DeprecatedScopeBase (string dbus_path_, string id_)
   {
     Object (dbus_path: dbus_path_, id: id_);
   }
diff -Nru libunity-7.1.4+19.04.20190319/src/unity-scope-channel.vala libunity-7.1.4+19.04.20190319/src/unity-scope-channel.vala
--- libunity-7.1.4+19.04.20190319/src/unity-scope-channel.vala	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/src/unity-scope-channel.vala	2019-03-19 10:18:05.000000000 +0000
@@ -312,7 +312,7 @@
           DBusSignalFlags.NONE, this.owner_changed);
     }
 
-    private void owner_changed (DBusConnection con, string? sender_name,
+    private void owner_changed (DBusConnection con, string sender_name,
                                 string obj_path, string ifc_name,
                                 string sig_name, Variant parameters)
     {
diff -Nru libunity-7.1.4+19.04.20190319/test/python/bug-1062331.py libunity-7.1.4+19.04.20190319/test/python/bug-1062331.py
--- libunity-7.1.4+19.04.20190319/test/python/bug-1062331.py	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/test/python/bug-1062331.py	2019-03-19 10:17:56.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 
 # no longer testing the bug from the filename
 from gi.repository import Unity
diff -Nru libunity-7.1.4+19.04.20190319/test/python/container-ownership.py libunity-7.1.4+19.04.20190319/test/python/container-ownership.py
--- libunity-7.1.4+19.04.20190319/test/python/container-ownership.py	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/test/python/container-ownership.py	2019-03-19 10:17:56.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 from gi.repository import Unity, Gio
 
 category_set = Unity.CategorySet.new()
diff -Nru libunity-7.1.4+19.04.20190319/test/python/extras.py libunity-7.1.4+19.04.20190319/test/python/extras.py
--- libunity-7.1.4+19.04.20190319/test/python/extras.py	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/test/python/extras.py	2019-03-19 10:17:56.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 
 from gi.repository import UnityExtras
 
diff -Nru libunity-7.1.4+19.04.20190319/test/python/scope-result.py libunity-7.1.4+19.04.20190319/test/python/scope-result.py
--- libunity-7.1.4+19.04.20190319/test/python/scope-result.py	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/test/python/scope-result.py	2019-03-19 10:17:56.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 from gi.repository import Unity, GLib
 
 class TestResultSet(Unity.ResultSet):
diff -Nru libunity-7.1.4+19.04.20190319/tools/capture-trace.py libunity-7.1.4+19.04.20190319/tools/capture-trace.py
--- libunity-7.1.4+19.04.20190319/tools/capture-trace.py	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/tools/capture-trace.py	2019-03-19 10:17:56.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 import os, sys
 import subprocess
diff -Nru libunity-7.1.4+19.04.20190319/tools/preview-renderer.vala libunity-7.1.4+19.04.20190319/tools/preview-renderer.vala
--- libunity-7.1.4+19.04.20190319/tools/preview-renderer.vala	2024-03-23 20:02:02.000000000 +0000
+++ libunity-7.1.4+19.04.20190319/tools/preview-renderer.vala	2019-03-19 10:17:56.000000000 +0000
@@ -63,7 +63,7 @@
      */
     public abstract class GridRenderer: PreviewRenderer
     {
-        protected GridRenderer()
+        public GridRenderer()
         {
             Object();
         }


More information about the Pkg-ayatana-devel mailing list