From 87ebc2af1f0417b3bc38a233e28ff673eff4fa51 Mon Sep 17 00:00:00 2001
From: Alessio Treglia <alessio@debian.org>
Date: Sat, 27 Aug 2011 10:54:21 +0200
Subject: Imported Upstream version 3.1.5

---
 data/Makefile.am | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index d406905..c99f807 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,16 +8,16 @@ utilities_in_files = simple-scan.desktop.in
 utilities_DATA = $(utilities_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_in_files = simple-scan.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
+gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
 
 man1_MANS = simple-scan.1
 
-EXTRA_DIST = $(ui_DATA) $(utilities_in_files) $(schema_in_files) $(man1_MANS)
+EXTRA_DIST = $(ui_DATA) $(utilities_in_files) org.gnome.SimpleScan.gschema.xml.in $(man1_MANS)
 
 DISTCLEANFILES = \
 	Makefile.in \
 	$(schema_DATA) \
-	$(utilities_DATA)
+	$(utilities_DATA) \
+	$(gsettings_SCHEMAS)
-- 
cgit v1.2.3