From 5ea80129fe2c77822dc0f52af8f43df61d67b1f7 Mon Sep 17 00:00:00 2001
From: Oron Peled <oron@actcom.co.il>
Date: May 13 2012 05:17:57 +0000
Subject: Merge branch 'master' into f17


Conflicts:
	debconf.spec

---

diff --git a/debconf.spec b/debconf.spec
index e826a4c..2b4a528 100644
--- a/debconf.spec
+++ b/debconf.spec
@@ -154,7 +154,7 @@ done
 
 %find_lang debconf
 
-%files -f debconf.lang
+%files
 %doc doc/README doc/EXAMPLES doc/CREDITS doc/README.translators doc/README.LDAP doc/TODO
 %doc debian/changelog debian/copyright debian/README.Debian
 %config(noreplace) %{_sysconfdir}/debconf.conf
@@ -197,7 +197,7 @@ done
 %{_mandir}/man7/debconf-devel.7*
 %{_mandir}/man7/debconf.7*
 
-%files i18n -f man-i18n.lang
+%files i18n -f man-i18n.lang -f debconf.lang
 %doc debian/changelog debian/copyright debian/README.Debian
 
 %files utils -f man-utils.lang