diff -u 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 +++ libunity-7.1.4+19.04.20190319/debian/changelog @@ -1,3 +1,29 @@ +libunity (7.1.4+19.04.20190319-5) unstable; urgency=medium + + * debian/control: + - fix typo in the Conflicts keyword + * extras,src/Makefile.am: + - set --shared-library valac option so the generated gir which is + needed for the correct depends to be created + * remove debian/patches which isn't use by the current packaging, it + was an indication of the changes applied to the source but those are + commited directly to the vcs now + + -- Sebastien Bacher Mon, 01 Feb 2021 18:01:36 +0100 + +libunity (7.1.4+19.04.20190319-3) unstable; urgency=medium + + * debian/control: + - Fix typo: s/scoped/scopes/, thanks Hans Joachim Desserud + (LP: #1268210) + * debian/patches/gir_build_fixes.patch + debian/patches/new_valac_build.patch: + - build fixes for gir and new valac, thanks ricotz! (Closes: #966967) + * debian/control, debian/gir-unity.install, debian/rules: + - rename the binary to use the correct version (CLoses: #971261) + + -- Sebastien Bacher Tue, 26 Jan 2021 16:51:30 +0100 + libunity (7.1.4+19.04.20190319-2) unstable; urgency=medium * debian/control: diff -u 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 +++ libunity-7.1.4+19.04.20190319/debian/control @@ -100,14 +100,14 @@ ${misc:Depends}, Description: desktop runner for misceallenous scopes The scope runner is a handy tool for wrapping on a desktop the various - scoped installed on the system. + scopes installed on the system. Package: libunity-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - gir1.2-unity-5.0 (= ${binary:Version}), + gir1.2-unity-7.0 (= ${binary:Version}), libunity9 (= ${binary:Version}), libunity-protocol-private0 (= ${binary:Version}), libglib2.0-dev, @@ -132,13 +132,16 @@ This package contains debugging tools for introspecting results and issuing search on the lenses manually. -Package: gir1.2-unity-5.0 +Package: gir1.2-unity-7.0 Section: introspection Architecture: any Multi-Arch: same Depends: ${gir:Depends}, ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, +Conflicts: gir1.2-unity-5.0 +Replaces: gir1.2-unity-5.0 +Provides: gir1.2-unity-5.0 Description: GObject introspection data for the Unity library This package contains introspection data for the Unity library. . reverted: --- libunity-7.1.4+19.04.20190319/debian/gir1.2-unity-5.0.install +++ libunity-7.1.4+19.04.20190319.orig/debian/gir1.2-unity-5.0.install @@ -1,2 +0,0 @@ -usr/lib/*/girepository-1.0/ usr/lib/ -usr/lib/python*/dist-packages/gi/overrides/*.py diff -u 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 +++ libunity-7.1.4+19.04.20190319/debian/patches/series @@ -1,0 +2,2 @@ +gir_build_fixes.patch +new_valac_build.patch diff -u 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 +++ libunity-7.1.4+19.04.20190319/debian/rules @@ -27,7 +27,7 @@ dh_missing --fail-missing -X.a -X.la -X.pyc -X.pyo override_dh_python3: - dh_python3 debian/gir1.2-unity-5.0/usr/lib/python3 + dh_python3 debian/gir1.2-unity-7.0/usr/lib/python3 override_dh_gencontrol: dh_girepository only in patch2: unchanged: --- libunity-7.1.4+19.04.20190319.orig/debian/gir1.2-unity-7.0.install +++ libunity-7.1.4+19.04.20190319/debian/gir1.2-unity-7.0.install @@ -0,0 +1,2 @@ +usr/lib/*/girepository-1.0/ usr/lib/ +usr/lib/python*/dist-packages/gi/overrides/*.py only in patch2: unchanged: --- libunity-7.1.4+19.04.20190319.orig/debian/patches/gir_build_fixes.patch +++ libunity-7.1.4+19.04.20190319/debian/patches/gir_build_fixes.patch @@ -0,0 +1,103 @@ +=== modified file 'extras/Makefile.am' +Index: libunity-7.1.4+19.04.20190319/extras/Makefile.am +=================================================================== +--- 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///g' UnityExtras-@GIR_VERSION@.gir + @sed -i -e 's/"Extras/"/g;s/"extras_/"/' UnityExtras-@GIR_VERSION@.gir + @sed -i -e 's///g' Unity-@GIR_VERSION@.gir +- @sed -i -e 's/emit_preview_ready/preview_ready/g' Unity-@GIR_VERSION@.gir +- @sed -i -e 's///;s///' Unity-@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 only in patch2: unchanged: --- libunity-7.1.4+19.04.20190319.orig/debian/patches/new_valac_build.patch +++ libunity-7.1.4+19.04.20190319/debian/patches/new_valac_build.patch @@ -0,0 +1,13 @@ +=== modified file 'src/unity-scope-channel.vala' +--- old/src/unity-scope-channel.vala 2019-03-01 17:32:13 +0000 ++++ new/src/unity-scope-channel.vala 2021-01-26 15:37:49 +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) + { + only in patch2: unchanged: --- 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 @@ --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_extras_la_vala.stamp: $(libunity_extras_la_VALASOURCES) $(AM_V_GEN) $(VALAC) $(libunity_extras_la_VALAFLAGS) $^ - @sed -i -e 's///g' UnityExtras-@GIR_VERSION@.gir @sed -i -e 's/"Extras/"/g;s/"extras_/"/' UnityExtras-@GIR_VERSION@.gir @sed -i -e 's///g' Unity-@GIR_VERSION@.gir - @sed -i -e 's/emit_preview_ready/preview_ready/g' Unity-@GIR_VERSION@.gir - @sed -i -e 's///;s///' Unity-@GIR_VERSION@.gir @touch $@ BUILT_SOURCES += libunity_la_vala.stamp @@ -169,12 +157,19 @@ # 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 only in patch2: unchanged: --- 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 @@ 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) {