From 8223c275633a16738af4580ee99a6b3e10cfa46e Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 1 Oct 2013 21:29:40 +0100 Subject: polkit: Make the polkit policy files translatable. --- Makefile | 10 +++++----- po/Makefile | 8 ++++---- polkit/drakxconf | 2 -- polkit/org.mageia.control-centre-gui.policy | 22 ---------------------- polkit/org.mageia.control-centre.policy | 22 ---------------------- .../policy/org.mageia.control-centre-gui.policy.in | 22 ++++++++++++++++++++++ polkit/policy/org.mageia.control-centre.policy.in | 22 ++++++++++++++++++++++ polkit/wrappers/drakxconf | 2 ++ 8 files changed, 55 insertions(+), 55 deletions(-) delete mode 100755 polkit/drakxconf delete mode 100644 polkit/org.mageia.control-centre-gui.policy delete mode 100644 polkit/org.mageia.control-centre.policy create mode 100644 polkit/policy/org.mageia.control-centre-gui.policy.in create mode 100644 polkit/policy/org.mageia.control-centre.policy.in create mode 100755 polkit/wrappers/drakxconf diff --git a/Makefile b/Makefile index 58b87ea5..239c8d25 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION = 12.42 NAME = drakconf -SUBDIRS = po pixmaps #data +SUBDIRS = po pixmaps polkit/policy #data localedir = $(DESTDIR)/usr/share/locale mcc_dir = $(DESTDIR)/usr/share/mcc SYSCONFDIR = $(DESTDIR)/etc/sysconfig @@ -19,23 +19,23 @@ drakconf: clean: $(MAKE) -C po $@ + $(MAKE) -C polkit/policy $@ rm -f *~ drakconf core .#*[0-9] core.* *.bak for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done install: all $(MAKE) -C po $@ + $(MAKE) -C polkit/policy $@ find -name '*.p[lm]' -o -name control-center -o -name drakconf | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g' - install -d $(DESTDIR)/usr/{bin,sbin,libexec,share/icons,share/polkit-1/actions} + install -d $(DESTDIR)/usr/{bin,sbin,libexec,share/icons} install -d $(mcc_dir)/themes/default/ install -m644 control-center.rc $(mcc_dir)/themes/default/gtkrc install -m755 $(NAME) $(DESTDIR)/usr/libexec/ - install -m644 polkit/org.mageia.control-centre.policy $(DESTDIR)/usr/share/polkit-1/actions install -m755 wrapper $(DESTDIR)/usr/bin/$(NAME) install -m755 menus_launcher.pl $(DESTDIR)/usr/sbin/ install -m755 print_launcher.pl $(DESTDIR)/usr/sbin/ install -m755 drakxconf $(DESTDIR)/usr/libexec/ - install -m644 polkit/org.mageia.control-centre-gui.policy $(DESTDIR)/usr/share/polkit-1/actions - install -m755 polkit/drakxconf $(DESTDIR)/usr/bin + install -m755 polkit/wrappers/drakxconf $(DESTDIR)/usr/bin install -m755 drakconsole $(DESTDIR)/usr/sbin/ install -m755 mdkwebadmin.pl $(DESTDIR)/usr/bin/ for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done diff --git a/po/Makefile b/po/Makefile index df4b4b20..acbb0701 100644 --- a/po/Makefile +++ b/po/Makefile @@ -35,13 +35,13 @@ clean: msgfmt -o $@ $< POTFILES.in: - (cd .. ; /bin/ls data/*.desktop.in data/*.directory.in *.desktop.in) > POTFILES.in + (cd .. ; /bin/ls -1 data/*.desktop.in data/*.directory.in *.desktop.in polkit/policy/*.in) > POTFILES.in $(PGOAL).pot: $(PL_FILES) POTFILES.in - intltool-update --gettext-package desktopstuff --pot + intltool-update --gettext-package non-perl --pot perl_checker -q --generate-pot $(PGOAL)_tmp.pot $(PL_FILES) - msgcat --use-first $(PGOAL)_tmp.pot desktopstuff.pot > $@ - rm -f desktopstuff.pot $(PGOAL)_tmp.pot + msgcat --use-first $(PGOAL)_tmp.pot non-perl.pot > $@ + rm -f non-perl.pot $(PGOAL)_tmp.pot update_n_merge: $(PGOAL).pot merge diff --git a/polkit/drakxconf b/polkit/drakxconf deleted file mode 100755 index db38e46a..00000000 --- a/polkit/drakxconf +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/pkexec /usr/libexec/drakxconf diff --git a/polkit/org.mageia.control-centre-gui.policy b/polkit/org.mageia.control-centre-gui.policy deleted file mode 100644 index 2e25fe17..00000000 --- a/polkit/org.mageia.control-centre-gui.policy +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Mageia Control Centre GUI - http://mageia.org/control-centre-gui - - - Run Mageia Control Centre GUI - Authentication is required to run Mageia Control Centre GUI - drakconf - - no - no - auth_admin_keep - - /usr/libexec/drakconf - true - - diff --git a/polkit/org.mageia.control-centre.policy b/polkit/org.mageia.control-centre.policy deleted file mode 100644 index bdc43663..00000000 --- a/polkit/org.mageia.control-centre.policy +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Mageia Control Centre - http://mageia.org/control-centre - - - Run Mageia Control Centre - Authentication is required to run Mageia Control Centre - drakconf - - no - no - auth_admin_keep - - /usr/libexec/drakxconf - true - - diff --git a/polkit/policy/org.mageia.control-centre-gui.policy.in b/polkit/policy/org.mageia.control-centre-gui.policy.in new file mode 100644 index 00000000..958ca7a6 --- /dev/null +++ b/polkit/policy/org.mageia.control-centre-gui.policy.in @@ -0,0 +1,22 @@ + + + + + Mageia Control Centre GUI + http://mageia.org/control-centre-gui + + + <_description>Run Mageia Control Centre GUI + <_message>Authentication is required to run Mageia Control Centre GUI + drakconf + + no + no + auth_admin_keep + + /usr/libexec/drakconf + true + + diff --git a/polkit/policy/org.mageia.control-centre.policy.in b/polkit/policy/org.mageia.control-centre.policy.in new file mode 100644 index 00000000..4772b0fc --- /dev/null +++ b/polkit/policy/org.mageia.control-centre.policy.in @@ -0,0 +1,22 @@ + + + + + Mageia Control Centre + http://mageia.org/control-centre + + + <_description>Run Mageia Control Centre + <_message>Authentication is required to run Mageia Control Centre + drakconf + + no + no + auth_admin_keep + + /usr/libexec/drakxconf + true + + diff --git a/polkit/wrappers/drakxconf b/polkit/wrappers/drakxconf new file mode 100755 index 00000000..db38e46a --- /dev/null +++ b/polkit/wrappers/drakxconf @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/pkexec /usr/libexec/drakxconf -- cgit v1.2.1