merge with master

diff --git a/debian/changelog b/debian/changelog
index bd30932..6763e8d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hplip (3.12.4-13) unstable; urgency=low
+
+  * Fixed to report job media progress
+  * Git: external/hplip
+  * Tag: hplip_3.12.4-13
+
+ -- GangHeok Kim <gangheok.kim@samsung.com>  Thu, 10 Jan 2013 19:58:21 +0900
+
 hplip (3.12.4-12slp2) unstable; urgency=low
 
   * Fixed not to build deprecated PPD API

diff --git a/hplip.manifest b/hplip.manifest
index f3ff7db..b771fc9 100644 (file)
--- a/hplip.manifest
+++ b/hplip.manifest
@@ -1,5 +1,5 @@
 <manifest>
        <request>
-               <domain name="cups"/>
+               <domain name="mobileprint"/>
        </request>
 </manifest>

diff --git a/packaging/hplip.spec b/packaging/hplip.spec
index eac46fa..86a7759 100644 (file)
--- a/packaging/hplip.spec
+++ b/packaging/hplip.spec
@@ -25,7 +25,7 @@ Group:          Hardware/Printing
 # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
 # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
 Version:        3.12.4
-Release:        12
+Release:        13
 Url:            http://hplipopensource.com
 # Source0...Source9 is for sources from HP:
 # URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.4.tar.gz
@@ -117,6 +117,7 @@ Patch103:           tizen_disable_dbus_hpcups.patch
 Patch104:              tizen_add_sigpipe_ign.patch
 Patch105:              tizen_fix_image_align.patch
 Patch106:              tizen_fix_debug_log.patch
+Patch107:              tizen_add_job_media_progress.patch
 
 #PreReq:         coreutils
 #PreReq:         /bin/grep
@@ -332,6 +333,7 @@ http://hplipopensource.com
 %patch104
 %patch105
 %patch106
+%patch107 -p1
 
 %build
 # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake)

diff --git a/packaging/tizen_add_job_media_progress.patch b/packaging/tizen_add_job_media_progress.patch
new file mode 100644 (file)
index 0000000..4d8c16d
--- /dev/null
+++ b/packaging/tizen_add_job_media_progress.patch
@@ -0,0 +1,15 @@
+diff -urN hplip.orig/prnt/hpcups/HPCupsFilter.cpp hplip/prnt/hpcups/HPCupsFilter.cpp
+--- hplip.orig/prnt/hpcups/HPCupsFilter.cpp    2013-01-10 19:55:26.010990577 +0900
++++ hplip/prnt/hpcups/HPCupsFilter.cpp 2013-01-10 19:54:58.118990579 +0900
+@@ -700,6 +700,11 @@
+             }
+             WriteBMPRaster (cfp, color_raster, cups_header.cupsWidth, COLOR_RASTER);
+             WriteBMPRaster (kfp, black_raster, cups_header.cupsWidth/8, BLACK_RASTER);
++
++                      if ((y & 127) == 0)
++                      {
++                              fprintf(stderr, "ATTR: job-media-progress=%d\n", 100 * y / cups_header.cupsHeight);
++                      }
+         }
+         m_Job.NewPage();
+         if (err != NO_ERROR) {