diff -Nru tiled-daily-0+git20150419~10~ubuntu14.10.1/debian/bzr-builder.manifest tiled-daily-0+git20150421~10~ubuntu14.10.1/debian/bzr-builder.manifest --- tiled-daily-0+git20150419~10~ubuntu14.10.1/debian/bzr-builder.manifest 2015-04-19 20:17:15.000000000 +0000 +++ tiled-daily-0+git20150421~10~ubuntu14.10.1/debian/bzr-builder.manifest 2015-04-21 02:16:33.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version 0+git20150419~10 -lp:tiled revid:git-v1:fa5e08759ddaabc7f5ed2b78dd49f075c479b351 +# bzr-builder format 0.3 deb-version 0+git20150421~10 +lp:tiled revid:git-v1:7d2e36f317562c4aadf6b2c029bcc3095ee7af78 merge packaging lp:~mapeditor.org/+junk/packaging revid:thorbjorn@lindeijer.nl-20140112131036-722g4nh7s4ruonsq diff -Nru tiled-daily-0+git20150419~10~ubuntu14.10.1/debian/changelog tiled-daily-0+git20150421~10~ubuntu14.10.1/debian/changelog --- tiled-daily-0+git20150419~10~ubuntu14.10.1/debian/changelog 2015-04-19 20:17:15.000000000 +0000 +++ tiled-daily-0+git20150421~10~ubuntu14.10.1/debian/changelog 2015-04-21 02:16:33.000000000 +0000 @@ -1,6 +1,6 @@ -tiled-daily (0+git20150419~10~ubuntu14.10.1) utopic; urgency=low +tiled-daily (0+git20150421~10~ubuntu14.10.1) utopic; urgency=low * Auto build. - -- Launchpad Package Builder Sun, 19 Apr 2015 20:17:15 +0000 + -- Launchpad Package Builder Tue, 21 Apr 2015 02:16:33 +0000 diff -Nru tiled-daily-0+git20150419~10~ubuntu14.10.1/.pc/.quilt_patches tiled-daily-0+git20150421~10~ubuntu14.10.1/.pc/.quilt_patches --- tiled-daily-0+git20150419~10~ubuntu14.10.1/.pc/.quilt_patches 2015-04-19 20:17:16.000000000 +0000 +++ tiled-daily-0+git20150421~10~ubuntu14.10.1/.pc/.quilt_patches 2015-04-21 02:16:33.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-907934/chroot-autobuild/home/buildd/work/tree/tiled-daily-0+git20150419~10~ubuntu14.10.1/debian/patches +/home/buildd/build-RECIPEBRANCHBUILD-908695/chroot-autobuild/home/buildd/work/tree/tiled-daily-0+git20150421~10~ubuntu14.10.1/debian/patches diff -Nru tiled-daily-0+git20150419~10~ubuntu14.10.1/.pc/.quilt_series tiled-daily-0+git20150421~10~ubuntu14.10.1/.pc/.quilt_series --- tiled-daily-0+git20150419~10~ubuntu14.10.1/.pc/.quilt_series 2015-04-19 20:17:16.000000000 +0000 +++ tiled-daily-0+git20150421~10~ubuntu14.10.1/.pc/.quilt_series 2015-04-21 02:16:33.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-907934/chroot-autobuild/home/buildd/work/tree/tiled-daily-0+git20150419~10~ubuntu14.10.1/debian/patches/series +/home/buildd/build-RECIPEBRANCHBUILD-908695/chroot-autobuild/home/buildd/work/tree/tiled-daily-0+git20150421~10~ubuntu14.10.1/debian/patches/series diff -Nru tiled-daily-0+git20150419~10~ubuntu14.10.1/src/libtiled/mapwriter.cpp tiled-daily-0+git20150421~10~ubuntu14.10.1/src/libtiled/mapwriter.cpp --- tiled-daily-0+git20150419~10~ubuntu14.10.1/src/libtiled/mapwriter.cpp 2015-04-19 20:17:08.000000000 +0000 +++ tiled-daily-0+git20150421~10~ubuntu14.10.1/src/libtiled/mapwriter.cpp 2015-04-21 02:16:30.000000000 +0000 @@ -109,7 +109,7 @@ bool MapWriterPrivate::openFile(QIODevice *file) { - if (!file->open(QIODevice::WriteOnly)) { + if (!file->open(QIODevice::WriteOnly | QIODevice::Text)) { mError = tr("Could not open file for writing."); return false; } diff -Nru tiled-daily-0+git20150419~10~ubuntu14.10.1/src/tiled/automappingmanager.cpp tiled-daily-0+git20150421~10~ubuntu14.10.1/src/tiled/automappingmanager.cpp --- tiled-daily-0+git20150419~10~ubuntu14.10.1/src/tiled/automappingmanager.cpp 2015-04-19 20:17:08.000000000 +0000 +++ tiled-daily-0+git20150421~10~ubuntu14.10.1/src/tiled/automappingmanager.cpp 2015-04-21 02:16:30.000000000 +0000 @@ -131,7 +131,7 @@ + QLatin1Char('\n'); return false; } - if (!rulesFile.open(QIODevice::ReadOnly)) { + if (!rulesFile.open(QIODevice::ReadOnly | QIODevice::Text)) { mError += tr("Error opening rules file:\n%1").arg(filePath) + QLatin1Char('\n'); return false;