← Back to branch summary

~ubuntu-branches/ubuntu/raring/tiled-qt/raring

~ubuntu-branches/ubuntu/raring/tiled-qt/raring

Viewing all changes in revision 7.

Committer: Bazaar Package Importer
Author(s): Angel Abad
Date: 2011-02-09 08:47:43 UTC
mfrom: (5.1.1 sid)
Revision ID: james.westby@ubuntu.com-20110209084743-1cakobhl0bk2cfpz

Tags: 0.6.0-1ubuntu1

* Merge from debian unstable. Remaining changes:
- Fix FTBFS due to indirect linking.
+ Add fix-build-indirect-linking.patch

files added:
.pc/addrpath.patch/src/plugins/plugin.pri

.pc/addrpath.patch/src/tmxviewer

.pc/addrpath.patch/src/tmxviewer/tmxviewer.pro

LICENSE.BSD

LICENSE.GPL

LICENSE.LGPL

debian/tmxviewer.xml

docs/map.dtd

docs/map.xsd

make-dist-win32.sh

src/libtiled/compression.cpp

src/libtiled/compression.h

src/libtiled/isometricrenderer.cpp

src/libtiled/isometricrenderer.h

src/libtiled/mapreader.cpp

src/libtiled/mapreader.h

src/libtiled/maprenderer.h

src/libtiled/mapwriter.cpp

src/libtiled/mapwriter.h

src/libtiled/object.h

src/libtiled/orthogonalrenderer.cpp

src/libtiled/orthogonalrenderer.h

src/libtiled/properties.cpp

src/libtiled/properties.h

src/plugins/tengine

src/plugins/tengine/tengine.pro

src/plugins/tengine/tengine_global.h

src/plugins/tengine/tengineplugin.cpp

src/plugins/tengine/tengineplugin.h

src/tiled/automap.cpp

src/tiled/automap.h

src/tiled/commandbutton.cpp

src/tiled/commandbutton.h

src/tiled/commanddatamodel.cpp

src/tiled/commanddatamodel.h

src/tiled/commanddialog.cpp

src/tiled/commanddialog.h

src/tiled/commanddialog.ui

src/tiled/createobjecttool.cpp

src/tiled/createobjecttool.h

src/tiled/documentmanager.cpp

src/tiled/documentmanager.h

src/tiled/images/16x16/layer-object.png

src/tiled/images/16x16/layer-tile.png

src/tiled/images/22x22/tool-select-objects.png

src/tiled/images/24x24/insert-image.png

src/tiled/images/24x24/insert-object.png

src/tiled/images/24x24/system-run.png

src/tiled/images/objectlayer-icon.svg

src/tiled/images/tilelayer-icon.svg

src/tiled/images/tmx-icon-mac.icns

src/tiled/movemapobjecttogroup.cpp

src/tiled/movemapobjecttogroup.h

src/tiled/objectselectiontool.cpp

src/tiled/objectselectiontool.h

src/tiled/tiledapplication.cpp

src/tiled/tiledapplication.h

src/tmxviewer

src/tmxviewer/main.cpp

src/tmxviewer/tmxviewer.cpp

src/tmxviewer/tmxviewer.h

src/tmxviewer/tmxviewer.pro

tests/test_mapreader.cpp

tests/test_mapreader.pro

translations/tiled_en.ts

translations/tiled_he.ts

translations/tiled_zh.ts

util

util/java

util/java/.gitignore

util/java/java-utils.ipr

util/java/libtiled-java

util/java/libtiled-java/.gitignore

util/java/libtiled-java/README

util/java/libtiled-java/build.xml

util/java/libtiled-java/libtiled-java.iml

util/java/libtiled-java/src

util/java/libtiled-java/src/tiled

util/java/libtiled-java/src/tiled/core

util/java/libtiled-java/src/tiled/core/AnimatedTile.java

util/java/libtiled-java/src/tiled/core/Map.java

util/java/libtiled-java/src/tiled/core/MapLayer.java

util/java/libtiled-java/src/tiled/core/MapObject.java

util/java/libtiled-java/src/tiled/core/ObjectGroup.java

