#
#
# delete "src/stable.h"
# 
# patch "guitone.pro"
#  from [793a62ed84e3c859c3963721260c4e6fa379f1fa]
#    to [8ff87b66c8b4a11e2ce8af3d0e914359e1466a2a]
#
============================================================
--- guitone.pro	793a62ed84e3c859c3963721260c4e6fa379f1fa
+++ guitone.pro	8ff87b66c8b4a11e2ce8af3d0e914359e1466a2a
@@ -1,8 +1,13 @@
 #
-# Common configuration
+# global version strings
 #
+GUITONE_VERSION    = "0.7"
+MIN_MTN_INT_VERSION = "5.0"
+MAX_MTN_INT_VERSION = "6.0"
 
-GUITONE_VERSION  = "0.6.4"
+#
+# common configuration
+#
 TEMPLATE         = app
 TARGET           = guitone
 !macx {
@@ -23,6 +28,7 @@ HEADERS  = src/view/MainWindow.h \
            src/view/DiffView.h \
            src/view/DiffStatusView.h \
            src/view/dialogs/Dialog.h \
+           src/view/dialogs/DialogManager.h \
            src/view/dialogs/SelectRevision.h \
            src/view/dialogs/UpdateWorkspace.h \
            src/view/dialogs/CheckoutRevision.h \
@@ -38,11 +44,13 @@ HEADERS  = src/view/MainWindow.h \
            src/view/dialogs/FileHistory.h \
            src/view/dialogs/UnaccountedRenames.h \
            src/view/dialogs/AddEditAttribute.h \
-           src/monotone/Monotone.h \
-           src/monotone/MonotoneDelegate.h \
            src/monotone/FileExporter.h \
            src/monotone/WorkspaceCreator.h \
            src/monotone/WorkspaceCommitter.h \
+           src/monotone/MonotoneThread.h \
+           src/monotone/MonotoneManager.h \
+           src/monotone/MonotoneUtil.h \
+           src/model/AutomateCommand.h \
            src/model/Inventory.h \
            src/model/InventoryItem.h \
            src/model/InventoryProxyModel.h \
@@ -55,7 +63,6 @@ HEADERS  = src/view/MainWindow.h \
            src/model/Tags.h \
            src/model/Branches.h \
            src/model/Keys.h \
-           src/model/Changeset.h \
            src/model/ChangesetModel.h \
            src/model/Toposort.h \
            src/model/Manifest.h \
@@ -85,6 +92,7 @@ SOURCES += src/view/MainWindow.cpp \
            src/view/DiffView.cpp \
            src/view/DiffStatusView.cpp \
            src/view/dialogs/Dialog.cpp \
+           src/view/dialogs/DialogManager.cpp \
            src/view/dialogs/SelectRevision.cpp \
            src/view/dialogs/UpdateWorkspace.cpp \
            src/view/dialogs/CheckoutRevision.cpp \
@@ -100,11 +108,13 @@ SOURCES += src/view/MainWindow.cpp \
            src/view/dialogs/FileHistory.cpp \
            src/view/dialogs/UnaccountedRenames.cpp \
            src/view/dialogs/AddEditAttribute.cpp \
-           src/monotone/Monotone.cpp \
-           src/monotone/MonotoneDelegate.cpp \
            src/monotone/FileExporter.cpp \
            src/monotone/WorkspaceCreator.cpp \
            src/monotone/WorkspaceCommitter.cpp \
+           src/monotone/MonotoneThread.cpp \
+           src/monotone/MonotoneManager.cpp \
+           src/monotone/MonotoneUtil.cpp \
+           src/model/AutomateCommand.cpp \
            src/model/Inventory.cpp \
            src/model/InventoryItem.cpp \
            src/model/InventoryProxyModel.cpp \
@@ -117,7 +127,6 @@ SOURCES += src/view/MainWindow.cpp \
            src/model/Tags.cpp \
            src/model/Branches.cpp \
            src/model/Keys.cpp \
-           src/model/Changeset.cpp \
            src/model/ChangesetModel.cpp \
            src/model/Toposort.cpp \
            src/model/Manifest.cpp \
@@ -138,7 +147,7 @@ SOURCES += src/view/MainWindow.cpp \
            src/util/StdioParser.cpp \
            src/Guitone.cpp \
            src/main.cpp
-           
+
 FORMS   += res/forms/select_revision.ui \
            res/forms/update_workspace.ui \
            res/forms/checkout_revision.ui \
@@ -157,8 +166,7 @@ FORMS   += res/forms/select_revision.ui 
            res/forms/unaccounted_renames.ui \
            res/forms/add_edit_attribute.ui
 
-UI_DIR   = tmp
-
+UI_DIR       = tmp
 OBJECTS_DIR  = tmp
 MOC_DIR      = tmp
 DESTDIR      = bin
@@ -166,21 +174,10 @@ RCC_DIR      = tmp
 RESOURCES    = res/guitone.qrc
 RCC_DIR      = tmp
 
-DEFINES     += GUITONE_VERSION=\\\"$${GUITONE_VERSION}\\\"
+DEFINES     += GUITONE_VERSION=\\\"$${GUITONE_VERSION}\\\" \
+               MIN_MTN_INT_VERSION=\\\"$${MIN_MTN_INT_VERSION}\\\" \
+               MAX_MTN_INT_VERSION=\\\"$${MAX_MTN_INT_VERSION}\\\"
 
-PRECOMPILED_HEADER = src/stable.h
-
-# is that needed?
-# win32:LIBS  += shell32.lib Advapi32.lib
-
-#
-# Libs for static build on windows, I don't know if I can test for static. 
-# I comment that in and out atm.
-#
-# win32:LIBS += gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib \
-#               winspool.lib ws2_32.lib ole32.lib uuid.lib user32.lib \
-#               advapi32.lib msimg32.lib shell32.lib
-
 # add guitone ico resource
 win32:RC_FILE = res/win32/guitone.rc
 
@@ -189,10 +186,6 @@ win32:RC_FILE = res/win32/guitone.rc
     SOURCES += src/view/dialogs/ApplicationUpdate.cpp
 }
 
-macx | unix {
-	QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
-}
-
 #
 # MacOS X specific configuration
 #
@@ -203,26 +196,19 @@ macx {
                src/view/MacStartMenu.h
     SOURCES += src/util/CocoaUtil.mm \
                src/view/MacStartMenu.cpp
-    
+
     # add the Sparkle and the Carbon framework
     QMAKE_LFLAGS += -framework Sparkle -framework Carbon
-    
-    # copy i18n resources into the final app bundle and 
+
+    # copy i18n resources into the final app bundle and
     # put the current version number into Info.plist
     QMAKE_POST_LINK = cp -R res/osx/Resources bin/guitone.app/Contents && \
         sed -e s/@@version@@/$${GUITONE_VERSION}/g \
         < res/osx/Info.plist.in  > bin/guitone.app/Contents/Info.plist
 
-    # add x86, ppc archs for universal release builds 
+    # add x86, ppc archs for universal release builds
     CONFIG(release, debug|release):CONFIG += x86 ppc
 
-    # do not try to build a universal binary if precompiled headers
-    # are enabled (this will fail badly)
-    contains(CONFIG, precompile_header):contains(CONFIG, x86):contains(CONFIG, ppc) {
-        warning(Disabling precompiled headers for universal builds.)
-        CONFIG -= precompile_header
-    }
-    
     QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
 }