From 9d9ef58760337c42819f702feb0c67b9af0f2988 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 1 Oct 2013 20:48:52 +0100 Subject: polkit: Make the polkit policy files translatable. --- Makefile | 8 +++++--- NEWS | 1 + po/Makefile | 11 ++++++++--- po/POTFILES.in | 3 +++ polkit/policy/Makefile | 16 ++++++++++++++++ polkit/policy/org.mageia.drakkeyboard.policy | 22 ---------------------- polkit/policy/org.mageia.drakkeyboard.policy.in | 22 ++++++++++++++++++++++ polkit/policy/org.mageia.drakmouse.policy | 22 ---------------------- polkit/policy/org.mageia.drakmouse.policy.in | 22 ++++++++++++++++++++++ polkit/policy/org.mageia.drakx11.policy | 22 ---------------------- polkit/policy/org.mageia.drakx11.policy.in | 22 ++++++++++++++++++++++ 11 files changed, 99 insertions(+), 72 deletions(-) create mode 100644 po/POTFILES.in create mode 100644 polkit/policy/Makefile delete mode 100644 polkit/policy/org.mageia.drakkeyboard.policy create mode 100644 polkit/policy/org.mageia.drakkeyboard.policy.in delete mode 100644 polkit/policy/org.mageia.drakmouse.policy create mode 100644 polkit/policy/org.mageia.drakmouse.policy.in delete mode 100644 polkit/policy/org.mageia.drakx11.policy create mode 100644 polkit/policy/org.mageia.drakx11.policy.in diff --git a/Makefile b/Makefile index 67febf0..c145ed2 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,6 @@ libdir=/usr/lib bindir=/usr/bin sbindir=/usr/sbin libexecdir=/usr/libexec -polkitpolicydir=/usr/share/polkit-1/actions desktopdir=/usr/share/applications autostartdir=/usr/share/autostart xinitdir=/etc/X11/xinit.d @@ -20,13 +19,15 @@ all: $(INLIBDEST_DIRS) install -d auto (find lib -name '*.pm'; find tools -type f) | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g' for i in po $(INLIBDEST_DIRS); do make -C $$i; done + make -C polkit/policy + make -C po check: @for p in `find lib -name *.pm`; do perl -cw -I$(libdir)/libDrakX $$p || exit 1; done @for p in tools/*; do head -n1 $$p | grep perl || continue; perl -cw $$p || exit 1; done install: - install -d $(DESTDIR){$(libdir),$(bindir),$(sbindir),$(desktopdir),$(autostartdir),$(xinitdir),$(iconsdir),$(pixmapsdir),$(libexecdir),$(polkitpolicydir)} + install -d $(DESTDIR){$(libdir),$(bindir),$(sbindir),$(desktopdir),$(autostartdir),$(xinitdir),$(iconsdir),$(pixmapsdir),$(libexecdir)} install -d $(INLIBDEST_DIRS:%=$(DESTDIR)$(libdir)/libDrakX//%) cp -a lib/*.pm $(DESTDIR)$(libdir)/libDrakX/ @@ -42,7 +43,6 @@ install: install -m755 tools/mousedrake $(DESTDIR)$(libexecdir)/drakmouse install -m755 tools/XFdrake $(DESTDIR)$(libexecdir)/drakx11 install polkit/wrappers/* $(DESTDIR)$(bindir) - install polkit/policy/* $(DESTDIR)$(polkitpolicydir) # Some compatibility name wrappers ln -s drakkeyboard $(DESTDIR)$(bindir)/keyboarddrake ln -s drakmouse $(DESTDIR)$(bindir)/mousedrake @@ -51,9 +51,11 @@ install: #install -m644 $(wildcard data/*.desktop) $(DESTDIR)$(desktopdir) #install -m644 $(wildcard data/icons/*.png) $(DESTDIR)$(iconsdir) install -m644 $(wildcard data/pixmaps/*.png) $(DESTDIR)$(pixmapsdir) + make -C polkit/policy install make -C po install clean: + make -C polkit/policy clean make -C po clean dist: diff --git a/NEWS b/NEWS index 8d1083c..e72cc0e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,4 @@ +- make the polkit policy files translatable (mga#11125) - add a legacy compatibility symlink for XFdrake Version 0.110 - 4 September 2013 diff --git a/po/Makefile b/po/Makefile index c294cc5..f11b883 100644 --- a/po/Makefile +++ b/po/Makefile @@ -31,9 +31,14 @@ clean: %.mo: %.po msgfmt -o $@ $< -$(POTFILE): $(PL_FILES) - perl_checker -q --generate-pot $@ $(PL_FILES) - +$(POTFILE): $(PL_FILES) POTFILES.in + intltool-update --gettext-package non-perl --pot + perl_checker -q --generate-pot .$@ $(PL_FILES) + msgcat -w 2048 --use-first .$@ non-perl.pot > $@ + rm -f non-perl.pot ..$@ .$@ + +POTFILES.in: + (cd .. ; /bin/ls -1 polkit/policy/*.policy.in; ) > POTFILES.in update_n_merge: $(PGOAL).pot merge diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000..d3cda6d --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,3 @@ +polkit/policy/org.mageia.drakkeyboard.policy.in +polkit/policy/org.mageia.drakmouse.policy.in +polkit/policy/org.mageia.drakx11.policy.in diff --git a/polkit/policy/Makefile b/polkit/policy/Makefile new file mode 100644 index 0000000..1de7222 --- /dev/null +++ b/polkit/policy/Makefile @@ -0,0 +1,16 @@ +POLKITPOLICYDEST = $(DESTDIR)/usr/share/polkit-1/actions + +POLICY_IN := $(wildcard *.policy.in) +POLICY = $(POLICY_IN:.policy.in=.policy) + +all: $(POLICY) + +clean: + rm -f $(POLICY) + +install: all + install -d $(POLKITPOLICYDEST) + install -m644 $(POLICY) $(POLKITPOLICYDEST) + +%.policy: %.policy.in + intltool-merge --utf8 ../../po $< $@ -x -u -c ../../po/.intltool-merge-cache diff --git a/polkit/policy/org.mageia.drakkeyboard.policy b/polkit/policy/org.mageia.drakkeyboard.policy deleted file mode 100644 index e3cd5bd..0000000 --- a/polkit/policy/org.mageia.drakkeyboard.policy +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Mageia - http://www.mageia.org/ - - - Run Mageia Keyboard Configuration - Authentication is required to run Mageia Keyboard Configuration - drakconf - - no - no - yes - - /usr/libexec/drakkeyboard - true - - diff --git a/polkit/policy/org.mageia.drakkeyboard.policy.in b/polkit/policy/org.mageia.drakkeyboard.policy.in new file mode 100644 index 0000000..7ebaf2a --- /dev/null +++ b/polkit/policy/org.mageia.drakkeyboard.policy.in @@ -0,0 +1,22 @@ + + + + + Mageia + http://www.mageia.org/ + + + <_description>Run Mageia Keyboard Configuration + <_message>Authentication is required to run Mageia Keyboard Configuration + drakconf + + no + no + yes + + /usr/libexec/drakkeyboard + true + + diff --git a/polkit/policy/org.mageia.drakmouse.policy b/polkit/policy/org.mageia.drakmouse.policy deleted file mode 100644 index 157e2d2..0000000 --- a/polkit/policy/org.mageia.drakmouse.policy +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Mageia - http://www.mageia.org/ - - - Run Mageia Mouse Configuration - Authentication is required to run Mageia Mouse Configuration - drakconf - - no - no - yes - - /usr/libexec/drakmouse - true - - diff --git a/polkit/policy/org.mageia.drakmouse.policy.in b/polkit/policy/org.mageia.drakmouse.policy.in new file mode 100644 index 0000000..dc9981e --- /dev/null +++ b/polkit/policy/org.mageia.drakmouse.policy.in @@ -0,0 +1,22 @@ + + + + + Mageia + http://www.mageia.org/ + + + <_description>Run Mageia Mouse Configuration + <_message>Authentication is required to run Mageia Mouse Configuration + drakconf + + no + no + yes + + /usr/libexec/drakmouse + true + + diff --git a/polkit/policy/org.mageia.drakx11.policy b/polkit/policy/org.mageia.drakx11.policy deleted file mode 100644 index efa8441..0000000 --- a/polkit/policy/org.mageia.drakx11.policy +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Mageia - http://www.mageia.org/ - - - Run Mageia Graphics Configuration - Authentication is required to run Mageia Graphics Configuration - drakconf - - no - no - auth_self_keep - - /usr/libexec/drakx11 - true - - diff --git a/polkit/policy/org.mageia.drakx11.policy.in b/polkit/policy/org.mageia.drakx11.policy.in new file mode 100644 index 0000000..5d1fad2 --- /dev/null +++ b/polkit/policy/org.mageia.drakx11.policy.in @@ -0,0 +1,22 @@ + + + + + Mageia + http://www.mageia.org/ + + + <_description>Run Mageia Graphics Configuration + <_message>Authentication is required to run Mageia Graphics Configuration + drakconf + + no + no + auth_self_keep + + /usr/libexec/drakx11 + true + + -- cgit v1.2.1