diff -Nru anjuta-3.34.0/debian/changelog anjuta-3.34.0/debian/changelog --- anjuta-3.34.0/debian/changelog 2021-10-09 11:32:28.000000000 +0000 +++ anjuta-3.34.0/debian/changelog 2022-02-11 12:53:56.000000000 +0000 @@ -1,3 +1,12 @@ +anjuta (2:3.34.0-5) unstable; urgency=medium + + * Cherry-pick patch to allow building with vala 0.56 + * Bump debhelper-compat to 13 + * debian/rules: Drop unneeded -Wl,--as-needed + * debian/rules: Drop obsolete dbgsym migration + + -- Jeremy Bicha Fri, 11 Feb 2022 07:53:56 -0500 + anjuta (2:3.34.0-4) unstable; urgency=medium * Cherry-pick patches to fix vala plugin build with vala 0.54 diff -Nru anjuta-3.34.0/debian/control anjuta-3.34.0/debian/control --- anjuta-3.34.0/debian/control 2021-10-09 11:32:28.000000000 +0000 +++ anjuta-3.34.0/debian/control 2022-02-11 12:53:56.000000000 +0000 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: Jeremy Bicha -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), dh-sequence-gir, dh-sequence-gnome, flex, diff -Nru anjuta-3.34.0/debian/control.in anjuta-3.34.0/debian/control.in --- anjuta-3.34.0/debian/control.in 2021-10-09 11:32:28.000000000 +0000 +++ anjuta-3.34.0/debian/control.in 2022-02-11 12:53:56.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), dh-sequence-gir, dh-sequence-gnome, flex, diff -Nru anjuta-3.34.0/debian/patches/build-Allow-building-with-vala-0.56.patch anjuta-3.34.0/debian/patches/build-Allow-building-with-vala-0.56.patch --- anjuta-3.34.0/debian/patches/build-Allow-building-with-vala-0.56.patch 1970-01-01 00:00:00.000000000 +0000 +++ anjuta-3.34.0/debian/patches/build-Allow-building-with-vala-0.56.patch 2022-02-11 12:53:56.000000000 +0000 @@ -0,0 +1,22 @@ +From: Jeremy Bicha +Date: Fri, 11 Feb 2022 07:39:13 -0500 +Subject: build: Allow building with vala 0.56 + +(cherry picked from commit 76239d67b6200d06aa2ee8fef2fddd16b169abbf) +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 877755d..94e3a1c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -338,7 +338,7 @@ if test "$user_disabled_vala" = 1; then + else + AC_MSG_RESULT(no) + AC_MSG_CHECKING(if libvala is available) +- m4_foreach_w([VERSION], [0.54 0.52 0.50 0.48 0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32], ++ m4_foreach_w([VERSION], [0.56 0.54 0.52 0.50 0.48 0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32], + [PKG_CHECK_EXISTS([ libvala-VERSION ], + [ valaver="-VERSION" ]) + ]) diff -Nru anjuta-3.34.0/debian/patches/series anjuta-3.34.0/debian/patches/series --- anjuta-3.34.0/debian/patches/series 2021-10-09 11:32:28.000000000 +0000 +++ anjuta-3.34.0/debian/patches/series 2022-02-11 12:53:56.000000000 +0000 @@ -5,3 +5,4 @@ build-Allow-building-with-vala-0.50-and-0.52.patch build-Allow-building-with-vala-0.54.patch language-support-vala-Support-for-vala-0.48-API.patch +build-Allow-building-with-vala-0.56.patch diff -Nru anjuta-3.34.0/debian/rules anjuta-3.34.0/debian/rules --- anjuta-3.34.0/debian/rules 2021-10-09 11:32:28.000000000 +0000 +++ anjuta-3.34.0/debian/rules 2022-02-11 12:53:56.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed +export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 export PYTHON=/usr/bin/python3 @@ -21,14 +21,12 @@ override_dh_makeshlibs: dh_makeshlibs -V '$(LIB_PKG) (>= $(SHVER))' -override_dh_install: +execute_before_dh_install: + find debian/tmp -name '*.la' -print -delete rm -f debian/tmp/usr/share/doc/anjuta/INSTALL rm -f debian/tmp/usr/share/doc/anjuta/COPYING rm -f debian/tmp/usr/share/doc/anjuta/ChangeLog - dh_install -X.la +# What is IAnjuta-3.0.gir used for? override_dh_missing: - dh_missing -X.la --list-missing - -override_dh_strip: - dh_strip --dbgsym-migration='anjuta-dbg (<< 2:3.22.0-1~)' + dh_missing -X IAnjuta