util/java/libtiled-java/src/tiled/core/Sprite.java

util/java/libtiled-java/src/tiled/core/Tile.java

util/java/libtiled-java/src/tiled/core/TileLayer.java

util/java/libtiled-java/src/tiled/core/TileSet.java

util/java/libtiled-java/src/tiled/io

util/java/libtiled-java/src/tiled/io/TMXMapReader.java

util/java/libtiled-java/src/tiled/io/TMXMapWriter.java

util/java/libtiled-java/src/tiled/io/resources

util/java/libtiled-java/src/tiled/io/resources/map.dtd

util/java/libtiled-java/src/tiled/io/xml

util/java/libtiled-java/src/tiled/io/xml/XMLWriter.java

util/java/libtiled-java/src/tiled/io/xml/XMLWriterException.java

util/java/libtiled-java/src/tiled/util

util/java/libtiled-java/src/tiled/util/Base64.java

util/java/libtiled-java/src/tiled/util/BasicTileCutter.java

util/java/libtiled-java/src/tiled/util/ImageHelper.java

util/java/libtiled-java/src/tiled/util/TileCutter.java

util/java/libtiled-java/src/tiled/util/TransparentImageFilter.java

util/java/libtiled-java/src/tiled/view

util/java/libtiled-java/src/tiled/view/MapRenderer.java

util/java/libtiled-java/src/tiled/view/OrthogonalRenderer.java

util/java/tmxviewer-java

util/java/tmxviewer-java/.gitignore

util/java/tmxviewer-java/README

util/java/tmxviewer-java/build.xml

util/java/tmxviewer-java/src

util/java/tmxviewer-java/src/TMXViewer.java

util/java/tmxviewer-java/tmxviewer-java.iml

files removed:
.pc/addrpath.patch/src/libtiled

.pc/addrpath.patch/src/libtiled/libtiled.pro

.pc/addrpath.patch/src/plugins/tmw

.pc/addrpath.patch/src/plugins/tmw/tmw.pro

src/tiled/compression.cpp

src/tiled/compression.h

src/tiled/isometricrenderer.cpp

src/tiled/isometricrenderer.h

src/tiled/maprenderer.h

src/tiled/orthogonalrenderer.cpp

src/tiled/orthogonalrenderer.h

tests/test_tmxmapreader.cpp

tests/test_tmxmapreader.pro

files modified:
.LICENSE-HEADER

.gitignore

.pc/addrpath.patch/src/tiled/tiled.pro

.pc/fix-build-indirect-linking.patch/src/tiled/tiled.pro

AUTHORS

COPYING

NEWS

debian/changelog

debian/clean

debian/control

debian/copyright

debian/patches/addrpath.patch

debian/patches/fix-build-indirect-linking.patch

debian/rules

debian/tiled.manpages

make-dist-mac.sh

src/libtiled/layer.cpp

src/libtiled/layer.h

src/libtiled/libtiled.pro

src/libtiled/map.cpp

src/libtiled/map.h

src/libtiled/mapobject.cpp

src/libtiled/mapobject.h

src/libtiled/objectgroup.cpp

src/libtiled/objectgroup.h

src/libtiled/tile.h

src/libtiled/tiled_global.h

src/libtiled/tilelayer.cpp

src/libtiled/tilelayer.h

src/libtiled/tileset.cpp

src/libtiled/tileset.h

src/plugins/plugin.pri

src/plugins/plugins.pro

src/plugins/tmw/tmw.pro

src/src.pro

src/tiled/Info.plist

src/tiled/abstracttiletool.cpp

src/tiled/abstracttiletool.h

src/tiled/abstracttool.cpp

src/tiled/abstracttool.h

src/tiled/brushitem.h

src/tiled/bucketfilltool.cpp

src/tiled/bucketfilltool.h

src/tiled/changeproperties.cpp

src/tiled/changeproperties.h

src/tiled/clipboardmanager.cpp

src/tiled/colorbutton.cpp

src/tiled/eraser.cpp

src/tiled/eraser.h

src/tiled/languagemanager.cpp

