# 
# 
# delete "guitone/wscript"
# 
# delete "waf"
# 
# delete "wscript"
# 
# patch ".mtn-ignore"
#  from [201bd2a479814835b0a2c14cd5cf943288029065]
#    to [9b4622f3f7b39d63d1f86d9aa9bd9c616cac54e3]
# 
# patch "NEWS"
#  from [5a12512531fe334ad01463e797953fa5aa3bccb4]
#    to [4d819fb33d030c92e310e5fdcb5a6de5c51394d7]
# 
# patch "guitone/src/model/Attributes.cpp"
#  from [d69e3790b504fa7768e226e4c7c31d87bbf3e21f]
#    to [106407b09b186aabe60e7065a7a98b9b743934d2]
# 
# patch "guitone/src/model/AutomateCommand.cpp"
#  from [c2e5e9404ba36c10e42fbd2d4702e2d782a91601]
#    to [ee1894776615f7ee996b752c6165acd77d673e5f]
# 
# patch "guitone/src/model/Branches.cpp"
#  from [9554a8636435f960db1f79c4145f65f9dee64166]
#    to [28cdf3be5042f184093660b5072fd4e1ae7568ce]
# 
# patch "guitone/src/model/Certs.cpp"
#  from [bf27bc8e9f27fd718600311d6a56b1dd771efe56]
#    to [1473edd0b790a0f3947f3e92a8776830096d3644]
# 
# patch "guitone/src/model/ContentDiff.cpp"
#  from [1daf3b2d129556b3ed6f978713915dfa14f8ef92]
#    to [7956135e454f451f5a943bd5521aae4c9f7bde4d]
# 
# patch "guitone/src/model/GetFile.cpp"
#  from [8debe7d014363712d8ced53352fd4fcb0558f1a0]
#    to [85d2c032b2f1f3a694ad55319fce154311520ffb]
# 
# patch "guitone/src/model/Inventory.cpp"
#  from [6485e0bee393c3e1a906ea0dc8766245efe3de4f]
#    to [45204bef5f64bbaa813299524623a7bf64d711fd]
# 
# patch "guitone/src/model/InventoryItem.cpp"
#  from [5cff35767a8b38283a8b30ee0856e47222a3006d]
#    to [b76305f5557db8c5c251b2fdca465caf4cd43f72]
# 
# patch "guitone/src/model/Keys.cpp"
#  from [32c89b1d250ee188af32318f8f9b370aab193ef6]
#    to [14aac7d06caf268b03e6725bc8f3cb4abaa74c9e]
# 
# patch "guitone/src/model/Select.cpp"
#  from [4b288fe9504e2bccbf1f6ca6fd3966a7b15c7ebc]
#    to [d9a7d10977ce65d4590e7a062074e175c80a79a0]
# 
# patch "guitone/src/model/Tags.cpp"
#  from [9af2920ea62b9948dd9f16fcd598930a0a61d9fc]
#    to [eccc24f182917ff3761998124c2b96e7f0f381c4]
# 
# patch "guitone/src/monotone/Monotone.cpp"
#  from [d59f5e25a79e5bfe685a5c5c197ef987815616f8]
#    to [dce32040f36eb676c48569f9746a739bf0c423d3]
# 
# patch "guitone/src/util/DiffParser.cpp"
#  from [035afd880a8d831378c9ffc92f54bf3cb776a22f]
#    to [ee79215f94252db70870ed6897b16a029b0b7758]
# 
# patch "guitone/src/util/IconProvider.cpp"
#  from [66986dae91c8fcd62c2242b75064f13f4ad64638]
#    to [4a172e07e8b4e83ef65d73cec3751f5c7371d61d]
# 
# patch "guitone/src/util/OpenFile.cpp"
#  from [e00508313cac085477ab072830a2d7e8936ec859]
#    to [4a53360ee1f4a743ae068e1b79a662f2a8790cf7]
# 
# patch "guitone/src/util/Settings.cpp"
#  from [2ace28b408a674cac9c33f7200a864ed01dd85dc]
#    to [f09f5c4e4725d265908c62c75790ac842df850a8]
# 
# patch "guitone/src/util/SignalWaiter.cpp"
#  from [2ea0662965fe1bb69cb94456179375d0c79a6f7c]
#    to [be5421eb7c7ffb705b73ed2fbe4743e2faa41eca]
# 
# patch "guitone/src/util/StanzaParser.cpp"
#  from [5e3157dfd596238c6c8482f80aa6e1d9761e96ca]
#    to [a4d3a459b736e4345c5abddf582ea8554621a830]
# 
# patch "guitone/src/view/AttributesView.cpp"
#  from [3585f25946b01e07db7ed67b6d40a7f48c94df99]
#    to [2a0c4aa00d943778a75ad39e34edb297f982333d]
# 
# patch "guitone/src/view/DiffStatusView.cpp"
#  from [49b345502a2dd0ef73e3cb9b652c95b04de4d04c]
#    to [d959c820dae2fe20e234f55bae89340f4b3b0a20]
# 
# patch "guitone/src/view/DiffView.cpp"
#  from [3592ed71969865576ff4d15a4282baf4ed520f78]
#    to [bff1c9cb3e9a2c285c95c92a98cbe744a1fef687]
# 
# patch "guitone/src/view/Guitone.cpp"
#  from [b609ffff8d59e6cb7b8307ba014d136b078542a8]
#    to [e0d4c9b776a12653b75c9efdfb26c04388cc8926]
# 
# patch "guitone/src/view/InventoryView.cpp"
#  from [e2dea0ef0171d4bcf95d5c372fcfffe563d817f8]
#    to [e4be7c3162cf3f29de547bf6bf00fcc028b9c224]
# 
# patch "guitone/src/view/Splitter.cpp"
#  from [4e4c470e130e7a33bb149611e29bf75b9405a30a]
#    to [95757ad05f6665e2ad79fb8480ff26f6c3fcda88]
# 
# patch "guitone/src/view/TreeView.cpp"
#  from [da752a686ec52d94005a798f51b5608b5832f219]
#    to [bfc2dd43c021e97628605eb1118f8ae7dc919539]
# 
# patch "guitone/src/view/dialogs/About.cpp"
#  from [a65d78d6c6d7c24ca278e4e7c852ae8dc961fe29]
#    to [f17a44b485c0b0c2795b002c99b26358f6171a76]
# 
# patch "guitone/src/view/dialogs/FileDiff.cpp"
#  from [e027d6d2a380605ef34054f7273338ce12d80d1b]
#    to [c6f55eaf9f12040e496d8c079c9e6ca406eee6a8]
# 
# patch "guitone/src/view/dialogs/GenerateKeypair.cpp"
#  from [e10b2c616092b8bc1a685a54b170c38cd90de540]
#    to [07e70c82a38fa7c833ae5d90563028d2fb68c23d]
# 
# patch "guitone/src/view/dialogs/KeyManagement.cpp"
#  from [1415a644f51169a82b74a67d7ce3d3c4011a85f0]
#    to [f5f5ee8b5c5836cd633e4395af8aad29e1d72c18]
# 
# patch "guitone/src/view/dialogs/Preferences.cpp"
#  from [518fbf6595ac87931b11d6330bce1f530cc8486f]
#    to [0baa429ddd2cc4f87bd4a81edc6ee5f24f386ccd]
# 
# patch "guitone/src/view/dialogs/RevisionDiff.cpp"
#  from [3f2e3de5d71556ab2396758d2ea2a8066227ae2d]
#    to [8e5f7cfdc82f4ea811c72387596b40711d45ac57]
# 
# patch "guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp"
#  from [7a2c5957d7ed86fd9ebbe6ca3060a4e628711ed8]
#    to [d05cbd2c11e69ea1bed9e1c6664c5d29af6fe16f]
# 
============================================================
--- .mtn-ignore	201bd2a479814835b0a2c14cd5cf943288029065
+++ .mtn-ignore	9b4622f3f7b39d63d1f86d9aa9bd9c616cac54e3
@@ -1,5 +1,3 @@
-_build_
-\.lock-wscript
 Makefile
 .*\.xcodeproj
 Info.plist
