merge with master

diff --git a/debian/changelog b/debian/changelog
index 4db58c3..7544a0a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+poppler (0.20.4-8) unstable; urgency=low
+
+  * Smack manifest updated
+  * Git: external/poppler
+  * Tag: poppler_0.20.4-8
+
+ -- GangHeok Kim <gangheok.kim@samsung.com>  Thu, 21 Feb 2013 18:04:07 +0900
+
+poppler (0.20.4-7) unstable; urgency=low
+
+  * SMACK rules updated
+  * Git: external/poppler
+  * Tag: poppler_0.20.4-7
+
+ -- Danny Jeongseok Seo <s.seo@samsung.com>  Thu, 14 Feb 2013 21:59:37 +0900
+
+poppler (0.20.4-6) unstable; urgency=low
+
+  * Smack rule updated
+  * Git: external/poppler
+  * Tag: poppler_0.20.4-6
+
+ -- GangHeok Kim <gangheok.kim@samsung.com>  Fri, 01 Feb 2013 18:13:11 +0900
+
 poppler (0.20.4-5slp2) unstable; urgency=low
 
   * Enabled poppler-cpp library

diff --git a/packaging/poppler.spec b/packaging/poppler.spec
index 08b967d..3c4a6b6 100644 (file)
--- a/packaging/poppler.spec
+++ b/packaging/poppler.spec
@@ -19,7 +19,7 @@
 
 Name:           poppler
 Version:        0.20.4
-Release:        5
+Release:        8
 # Actual version of poppler-data:
 %define poppler_data_version 0.2.1
 %define poppler_soname 25
@@ -294,7 +294,17 @@ cp %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/usr/share/license/poppler-to
 %defattr (-, root, root)
 /usr/share/license/poppler-tools
 #%doc COPYING
-%{_bindir}/*
+%{_bindir}/pdfdetach
+%{_bindir}/pdffonts
+%{_bindir}/pdfimages
+%{_bindir}/pdfinfo
+%{_bindir}/pdfseparate
+%{_bindir}/pdftocairo
+%{_bindir}/pdftohtml
+%{_bindir}/pdftoppm
+%{_bindir}/pdftops
+%{_bindir}/pdftotext
+%{_bindir}/pdfunite
 #%doc %{_mandir}/man1/*.*
 
 %files -n libpoppler-cpp%{poppler_cpp_soname}

diff --git a/poppler-tools.manifest b/poppler-tools.manifest
index 81ace0c..8ace46b 100644 (file)
--- a/poppler-tools.manifest
+++ b/poppler-tools.manifest
@@ -1,6 +1,9 @@
 <manifest>
+       <define>
+               <domain name="mobileprint" policy="restricted" plist="poppler-tools,avahi-data,avahi,cups-data,cups,hplip,epson-inkjet-printer-escpr,epson-laser-printer-escpage,samsungcupsfilter,cups-filters,print-service,org.tizen.mobileprint"/>
+       </define>
        <request>
-               <domain name="_"/>
+               <domain name="mobileprint"/>
        </request>
 </manifest>