src/tiled/layerdock.cpp

src/tiled/layermodel.cpp

src/tiled/layermodel.h

src/tiled/main.cpp

src/tiled/mainwindow.cpp

src/tiled/mainwindow.h

src/tiled/mainwindow.ui

src/tiled/mapdocument.cpp

src/tiled/mapdocument.h

src/tiled/mapdocumentactionhandler.cpp

src/tiled/mapdocumentactionhandler.h

src/tiled/mapobjectitem.cpp

src/tiled/mapobjectitem.h

src/tiled/mapscene.cpp

src/tiled/mapscene.h

src/tiled/mapview.cpp

src/tiled/mapview.h

src/tiled/mapwriterinterface.h

src/tiled/newtilesetdialog.cpp

src/tiled/newtilesetdialog.h

src/tiled/objectgroupitem.cpp

src/tiled/objectgrouppropertiesdialog.cpp

src/tiled/objectpropertiesdialog.cpp

src/tiled/preferences.cpp

src/tiled/preferences.h

src/tiled/preferencesdialog.cpp

src/tiled/preferencesdialog.h

src/tiled/preferencesdialog.ui

src/tiled/propertiesdialog.cpp

src/tiled/propertiesdialog.h

src/tiled/propertiesmodel.cpp

src/tiled/propertiesmodel.h

src/tiled/resizedialog.ui

src/tiled/selectiontool.cpp

src/tiled/selectiontool.h

src/tiled/stampbrush.cpp

src/tiled/stampbrush.h

src/tiled/tiled.pro

src/tiled/tiled.qrc

src/tiled/tilelayeritem.h

src/tiled/tilesetdock.cpp

src/tiled/tilesetdock.h

src/tiled/tilesetmanager.cpp

src/tiled/tilesetmanager.h

src/tiled/tilesetview.cpp

src/tiled/tmxmapreader.cpp

src/tiled/tmxmapreader.h

src/tiled/tmxmapwriter.cpp

src/tiled/tmxmapwriter.h

src/tiled/toolmanager.cpp

src/tiled/toolmanager.h

src/tiled/utils.cpp

src/tiled/utils.h

tiled.pri

translations/tiled_cs.ts

translations/tiled_de.ts

translations/tiled_es.ts

translations/tiled_fr.ts

translations/tiled_it.ts

translations/tiled_ja.ts

translations/tiled_lv.ts

translations/tiled_nl.ts

translations/tiled_pt.ts

translations/tiled_pt_BR.ts

translations/translations.pro

Show diffs side-by-side

added added

removed removed

.LICENSE-HEADER

.pc/addrpath.patch/src/libtiled/

.pc/addrpath.patch/src/libtiled/libtiled.pro

.pc/addrpath.patch/src/plugins/plugin.pri

.pc/addrpath.patch/src/plugins/tmw/

.pc/addrpath.patch/src/plugins/tmw/tmw.pro

.pc/addrpath.patch/src/tiled/tiled.pro

.pc/addrpath.patch/src/tmxviewer/

.pc/addrpath.patch/src/tmxviewer/tmxviewer.pro

.pc/fix-build-indirect-linking.patch/src/tiled/tiled.pro

debian/changelog

debian/copyright

debian/patches/addrpath.patch

debian/patches/fix-build-indirect-linking.patch

debian/tiled.manpages

debian/tmxviewer.xml

make-dist-mac.sh

make-dist-win32.sh

src/libtiled/compression.cpp

src/libtiled/compression.h

src/libtiled/isometricrenderer.cpp

src/libtiled/isometricrenderer.h

src/libtiled/layer.cpp

src/libtiled/layer.h

src/libtiled/libtiled.pro

src/libtiled/map.cpp

src/libtiled/map.h

src/libtiled/mapobject.cpp

src/libtiled/mapobject.h

src/libtiled/mapreader.cpp

src/libtiled/mapreader.h

src/libtiled/maprenderer.h

src/libtiled/mapwriter.cpp

src/libtiled/mapwriter.h

src/libtiled/object.h

src/libtiled/objectgroup.cpp

src/libtiled/objectgroup.h