============================================================
--- NEWS	5a12512531fe334ad01463e797953fa5aa3bccb4
+++ NEWS	4d819fb33d030c92e310e5fdcb5a6de5c51394d7
@@ -32,10 +32,6 @@
    thus was removed
  - internal: removed dependency of AutomateCommand from the Monotone wrapper, now this
    should be easier to use in other projects as well...
- - other: added experimental support for a new, python-based buildsystem. this currently
-   builds guitone on OSX and Linux fine (no Win32 support yet, sorry) and additionally
-   provides the possibility to create a monolithic application bundle on OSX as well
-   as a disk image for distribution. see ./waf --help for details
 
 2006-10-03 (0.4)
  - Interims release, mainly to show we're still alive =)
============================================================
--- guitone/src/model/Attributes.cpp	d69e3790b504fa7768e226e4c7c31d87bbf3e21f
+++ guitone/src/model/Attributes.cpp	106407b09b186aabe60e7065a7a98b9b743934d2
@@ -218,7 +218,3 @@ QModelIndex Attributes::parent(const QMo
     return QModelIndex();
 }
 
-#ifdef WAF
-#include "Attributes.moc"
-#endif
-
============================================================
--- guitone/src/model/AutomateCommand.cpp	c2e5e9404ba36c10e42fbd2d4702e2d782a91601
+++ guitone/src/model/AutomateCommand.cpp	ee1894776615f7ee996b752c6165acd77d673e5f
@@ -93,8 +93,3 @@ void AutomateCommand::clearData()
     reset();
 }
 
