From 531094f516a63feaba471b60f98fa11738b7be35 Mon Sep 17 00:00:00 2001 From: daviddavid Date: Mon, 29 Jun 2020 14:21:04 +0200 Subject: Remove polkit from po-update.sh, already done in polkit/Makefile - fixes generation of polkit file translations during build --- Makefile | 4 ++-- polkit/Makefile | 4 ++-- tools/po-update.sh | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index c2c0101..66bf226 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ PACKAGE = isodumper VERSION = 1.18 GITPATH = git://git.mageia.org/software/isodumper -all: version dirs pofiles +all: version dirs pofiles version: echo "RELEASE='$(VERSION)'" > lib/version.py @@ -84,7 +84,7 @@ install: mkdir -p $(DESTDIR)$(POLKITPOLICYDIR) install -m 644 polkit/org.mageia.isodumper.policy $(DESTDIR)$(POLKITPOLICYDIR) - # for PYLIBFILES isodumper.py raw_write.py + # for PYLIBFILES isodumper.py version.py raw_write.py mkdir -p $(DESTDIR)$(PYLIBDIR)/isodumper install -m 755 lib/isodumper.py $(DESTDIR)$(PYLIBDIR)/isodumper install -m 755 lib/version.py $(DESTDIR)$(PYLIBDIR)/isodumper diff --git a/polkit/Makefile b/polkit/Makefile index 334fc57..64f202d 100644 --- a/polkit/Makefile +++ b/polkit/Makefile @@ -21,10 +21,10 @@ POLICY_IN := $(wildcard *.policy.in) POLICY = $(POLICY_IN:.policy.in=.policy) WRAPPERS = $(patsubst org.mageia.%.policy,%,$(POLICY)) -all: $(POLICY) +all: $(POLICY) clean: - rm -f $(POLICY) + rm -f $(POLICY) %.policy: %.policy.in intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache diff --git a/tools/po-update.sh b/tools/po-update.sh index ba22ef4..9bb850a 100755 --- a/tools/po-update.sh +++ b/tools/po-update.sh @@ -13,7 +13,6 @@ cd "$(readlink -f "$(dirname "$0")/..")" VERSION=(1.19) DOMAIN=(isodumper) -intltool-extract --type=gettext/xml polkit/org.mageia.isodumper.policy.in intltool-extract --type=gettext/ini share/applications/isodumper.desktop.in intltool-extract --type=gettext/ini share/applications/format-usb.desktop.in @@ -31,17 +30,14 @@ POT_FILE="$POT_DIR/$DOMAIN.pot" --output="$POT_FILE" \ lib/isodumper.py \ backend/raw_write.py \ - polkit/org.mageia.isodumper.policy.in.h \ share/applications/isodumper.desktop.in.h \ share/applications/format-usb.desktop.in.h /bin/sed --in-place --expression="s/charset=CHARSET/charset=UTF-8/" "$POT_FILE" intltool-merge --desktop-style po share/applications/isodumper.desktop.in share/applications/isodumper.desktop -intltool-merge --desktop-style po polkit/org.mageia.isodumper.policy.in polkit/org.mageia.isodumper.policy intltool-merge --desktop-style po share/applications/format-usb.desktop.in share/applications/format-usb.desktop -rm -f polkit/org.mageia.isodumper.policy.in.h rm -f share/applications/isodumper.desktop.in.h rm -f share/applications/format-usb.desktop.in.h -- cgit v1.2.1