summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac4
-rw-r--r--data/Makefile.am2
-rw-r--r--doc/Makefile.am2
-rw-r--r--po/POTFILES.in3
5 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index d9d2ad1..f400a13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = 1.7
NULL =
+DISTCHECK_CONFIGURE_FLAGS = --without-systemd
+
SUBDIRS = \
src \
savers \
@@ -20,8 +22,6 @@ EXTRA_DIST = \
README \
ChangeLog \
NEWS \
- TODO \
- HACKING \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
diff --git a/configure.ac b/configure.ac
index 4499567..71ae024 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,12 +2,12 @@ dnl -*- mode: m4 -*-
AC_PREREQ(2.60)
AC_INIT([mate-screensaver],
- [1.6.0],
+ [1.6.1],
[http://www.mate-desktop.org/])
AC_CONFIG_SRCDIR(src/mate-screensaver.c)
-AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS(config.h)
diff --git a/data/Makefile.am b/data/Makefile.am
index bc42b57..70ac481 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -50,7 +50,7 @@ dist_migration_DATA = org.mate.screensaver.gschema.migrate
EXTRA_DIST = \
- $(gsettings_SCHEMAS:.xml=.xml.in.in) \
+ $(gsettings_SCHEMAS).in \
$(desktop_in_files) \
$(directory_in_files) \
$(gtkbuilder_DATA) \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a8851b7..5a69bc8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -7,7 +7,7 @@ SPEC_XML_FILES = \
if DOCBOOK_DOCS_ENABLED
-htmldocdir = $(DOCDIR)/spec
+htmldocdir = $(DOCDIR)
htmldoc_DATA = mate-screensaver.html
mate-screensaver.html : dbus-interface.xml
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 40895dd..0b3fc6a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,8 @@ data/mate-screensaver-preferences.desktop.in
[type: gettext/glade]data/mate-screensaver-preferences.ui
data/mate-screensaver.directory.in
data/images/cosmos/cosmos.xml.in.in
-data/org.gnome.screensaver.gschema.xml
+[type: gettext/glade]data/lock-dialog-default.ui
+data/org.mate.screensaver.gschema.xml.in
savers/cosmos-slideshow.desktop.in.in
savers/footlogo-floaters.desktop.in.in
savers/personal-slideshow.desktop.in.in