summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perl-install/Makefile.drakxtools6
-rw-r--r--perl-install/standalone/po/Makefile2
-rw-r--r--perl-install/standalone/po/POTFILES.in9
-rw-r--r--perl-install/standalone/polkit/policy/Makefile16
-rw-r--r--perl-install/standalone/polkit/policy/org.mageia.drakauth.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.drakauth.policy)4
-rw-r--r--perl-install/standalone/polkit/policy/org.mageia.drakboot.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.drakboot.policy)4
-rw-r--r--perl-install/standalone/polkit/policy/org.mageia.drakclock.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.drakclock.policy)4
-rw-r--r--perl-install/standalone/polkit/policy/org.mageia.drakfont.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.drakfont.policy)4
-rw-r--r--perl-install/standalone/polkit/policy/org.mageia.draklog.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.draklog.policy)4
-rw-r--r--perl-install/standalone/polkit/policy/org.mageia.drakups.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.drakups.policy)4
-rw-r--r--perl-install/standalone/polkit/policy/org.mageia.drakxservices.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.drakxservices.policy)4
11 files changed, 41 insertions, 20 deletions
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 9922bfecf..16dfc6bc0 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -4,7 +4,7 @@ include Makefile.config
.PHONY: install
INLIBDEST_DIRS = c resize_fat
-HAVEINST_DIRS = share/po standalone/po standalone/interactive_http standalone/menu
+HAVEINST_DIRS = share/po standalone/po standalone/interactive_http standalone/menu standalone/polkit/policy
DIRS = $(INLIBDEST_DIRS) $(HAVEINST_DIRS) harddrake ../tools/serial_probe
NAME = libDrakX
XSETUPLEVEL=40
@@ -21,7 +21,6 @@ ETCDEST = $(PREFIX)/etc/gtk
LIBDEST = $(LIBDIR)/$(NAME)
PIXDIR = $(DATADIR)/$(NAME)/pixmaps
INITDIR = $(PREFIX)/etc/rc.d/init.d
-POLKITPOLICYDEST = $(PREFIX)/usr/share/polkit-1/actions
.PHONY: $(DIRS)
all: ../tools/rpcinfo-flushed $(DIRS)
@@ -32,7 +31,7 @@ $(DIRS):
install:
perl -pi -e "s/\"VER\"(; # version)/\"$(VERSION)\"\1/" standalone.pm
- mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{applications,harddrake,pixmaps,icons/{large,mini},autostart} $(PIXDIR) $(INITDIR) $(MENUDIR) $(LIBEXECDEST) $(POLKITPOLICYDEST)
+ mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{applications,harddrake,pixmaps,icons/{large,mini},autostart} $(PIXDIR) $(INITDIR) $(MENUDIR) $(LIBEXECDEST)
install -d $(INLIBDEST_DIRS:%=$(LIBDEST)/%)
install $(STANDALONEPMS) standalone/convert $(SBINDEST)
install -s ../tools/rpcinfo-flushed ../tools/serial_probe/serial_probe $(SBINDEST)
@@ -48,7 +47,6 @@ install:
mv -f $(SBINDEST)/drak{auth,boot,clock,font,ups,xservices} $(LIBEXECDEST)
mv -f $(SBINDEST)/logdrake $(LIBEXECDEST)/draklog
install standalone/polkit/wrappers/* $(BINDEST)
- install standalone/polkit/policy/* $(POLKITPOLICYDEST)
install -m 644 *.pm $(LIBDEST)
for i in $(PMS_DIRS); do install -d $(LIBDEST)/$$i ; install -m 644 $$i/*.pm $(LIBDEST)/$$i/;done
diff --git a/perl-install/standalone/po/Makefile b/perl-install/standalone/po/Makefile
index 6de29edf9..949114095 100644
--- a/perl-install/standalone/po/Makefile
+++ b/perl-install/standalone/po/Makefile
@@ -40,7 +40,7 @@ install: $(MOFILES)
done
POTFILES.in:
- (cd .. ; /bin/ls menu/*.desktop.in) > POTFILES.in
+ (cd .. ; /bin/ls -1 menu/*.desktop.in polkit/policy/*.policy.in; ) > POTFILES.in
clean:
diff --git a/perl-install/standalone/po/POTFILES.in b/perl-install/standalone/po/POTFILES.in
index 2d36aa8cb..e2f9be93f 100644
--- a/perl-install/standalone/po/POTFILES.in
+++ b/perl-install/standalone/po/POTFILES.in
@@ -1,3 +1,10 @@
-menu/localedrake-system.desktop.in
menu/harddrake.desktop.in
+menu/localedrake-system.desktop.in
menu/localedrake-user.desktop.in
+polkit/policy/org.mageia.drakauth.policy.in
+polkit/policy/org.mageia.drakboot.policy.in
+polkit/policy/org.mageia.drakclock.policy.in
+polkit/policy/org.mageia.drakfont.policy.in
+polkit/policy/org.mageia.draklog.policy.in
+polkit/policy/org.mageia.drakups.policy.in
+polkit/policy/org.mageia.drakxservices.policy.in
diff --git a/perl-install/standalone/polkit/policy/Makefile b/perl-install/standalone/polkit/policy/Makefile
new file mode 100644
index 000000000..09ce27564
--- /dev/null
+++ b/perl-install/standalone/polkit/policy/Makefile
@@ -0,0 +1,16 @@
+POLKITPOLICYDEST = $(PREFIX)/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/perl-install/standalone/polkit/policy/org.mageia.drakauth.policy b/perl-install/standalone/polkit/policy/org.mageia.drakauth.policy.in
index 905be635e..cfb2ba973 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.drakauth.policy
+++ b/perl-install/standalone/polkit/policy/org.mageia.drakauth.policy.in
@@ -8,8 +8,8 @@
<vendor_url>http://www.mageia.org/</vendor_url>
<action id="org.mageia.drakauth.pkexec.run">
- <description>Run Mageia Authentication Configuration</description>
- <message>Authentication is required to run Mageia Authentication Configuration</message>
+ <_description>Run Mageia Authentication Configuration</_description>
+ <_message>Authentication is required to run Mageia Authentication Configuration</_message>
<icon_name>drakconf</icon_name>
<defaults>
<allow_any>no</allow_any>
diff --git a/perl-install/standalone/polkit/policy/org.mageia.drakboot.policy b/perl-install/standalone/polkit/policy/org.mageia.drakboot.policy.in
index e41372f73..8c1b81104 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.drakboot.policy
+++ b/perl-install/standalone/polkit/policy/org.mageia.drakboot.policy.in
@@ -8,8 +8,8 @@
<vendor_url>http://www.mageia.org/</vendor_url>
<action id="org.mageia.drakboot.pkexec.run">
- <description>Run Mageia Boot Configuration</description>
- <message>Authentication is required to run Mageia Boot Configuration</message>
+ <_description>Run Mageia Boot Configuration</_description>
+ <_message>Authentication is required to run Mageia Boot Configuration</_message>
<icon_name>drakconf</icon_name>
<defaults>
<allow_any>no</allow_any>
diff --git a/perl-install/standalone/polkit/policy/org.mageia.drakclock.policy b/perl-install/standalone/polkit/policy/org.mageia.drakclock.policy.in
index 627f8745b..ffb240242 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.drakclock.policy
+++ b/perl-install/standalone/polkit/policy/org.mageia.drakclock.policy.in
@@ -8,8 +8,8 @@
<vendor_url>http://www.mageia.org/</vendor_url>
<action id="org.mageia.drakclock.pkexec.run">
- <description>Run Mageia Date and Time Configuration</description>
- <message>Authentication is required to run Mageia Date and Time Configuration</message>
+ <_description>Run Mageia Date and Time Configuration</_description>
+ <_message>Authentication is required to run Mageia Date and Time Configuration</_message>
<icon_name>drakconf</icon_name>
<defaults>
<allow_any>no</allow_any>
diff --git a/perl-install/standalone/polkit/policy/org.mageia.drakfont.policy b/perl-install/standalone/polkit/policy/org.mageia.drakfont.policy.in
index c4837cca5..ab5952d66 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.drakfont.policy
+++ b/perl-install/standalone/polkit/policy/org.mageia.drakfont.policy.in
@@ -8,8 +8,8 @@
<vendor_url>http://www.mageia.org/</vendor_url>
<action id="org.mageia.drakfont.pkexec.run">
- <description>Run Mageia Font Configuration</description>
- <message>Authentication is required to run Mageia Font Configuration</message>
+ <_description>Run Mageia Font Configuration</_description>
+ <_message>Authentication is required to run Mageia Font Configuration</_message>
<icon_name>drakconf</icon_name>
<defaults>
<allow_any>no</allow_any>
diff --git a/perl-install/standalone/polkit/policy/org.mageia.draklog.policy b/perl-install/standalone/polkit/policy/org.mageia.draklog.policy.in
index 85842378f..14af2ddcf 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.draklog.policy
+++ b/perl-install/standalone/polkit/policy/org.mageia.draklog.policy.in
@@ -8,8 +8,8 @@
<vendor_url>http://www.mageia.org/</vendor_url>
<action id="org.mageia.draklog.pkexec.run">
- <description>Run Mageia Log Viewer</description>
- <message>Authentication is required to run Mageia Log Viewer</message>
+ <_description>Run Mageia Log Viewer</_description>
+ <_message>Authentication is required to run Mageia Log Viewer</_message>
<icon_name>drakconf</icon_name>
<defaults>
<allow_any>no</allow_any>
diff --git a/perl-install/standalone/polkit/policy/org.mageia.drakups.policy b/perl-install/standalone/polkit/policy/org.mageia.drakups.policy.in
index 2af273084..31735098d 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.drakups.policy
+++ b/perl-install/standalone/polkit/policy/org.mageia.drakups.policy.in
@@ -8,8 +8,8 @@
<vendor_url>http://www.mageia.org/</vendor_url>
<action id="org.mageia.drakups.pkexec.run">
- <description>Run Mageia UPS Configuration</description>
- <message>Authentication is required to run Mageia UPS Configuration</message>
+ <_description>Run Mageia UPS Configuration</_description>
+ <_message>Authentication is required to run Mageia UPS Configuration</_message>
<icon_name>drakconf</icon_name>
<defaults>
<allow_any>no</allow_any>
diff --git a/perl-install/standalone/polkit/policy/org.mageia.drakxservices.policy b/perl-install/standalone/polkit/policy/org.mageia.drakxservices.policy.in
index daa9a7267..9c4512a50 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.drakxservices.policy
+++ b/perl-install/standalone/polkit/policy/org.mageia.drakxservices.policy.in
@@ -8,8 +8,8 @@
<vendor_url>http://www.mageia.org/</vendor_url>
<action id="org.mageia.drakxservices.pkexec.run">
- <description>Run Mageia Service Configuration</description>
- <message>Authentication is required to run Mageia Service Configuration</message>
+ <_description>Run Mageia Service Configuration</_description>
+ <_message>Authentication is required to run Mageia Service Configuration</_message>
<icon_name>drakconf</icon_name>
<defaults>
<allow_any>no</allow_any>
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-02 03:49:23 +0000