diff -Nru cutycapt-0.0~svn6/debian/changelog cutycapt-0.0~svn6/debian/changelog --- cutycapt-0.0~svn6/debian/changelog 2010-10-29 19:41:26.000000000 +0000 +++ cutycapt-0.0~svn6/debian/changelog 2011-03-13 18:08:10.000000000 +0000 @@ -1,9 +1,16 @@ -cutycapt (0.0~svn6-1ubuntu1) natty; urgency=low +cutycapt (0.0~svn6-3) unstable; urgency=low - * debian/control: Add libqtwebkit-dev to build-dep, fixes - FTBFS (LP: #668449) + * Add Build-Depends on libqtwebkit-dev (Closes: #618240) - -- Roy Jamison Fri, 29 Oct 2010 21:41:26 +0200 + -- David Paleino Sun, 13 Mar 2011 19:08:07 +0100 + +cutycapt (0.0~svn6-2) unstable; urgency=low + + * Assume http if no scheme is given on the command line + (01-assume_http_as_default.patch) (Closes: #611900) + * Bump Standards-Version to 3.9.1, no changes needed + + -- David Paleino Tue, 01 Mar 2011 12:55:57 +0100 cutycapt (0.0~svn6-1) unstable; urgency=low diff -Nru cutycapt-0.0~svn6/debian/control cutycapt-0.0~svn6/debian/control --- cutycapt-0.0~svn6/debian/control 2010-10-29 19:41:23.000000000 +0000 +++ cutycapt-0.0~svn6/debian/control 2011-03-13 18:07:36.000000000 +0000 @@ -1,14 +1,13 @@ Source: cutycapt Section: web Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: David Paleino +Maintainer: David Paleino Build-Depends: debhelper (>= 7.4.12~) , libqt4-dev (>= 4.4.0) - , qt4-qmake , libqtwebkit-dev -Standards-Version: 3.9.0 + , qt4-qmake +Standards-Version: 3.9.1 Homepage: http://cutycapt.sourceforge.net/ Vcs-Git: git://git.debian.org/collab-maint/cutycapt.git Vcs-Browser: http://git.debian.org/?p=collab-maint/cutycapt.git;a=summary diff -Nru cutycapt-0.0~svn6/debian/patches/01-assume_http_as_default.patch cutycapt-0.0~svn6/debian/patches/01-assume_http_as_default.patch --- cutycapt-0.0~svn6/debian/patches/01-assume_http_as_default.patch 1970-01-01 00:00:00.000000000 +0000 +++ cutycapt-0.0~svn6/debian/patches/01-assume_http_as_default.patch 2011-03-01 11:54:58.000000000 +0000 @@ -0,0 +1,61 @@ +From: David Paleino +Subject: if no scheme is present, assume http +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=611900 +Forwarded: no + +--- + CutyCapt.cpp | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +--- cutycapt.orig/CutyCapt.cpp ++++ cutycapt/CutyCapt.cpp +@@ -362,7 +362,7 @@ main(int argc, char *argv[]) { + int argMaxWait = 90000; + int argVerbosity = 0; + +- const char* argUrl = NULL; ++ QByteArray argUrl = NULL; + const char* argUserStyle = NULL; + const char* argUserStylePath = NULL; + const char* argUserStyleString = NULL; +@@ -370,6 +370,7 @@ main(int argc, char *argv[]) { + const char* argInjectScript = NULL; + const char* argScriptObject = NULL; + QString argOut; ++ QUrl parsedUrl; + + CutyCapt::OutputFormat format = CutyCapt::OtherFormat; + +@@ -421,7 +422,7 @@ main(int argc, char *argv[]) { + + // --name=value options + if (strncmp("--url", s, nlen) == 0) { +- argUrl = value; ++ argUrl = QByteArray(value); + + } else if (strncmp("--min-width", s, nlen) == 0) { + // TODO: add error checking here? +@@ -571,14 +572,21 @@ main(int argc, char *argv[]) { + } + } + +- if (argUrl == NULL || argOut == NULL || argHelp) { ++ if (argUrl.isNull() || argOut == NULL || argHelp) { + CaptHelp(); + return EXIT_FAILURE; + } + ++ // Check if a scheme is present, if not, assume http. ++ parsedUrl = QUrl::fromEncoded(argUrl); ++ if (parsedUrl.scheme() == "") { ++ argUrl = "http://" + argUrl; ++ parsedUrl = QUrl::fromEncoded(argUrl); ++ } ++ + // This used to use QUrl(argUrl) but that escapes %hh sequences + // even though it should not, as URLs can assumed to be escaped. +- req.setUrl( QUrl::fromEncoded(argUrl) ); ++ req.setUrl(parsedUrl); + + QString scriptProp(argScriptObject); + QString scriptCode; diff -Nru cutycapt-0.0~svn6/debian/patches/series cutycapt-0.0~svn6/debian/patches/series --- cutycapt-0.0~svn6/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ cutycapt-0.0~svn6/debian/patches/series 2011-03-01 11:53:37.000000000 +0000 @@ -0,0 +1 @@ +01-assume_http_as_default.patch