merge with master

5 files changed, 75 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index b56bcc0..4797a24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+epson-inkjet-printer-escpr (1.2.2-3) unstable; urgency=low
+
+  * Fixed to report PAGE before job-media-progress
+  * Git: external/epson-inkjet-printer-escpr
+  * Tag: epson-inkjet-printer-escpr_1.2.2-3
+
+ -- GangHeok Kim <gangheok.kim@samsung.com>  Tue, 29 Jan 2013 09:18:10 +0900
+
+epson-inkjet-printer-escpr (1.2.2-2) unstable; urgency=low
+
+  * Fixed to report job media progress
+  * Git: external/epson-inkjet-printer-escpr
+  * Tag: epson-inkjet-printer-escpr_1.2.2-2
+
+ -- GangHeok Kim <gangheok.kim@samsung.com>  Thu, 10 Jan 2013 20:16:29 +0900
+
 epson-inkjet-printer-escpr (1.2.2-1slp2) unstable; urgency=low
 
   * Upgraded to 1.2.2-1
diff --git a/epson-inkjet-printer-escpr.manifest b/epson-inkjet-printer-escpr.manifest
index e2f9ea0..9ed9d1b 100644
--- a/epson-inkjet-printer-escpr.manifest
+++ b/epson-inkjet-printer-escpr.manifest
@@ -1,8 +1,10 @@
 <manifest>
 	<request>
-		<domain name="cups"/>
+		<domain name="mobileprint"/>
 	</request>
 	<assign>
-		<filesystem path="/usr/lib/libescpr.so.1.0.0" label="_" />
+		<filesystem path="/usr/lib/libescpr.so" label="_" exec_label="_" />
+		<filesystem path="/usr/lib/libescpr.so.1" label="_" exec_label="_" />
+		<filesystem path="/usr/lib/libescpr.so.1.0.0" label="_" exec_label="_" />
 	</assign>
 </manifest>
diff --git a/packaging/epson-inkjet-printer-escpr.spec b/packaging/epson-inkjet-printer-escpr.spec
index 4a501b4..cdeb38a 100644
--- a/packaging/epson-inkjet-printer-escpr.spec
+++ b/packaging/epson-inkjet-printer-escpr.spec
@@ -22,7 +22,7 @@
 
 Name: epson-inkjet-printer-escpr
 Version: 1.2.2
-Release: 2
+Release: 3
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Vendor: Seiko Epson Corporation
@@ -35,6 +35,8 @@ Group: Applications/System
 Summary: Epson Inkjet Printer Driver (ESC/P-R) for Linux
 # Bug fix for Tizen
 Patch0: tizen_bugfix.patch
+Patch1: tizen_add_job_media_progress.patch
+Patch2: tizen_report_page_info.patch
 
 %description
 This software is a filter program used with Common UNIX Printing
@@ -50,6 +52,8 @@ http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure \
@@ -82,6 +86,6 @@ rm -rf ${RPM_BUILD_ROOT}
 /usr/share/license/%{name}
 %{cupsfilterdir}/epson-escpr
 %{cupsfilterdir}/epson-escpr-wrapper
-%{_libdir}/libescpr.so*
+%attr(644,-,-) %{_libdir}/libescpr.so*
 %exclude %{_libdir}/libescpr.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..82e6672
--- /dev/null
+++ b/packaging/tizen_add_job_media_progress.patch
@@ -0,0 +1,17 @@
+diff -urN epson-inkjet-printer-escpr.orig/src/wrapper.c epson-inkjet-printer-escpr/src/wrapper.c
+--- epson-inkjet-printer-escpr.orig/src/wrapper.c	2013-01-10 20:10:44.098990466 +0900
++++ epson-inkjet-printer-escpr/src/wrapper.c	2013-01-10 20:08:28.734990482 +0900
+@@ -231,6 +231,10 @@
+ 				debug_msg("fwrite error");
+ 				return 8;
+ 			}
++            if ((i & 127) == 0)
++            {
++                fprintf(stderr, "ATTR: job-media-progress=%d\n", 100 * i / header.cupsHeight);
++            }
+ 		}
+-		
++
+ 		free (image_raw);
+ 	}
+ 
diff --git a/packaging/tizen_report_page_info.patch b/packaging/tizen_report_page_info.patch
new file mode 100644
index 0000000..ae419e6
--- /dev/null
+++ b/packaging/tizen_report_page_info.patch
@@ -0,0 +1,32 @@
+diff -urN epson-inkjet-printer-escpr.orig/src/wrapper.c epson-inkjet-printer-escpr/src/wrapper.c
+--- epson-inkjet-printer-escpr.orig/src/wrapper.c	2013-01-29 08:47:03.470762954 +0900
++++ epson-inkjet-printer-escpr/src/wrapper.c	2013-01-29 08:51:12.762758216 +0900
+@@ -111,7 +111,7 @@
+ 	cups_raster_t *ras;	/* raster stream for printing */
+ 	cups_page_header_t header; /* page device dictionary header */
+ 	filter_option_t fopt;
+-
++	int Page;		/*  current page number */
+ #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+   struct sigaction action;      /* Actions for POSIX signals */
+ #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+@@ -183,8 +183,10 @@
+ 	}
+ 
+ 	pfp = NULL;
++	Page = 0;
+ 	while (cupsRasterReadHeader (ras, &header) && !cancel_flg)
+ 	{
++		Page++;
+ 		int image_bytes;
+ 		char *image_raw;
+ 		int write_size = 0;
+@@ -218,7 +220,7 @@
+ 
+ 		image_bytes = WIDTH_BYTES(header.cupsBytesPerLine * 8);
+ 		image_raw = (char *)calloc (sizeof (char), image_bytes);
+-
++		fprintf(stderr, "PAGE: %d %d\n", Page, header.NumCopies);
+ 		for (i = 0; i < header.cupsHeight && !cancel_flg; i ++)
+ 		{
+ 			if (!cupsRasterReadPixels (ras, (unsigned char*)image_raw, header.cupsBytesPerLine))