From f609ed732f3adb065f7af3109b3e7411c1344107 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Fri, 25 Jul 2014 01:08:47 -0700 Subject: [PATCH 1/5] update travis file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6e1f218..7a30945 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ script: branches: only: - master - - travis + - incoming From 5baa3be8789c4c5b5611541505c659dbc1f3d5a7 Mon Sep 17 00:00:00 2001 From: Sam Rijs Date: Fri, 26 Sep 2014 16:32:58 +1000 Subject: [PATCH 2/5] fix typo: generalize error message --- src/BackgroundRenderer/SplashBackgroundRenderer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BackgroundRenderer/SplashBackgroundRenderer.cc b/src/BackgroundRenderer/SplashBackgroundRenderer.cc index 7a9f79b..3217535 100644 --- a/src/BackgroundRenderer/SplashBackgroundRenderer.cc +++ b/src/BackgroundRenderer/SplashBackgroundRenderer.cc @@ -232,7 +232,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); From eb4de241023a968693f751bf9c4ac195872c6e2e Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Wed, 12 Nov 2014 09:45:49 +0800 Subject: [PATCH 3/5] trying to fix ppa packaging --- build_for_ppa.py | 4 ++-- debian/changelog | 6 ++++++ debian/control | 2 +- debian/rules | 3 +++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build_for_ppa.py b/build_for_ppa.py index 14edec8..81dea72 100755 --- a/build_for_ppa.py +++ b/build_for_ppa.py @@ -19,8 +19,8 @@ import re import time package='pdf2htmlex' -ppa_name='pdf2htmlex' -supported_distributions=('precise', 'raring', 'saucy') +ppa_name='ppa:coolwanglu/pdf2htmlex' +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' diff --git a/debian/changelog b/debian/changelog index 4880273..ecc3f5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pdf2htmlex (0.12-1~git201411120106r4f417-0ubuntu1) saucy; urgency=medium + + * Trying with PPA dependency + + -- WANG Lu Wed, 12 Nov 2014 01:02:35 +0800 + pdf2htmlex (0.11-1~git201311150048r23755-0ubuntu1) saucy; urgency=low * Fix packaging diff --git a/debian/control b/debian/control index 556b9f8..e8ce2d4 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: pdf2htmlex Section: universe/web Priority: extra Maintainer: WANG Lu -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), pkg-config, debhelper (>= 8), libpoppler-dev (>= 0.20.3), libpng12-dev, libjpeg-dev, libfontforge-dev, libspiro-dev, python-dev, default-jre-headless (>= 1.6), libcairo2-dev Standards-Version: 3.9.3 Homepage: http://github.com/coolwanglu/pdf2htmlEX diff --git a/debian/rules b/debian/rules index 4f2c774..6793dda 100644 --- a/debian/rules +++ b/debian/rules @@ -2,3 +2,6 @@ %: dh $@ +override_dh_auto_configure: + dh_auto_configure -- -DENABLE_SVG=ON + From 1a6ecd81fc4e180f442dab2731ee6544c013ea76 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Wed, 12 Nov 2014 10:58:16 +0800 Subject: [PATCH 4/5] fix ppa packaging --- debian/changelog | 12 ++++++++++++ debian/control | 2 +- debian/rules | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ecc3f5d..3c51a9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +pdf2htmlex (0.12-1~git201411121022reb4de-0ubuntu1) trusty; urgency=medium + + * Added libpango1.0-dev as building dependency + + -- WANG Lu 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 Wed, 12 Nov 2014 09:45:54 +0800 + pdf2htmlex (0.12-1~git201411120106r4f417-0ubuntu1) saucy; urgency=medium * Trying with PPA dependency diff --git a/debian/control b/debian/control index e8ce2d4..ad633cc 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: pdf2htmlex Section: universe/web Priority: extra Maintainer: WANG Lu -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), libcairo2-dev +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), libcairo2-dev, libpango1.0-dev Standards-Version: 3.9.3 Homepage: http://github.com/coolwanglu/pdf2htmlEX diff --git a/debian/rules b/debian/rules index 6793dda..f637505 100644 --- a/debian/rules +++ b/debian/rules @@ -5,3 +5,6 @@ override_dh_auto_configure: dh_auto_configure -- -DENABLE_SVG=ON +override_dh_auto_test: + + From 67dac7d9934c8092a1698347073ca2045d16c747 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Wed, 12 Nov 2014 11:43:28 +0800 Subject: [PATCH 5/5] wrap-and-sort --- debian/changelog | 6 ++++++ debian/control | 15 +++++++++++++-- debian/copyright | 1 - 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c51a9e..94324f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pdf2htmlex (0.12-1~git201411121058r1a6ec-0ubuntu1) trusty; urgency=medium + + * Disable test for PPA + + -- WANG Lu Wed, 12 Nov 2014 10:58:17 +0800 + pdf2htmlex (0.12-1~git201411121022reb4de-0ubuntu1) trusty; urgency=medium * Added libpango1.0-dev as building dependency diff --git a/debian/control b/debian/control index ad633cc..1399f61 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,24 @@ Source: pdf2htmlex Section: universe/web Priority: extra Maintainer: WANG Lu -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), libcairo2-dev, libpango1.0-dev +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 diff --git a/debian/copyright b/debian/copyright index a4c49dc..049cec9 100644 --- a/debian/copyright +++ b/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 . -