merge with mastersubmit/tizen_2.1/20130424.224909submit/tizen/20130517.045931accepted/tizen_2.1/20130425.024611accepted/tizen/20130520.1017362.1b_releasetizen_2.1

6 files changed, 96 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 9ab075a..6ffaa1b 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+epson-laser-printer-escpage (1.0.1-8) unstable; urgency=low
+
+  * Fixed filter to ignore SIGPIPE
+  * Git: external/epson-laser-printer-escpage
+  * Tag: epson-laser-printer-escpage-1.0.1-8
+
+ -- GangHeok Kim <gangheok.kim@samsung.com>  Tue, 05 Feb 2013 15:08:19 +0900
+
+epson-laser-printer-escpage (1.0.1-7) unstable; urgency=low
+
+  * Fixed to report PAGE info before job-media-progress
+  * Git: external/epson-laser-printer-escpage
+  * Tag: epson-laser-printer-escpage-1.0.1-7
+
+ -- GangHeok Kim <gangheok.kim@samsung.com>  Tue, 29 Jan 2013 09:30:48 +0900
+
+epson-laser-printer-escpage (1.0.1-6) unstable; urgency=low
+
+  * Fixed to report job media progress
+  * Git: external/epson-laser-printer-escpage
+  * Tag: epson-laser-printer-escpage-1.0.1-6
+
+ -- GangHeok Kim <gangheok.kim@samsung.com>  Thu, 10 Jan 2013 20:23:50 +0900
+
 epson-laser-printer-escpage (1.0.1-5slp2) unstable; urgency=low
 
   * Fixed uncorrect PPD files
diff --git a/epson-laser-printer-escpage.manifest b/epson-laser-printer-escpage.manifest
index 6300b52..bab3aad 100644
--- a/epson-laser-printer-escpage.manifest
+++ b/epson-laser-printer-escpage.manifest
@@ -1,8 +1,10 @@
 <manifest>
 	<request>
-		<domain name="cups"/>
+		<domain name="mobileprint"/>
 	</request>
 	<assign>
-		<filesystem path="/usr/lib/libescpage.so.1.0.1" label="_" />
+		<filesystem path="/usr/lib/libescpage.so" label="_" exec_label="_" />
+		<filesystem path="/usr/lib/libescpage.so.1" label="_" exec_label="_" />
+		<filesystem path="/usr/lib/libescpage.so.1.0.1" label="_" exec_label="_" />
 	</assign>
 </manifest>
diff --git a/packaging/epson-laser-printer-escpage.spec b/packaging/epson-laser-printer-escpage.spec
index 30e3a61..e003e93 100644
--- a/packaging/epson-laser-printer-escpage.spec
+++ b/packaging/epson-laser-printer-escpage.spec
@@ -7,18 +7,22 @@
 
 Name: epson-laser-printer-escpage
 Version: 1.0.1
-Release: 5
+Release: 8
 Source0: %{name}-%{version}.tar.gz
 License: LGPL
 Vendor: Seiko Epson Corporation
 Packager: Seiko Epson Corporation <linux-printer@epson.jp>
 BuildRoot: %{_tmppath}/%{name}-%{version}
 BuildRequires: cups-devel
+Requires: cups
 Group: Applications/System
 Summary: Epson Laser Printer Driver (ESC/Page) for Linux
 # Bug fix for Tizen
 # Structure values are unused in Tizen
 Patch0: tizen_disable_unused_value.patch
+Patch1: tizen_add_job_media_progress.patch
+Patch2: tizen_report_page_info.patch
+Patch3: tizen_fix_ignore_sigpipe.patch
 
 %description
 This software is a filter program used with Common UNIX Printing
@@ -31,6 +35,9 @@ used for all EPSON ESC/Page printers.
 %prep
 %setup -q
 %patch0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %configure \
