diff -Nru inkscape-0.48+devel+10728+24~oneiric1/debian/bzr-builder.manifest inkscape-0.48+devel+10729+25~oneiric1/debian/bzr-builder.manifest --- inkscape-0.48+devel+10728+24~oneiric1/debian/bzr-builder.manifest 2011-11-06 09:48:50.000000000 +0000 +++ inkscape-0.48+devel+10729+25~oneiric1/debian/bzr-builder.manifest 2011-11-07 14:47:26.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version 1:0.48+devel+10728+24 -lp:inkscape revid:goejendaagh@zonnet.nl-20111105234609-ja9k5c6mos2zsuky -nest packaging lp:~inkscape.dev/inkscape/debian-packaging debian revid:valavanisalex@googlemail.com-20111031235030-ixd66qbmqhpnwqcv +# bzr-builder format 0.3 deb-version 1:0.48+devel+10729+25 +lp:inkscape revid:kris.de.gussem@hotmail.com-20111107140320-zxh7p8xdx7zi7k2q +nest packaging lp:~inkscape.dev/inkscape/debian-packaging debian revid:valavanisalex@gmail.com-20111106114853-wp6zz3z85gl03m5c diff -Nru inkscape-0.48+devel+10728+24~oneiric1/debian/changelog inkscape-0.48+devel+10729+25~oneiric1/debian/changelog --- inkscape-0.48+devel+10728+24~oneiric1/debian/changelog 2011-11-06 09:48:50.000000000 +0000 +++ inkscape-0.48+devel+10729+25~oneiric1/debian/changelog 2011-11-07 14:47:26.000000000 +0000 @@ -1,8 +1,8 @@ -inkscape (1:0.48+devel+10728+24~oneiric1) natty; urgency=low +inkscape (1:0.48+devel+10729+25~oneiric1) natty; urgency=low * Auto build. - -- Launchpad Package Builder Sun, 06 Nov 2011 09:48:50 +0000 + -- Launchpad Package Builder Mon, 07 Nov 2011 14:47:26 +0000 inkscape (1:0.48+devel+10326+10) natty; urgency=low diff -Nru inkscape-0.48+devel+10728+24~oneiric1/debian/compat inkscape-0.48+devel+10729+25~oneiric1/debian/compat --- inkscape-0.48+devel+10728+24~oneiric1/debian/compat 2011-11-06 09:48:50.000000000 +0000 +++ inkscape-0.48+devel+10729+25~oneiric1/debian/compat 2011-11-07 14:47:25.000000000 +0000 @@ -1 +1 @@ -8 +7 diff -Nru inkscape-0.48+devel+10728+24~oneiric1/debian/control inkscape-0.48+devel+10729+25~oneiric1/debian/control --- inkscape-0.48+devel+10728+24~oneiric1/debian/control 2011-11-06 09:48:50.000000000 +0000 +++ inkscape-0.48+devel+10729+25~oneiric1/debian/control 2011-11-07 14:47:25.000000000 +0000 @@ -8,7 +8,7 @@ Alex Valavanis Build-Depends: autoconf, automake, - debhelper (>= 8.0.0), + debhelper (>= 7.0.0), intltool, libart-2.0-dev (>= 2.3.10), libaspell-dev, diff -Nru inkscape-0.48+devel+10728+24~oneiric1/debian/rules inkscape-0.48+devel+10729+25~oneiric1/debian/rules --- inkscape-0.48+devel+10728+24~oneiric1/debian/rules 2011-11-06 09:48:50.000000000 +0000 +++ inkscape-0.48+devel+10729+25~oneiric1/debian/rules 2011-11-07 14:47:25.000000000 +0000 @@ -56,7 +56,10 @@ --enable-lcms -build: config.status +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp +build-stamp: config.status dh_testdir ifneq "$(wildcard /usr/share/misc/config.sub)" "" diff -Nru inkscape-0.48+devel+10728+24~oneiric1/src/dom/css.h inkscape-0.48+devel+10729+25~oneiric1/src/dom/css.h --- inkscape-0.48+devel+10728+24~oneiric1/src/dom/css.h 2011-11-06 09:48:41.000000000 +0000 +++ inkscape-0.48+devel+10729+25~oneiric1/src/dom/css.h 2011-11-07 14:47:15.000000000 +0000 @@ -390,7 +390,7 @@ /** * */ - CSSStyleSheet() : stylesheets::StyleSheet() + CSSStyleSheet() : stylesheets::StyleSheet(), ownerRule(0) { } @@ -1217,6 +1217,7 @@ */ void assign(const CSSImportRule &other) { + href = other.href; mediaList = other.mediaList; styleSheet = other.styleSheet; } diff -Nru inkscape-0.48+devel+10728+24~oneiric1/src/dom/domimpl.cpp inkscape-0.48+devel+10729+25~oneiric1/src/dom/domimpl.cpp --- inkscape-0.48+devel+10728+24~oneiric1/src/dom/domimpl.cpp 2011-11-06 09:48:42.000000000 +0000 +++ inkscape-0.48+devel+10729+25~oneiric1/src/dom/domimpl.cpp 2011-11-07 14:47:15.000000000 +0000 @@ -2077,7 +2077,7 @@ /** * */ -DOMErrorImpl::DOMErrorImpl() +DOMErrorImpl::DOMErrorImpl() : message(""), severity(0), type("") { } @@ -2183,7 +2183,7 @@ /** * */ -DOMLocatorImpl::DOMLocatorImpl() +DOMLocatorImpl::DOMLocatorImpl() : byteOffset(0), columnNumber (0), uri(""), lineNumber(0), relatedNode(0), utf16Offset(0) { } diff -Nru inkscape-0.48+devel+10728+24~oneiric1/src/dom/uri.cpp inkscape-0.48+devel+10729+25~oneiric1/src/dom/uri.cpp --- inkscape-0.48+devel+10728+24~oneiric1/src/dom/uri.cpp 2011-11-06 09:48:45.000000000 +0000 +++ inkscape-0.48+devel+10729+25~oneiric1/src/dom/uri.cpp 2011-11-07 14:47:19.000000000 +0000 @@ -144,6 +144,7 @@ scheme = SCHEME_NONE; schemeStr.clear(); port = 0; + portSpecified = false; authority.clear(); path.clear(); absolute = false; @@ -200,18 +201,18 @@ DOMString URI::toString() const { DOMString str = schemeStr; - if (authority.size() > 0) + if (!authority.empty()) { str.append("//"); str.append(toStr(authority)); } str.append(toStr(path)); - if (query.size() > 0) + if (!query.empty()) { str.append("?"); str.append(toStr(query)); } - if (fragment.size() > 0) + if (!fragment.empty()) { str.append("#"); str.append(toStr(fragment)); @@ -380,11 +381,11 @@ return other; //## 2 - if (other.fragment.size() > 0 && - other.path.size() == 0 && - other.scheme == SCHEME_NONE && - other.authority.size() == 0 && - other.query.size() == 0 ) + if (!other.fragment.empty() && + other.path.empty() && + other.scheme == SCHEME_NONE && + other.authority.empty() && + other.query.empty()) { URI fragUri = *this; fragUri.fragment = other.fragment; @@ -398,7 +399,7 @@ newUri.schemeStr = schemeStr; newUri.query = other.query; newUri.fragment = other.fragment; - if (other.authority.size() > 0) + if (!other.authority.empty()) { //# 3.2 if (absolute || other.absolute) diff -Nru inkscape-0.48+devel+10728+24~oneiric1/src/dom/util/digest.h inkscape-0.48+devel+10729+25~oneiric1/src/dom/util/digest.h --- inkscape-0.48+devel+10728+24~oneiric1/src/dom/util/digest.h 2011-11-06 09:48:42.000000000 +0000 +++ inkscape-0.48+devel+10729+25~oneiric1/src/dom/util/digest.h 2011-11-07 14:47:15.000000000 +0000 @@ -146,8 +146,8 @@ /** * Append a byte vector to the hash */ - virtual void append(const std::vector buf) - { + virtual void append(const std::vector &buf) + { //NOTE: function seems to be unused for (unsigned int i=0 ; i