src/libtiled/orthogonalrenderer.cpp

src/libtiled/orthogonalrenderer.h

src/libtiled/properties.cpp

src/libtiled/properties.h

src/libtiled/tile.h

src/libtiled/tiled_global.h

src/libtiled/tilelayer.cpp

src/libtiled/tilelayer.h

src/libtiled/tileset.cpp

src/libtiled/tileset.h

src/plugins/plugin.pri

src/plugins/plugins.pro

src/plugins/tengine/

src/plugins/tengine/tengine.pro

src/plugins/tengine/tengine_global.h

src/plugins/tengine/tengineplugin.cpp

src/plugins/tengine/tengineplugin.h

src/plugins/tmw/tmw.pro

src/tiled/Info.plist

src/tiled/abstracttiletool.cpp

src/tiled/abstracttiletool.h

src/tiled/abstracttool.cpp

src/tiled/abstracttool.h

src/tiled/automap.cpp

src/tiled/automap.h

src/tiled/brushitem.h

src/tiled/bucketfilltool.cpp

src/tiled/bucketfilltool.h

src/tiled/changeproperties.cpp

src/tiled/changeproperties.h

src/tiled/clipboardmanager.cpp

src/tiled/colorbutton.cpp

src/tiled/commandbutton.cpp

src/tiled/commandbutton.h

src/tiled/commanddatamodel.cpp

src/tiled/commanddatamodel.h

src/tiled/commanddialog.cpp

src/tiled/commanddialog.h

src/tiled/commanddialog.ui

src/tiled/compression.cpp

src/tiled/compression.h

src/tiled/createobjecttool.cpp

src/tiled/createobjecttool.h

src/tiled/documentmanager.cpp

src/tiled/documentmanager.h

src/tiled/eraser.cpp

src/tiled/eraser.h

src/tiled/images/16x16/layer-object.png

src/tiled/images/16x16/layer-tile.png

src/tiled/images/22x22/tool-select-objects.png

src/tiled/images/24x24/insert-image.png

src/tiled/images/24x24/insert-object.png

src/tiled/images/24x24/system-run.png

src/tiled/images/objectlayer-icon.svg

src/tiled/images/tilelayer-icon.svg

src/tiled/images/tmx-icon-mac.icns

src/tiled/isometricrenderer.cpp

src/tiled/isometricrenderer.h

src/tiled/languagemanager.cpp

src/tiled/layerdock.cpp

src/tiled/layermodel.cpp

src/tiled/layermodel.h

src/tiled/main.cpp

src/tiled/mainwindow.cpp

src/tiled/mainwindow.h

src/tiled/mainwindow.ui

src/tiled/mapdocument.cpp

src/tiled/mapdocument.h

src/tiled/mapdocumentactionhandler.cpp

src/tiled/mapdocumentactionhandler.h

src/tiled/mapobjectitem.cpp

src/tiled/mapobjectitem.h

src/tiled/maprenderer.h

src/tiled/mapscene.cpp

src/tiled/mapscene.h

src/tiled/mapview.cpp

src/tiled/mapview.h

src/tiled/mapwriterinterface.h

src/tiled/movemapobjecttogroup.cpp

src/tiled/movemapobjecttogroup.h

src/tiled/newtilesetdialog.cpp

src/tiled/newtilesetdialog.h

src/tiled/objectgroupitem.cpp

src/tiled/objectgrouppropertiesdialog.cpp

src/tiled/objectpropertiesdialog.cpp

src/tiled/objectselectiontool.cpp

src/tiled/objectselectiontool.h

src/tiled/orthogonalrenderer.cpp

src/tiled/orthogonalrenderer.h

src/tiled/preferences.cpp

src/tiled/preferences.h

src/tiled/preferencesdialog.cpp

src/tiled/preferencesdialog.h

src/tiled/preferencesdialog.ui

src/tiled/propertiesdialog.cpp

src/tiled/propertiesdialog.h

src/tiled/propertiesmodel.cpp

src/tiled/propertiesmodel.h

src/tiled/resizedialog.ui

src/tiled/selectiontool.cpp