-
-#ifdef WAF
-#include "AutomateCommand.moc"
-#endif
-
============================================================
--- guitone/src/model/Branches.cpp	9554a8636435f960db1f79c4145f65f9dee64166
+++ guitone/src/model/Branches.cpp	28cdf3be5042f184093660b5072fd4e1ae7568ce
@@ -104,7 +104,3 @@ QModelIndex Branches::parent(const QMode
     return QModelIndex();
 }
 
-#ifdef WAF
-#include "Branches.moc"
-#endif
-
============================================================
--- guitone/src/model/Certs.cpp	bf27bc8e9f27fd718600311d6a56b1dd771efe56
+++ guitone/src/model/Certs.cpp	1473edd0b790a0f3947f3e92a8776830096d3644
@@ -236,8 +236,3 @@ void Certs::clearData()
     AutomateCommand::clearData();
 }
 
-
-#ifdef WAF
-#include "Certs.moc"
-#endif
-
============================================================
--- guitone/src/model/ContentDiff.cpp	1daf3b2d129556b3ed6f978713915dfa14f8ef92
+++ guitone/src/model/ContentDiff.cpp	7956135e454f451f5a943bd5521aae4c9f7bde4d
@@ -255,8 +255,3 @@ QModelIndex ContentDiff::parent(const QM
     return createIndex(lines.indexOf(line->parent) , 0, line->parent);
 }
 
-
-#ifdef WAF
-#include "ContentDiff.moc"
-#endif
-
============================================================
--- guitone/src/model/GetFile.cpp	8debe7d014363712d8ced53352fd4fcb0558f1a0
+++ guitone/src/model/GetFile.cpp	85d2c032b2f1f3a694ad55319fce154311520ffb
@@ -234,8 +234,3 @@ QModelIndex GetFile::parent(const QModel
     return QModelIndex();
 }
 
-
-#ifdef WAF
-#include "GetFile.moc"
-#endif
-
============================================================
--- guitone/src/model/Inventory.cpp	6485e0bee393c3e1a906ea0dc8766245efe3de4f
+++ guitone/src/model/Inventory.cpp	45204bef5f64bbaa813299524623a7bf64d711fd
@@ -426,7 +426,3 @@ void Inventory::deleteModel(void)
 	this->reset();
 }
 