@@ -61,7 +68,7 @@ rm -rf ${RPM_BUILD_ROOT}
 #%doc AUTHORS COPYING NEWS README README.ja
 /usr/share/license/%{name}
 %{cupsfilterdir}/*
-%{_libdir}/libescpage*.so*
+%attr(644,-,-) %{_libdir}/libescpage*.so*
 %exclude %{_libdir}/libescpage.a
 %exclude %{_libdir}/libescpage.la
 %exclude %{cupsppddir}
diff --git a/packaging/tizen_add_job_media_progress.patch b/packaging/tizen_add_job_media_progress.patch
new file mode 100644
index 0000000..6a60d02
--- /dev/null
+++ b/packaging/tizen_add_job_media_progress.patch
@@ -0,0 +1,14 @@
+diff -urN epson-laser-printer-escpage.orig/src/filter.c epson-laser-printer-escpage/src/filter.c
+--- epson-laser-printer-escpage.orig/src/filter.c	2013-01-10 20:14:02.566990442 +0900
++++ epson-laser-printer-escpage/src/filter.c	2013-01-10 20:13:33.774990447 +0900
+@@ -923,6 +923,10 @@
+           }
+           debug_msg("%s:%d \t<<%s>>: \tCompleted print line [%d]\n", __FILE__, __LINE__, __FUNCTION__, i);
+         }
++		if ((i & 127) == 0)
++		{
++			fprintf(stderr, "ATTR: job-media-progress=%d\n", 100 * i / header.cupsHeight);
++		}
+       }
+     debug_msg("pageEndPage(%d) call\n", page_count);
+     err = pageEndPage();
diff --git a/packaging/tizen_fix_ignore_sigpipe.patch b/packaging/tizen_fix_ignore_sigpipe.patch
new file mode 100644
index 0000000..1d6ec5b
--- /dev/null
+++ b/packaging/tizen_fix_ignore_sigpipe.patch
@@ -0,0 +1,33 @@
+diff -urN epson-laser-printer-escpage.orig/src/filter.c epson-laser-printer-escpage/src/filter.c
+--- epson-laser-printer-escpage.orig/src/filter.c	2013-02-05 15:05:36.769014015 +0900
++++ epson-laser-printer-escpage/src/filter.c	2013-02-05 15:07:13.025014004 +0900
+@@ -39,6 +39,7 @@
+ #include <errno.h>
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <signal.h>
+ 
+ #include "err.h"
+ #include "mem.h"
+@@ -619,7 +620,20 @@
+   cups_raster_t *ras; /* raster stream for printing */
+   cups_page_header_t header; /* page device dictionary header */
+   EPS_JOB_ATTRIB fopt;
+-  
++
++#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
++    struct sigaction action;      /*   Actions for POSIX signals */
++#endif /*   HAVE_SIGACTION && !HAVE_SIGSET */
++    #ifdef HAVE_SIGSET
++    sigset(SIGPIPE, SIG_IGN);
++#elif defined(HAVE_SIGACTION)
++    memset(&action, 0, sizeof(action));
++    action.sa_handler = SIG_IGN;
++    sigaction(SIGPIPE, &action, NULL);
++#else
++    signal(SIGPIPE, SIG_IGN);
++#endif /*   HAVE_SIGSET */
++
+   debug_msg("%s:%d \t<<%s>>: \t\tStart()\n", __FILE__, __LINE__, __FUNCTION__);
+ 
+ /* attach point */
diff --git a/packaging/tizen_report_page_info.patch b/packaging/tizen_report_page_info.patch
new file mode 100644
index 0000000..1df87e7
--- /dev/null
+++ b/packaging/tizen_report_page_info.patch
@@ -0,0 +1,12 @@
+diff -urN epson-laser-printer-escpage.orig/src/filter.c epson-laser-printer-escpage/src/filter.c
+--- epson-laser-printer-escpage.orig/src/filter.c	2013-01-29 09:26:35.266717859 +0900
++++ epson-laser-printer-escpage/src/filter.c	2013-01-29 09:28:45.270715387 +0900
+@@ -851,7 +851,7 @@
+     int i = 0;
+     int y_count = 0;
+     debug_msg("duplex = %d, page_count = %d\n", jobAttr.duplex, page_count);
+-    
++    fprintf(stderr, "PAGE: %d %d\n",page_count, header.NumCopies);
+     for (i = 0; i < header.cupsHeight && !cancel_flg; i ++)
+       {
+         debug_msg("%s:%d \t<<%s>>: \tStart print line [%d]\n", __FILE__, __LINE__, __FUNCTION__, i);