From 0cecd17680f54773f8aa73f86f4f1d9c06c84f13 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 2 Dec 2022 10:18:50 +0000 Subject: [PATCH] Remove dpkg trigger on old immodules search path GTK 3 hasn't searched this path since 2015, so it was no longer useful to have a trigger on it. --- debian/libgtk-3-0.postinst.in | 3 +-- debian/libgtk-3-0.triggers.in | 1 - debian/rules | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/libgtk-3-0.postinst.in b/debian/libgtk-3-0.postinst.in index dd7d0e348d..20acc98eb6 100644 --- a/debian/libgtk-3-0.postinst.in +++ b/debian/libgtk-3-0.postinst.in @@ -2,7 +2,6 @@ set -e IMMODULES_DIR=/@MODULES_BASE_PATH@/immodules -IMMODULES_DIR_OLD=/@OLD_MODULES_BASE_PATH@/immodules if [ "$1" = triggered ]; then # This is triggered everytime an application installs a @@ -14,7 +13,7 @@ fi #DEBHELPER# # Also handle the initial installation -if [ -d $IMMODULES_DIR ] || [ -d $IMMODULES_DIR_OLD ]; then +if [ -d "$IMMODULES_DIR" ]; then /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 --update-cache || true fi diff --git a/debian/libgtk-3-0.triggers.in b/debian/libgtk-3-0.triggers.in index 85a23ca097..d40b55b059 100644 --- a/debian/libgtk-3-0.triggers.in +++ b/debian/libgtk-3-0.triggers.in @@ -1,2 +1 @@ interest-noawait /@MODULES_BASE_PATH@/immodules -interest-noawait /@OLD_MODULES_BASE_PATH@/immodules diff --git a/debian/rules b/debian/rules index d036215bb7..0b6ea570bc 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,6 @@ CONFDIR := etc/gtk-3.0 # relative base directory for all types of modules MODULES_BASE_PATH := $(LIBDIR)/gtk-3.0/$(GTK_BINARY_VERSION) -OLD_MODULES_BASE_PATH := usr/lib/gtk-3.0/$(GTK_BINARY_VERSION) # package names SHARED_PKG := libgtk-$(APIVER)-$(SONAME) @@ -81,7 +80,6 @@ debian/%: debian/%.in -e "s#@LIBDIR@#$(LIBDIR)#g" \ -e 's#@CONFDIR@#$(CONFDIR)#g' \ -e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \ - -e "s#@OLD_MODULES_BASE_PATH@#$(OLD_MODULES_BASE_PATH)#g" \ -e "s#@NEWS@#$(NEWS)#g" \ -e "s#@README@#$(README)#g" \ $@.in > $@