Merge branch 'master' into incoming

.travis.yml

@@ -21,4 +21,4 @@ script:
 branches:
   only:
     - master
-    - travis
+    - incoming

build_for_ppa.py

@@ -19,8 +19,8 @@ import re
 import time
 
 package='pdf2htmlex'
-ppa_name='pdf2htmlex'
+ppa_name='ppa:coolwanglu/pdf2htmlex'
-supported_distributions=('precise', 'raring', 'saucy')
+supported_distributions=('precise', 'trusty')
 dist_pattern=re.compile('|'.join(['\\) '+i for i in supported_distributions]))
 archive_cmd='(rm CMakeCache.txt || true) && cmake . && make dist'
 archive_suffix='.tar.bz2'

debian/changelog

@@ -1,3 +1,27 @@
+pdf2htmlex (0.12-1~git201411121058r1a6ec-0ubuntu1) trusty; urgency=medium
+
+  * Disable test for PPA
+
+ -- WANG Lu <coolwanglu@gmail.com>  Wed, 12 Nov 2014 10:58:17 +0800
+
+pdf2htmlex (0.12-1~git201411121022reb4de-0ubuntu1) trusty; urgency=medium
+
+  * Added libpango1.0-dev as building dependency 
+
+ -- WANG Lu <coolwanglu@gmail.com>  Wed, 12 Nov 2014 09:54:57 +0800
+
+pdf2htmlex (0.12-1~git201411120945reb4de-0ubuntu1) trusty; urgency=medium
+
+  * Added libcairo-dev as building dependency 
+
+ -- WANG Lu <coolwanglu@gmail.com>  Wed, 12 Nov 2014 09:45:54 +0800
+
+pdf2htmlex (0.12-1~git201411120106r4f417-0ubuntu1) saucy; urgency=medium
+
+  * Trying with PPA dependency
+
+ -- WANG Lu <coolwanglu@gmail.com>  Wed, 12 Nov 2014 01:02:35 +0800
+
 pdf2htmlex (0.11-1~git201311150048r23755-0ubuntu1) saucy; urgency=low
 
   * Fix packaging

debian/control

@@ -2,13 +2,24 @@ Source: pdf2htmlex
 Section: universe/web
 Priority: extra
 Maintainer: WANG Lu <coolwanglu@gmail.com>
-Build-Depends: cmake (>= 2.6.0), pkg-config, debhelper (>= 8), libpoppler-dev (>= 0.20.3), libpng12-dev, libjpeg-dev, libfontforge-dev, libspiro-dev, python-dev, default-jre-headless (>= 1.6)
+Build-Depends: cmake (>= 2.6.0),
+               debhelper (>= 8),
+               default-jre-headless (>= 1.6),
+               libcairo2-dev,
+               libfontforge-dev,
+               libjpeg-dev,
+               libpango1.0-dev,
+               libpng12-dev,
+               libpoppler-dev (>= 0.20.3),
+               libspiro-dev,
+               pkg-config,
+               python-dev
 Standards-Version: 3.9.3
 Homepage: http://github.com/coolwanglu/pdf2htmlEX
 
 Package: pdf2htmlex
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: ttfautohint
 Description: Converts PDF to HTML without losing format
  pdf2htmlEX converts PDF to HTML while retaining text, format & style as much as possible

debian/copyright

@@ -20,4 +20,3 @@ License: GPL-3
  .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-

debian/rules

@@ -2,3 +2,9 @@
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DENABLE_SVG=ON
+
+override_dh_auto_test:
+
+

src/BackgroundRenderer/SplashBackgroundRenderer.cc

@@ -234,7 +234,7 @@ void SplashBackgroundRenderer::dump_image(const char * filename, int x1, int y1,
     }
 
     if(!writer->init(f, width, height, param.h_dpi, param.v_dpi))
-        throw "Cannot initialize PNGWriter";
+        throw "Cannot initialize image writer";
         
     auto * bitmap = getBitmap();
     assert(bitmap->getMode() == splashModeRGB8);