-#ifdef WAF
-#include "Inventory.moc"
-#endif
-
============================================================
--- guitone/src/model/InventoryItem.cpp	5cff35767a8b38283a8b30ee0856e47222a3006d
+++ guitone/src/model/InventoryItem.cpp	b76305f5557db8c5c251b2fdca465caf4cd43f72
@@ -301,8 +301,3 @@ QString InventoryItem::getStatusString()
     return list.join(", ");
 }
 
-
-#ifdef WAF
-#include "InventoryItem.moc"
-#endif
-
============================================================
--- guitone/src/model/Keys.cpp	32c89b1d250ee188af32318f8f9b370aab193ef6
+++ guitone/src/model/Keys.cpp	14aac7d06caf268b03e6725bc8f3cb4abaa74c9e
@@ -236,7 +236,3 @@ QModelIndex Keys::parent(const QModelInd
     return QModelIndex();
 }
 
-#ifdef WAF
-#include "Keys.moc"
-#endif
-
============================================================
--- guitone/src/model/Select.cpp	4b288fe9504e2bccbf1f6ca6fd3966a7b15c7ebc
+++ guitone/src/model/Select.cpp	d9a7d10977ce65d4590e7a062074e175c80a79a0
@@ -146,7 +146,3 @@ QModelIndex Select::parent(const QModelI
     return QModelIndex();
 }
 
-#ifdef WAF
-#include "Select.moc"
-#endif
-
============================================================
--- guitone/src/model/Tags.cpp	9af2920ea62b9948dd9f16fcd598930a0a61d9fc
+++ guitone/src/model/Tags.cpp	eccc24f182917ff3761998124c2b96e7f0f381c4
@@ -177,7 +177,3 @@ QModelIndex Tags::parent(const QModelInd
     return QModelIndex();
 }
 
-#ifdef WAF
-#include "Tags.moc"
-#endif
-
============================================================
--- guitone/src/monotone/Monotone.cpp	d59f5e25a79e5bfe685a5c5c197ef987815616f8
+++ guitone/src/monotone/Monotone.cpp	dce32040f36eb676c48569f9746a739bf0c423d3
@@ -513,8 +513,3 @@ bool Monotone::checkInterfaceVersion(con
     return curMajor > needMajor || curMajor == needMajor && curMinor >= needMinor;
 }
 
-
-#ifdef WAF
-#include "Monotone.moc"
-#endif
-
============================================================
--- guitone/src/util/DiffParser.cpp	035afd880a8d831378c9ffc92f54bf3cb776a22f
+++ guitone/src/util/DiffParser.cpp	ee79215f94252db70870ed6897b16a029b0b7758
@@ -130,8 +130,3 @@ Diff* DiffParser::getDiff(const QString 
     return fileDiffs.value(filename);
 }
 
-
-#ifdef WAF
-#include "DiffParser.moc"
-#endif
-
============================================================
--- guitone/src/util/IconProvider.cpp	66986dae91c8fcd62c2242b75064f13f4ad64638
+++ guitone/src/util/IconProvider.cpp	4a172e07e8b4e83ef65d73cec3751f5c7371d61d
@@ -250,7 +250,3 @@ QIcon IconProvider::getIcon(InventoryIte
     return fileIcons.value(0);
 }
 
-#ifdef WAF
-#include "IconProvider.moc"
-#endif
-
============================================================
--- guitone/src/util/OpenFile.cpp	e00508313cac085477ab072830a2d7e8936ec859
+++ guitone/src/util/OpenFile.cpp	4a53360ee1f4a743ae068e1b79a662f2a8790cf7
@@ -66,8 +66,3 @@ bool OpenFile::open(QWidget *widget, con
   return retval;
 }
 
