#
#
# delete "build.sh"
# 
# delete "init-vc.bat"
# 
# patch "NEWS"
#  from [f077b0724ecd4157696ceb878ec1437cedaa407a]
#    to [1015bd5cae7109a78e07299605a121d7a02f1d7a]
# 
# patch "README"
#  from [4830639f1ddbe6040d9f86d1ec6b7bc53ced2ca0]
#    to [d87a815f002f45b71d939c0cd91a7a0563aae90d]
# 
# patch "guitone.pro"
#  from [ce0f30ea523b06a4feb23521e1f8a95e1d7cb683]
#    to [ba431b080233a6831ab7c78c83fa6cbc35f6fa10]
#
============================================================
--- NEWS	f077b0724ecd4157696ceb878ec1437cedaa407a
+++ NEWS	1015bd5cae7109a78e07299605a121d7a02f1d7a
@@ -5,7 +5,7 @@
    revision
  - new: find unaccounted renames in your workspace (i.e. finds those renames
    which only happened in the filesystem). Matches files by content and
-   directories by name (todo: implement actual renaming)
+   directories by name (actual renaming not yet implemented)
  - new: add, drop and edit file attributes directly in the workspace view
  - new: its now possible to actually copy the public key data to the clipboard
    in the key management dialog
@@ -17,9 +17,14 @@
    those with big directory trees and many files
  - improved: input field in the select revision dialog now acts on ENTER
  - improved: new simpler icon set which makes it easier to detect which files
-   have been changed in a workspace; also  added a panel
+   have been changed in a workspace; also added a panel
    (Window > Panels > Icon help) which contains explanations for all states
+ - improved: monotone databases are now properly recognized and distinguished
+   from empty files, non-sqlite dbs and even non-monotone sqlite dbs
  - bugfix: the workspace is now properly updated after a commit
+ - bugfix: the global qt translation is now loaded properly
+ - bugfix: double-clicking on mtn databases on Mac OS X no longer leads to
+   application hangs
  - change: the proper monotone version is now solely determined by looking at
    the output of interface version. An upper limit has been introduced for that
    as well; the dialogs now show the interface version of the installed mtn
============================================================
--- README	4830639f1ddbe6040d9f86d1ec6b7bc53ced2ca0
+++ README	d87a815f002f45b71d939c0cd91a7a0563aae90d
@@ -6,8 +6,8 @@
 interface, so its likely that it won't do things which aren't implemented there
 (currently for example workspace actions like update and commit).
 
-You need Qt >= 4.2 to build and monotone >= 0.34 (or a monotone with
-an interface version of 4.1 or greater) to run guitone. Earlier
+You need Qt >= 4.2 to build and monotone >= 0.37 (or a monotone with
+an interface version of 6.0 or greater) to run guitone. Earlier
 versions do not have all the infrastructure for certain functionalities
 available, but might still work in some areas. (You have to lower the
 requirements in Monotone.cpp before to make it actually work with older
@@ -16,7 +16,7 @@
 To build under Linux / Mac OS X, just do
 
  $ cd /path/to/guitone
- $ ./build.sh
+ $ qmake -config release && make
 
 On Mac OS X you need the Sparkle framework (http://sparkle.andymatuschak.org/)
 installed to build guitone. Make sure it does reside outside
@@ -44,7 +44,7 @@
 repository at thomaskeller.biz. guitone is located in the branch
 net.venge.monotone.guitone:
 
- $ mtn pull -d mydb.mtn thomaskeller.biz "net.venge.monotone.guitone*"
+ $ mtn pull -d mydb.mtn thomaskeller.biz "net.venge.monotone.guitone"
 
 
 Program Notes
@@ -93,18 +93,19 @@
 Known Bugs
 ==========
 
-* If you try to open a database or workspace in Mac OS X through Finder
-  and guitone is not yet running, you'll receive a deadlock. We're
-  currently investigating this issue.
+* Most of the workspace commands (add, drop, update, rename, ...) haven't been
+  implemented because the monotone automation interface does not yet have
+  support for them. This will eventually be changed in the future on either
+  side (i.e. either I will implement the functionality directly in monotone or
+  I'll use the normal command line interface to trigger the commands), but
+  this heavily depends on my workload and mood...
+  The Update Workspace dialog and the right-click actions in the workspace
+  view are therefore just a stub and won't do anything.
 
-* After you committed a revision, your workspace is not updated, simply
-  because there is no monotone automation command available for this. In the
-  meantime you just have to reload your workspace after a commit.
+* Support for partial loading of a monotone workspace has been disabled for
+  now because of a bug in monotone's inventory output and other restrictions
+  concerning the format, which have to be fixed upstream first.
 
-* The Update Workspace dialog is currently a stub for the same reason and
-  won't do anything. Other workspace commands like add, drop, rename and setup
-  are not supported yet in the automation interface as well.
-
 * If your problem is not described here, take a look at the task list on
   http://guitone.thomaskeller.biz/g/tracker
 
============================================================
--- guitone.pro	ce0f30ea523b06a4feb23521e1f8a95e1d7cb683
+++ guitone.pro	ba431b080233a6831ab7c78c83fa6cbc35f6fa10
@@ -228,3 +228,5 @@ macx {
     QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
 }
 
+message("updating and compiling translations")
+system("lupdate guitone.pro && lrelease guitone.pro")