src/tiled/selectiontool.h

src/tiled/stampbrush.cpp

src/tiled/stampbrush.h

src/tiled/tiled.pro

src/tiled/tiled.qrc

src/tiled/tiledapplication.cpp

src/tiled/tiledapplication.h

src/tiled/tilelayeritem.h

src/tiled/tilesetdock.cpp

src/tiled/tilesetdock.h

src/tiled/tilesetmanager.cpp

src/tiled/tilesetmanager.h

src/tiled/tilesetview.cpp

src/tiled/tmxmapreader.cpp

src/tiled/tmxmapreader.h

src/tiled/tmxmapwriter.cpp

src/tiled/tmxmapwriter.h

src/tiled/toolmanager.cpp

src/tiled/toolmanager.h

src/tiled/utils.cpp

src/tiled/utils.h

src/tmxviewer/main.cpp

src/tmxviewer/tmxviewer.cpp

src/tmxviewer/tmxviewer.h

src/tmxviewer/tmxviewer.pro

tests/test_mapreader.cpp

tests/test_mapreader.pro

tests/test_tmxmapreader.cpp

tests/test_tmxmapreader.pro

translations/tiled_cs.ts

translations/tiled_de.ts

translations/tiled_en.ts

translations/tiled_es.ts

translations/tiled_fr.ts

translations/tiled_he.ts

translations/tiled_it.ts

translations/tiled_ja.ts

translations/tiled_lv.ts

translations/tiled_nl.ts

translations/tiled_pt.ts

translations/tiled_pt_BR.ts

translations/tiled_zh.ts

translations/translations.pro

util/java/.gitignore

util/java/java-utils.ipr

util/java/libtiled-java/

util/java/libtiled-java/.gitignore

util/java/libtiled-java/README

util/java/libtiled-java/build.xml

util/java/libtiled-java/libtiled-java.iml

util/java/libtiled-java/src/

util/java/libtiled-java/src/tiled/

util/java/libtiled-java/src/tiled/core/

util/java/libtiled-java/src/tiled/core/AnimatedTile.java

util/java/libtiled-java/src/tiled/core/Map.java

util/java/libtiled-java/src/tiled/core/MapLayer.java

util/java/libtiled-java/src/tiled/core/MapObject.java

util/java/libtiled-java/src/tiled/core/ObjectGroup.java

util/java/libtiled-java/src/tiled/core/Sprite.java

util/java/libtiled-java/src/tiled/core/Tile.java

util/java/libtiled-java/src/tiled/core/TileLayer.java

util/java/libtiled-java/src/tiled/core/TileSet.java

util/java/libtiled-java/src/tiled/io/

util/java/libtiled-java/src/tiled/io/TMXMapReader.java

util/java/libtiled-java/src/tiled/io/TMXMapWriter.java

util/java/libtiled-java/src/tiled/io/resources/

util/java/libtiled-java/src/tiled/io/resources/map.dtd

util/java/libtiled-java/src/tiled/io/xml/

util/java/libtiled-java/src/tiled/io/xml/XMLWriter.java

util/java/libtiled-java/src/tiled/io/xml/XMLWriterException.java

util/java/libtiled-java/src/tiled/util/

util/java/libtiled-java/src/tiled/util/Base64.java

util/java/libtiled-java/src/tiled/util/BasicTileCutter.java

util/java/libtiled-java/src/tiled/util/ImageHelper.java

util/java/libtiled-java/src/tiled/util/TileCutter.java

util/java/libtiled-java/src/tiled/util/TransparentImageFilter.java

util/java/libtiled-java/src/tiled/view/

util/java/libtiled-java/src/tiled/view/MapRenderer.java

util/java/libtiled-java/src/tiled/view/OrthogonalRenderer.java

util/java/tmxviewer-java/

util/java/tmxviewer-java/.gitignore

util/java/tmxviewer-java/README

util/java/tmxviewer-java/build.xml

util/java/tmxviewer-java/src/

util/java/tmxviewer-java/src/TMXViewer.java

util/java/tmxviewer-java/tmxviewer-java.iml

Older »