From 94b3317504dade2520f47e813c780f7e54a3ac2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 29 Apr 2015 12:43:58 +0200
Subject: Imported Upstream version 3.17.1

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

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index b436f12..6d68e8e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,15 +5,16 @@ desktop_DATA = simple-scan.desktop
 @INTLTOOL_DESKTOP_RULE@
 
 appdatadir = $(datadir)/appdata
-dist_appdata_DATA = simple-scan.appdata.xml
+appdata_DATA = simple-scan.appdata.xml
+@INTLTOOL_XML_RULE@
 
 gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 dist_man1_MANS = simple-scan.1
 
 EXTRA_DIST = simple-scan.desktop.in \
+             simple-scan.appdata.xml.in \
              org.gnome.SimpleScan.gschema.xml.in \
              simple-scan.ui \
              simple-scan.gresource.xml
@@ -22,4 +23,5 @@ DISTCLEANFILES = \
 	Makefile.in \
 	$(schema_DATA) \
 	$(desktop_DATA) \
+	$(appdata_DATA) \
 	$(gsettings_SCHEMAS)
-- 
cgit v1.2.3