-
-#ifdef WAF
-#include "OpenFile.moc"
-#endif
-
============================================================
--- guitone/src/util/Settings.cpp	2ace28b408a674cac9c33f7200a864ed01dd85dc
+++ guitone/src/util/Settings.cpp	f09f5c4e4725d265908c62c75790ac842df850a8
@@ -148,8 +148,3 @@ void Settings::removeItemFromList(const 
 	setItemList(name, list);
 }
 
-
-#ifdef WAF
-#include "Settings.moc"
-#endif
-
============================================================
--- guitone/src/util/SignalWaiter.cpp	2ea0662965fe1bb69cb94456179375d0c79a6f7c
+++ guitone/src/util/SignalWaiter.cpp	be5421eb7c7ffb705b73ed2fbe4743e2faa41eca
@@ -51,8 +51,3 @@ void SignalWaiter::timedOut() {
     timeout = true;
 }
 
-
-#ifdef WAF
-#include "SignalWaiter.moc"
-#endif
-
============================================================
--- guitone/src/util/StanzaParser.cpp	5e3157dfd596238c6c8482f80aa6e1d9761e96ca
+++ guitone/src/util/StanzaParser.cpp	a4d3a459b736e4345c5abddf582ea8554621a830
@@ -167,7 +167,3 @@ QChar StanzaParser::getNext()
     return ch;
 }
 
-#ifdef WAF
-#include "StanzaParser.moc"
-#endif
-
============================================================
--- guitone/src/view/AttributesView.cpp	3585f25946b01e07db7ed67b6d40a7f48c94df99
+++ guitone/src/view/AttributesView.cpp	2a0c4aa00d943778a75ad39e34edb297f982333d
@@ -30,7 +30,3 @@ AttributesView::~AttributesView() {}
 
 AttributesView::~AttributesView() {}
 
-#ifdef WAF
-#include "AttributesView.moc"
-#endif
-
============================================================
--- guitone/src/view/DiffStatusView.cpp	49b345502a2dd0ef73e3cb9b652c95b04de4d04c
+++ guitone/src/view/DiffStatusView.cpp	d959c820dae2fe20e234f55bae89340f4b3b0a20
@@ -73,8 +73,3 @@ void DiffStatusView::paintEvent(QPaintEv
     }
 }
 
-
-#ifdef WAF
-#include "DiffStatusView.moc"
-#endif
-
============================================================
--- guitone/src/view/DiffView.cpp	3592ed71969865576ff4d15a4282baf4ed520f78
+++ guitone/src/view/DiffView.cpp	bff1c9cb3e9a2c285c95c92a98cbe744a1fef687
@@ -30,8 +30,3 @@ DiffView::~DiffView() {}
 
 DiffView::~DiffView() {}
 
-
-#ifdef WAF
-#include "DiffView.moc"
-#endif
-
============================================================
--- guitone/src/view/Guitone.cpp	b609ffff8d59e6cb7b8307ba014d136b078542a8
+++ guitone/src/view/Guitone.cpp	e0d4c9b776a12653b75c9efdfb26c04388cc8926
@@ -459,8 +459,3 @@ void Guitone::aboutGuitone()
     aboutDlg.exec();
 }
 
-
-#ifdef WAF
-#include "Guitone.moc"
-#endif
-
============================================================
--- guitone/src/view/InventoryView.cpp	e2dea0ef0171d4bcf95d5c372fcfffe563d817f8
+++ guitone/src/view/InventoryView.cpp	e4be7c3162cf3f29de547bf6bf00fcc028b9c224
@@ -467,8 +467,3 @@ void InventoryView::itemClicked(const QM
     return;
 }
 
-
-#ifdef WAF
-#include "InventoryView.moc"
-#endif
-
============================================================
--- guitone/src/view/Splitter.cpp	4e4c470e130e7a33bb149611e29bf75b9405a30a
+++ guitone/src/view/Splitter.cpp	95757ad05f6665e2ad79fb8480ff26f6c3fcda88
@@ -57,7 +57,3 @@ void Splitter::saveState(void)
     Settings::setSplitterState(QSplitter::saveState(), objectName());
 }
 
