Use meson build system

Use meson build system instead of autoconf tools.

Set dependency on CUPS 1.6 and newer and glib 2.36 and newer
so we can remove some compatibility code.

11 files changed, 131 insertions, 461 deletions

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 1007204..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-SUBDIRS = src po
-
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
-
-EXTRA_DIST = HACKING
-
-MAINTAINERCLEANFILES = \
-	$(srcdir)/INSTALL \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/compile \
-	$(srcdir)/config.guess \
-	$(srcdir)/config.h.in \
-	$(srcdir)/config.sub \
-	$(srcdir)/depcomp \
-	$(srcdir)/elisp-comp \
-	$(srcdir)/install-sh \
-	$(srcdir)/ltmain.sh \
-	$(srcdir)/missing \
-	$(srcdir)/mkinstalldirs \
-	`find "$(srcdir)" -type f -name Makefile.in -print` \
-	$(srcdir)/configure
-
-CHANGELOG_GIT_RANGE =
-dist-hook:
-	$(AM_V_GEN)if test -d "$(srcdir)/.git"; then \
-	  ( echo '# Generated by Makefile. Do not edit.'; echo; \
-	    GIT_DIR="$(top_srcdir)/.git" ./missing --run \
-	    git log $(CHANGELOG_GIT_RANGE) --no-color -M -C --name-status ) \
-	  > ChangeLog.tmp \
-	  && mv -f ChangeLog.tmp $(distdir)/ChangeLog \
-	  || ( rm -f ChangeLog.tmp ; echo Failed to generate ChangeLog >&2 ); \
-	else \
-	  echo A git checkout is required to generate ChangeLog >&2; \
-	fi
-
-GITIGNOREFILES = $(PACKAGE)-\*.tar.{gz,bz2,xz}
--include $(top_srcdir)/git.mk
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index c42da32..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="cups-pk-helper"
-REQUIRED_AUTOMAKE_VERSION=1.9
-REQUIRED_M4MACROS=
-
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/$PKG_NAME.doap) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common."
-    exit 1
-}
-
-. gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index b68256a..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,83 +0,0 @@
-AC_INIT([cups-pk-helper], [0.2.7],
-        [https://bugs.freedesktop.org/enter_bug.cgi?product=cups-pk-helper])
-AC_CONFIG_SRCDIR(src/cups-pk-helper-mechanism.c)
-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AM_CONFIG_HEADER(config.h)
-
-# Standard C stuff
-AC_PROG_CC
-
-# Additional programs that we need
-AC_PATH_PROG(GLIB_GENMARSHAL, [glib-genmarshal])
-
-# Internationalisation
-IT_PROG_INTLTOOL([0.40.6])
-GETTEXT_PACKAGE=cups-pk-helper
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define the gettext package to be used])
-AM_GLIB_GNU_GETTEXT
-
-# Compiler Warnings
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
-
-AC_ARG_ENABLE(deprecation_flags,
-              [AC_HELP_STRING([--enable-deprecation-flags],
-                              [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
-              [enable_deprecation_flags=no])
-
-if test "x$enable_deprecation_flags" = "xyes"; then
-   DISABLE_DEPRECATED_CFLAGS=$DISABLE_DEPRECATED
-   AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-fi
-
-# Dependencies
-GIO_REQUIRED=2.29.8
-POLKIT_REQUIRED=0.97
-
-# pkg-config dependency checks
-PKG_CHECK_MODULES(CUPS_PK, gio-2.0 >= $GIO_REQUIRED gio-unix-2.0 >= $GIO_REQUIRED polkit-gobject-1 >= $POLKIT_REQUIRED)
-AC_SUBST(CUPS_PK_CFLAGS)
-AC_SUBST(CUPS_PK_LIBS)
-
-PKG_CHECK_MODULES(TEST, gio-2.0 >= $GIO_REQUIRED gio-unix-2.0 >= $GIO_REQUIRED)
-AC_SUBST(TEST_CFLAGS)
-AC_SUBST(TEST_LIBS)
-
-# check for cups
-AC_CHECK_HEADERS(cups/cups.h cups/http.h cups/ipp.h)
-CUPS_LIBS=-lcups
-AC_SUBST(CUPS_LIBS)
-
-AC_PATH_PROG([GDBUS_CODEGEN], [gdbus-codegen])
-
-AC_OUTPUT([
-Makefile
-src/Makefile
-po/Makefile.in
-])
-
-dnl ---------------------------------------------------------------------------
-dnl - Show summary
-dnl ---------------------------------------------------------------------------
-
-echo "
-              cups-pk-helper $VERSION
-              `echo cups-pk-helper $VERSION | sed "s/./=/g"`
-
-        prefix:                        ${prefix}
-        exec_prefix:                   ${exec_prefix}
-        libdir:                        ${libdir}
-        bindir:                        ${bindir}
-        sbindir:                       ${sbindir}
-        sysconfdir:                    ${sysconfdir}
-        localstatedir:                 ${localstatedir}
-        datadir:                       ${datadir}
-        source code location:          ${srcdir}
-        compiler:                      ${CC}
-        cflags:                        ${CFLAGS}
-        Maintainer mode:               ${USE_MAINTAINER_MODE}
-        Use *_DISABLE_DEPRECATED:      ${enable_deprecation_flags}
-
-"
diff --git a/git.mk b/git.mk
deleted file mode 100644
index ff5c0c3..0000000
--- a/git.mk
+++ /dev/null
@@ -1,206 +0,0 @@
-# git.mk
-#
-# Copyright 2009, Red Hat, Inc.
-# Copyright 2010,2011 Behdad Esfahbod
-# Written by Behdad Esfahbod
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-#
-# The canonical source for this file is https://github.com/behdad/git.mk.
-#
-# To use in your project, import this file in your git repo's toplevel,
-# then do "make -f git.mk".  This modifies all Makefile.am files in
-# your project to -include git.mk.  Remember to add that line to new
-# Makefile.am files you create in your project, or just rerun the
-# "make -f git.mk".
-#
-# This enables automatic .gitignore generation.  If you need to ignore
-# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
-# But think twice before doing that.  If a file has to be in .gitignore,
-# chances are very high that it's a generated file and should be in one
-# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
-#
-# The only case that you need to manually add a file to GITIGNOREFILES is
-# when remove files in one of mostlyclean-local, clean-local, distclean-local,
-# or maintainer-clean-local make targets.
-#
-# Note that for files like editor backup, etc, there are better places to
-# ignore them.  See "man gitignore".
-#
-# If "make maintainer-clean" removes the files but they are not recognized
-# by this script (that is, if "git status" shows untracked files still), send
-# me the output of "git status" as well as your Makefile.am and Makefile for
-# the directories involved and I'll diagnose.
-#
-# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
-# Makefile.am.sample in the git.mk git repo.
-#
-# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
-# not tarballs.  It serves no useful purpose in tarballs and clutters the
-# build dir.
-#
-# This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings.
-#
-#
-# KNOWN ISSUES:
-#
-# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
-#   submodule doesn't find us.  If you have configure.{in,ac} files in
-#   subdirs, add a proxy git.mk file in those dirs that simply does:
-#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
-#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
-#   example.
-#
-
-git-all: git-mk-install
-
-git-mk-install:
-	@echo Installing git makefile
-	@any_failed=; \
-		find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \
-		if grep 'include .*/git.mk' $$x >/dev/null; then \
-			echo $$x already includes git.mk; \
-		else \
-			failed=; \
-			echo "Updating $$x"; \
-			{ cat $$x; \
-			  echo ''; \
-			  echo '-include $$(top_srcdir)/git.mk'; \
-			} > $$x.tmp || failed=1; \
-			if test x$$failed = x; then \
-				mv $$x.tmp $$x || failed=1; \
-			fi; \
-			if test x$$failed = x; then : else \
-				echo Failed updating $$x; >&2 \
-				any_failed=1; \
-			fi; \
-	fi; done; test -z "$$any_failed"
-
-.PHONY: git-all git-mk-install
-
-
-### .gitignore generation
-
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
-	$(AM_V_GEN) \
-	{ \
-		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
-			for x in \
-				$(DOC_MODULE)-decl-list.txt \
-				$(DOC_MODULE)-decl.txt \
-				tmpl/$(DOC_MODULE)-unused.sgml \
-				"tmpl/*.bak" \
-				xml html \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
-			for x in \
-				$(_DOC_C_DOCS) \
-				$(_DOC_LC_DOCS) \
-				$(_DOC_OMF_ALL) \
-				$(_DOC_DSK_ALL) \
-				$(_DOC_HTML_ALL) \
-				$(_DOC_MOFILES) \
-				$(_DOC_POFILES) \
-				$(DOC_H_FILE) \
-				"*/.xml2po.mo" \
-				"*/*.omf.out" \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
-			for x in \
-				$(_HELP_LC_FILES) \
-				$(_HELP_LC_STAMPS) \
-				$(_HELP_MOFILES) \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
-			for x in \
-				$(gsettings_SCHEMAS:.xml=.valid) \
-				$(gsettings__enum_file) \
-			; do echo /$$x; done; \
-		fi; \
-		if test -f $(srcdir)/po/Makefile.in.in; then \
-			for x in \
-				po/Makefile.in.in \
-				po/Makefile.in \
-				po/Makefile \
-				po/POTFILES \
-				po/stamp-it \
-				po/.intltool-merge-cache \
-				"po/*.gmo" \
-				"po/*.mo" \
-				po/$(GETTEXT_PACKAGE).pot \
-				intltool-extract.in \
-				intltool-merge.in \
-				intltool-update.in \
-			; do echo /$$x; done; \
-		fi; \
-		if test -f $(srcdir)/configure; then \
-			for x in \
-				autom4te.cache \
-				configure \
-				config.h \
-				stamp-h1 \
-				libtool \
-				config.lt \
-			; do echo /$$x; done; \
-		fi; \
-		for x in \
-			.gitignore \
-			$(GITIGNOREFILES) \
-			$(CLEANFILES) \
-			$(PROGRAMS) \
-			$(check_PROGRAMS) \
-			$(EXTRA_PROGRAMS) \
-			$(LTLIBRARIES) \
-			so_locations \
-			.libs _libs \
-			$(MOSTLYCLEANFILES) \
-			"*.$(OBJEXT)" \
-			"*.lo" \
-			$(DISTCLEANFILES) \
-			$(am__CONFIG_DISTCLEAN_FILES) \
-			$(CONFIG_CLEAN_FILES) \
-			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
-			"*.tab.c" \
-			$(MAINTAINERCLEANFILES) \
-			$(BUILT_SOURCES) \
-			$(DEPDIR) \
-			Makefile \
-			Makefile.in \
-			"*.orig" \
-			"*.rej" \
-			"*.bak" \
-			"*~" \
-			".*.sw[nop]" \
-			".dirstamp" \
-		; do echo /$$x; done; \
-	} | \
-	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
-	sed 's@/[.]/@/@g' | \
-	LC_ALL=C sort | uniq > $@.tmp && \
-	mv $@.tmp $@;
-
-all: $(srcdir)/.gitignore gitignore-recurse-maybe
-gitignore-recurse-maybe:
-	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
-		$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
-	fi;
-gitignore-recurse:
-	@for subdir in $(DIST_SUBDIRS); do \
-	  case " $(SUBDIRS) " in \
-	    *" $$subdir "*) :;; \
-	    *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
-	  esac; \
-	done
-gitignore: $(srcdir)/.gitignore gitignore-recurse
-
-maintainer-clean: gitignore-clean
-gitignore-clean:
-	-rm -f $(srcdir)/.gitignore
-
-.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..c9d4416
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,23 @@
+project ('cups-pk-helper',
+         'c',
+         version: '0.2.7',
+         # Debian uses meson 0.49.2 in stable currently.
+         meson_version : '>= 0.49.2',
+         license: 'GPLv2+')
+
+gnome = import ('gnome')
+i18n = import ('i18n')
+
+cc = meson.get_compiler ('c')
+
+glib2_req = '>= 2.36.0'
+
+glib2_dep = dependency ('glib-2.0', version : glib2_req)
+gio2_dep = dependency ('gio-2.0', version : glib2_req)
+gio_unix2_dep = dependency ('gio-unix-2.0', version : glib2_req)
+gobject2_dep = dependency ('gobject-2.0', version : glib2_req)
+polkit_dep = dependency ('polkit-gobject-1', version : '>= 0.97')
+cups_dep = dependency ('cups', version : '>= 1.6')
+
+subdir ('po')
+subdir ('src')
diff --git a/po/meson.build b/po/meson.build
new file mode 100644
index 0000000..b2e9e42
--- /dev/null
+++ b/po/meson.build
@@ -0,0 +1 @@
+i18n.gettext (meson.project_name (), preset: 'glib')
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 89f6f93..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,87 +0,0 @@
-libexec_PROGRAMS = cups-pk-helper-mechanism
-noinst_PROGRAMS = 	\
-	test-cups	\
-	test-cups-pk
-
-AM_CPPFLAGS =				\
-	$(DISABLE_DEPRECATED_CFLAGS)
-
-AM_CFLAGS = $(WARN_CFLAGS)
-
-cups_pk_helper_mechanism_SOURCES =	\
-	cups.c				\
-	cups.h				\
-	cups-pk-helper-mechanism.c	\
-	cups-pk-helper-mechanism.h	\
-	main.c				\
-	$(cph_iface_mechanism)
-cups_pk_helper_mechanism_CFLAGS =	\
-	$(AM_CFLAGS)			\
-	$(CUPS_PK_CFLAGS)
-cups_pk_helper_mechanism_LDADD =	\
-	$(CUPS_PK_LIBS)			\
-	$(CUPS_LIBS)
-
-cph_iface_mechanism =		\
-	cph-iface-mechanism.c	\
-	cph-iface-mechanism.h
-
-$(cph_iface_mechanism): $(srcdir)/cups-pk-helper-mechanism.xml
-	$(AM_V_GEN)$(GDBUS_CODEGEN)					\
-			--interface-prefix=org.opensuse.CupsPkHelper.	\
-			--c-namespace CphIface				\
-			--generate-c-code cph-iface-mechanism		\
-			--c-generate-object-manager			\
-			$<
-
-BUILT_SOURCES = $(cph_iface_mechanism)
-
-test_cups_SOURCES =	\
-	cups.c		\
-	cups.h		\
-	test-cups.c
-test_cups_CFLAGS =	\
-	$(AM_CFLAGS)	\
-	$(TEST_CFLAGS)
-test_cups_LDADD =	\
-	$(TEST_LIBS)	\
-	$(CUPS_LIBS)
-
-test_cups_pk_SOURCES =	\
-	test-cups-pk.c	\
-	$(cph_iface_mechanism)
-test_cups_pk_CFLAGS =	\
-	$(AM_CFLAGS)	\
-	$(TEST_CFLAGS)
-test_cups_pk_LDADD =	\
-	$(TEST_LIBS)	\
-	$(CUPS_LIBS)
-
-dbus_confdir = $(datadir)/dbus-1/system.d
-dbus_conf_DATA = org.opensuse.CupsPkHelper.Mechanism.conf
-
-dbus_servicesdir = $(datadir)/dbus-1/system-services
-dbus_services_in_files = org.opensuse.CupsPkHelper.Mechanism.service.in
-dbus_services_DATA = $(dbus_services_in_files:.service.in=.service)
-
-$(dbus_services_DATA): $(dbus_services_in_files)
-	$(AM_V_GEN)sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-
-polkitdir = $(datadir)/polkit-1/actions
-polkit_in_files = org.opensuse.cupspkhelper.mechanism.policy.in
-polkit_DATA = $(polkit_in_files:.policy.in=.policy)
-
-@INTLTOOL_POLICY_RULE@
-
-EXTRA_DIST =						\
-	$(dbus_services_in_files)			\
-	org.opensuse.CupsPkHelper.Mechanism.conf	\
-	$(polkit_in_files)				\
-	cups-pk-helper-mechanism.xml
-
-CLEANFILES = 			\
-	$(BUILT_SOURCES)	\
-	$(polkit_DATA)		\
-	$(dbus_services_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/src/cups.c b/src/cups.c
index a2cb9f4..b7187e7 100644
--- a/src/cups.c
+++ b/src/cups.c
@@ -35,8 +35,6 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 
-#include <config.h>
-
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 0000000..a47e273
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,84 @@
+prefix = get_option ('prefix')
+datadir = get_option ('datadir')
+libexecdir = get_option ('libexecdir')
+
+cups_pk_helper_mechanism_sources = files (
+  'cups.c',
+  'cups.h',
+  'cups-pk-helper-mechanism.c',
+  'cups-pk-helper-mechanism.h',
+  'main.c'
+)
+
+cph_iface_mechanism_source = gnome.gdbus_codegen (
+  'cph-iface-mechanism',
+  'cups-pk-helper-mechanism.xml',
+  interface_prefix : 'org.opensuse.CupsPkHelper.',
+  namespace : 'CphIface',
+  object_manager : true
+)
+
+executable (
+  'cups-pk-helper-mechanism',
+  cups_pk_helper_mechanism_sources,
+  cph_iface_mechanism_source,
+  install: true,
+  install_dir: join_paths (prefix, libexecdir),
+  dependencies : [glib2_dep, gio2_dep, gio_unix2_dep, polkit_dep, cups_dep]
+)
+
+
+cph_sources = files (
+  'cups.c',
+  'cups.h',
+)
+
+tests = [
+  'test-cups', 'test-cups-pk'
+]
+
+foreach test_name: tests
+  bin = executable (
+    test_name,
+    test_name + '.c',
+    cph_sources,
+    cph_iface_mechanism_source,
+    dependencies: [glib2_dep, gobject2_dep, gio2_dep, gio_unix2_dep, cups_dep],
+    c_args: ['-DG_DISABLE_DEPRECATED'])
+  test (test_name, bin,
+        env: ['G_TEST_SRCDIR=@0@'.format (meson.current_source_dir ()),
+              'G_TEST_BUILDDIR=@0@'.format (meson.current_build_dir ())])
+endforeach
+
+
+# Install configuration file
+install_data (
+  'org.opensuse.CupsPkHelper.Mechanism.conf',
+  install_dir: join_paths (prefix, datadir, 'dbus-1', 'system.d'),
+)
+
+
+# Substitute fields in service file and install it
+dbus_conf = configuration_data ()
+dbus_conf.set ('libexecdir', join_paths (prefix, libexecdir))
+configure_file (
+  input: 'org.opensuse.CupsPkHelper.Mechanism.service.in',
+  output: 'org.opensuse.CupsPkHelper.Mechanism.service',
+  configuration: dbus_conf,
+)
+install_data (
+  meson.current_build_dir () / 'org.opensuse.CupsPkHelper.Mechanism.service',
+  install_dir: join_paths (prefix, datadir, 'dbus-1', 'system-services')
+)
+
+
+# Translate and install policy file
+i18n.merge_file (
+  input: 'org.opensuse.cupspkhelper.mechanism.policy.in',
+  output: 'org.opensuse.cupspkhelper.mechanism.policy',
+  type: 'xml',
+  data_dirs: join_paths (meson.source_root (), 'src'),
+  po_dir: join_paths (meson.source_root (), 'po'),
+  install: true,
+  install_dir: join_paths (prefix, datadir, 'polkit-1', 'actions')
+)
diff --git a/src/org.opensuse.CupsPkHelper.Mechanism.service.in b/src/org.opensuse.CupsPkHelper.Mechanism.service.in
index 87fd6f7..472c213 100644
--- a/src/org.opensuse.CupsPkHelper.Mechanism.service.in
+++ b/src/org.opensuse.CupsPkHelper.Mechanism.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.opensuse.CupsPkHelper.Mechanism
-Exec=@LIBEXECDIR@/cups-pk-helper-mechanism
+Exec=@libexecdir@/cups-pk-helper-mechanism
 User=root
diff --git a/src/org.opensuse.cupspkhelper.mechanism.policy.in b/src/org.opensuse.cupspkhelper.mechanism.policy.in
index b947f62..1b663b2 100644
--- a/src/org.opensuse.cupspkhelper.mechanism.policy.in
+++ b/src/org.opensuse.cupspkhelper.mechanism.policy.in
@@ -9,8 +9,8 @@
   <icon_name>printer</icon_name>
 
   <action id="org.opensuse.cupspkhelper.mechanism.server-settings">
-    <_description>Get/Set server settings</_description>
-    <_message>Privileges are required to get/set server settings.</_message>
+    <description>Get/Set server settings</description>
+    <message>Privileges are required to get/set server settings.</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -19,8 +19,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.devices-get">
-    <_description>Get list of available devices</_description>
-    <_message>Privileges are required to get list of available devices.</_message>
+    <description>Get list of available devices</description>
+    <message>Privileges are required to get list of available devices.</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -32,8 +32,8 @@
        operation: if some authorization is required, then the PolicyKit helper
        will fallback on printer-X-edit. -->
   <action id="org.opensuse.cupspkhelper.mechanism.printer-set-default">
-    <_description>Set a printer as default printer</_description>
-    <_message>Privileges are required to set a printer, or a class, as default printer.</_message>
+    <description>Set a printer as default printer</description>
+    <message>Privileges are required to set a printer, or a class, as default printer.</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -45,8 +45,8 @@
        operation: if some authorization is required, then the PolicyKit helper
        will fallback on printer-X-edit. -->
   <action id="org.opensuse.cupspkhelper.mechanism.printer-enable">
-    <_description>Enable/Disable a printer</_description>
-    <_message>Privileges are required to enable/disable a printer, or a class.</_message>
+    <description>Enable/Disable a printer</description>
+    <message>Privileges are required to enable/disable a printer, or a class.</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -55,8 +55,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.printer-local-edit">
-    <_description>Add/Remove/Edit a local printer</_description>
-    <_message>Privileges are required to add/remove/edit a local printer.</_message>
+    <description>Add/Remove/Edit a local printer</description>
+    <message>Privileges are required to add/remove/edit a local printer.</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -65,8 +65,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.printer-remote-edit">
-    <_description>Add/Remove/Edit a remote printer</_description>
-    <_message>Privileges are required to add/remove/edit a remote printer.</_message>
+    <description>Add/Remove/Edit a remote printer</description>
+    <message>Privileges are required to add/remove/edit a remote printer.</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -75,8 +75,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.class-edit">
-    <_description>Add/Remove/Edit a class</_description>
-    <_message>Privileges are required to add/remove/edit a class.</_message>
+    <description>Add/Remove/Edit a class</description>
+    <message>Privileges are required to add/remove/edit a class.</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -85,8 +85,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.job-edit">
-    <_description>Restart/Cancel/Edit a job</_description>
-    <_message>Privileges are required to restart/cancel/edit a job.</_message>
+    <description>Restart/Cancel/Edit a job</description>
+    <message>Privileges are required to restart/cancel/edit a job.</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -95,8 +95,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.job-not-owned-edit">
-    <_description>Restart/Cancel/Edit a job owned by another user</_description>
-    <_message>Privileges are required to restart/cancel/edit a job owned by another user.</_message>
+    <description>Restart/Cancel/Edit a job owned by another user</description>
+    <message>Privileges are required to restart/cancel/edit a job owned by another user.</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -105,8 +105,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.all-edit">
-    <_description>Change printer settings</_description>
-    <_message>Privileges are required to change printer settings. This should only be needed from the Printers system settings panel.</_message>
+    <description>Change printer settings</description>
+    <message>Privileges are required to change printer settings. This should only be needed from the Printers system settings panel.</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
@@ -116,8 +116,8 @@
 
   <!-- Deprecated -->
   <action id="org.opensuse.cupspkhelper.mechanism.printeraddremove">
-    <_description>Add/Remove/Edit a printer</_description>
-    <_message>Privileges are required to add/remove/edit a printer.</_message>
+    <description>Add/Remove/Edit a printer</description>
+    <message>Privileges are required to add/remove/edit a printer.</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>