From 45cf68aa350b1ec1edfbbb90d7d47b7bc8e6a194 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 14 Aug 2023 11:21:27 +0200 Subject: Removing generated files to fix FTBFS when build twice in a row (Closes: #1044144). Signed-off-by: Daniel Baumann --- debian/patches/debian/0004-gettext-catalogs.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + debian/rules | 5 +++++ 3 files changed, 24 insertions(+) create mode 100644 debian/patches/debian/0004-gettext-catalogs.patch (limited to 'debian') diff --git a/debian/patches/debian/0004-gettext-catalogs.patch b/debian/patches/debian/0004-gettext-catalogs.patch new file mode 100644 index 0000000..b898205 --- /dev/null +++ b/debian/patches/debian/0004-gettext-catalogs.patch @@ -0,0 +1,18 @@ +Author: Daniel Baumann +Description: Update middleclickclose.mk for re-creation of gettext catalogs. + +diff -Naurp gnome-shell-extensions-extra.orig/extensions/middleclickclose.mk gnome-shell-extensions-extra/extensions/middleclickclose.mk +--- gnome-shell-extensions-extra.orig/extensions/middleclickclose.mk ++++ gnome-shell-extensions-extra/extensions/middleclickclose.mk +@@ -30,9 +30,9 @@ all: + test: + + build: +- for TRANSLATION in $(EXTENSION)/$(UUID)/locale/*/*/*.mo; \ ++ for TRANSLATION in $(EXTENSION)/$(UUID)/locale/*/*/*.po; \ + do \ +- msgfmt -cv -o $${TRANSLATION} $$(dirname $${TRANSLATION})/$$(basename $${TRANSLATION} .mo).po; \ ++ msgfmt -cv -o $$(dirname $${TRANSLATION})/$$(basename $${TRANSLATION} .po).mo $${TRANSLATION}; \ + done + + glib-compile-schemas --strict --targetdir=$(EXTENSION)/$(UUID)/schemas/ $(EXTENSION)/$(UUID)/schemas diff --git a/debian/patches/series b/debian/patches/series index 0032921..40ed0f3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ debian/0001-multi-monitors-add-on_show-indicator.patch debian/0002-multi-monitors-add-on_show-activities.patch debian/0003-no-overview_metadata.patch +debian/0004-gettext-catalogs.patch diff --git a/debian/rules b/debian/rules index a16acfd..e71b69c 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,11 @@ %: dh ${@} --no-parallel +execute_after_dh_auto_clean: + # remove generated files + rm -f extensions/*/*/schemas/gschemas.compiled + rm -f extensions/middleclickclose/*/locale/*/LC_MESSAGES/*.mo + execute_after_dh_auto_install: # removing unused files rm -f debian/gnome-shell-extensions-extra/usr/share/doc/*/CHANGELOG.txt -- cgit v1.2.3