-#ifdef WAF
-#include "Splitter.moc"
-#endif
-
============================================================
--- guitone/src/view/TreeView.cpp	da752a686ec52d94005a798f51b5608b5832f219
+++ guitone/src/view/TreeView.cpp	bfc2dd43c021e97628605eb1118f8ae7dc919539
@@ -74,7 +74,3 @@ void TreeView::saveHeaderViewState()
     Settings::saveHeaderViewState(header(), QString(objectName()).append("_header"));
 }
 
-#ifdef WAF
-#include "TreeView.moc"
-#endif
-
============================================================
--- guitone/src/view/dialogs/About.cpp	a65d78d6c6d7c24ca278e4e7c852ae8dc961fe29
+++ guitone/src/view/dialogs/About.cpp	f17a44b485c0b0c2795b002c99b26358f6171a76
@@ -43,8 +43,3 @@ About::~About() {}
 
 About::~About() {}
 
-
-#ifdef WAF
-#include "About.moc"
-#endif
-
============================================================
--- guitone/src/view/dialogs/FileDiff.cpp	e027d6d2a380605ef34054f7273338ce12d80d1b
+++ guitone/src/view/dialogs/FileDiff.cpp	c6f55eaf9f12040e496d8c079c9e6ca406eee6a8
@@ -106,8 +106,3 @@ void FileDiff::versionToggled(bool dummy
     diffStatusView->update();
 }
 
-
-#ifdef WAF
-#include "FileDiff.moc"
-#endif
-
============================================================
--- guitone/src/view/dialogs/GenerateKeypair.cpp	e10b2c616092b8bc1a685a54b170c38cd90de540
+++ guitone/src/view/dialogs/GenerateKeypair.cpp	07e70c82a38fa7c833ae5d90563028d2fb68c23d
@@ -90,8 +90,3 @@ void GenerateKeypair::accept()
     done(QDialog::Accepted);
 }
 
-
-#ifdef WAF
-#include "GenerateKeypair.moc"
-#endif
-
============================================================
--- guitone/src/view/dialogs/KeyManagement.cpp	1415a644f51169a82b74a67d7ce3d3c4011a85f0
+++ guitone/src/view/dialogs/KeyManagement.cpp	f5f5ee8b5c5836cd633e4395af8aad29e1d72c18
@@ -116,8 +116,3 @@ void KeyManagement::copyPubkeyDataToClip
     qDebug("KeyManagement::copyPubkeyDataToClipboard: no automate pubkey available!");
 }
 
-
-#ifdef WAF
-#include "KeyManagement.moc"
-#endif
-
============================================================
--- guitone/src/view/dialogs/Preferences.cpp	518fbf6595ac87931b11d6330bce1f530cc8486f
+++ guitone/src/view/dialogs/Preferences.cpp	0baa429ddd2cc4f87bd4a81edc6ee5f24f386ccd
@@ -97,7 +97,3 @@ void Preferences::openFileBrowser()
     }
 }
 
-#ifdef WAF
-#include "Preferences.moc"
-#endif
-
============================================================
--- guitone/src/view/dialogs/RevisionDiff.cpp	3f2e3de5d71556ab2396758d2ea2a8066227ae2d
+++ guitone/src/view/dialogs/RevisionDiff.cpp	8e5f7cfdc82f4ea811c72387596b40711d45ac57
@@ -64,8 +64,3 @@ RevisionDiff::~RevisionDiff() {}
 
 RevisionDiff::~RevisionDiff() {}
 
-
-#ifdef WAF
-#include "RevisionDiff.moc"
-#endif
-
============================================================
--- guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp	7a2c5957d7ed86fd9ebbe6ca3060a4e628711ed8
+++ guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp	d05cbd2c11e69ea1bed9e1c6664c5d29af6fe16f
@@ -267,8 +267,3 @@ void SwitchWorkspaceRevision::saveState(
     splitter->saveState();
 }
 
-
-#ifdef WAF
-#include "SwitchWorkspaceRevision.moc"
-#endif
-