Updated Changelog for 1.1.3.

Update to version 1.3.0
Updated version to 1.1.3pre1
2012-11-30 14:59:18 +01:00 · 2012-11-30 14:53:58 +01:00 · 2012-11-29 21:27:45 +01:00
@@ -1,4 +1,3 @@
-.gitmodules
 *build*/
 *flymake*
 CMakeLists.txt.user*
@@ -6,7 +5,3 @@ CMakeLists.txt.user*
 *~
 *.autosave
 doc/_build/*
-*~
-*.kate-swp
-*.kdev4
-win/
@@ -1,3 +0,0 @@
-[submodule "doc/ocdoc"]
-	path = doc/ocdoc
-	url = https://github.com/owncloud/documentation
@@ -4,55 +4,22 @@ project(mirall)
 set(PACKAGE "mirall")
 set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )

-include(Warnings)
-
-set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme")
-if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
-     include ( ${OEM_THEME_DIR}/OEM.cmake )
+if ( EXISTS ${CMAKE_SOURCE_DIR}/OEM.cmake )
+     include ( ${CMAKE_SOURCE_DIR}/OEM.cmake )
 else ()
     include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake )
 endif()

-if (NOT DEFINED APPLICATION_SHORTNAME)
-     set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
-endif()
-
 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
 configure_file( ${CMAKE_SOURCE_DIR}/src/mirall/version.h.in "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/version.h" )
-include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")
-
-#####
-## handle DBUS for Fdo notifications
-if( UNIX AND NOT APPLE )
-    add_definitions( -DUSE_FDO_NOTIFICATIONS)
-    set(WITH_DBUS ON)
-endif()
-####
+include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")

 include(GNUInstallDirs)
-include(DefineInstallationPaths)
-include(QtVersionAbstraction)
-
-setup_qt()
-
-include(GetGitRevisionDescription)
-get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-
-# if we cannot get it from git, directly try .tag (packages)
-# this will work if the tar balls have been properly created
-# via git-archive.
-if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
-    file(READ ${CMAKE_SOURCE_DIR}/.tag sha1_candidate)
-    string(REPLACE "\n" "" sha1_candidate ${sha1_candidate})
-    if (NOT ${sha1_candidate} STREQUAL "$Format:%H$")
-        message("${sha1_candidate}")
-        set (GIT_SHA1 "${sha1_candidate}")
-    endif()
+## stupid, we should upstream this
+if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" AND NOT CMAKE_INSTALL_SYSCONFDIR)
+    set(CMAKE_INSTALL_SYSCONFDIR "/etc")
 endif()

-set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
-set(DATADIR ${DATA_INSTALL_DIR})
-
 #####
 ## handle BUILD_OWNCLOUD_OSX_BUNDLE
 # BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX
@@ -70,29 +37,44 @@ else()
 endif()
 #####

-#### find libs
-#find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest QtWebkit REQUIRED )
-#if( UNIX AND NOT APPLE ) # Fdo notifications
-#    find_package(Qt4 4.7.0 COMPONENTS QtDBus REQUIRED )
-#endif()
-find_package(Neon REQUIRED)
-find_package(Csync REQUIRED)
-find_package(QtKeychain REQUIRED)
-if(UNIX)
-find_package(INotify REQUIRED)
-else()
+find_package(Qt4 4.6.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest REQUIRED )
+find_package(Csync)
 find_package(INotify)
-endif()
 find_package(Sphinx)
 find_package(PdfLatex)

-set(WITH_QTKEYCHAIN ${QTKEYCHAIN_FOUND})
+set(WITH_CSYNC CSYNC_FOUND)
 set(USE_INOTIFY ${INOTIFY_FOUND})

 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

+set(CPACK_SOURCE_IGNORE_FILES
+  # hidden files
+  "/\\\\..+$"
+  # temporary files
+  "\\\\.swp$"
+  # backup files
+  "~$"
+  # others
+  "\\\\.#"
+  "/#"
+  "/build/"
+  "/_build/"
+  # used before
+  "\\\\.o$"
+  "\\\\.lo$"
+  "\\\\.la$"
+  "Makefile\\\\.in$"
+)
+
 include(OwnCloudCPack.cmake)

+#
+# This cmake builds two targets (aka apps), mirall and owncloud. For the owncloud
+# target, OWNCLOUD_CLIENT needs to be a compile flag. It is set in src/CMakeLists.txt
+# but if that fails because cmake is too old, uncomment this here if you want to build
+# owncloud.
+# add_definitions(-DOWNCLOUD_CLIENT)
 add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)

@@ -112,5 +94,5 @@ endif(UNIT_TESTING)
 if(BUILD_OWNCLOUD_OSX_BUNDLE)
    configure_file(sync-exclude.lst ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
 else()
-    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
+    install( FILES sync-exclude.lst DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} )
 endif()
@@ -1,48 +0,0 @@
-## Submitting Desktop Client issues
-
-If you have questions about how to use the ownCloud Desktop Client, please
-direct these to the [mailing list][mailinglist] or our [forum][forum].
-We are also available on [IRC][irc].
-
-### Bug Reporting Guidelines
-* Important: Report the issue using our [template][template], it includes all the
-  informations we need to track down the issue.  
-* This repository is *only* for issues within the ownCloud desktop client. 
-  Issues in other compontents should be reported in their own repositores: 
-  - [ownCloud server](https://github.com/owncloud/core/issues)
-  - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
-    Contacts...)
-  - [Android client](https://github.com/owncloud/android/issues)
-  - [iOS client](https://github.com/owncloud/ios-issues/issues)
-* Search the existing issues first, it's likely that your issue was already
-  reported.
-
-If your issue appears to be a bug, and hasn't been reported, open a new issue.
-
-Help us to maximize the effort we can spend fixing issues and adding new
-features, by not reporting duplicate issues.
-
-[template]: https://raw.github.com/owncloud/mirall/master/issue_template.md
-[mailinglist]: https://mail.kde.org/mailman/listinfo/owncloud
-[forum]: http://forum.owncloud.org/
-[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
-
-## Contributing to Source Code
-
-Thanks for wanting to contribute source code to ownCloud. That's great!
-
-Before we're able to merge your code to mirall, you need to sign
-our [Contributor Agreement][agreement].
-
-Please read the [Desktop Client Manual][mirallman] and the [Developer
-Manuals][devmanual] to get useful infos like how to create your first
-application or how to test the ownCloud code with phpunit.
-
-[agreement]: http://owncloud.org/about/contributor-agreement/
-[devmanual]: http://owncloud.org/dev/
-[mirallman]: http://doc.owncloud.org/desktop/1.1/
-
-## Translations
-Please submit translations via [Transifex][transifex].
-
-[transifex]: https://www.transifex.com/projects/p/owncloud/
@@ -9,10 +9,9 @@ endif(CPACK_GENERATOR MATCHES "NSIS")

 set( CMAKE_SOURCE_DIR  @CMAKE_SOURCE_DIR@ )
 set( CMAKE_BINARY_DIR  @CMAKE_BINARY_DIR@ )
-set( OEM_THEME_DIR     @OEM_THEME_DIR@ )

-if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
-     include ( ${OEM_THEME_DIR}/OEM.cmake )
+if ( EXISTS "${CMAKE_SOURCE_DIR}/OEM.cmake" )
+     include ( "${CMAKE_SOURCE_DIR}/OEM.cmake" )
 else ()
     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
 endif()
@@ -21,9 +20,11 @@ set( CSYNC_BINARY_DIR  @CSYNC_BINARY_DIR@ )
 set( MINGW_ROOT @CMAKE_FIND_ROOT_PATH@ )
 if(CSYNC_BINARY_DIR)
    set( CSYNC_LIBRARY_DIR "${CSYNC_BINARY_DIR}/src" )
+    set( CSYNC_PLUGIN_DIR  "${CSYNC_BINARY_DIR}/modules" )
    set( CSYNC_CONFIG_DIR  "${CSYNC_BINARY_DIR}/config" )
 else()
    set( CSYNC_LIBRARY_DIR "${MINGW_ROOT}/bin" )
+    set( CSYNC_PLUGIN_DIR  "${MINGW_ROOT}/plugins-0" ) #FIXME: whatever it is
    set( CSYNC_CONFIG_DIR  "${MINGW_ROOT}/etc/ocsync" )
 endif()
 set( BUILD_OWNCLOUD_OSX_BUNDLE @BUILD_OWNCLOUD_OSX_BUNDLE@)
@@ -1,158 +1,9 @@
 ChangeLog
 =========
-version 1.4.1 (release 2013-09-24 ), csync 0.90.1 required
+version 1.1.3 (release 2012-11-30), csync 0.60.3 required
+  * No changes to mirall, csync fixes only.

-  * Translation and documentation fixes.
-  * Fixed error display in settings/status dialog, displays multi 
-    line error messages now correctly.
-  * Wait up to 30 secs before complaining about missing systray
-    Fixes bug #949
-  * Fixed utf8 issues with basic auth authentication, fixes bug #941
-  * Fixed remote folder selector, avoid recursive syncing, fixes bug #962
-  * Handle and display network problems at startup correctly.
-  * Enable and disable the folder watcher during syncs correctly.
-  * Fix setting of thread priority.
-  * Fixed file size display.
-  * Fixed various folder wizard issues, bug #992
-  * Made "Sync started" message optional, fixes bug #934
-  * Fixed shutdown, avoid crashed config on win32, fixes bug #945
-  * Pop up config wizard if no server url is configured, fixes bug #1018
-  * Settings: calculate sidebar width dynamically, fixes bug #1020
-  * Fixed a crash if sync folders were removed, fixes bug #713
-  * Do proper resync after network disconnect, fixes bug #1007
-  * Various minor code fixes
-
-version 1.4.0 (release 2013-09-04 ), csync 0.90.0 required
-
-  * New Scheduler: Only sync when there are actual changes in the server
-  * Add a Settings Dialog, move Proxy Settings there
-  * Transform folder Status Dialog into Account Settings, provide feedback via context menu
-  * Add Bandwidth Control
-  * Add a visual storage/quota indicator (context menu and account settings)
-  * Add progress indication (context menu and account settings)
-  * Introduce a sync history, persisting results across syncs
-  * Move ability to switch to mono icons from a switch to a Settings option
-  * Add "Launch on System Startup" GUI option
-  * Add "Show Desktop Nofications"GUI option (enabled by default)
-    top optionally disable sync notifications
-  * Add Help item, pointing to online reference
-  * Implement graphical selection of remote folders in FolderWizard
-  * Allow custom ignore patterns
-  * Add an editor for ingore patterns
-  * ALlow to flag certain ignore patterns as discardable
-  * Ensure to ship with all valid translations
-  * Progress Dialog now preserves the last syncned items across sync runs
-  * Split Setup Wizard into multiple pages again
-  * Implement "--logfile -" to log to stdout
-  * Add preliminary support for Shibboleth authentication
-  * Linux: Provide more icon sizes
-  * Linux: Do not trigger notifier on ignored files
-  * Windows: Reduce priority of CSync thread
-  * Documentation: Prem. updates to reflect UI changes
-  * Significant code refactorings
-  * Require Qt 4.7
-  * Known issue: Under certain conditions, a file will only get uploaded after up to five minutes
-
-version 1.3.0 (release 2013-06-25 ), csync 0.80.0 required
-
-  * Default proxy port to 8080
-  * Don't lose proxy settings when changing passwords
-  * Support SOCKS5 proxy (useful in combination with ssh   *D)
-  * Propagate proxy changes to csync at runtime
-  * Improve proxy wizard
-  * Display proxy errors
-  * Solved problems with lock files
-  * Warn if for some reason all files are scheduled for removal on either side
-  * Avoid infinite loop if authentication fails in certain cases
-  * Fix reading the password from the config in certain cases
-  * Do not crash when configured sync target disappears
-  * Make --help work on windows
-  * Make sync feedback less ambiguous.
-  * Fix icon tray tooltip sometimes showing repeated content
-  * More use of native directory separators on Windows
-  * Remove journal when reusing a directory that used to have a journal before
-  * Visual clean up of status dialog items
-  * Wizard: When changing the URL or user name, allow the user to push his data
-    to the new location or wipe the folder and start from scratch
-  * Wizard: Make setting a custom folder as a sync target work again
-  * Fix application icon
-  * User-Agent now contains "Mozilla/5.0" and the Platform name (for firewall/proxy compat)
-  * Server side directory moves will be detected
-  * New setup wizard, defaulting to root syncing (only for new setups)
-  * Improved thread stop/termination
-
-version 1.2.5 (release 2013-04-23 ), csync 0.70.7 required
-  * [Fixes] NSIS installer fixes
-  * [Fixes] Fix crash race by making certificateChain() thread safe
-  * [Fixes] Build with older CMake versions (CentOS/RHEL 6) 
-  * [Fixes] Wording in GUI
-  * [Fixes] Silently ignore "installed = true" status.php
-  * Set log verbosity before calling csync_init.
-  * GUI feedback for the statistics copy action
-  * Safer approach for detecting duplicate sync runs
-
-version 1.2.4 (release 2013-04-11 ), csync 0.70.6 required
-  * [Fixes] Clarify string in folder wizard
-  * [Fixes] Fixed some valgrind warnings
-  * [Fixes] Ensure that only one sync thread can ever run 
-  * [Fixes] Fix default config storage path
-  * [Fixes] Skip folders with no absolute path
-  * [Fixes] Allow setting the configuration directory on command line
-
-version 1.2.3 (release 2013-04-02 ), csync 0.70.5 required
-  * [Fixes] Unbreak self-signed certificate handling
-
-version 1.2.2 (release 2013-04-02 ), csync 0.70.5 required
-  * [Fixes] Do not crash when local file tree contains symlinks
-  * [Fixes] Correctly handle locked files on Windows
-  * [Fixes] Display errors in all members of the SSL chain
-  * [Fixes] Enable Accessibility features on Windows
-  * [Fixes] Make setupFavLink work properly on Mac OS
-  * [Fixes] Ignore temporary files created by MS Office
-  * [Gui] Support Nautilus in setupFavLink
-
-version 1.2.1 (release 2013-02-26 ), csync 0.70.4 required
-  * [Fixes] Leave configured folders on configuration changes.
-  * [Fixes] Do not allow to finish the setup dialog if connection can't be established.
-  * [Fixes] Better handling of credentials in setup dialog.
-  * [Fixes] Do not leak fd's to /dev/null when using gnutls
-  * [Fixes] Stop sync scheduling when configuration wizard starts.
-  * [Fixes] Clear pending network requests when stepping back in config wizard.
-  * [Fixes] User password dialog asynchronous issues.
-  * [Fixes] Make folderman starting and stoping the scheduling.
-  * [Fixes] Various minor fixes and cleanups.
-  * [Fixes] Crash on pausing sync
-  * [Fixes] Stale lock file after pausing sync
-  * [App] Load translations from app dir or bundle as well.
-  * [Platform] Build fixes and simplifications, ie. build only one lib.
-  * [Platform] Added some getter/setters for configuration values.
-  * [Platform] Added man pages.
-  * [Platform] Simplified/fixed credential store usage and custom configs.
-  * [Platform] Added soname version to libowncloudsync.
-  * [Platform] Pull in Qt translations
-  * [Gui]  Make sync result popups less annoyingq
-  * [Gui] Fix for result popup
-
-version 1.2.0 (release 2013-01-24 ), csync 0.70.2 required
-  * [GUI] New status dialog to show a detailed list of synced files.
-  * [GUI] New tray notifications about synced files.
-  * [GUI] New platform specific icon set.
-  * [App] Using cross platform QtKeychain library to store credentials crypted.
-  * [App] Use cross platform notification for changes in the local file system rather than regular poll.
-  * [Fixes] Improved SSL Certificate handling and SSL fixes troughout syncing.
-  * [Fixes] Fixed proxy authentication.
-  * [Fixes] Allow brackets in folder name alias.
-  * [Fixes] Lots of other minor fixes.
-  * [Platform] cmake fixes.
-  * [Platform] Improved, more detailed error reporting.
-
-version 1.1.4 (release 2012-12-19 ), csync 0.60.4 required
-  * No changes to mirall, only csync fixes.
-
-version 1.1.3 (release 2012-11-30 ), csync 0.60.3 required
-  * No changes to mirall, only csync fixes.
-
-version 1.1.2 (release 2012-11-26 ), csync 0.60.2 required
+version 1.1.2 (release 2012-11-26), csync 0.60.2 required
  * [Fixes] Allow to properly cancel the password dialog.
  * [Fixes] Share folder name correctly percent encoded with old Qt
            4.6 builds ie. Debian.
@@ -170,19 +21,23 @@ version 1.1.2 (release 2012-11-26 ), csync 0.60.2 required
  * [Platform] Fix Mac building

 version 1.1.1 (release 2012-10-18), csync 0.60.1 required
-  * [GUI]   Allow changing folder name in single folder mode
+  * [GUI]   Allow changing folder name in single folder mode 
  * [GUI]   Windows: Add license to installer
  * [GUI]   owncloud --logwindow will bring up the log window
            in an already running instance
  * [Fixes] Make sure SSL errors are always handled
-  * [Fixes] Allow special characters in folder alias
-  * [Fixes] Proper workaround for Menu bug in Ubuntu
+  * [Fixes] Allow special characters in folder alias 
+  * [Fixes] Proper workaround for Menu bug in Ubuntu 
  * [Fixes] csync: Fix improper memory cleanup which could
            cause memory leaks and crashes
-  * [Fixes] csync: Fix memory leak
-  * [Fixes] csync: Allow single quote (') in file names
-  * [Fixes] csync: Remove stray temporary files
+  * [Fixes] csync: Fix memory leak 
+  * [Fixes] csync: Allow single quote (') in file names 
+  * [Fixes] csync: Remove stray temporary files 

+version 1.1.0 (release 2012-10-10), csync 0.60.0 required
+  * [GUI]   Added an about dialog
+  * [GUI]   Improved themeing capabilities of the client.
+  * [GUI]   Minor fixes in folder assistant.
  * [GUI]   Reworked tray context menu.
  * [GUI]   Users can now sync the server root folder.
  * [Fixes] Proxy support: now supports Proxy Auto-Configuration (PAC)
@@ -201,7 +56,7 @@ version 1.1.1 (release 2012-10-18), csync 0.60.1 required
  * [Platform] csync conf file and database were moved to the users app data
               directory, away from the .csync dir.
  *         Renamed exclude.lst to sync-exclude.lst and moved it to
-            /etc/appName()/ for more clean packaging. From the user path,
+            /etc/appName()/ for more clean packaging. From the user path, 
 	    still exclude.lst is read if sync-exclude.lst is not existing.
  *         Placed custom.ini with customization options to /etc/appName()

@@ -210,7 +65,7 @@ version 1.0.5 (release 2012-08-14), csync 0.50.8 required

 version 1.0.4 (release 2012-08-10), csync 0.50.8 required
  * [APP] ownCloud is now a single instance app, can not start twice any more.
-  * [APP] Proxy support
+  * [APP] Proxy support 
  * [APP] Handle HTTP redirection correctly, note new url.
  * [APP] More relaxed handling of read only directories in the sync paths.
  * [APP] Started to split off a library with sync functionality, eg for KDE
@@ -221,13 +76,13 @@ version 1.0.4 (release 2012-08-10), csync 0.50.8 required
  * [GUI] Removed Log Window Button, log available through command line.
  * [GUI] Proxy configuration dialog added.
  * [GUI] Added Translations to languages Slovenian, Polish, Catalan,
-          Portuguese (Brazil), German, Greek, Spanish, Czech, Italian, Slovak,
-	  French, Russian, Japanese, Swedish, Portuguese (Portugal)
+          Portuguese (Brazil), German, Greek, Spanish, Czech, Italian, Slovak, 
+	  French, Russian, Japanese, Swedish, Portuguese (Portugal) 
 	  all with translation rate >90%.
  * [Fixes] Loading of self signed certs into Networkmanager (#oc-843)
  * [Fixes] Win32: Handle SSL dll loading correctly.
  * [Fixes] Many other small fixes and improvements.
-
+  
 version 1.0.3 (release 2012-06-19), csync 0.50.7 required
  * [GUI] Added a log window which catches the logging if required and
          allows to save for information.
@@ -236,7 +91,7 @@ version 1.0.3 (release 2012-06-19), csync 0.50.7 required
  * [Fixes] Do not use csync database files from a sync before.
  * [Fixes] In Connection wizard, write the final config onyl if
            the user really accepted. Also remove the former database.
-  * [Fixes] More user expected behaviour deletion of sync folder local
+  * [Fixes] More user expected behaviour deletion of sync folder local 
            and remote.
  * [Fixes] Allow special characters in the sync directory names
  * [Fixes] Win32: Fixed directory removal with special character dirs.
@@ -277,3 +132,4 @@ version 1.0.1 (release 2012-04-18), csync 0.50.5 required
  * [Platform] MacOSX Bundle creation added
  * [Platform] Enabled ranslations on Windows.

+
@@ -1,10 +1,7 @@
+set( APPLICATION_SHORTNAME  "owncloud" )
 set( APPLICATION_NAME       "ownCloud" )
-#set( APPLICATION_SHORTNAME  ${APPLICATION_NAME} )
-set( APPLICATION_EXECUTABLE "owncloud" )
-set( APPLICATION_DOMAIN     "owncloud.com" )
-set( APPLICATION_VENDOR     "ownCloud, Inc" )
-set( THEME_CLASS            "ownCloudTheme" )
-set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
-set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
-# set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
-# set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
+set( APPLICATION_EXECUTABLE "owncloud"        )
+set( APPLICATION_DOMAIN     "owncloud.org"    )
+set( APPLICATION_VENDOR     "ownCloud.org"    )
+set( THEME_CLASS            "ownCloudTheme"   )
+set( APPLICATION_REV_DOMAIN "org.owncloud.desktopclient" )
@@ -2,8 +2,8 @@ include( InstallRequiredSystemLibraries )

 set( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )

-if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake )
-     include ( "${OEM_THEME_DIR}/OEM.cmake" )
+if ( EXISTS "${CMAKE_SOURCE_DIR}/OEM.cmake" )
+     include ( "${CMAKE_SOURCE_DIR}/OEM.cmake" )
 else ()
     include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" )
 endif()
@@ -45,12 +45,12 @@ if(WIN32)
    # CPACK_INCLUDE_TOPLEVEL_DIRECTORY    Controls whether CPack adds a top-level directory, usually of the form ProjectName-Version-OS, to the top of package tree.  0 to disable, 1 to enable
    # CPACK_INSTALL_CMAKE_PROJECTS    List of four values: Build directory, Project Name, Project Component, Directory in the package     /home/andy/vtk/CMake-bin;CMake;ALL;/
    set( CPACK_PACKAGE_DESCRIPTION_FILE  "${CMAKE_SOURCE_DIR}/README.md" ) # File used as a description of a project     /path/to/project/ReadMe.txt
-    set( CPACK_PACKAGE_DESCRIPTION_SUMMARY  "${APPLICATION_NAME} Syncing Client" ) #  Description summary of a project
+    set( CPACK_PACKAGE_DESCRIPTION_SUMMARY  "ownCloud Syncing Client" ) #  Description summary of a project
    # CPACK_PACKAGE_EXECUTABLES   List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts.     ccmake;CMake
    set( CPACK_PACKAGE_INSTALL_DIRECTORY  ${APPLICATION_NAME} )     # Installation directory on the target system -> C:\Program Files\fellody
    set( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APPLICATION_NAME} )  # Registry key used when installing this project  CMake 2.5.0
    set( CPACK_PACKAGE_NAME  ${APPLICATION_NAME} ) # Package name, defaults to the project name
-    set( CPACK_PACKAGE_VENDOR  "http://${APPLICATION_DOMAIN}" )   # Package vendor name
+    set( CPACK_PACKAGE_VENDOR  "http://owncloud.com" )   # Package vendor name
 endif()

 # set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt" ) # License file for the project, used by the STGZ, NSIS, and PackageMaker generators.  /home/andy/vtk/CMake/Copyright.txt
@@ -2,12 +2,50 @@

 ## Introduction

-Mirall is a tool to synchronize files from ownCloud Server with your computer.
-It uses OCSync as its syncing backend.
+Mirall synchronizes your folders with another computer.
+
+The ultimate goals of Mirall are:
+
+* Network location aware: should not try to sync against your NAS if you are
+  not in the home network
+* It is a zero-interaction tool. So forget about resolving conflicts.
+* It should work silently and realiably.
+
+Mirall is in early stages of development, and may still eat your
+files or hang your computer.
+
+* Network location awareness not implemented yet
+* Current version supports local and remote (sftp and smb) folders.
+* It is powered by csync (http://www.csync.org), however
+  the user does not know and other tools will be incorporated to provide other
+  functionality.
+
+## Current issues
+
+* No sane way to backup conflicting versions yet, this should be solved
+  in a near csync release (--conflictcopy, available in Jann's branch).
+  Right now the newest copy wins.
+* You can't remove folder configurations
+  Workaround: delete ~/.local/share/data/Mirall/folders/$alias and restart
+* Some tasks block the GUI (initial setup of watchers)
+* May be some concurrency issues
+
+## Roadmap
+
+* Improve robustness to minimize user interaction
+* Improve feedback and sync results
+* Add support for other folder types: tarsnap, duplicity, git (SparkleShare)
+
+## Requirements
+
+* Linux (currently it uses inotify to detect file changes)
+* unison installed in the local and remote machine
+  (you should not care if you got Mirall with your favorite
+   distribution)

 ## Download

-### Binary packages
+### openSUSE

 * Refer to the download page http://owncloud.org/sync-clients/

@@ -17,12 +55,23 @@ It uses OCSync as its syncing backend.

 ## Building the source code

-Please refer to [Building the Client](http://doc.owncloud.org/desktop/1.2/building.html)
-in the ownCloud client manual.
+You need Qt 4.7 and cmake:
+
+    mkdir build
+    cd build
+    cmake ..
+    make
+
+To generate a tarball:
+
+    mkdir build
+    cd build
+    cmake ..
+    make package_source

 ## Authors

-* Duncan Mac-Vicar P. <duncan@kde.org> (original Mirall author)
+* Duncan Mac-Vicar P. <duncan@kde.org>
 * Klaas Freitag <freitag@owncloud.com>
 * Daniel Molkentin <danimo@owncloud.com>

@@ -1,6 +1,5 @@
 set( VERSION_MAJOR 1 )
-set( VERSION_MINOR 5 )
-set( VERSION_PATCH 0 )
-set( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}beta2")
-set( SOVERSION 0 )
+set( VERSION_MINOR 1 )
+set( VERSION_PATCH 3 )
+set( VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} )

@@ -10,7 +10,8 @@ mount="/Volumes/$(basename $src_dmg|cut -d"-" -f1)"

 test -e $tmp_dmg && rm -rf $tmp_dmg
 hdiutil convert $src_dmg -format UDRW -o $tmp_dmg
-hdiutil attach $tmp_dmg
+open $tmp_dmg
+sleep 2s
 pushd $mount
 codesign -s "$identity" $mount/*.app
 popd
@@ -32,7 +32,3 @@ SET(QT_MOC_EXECUTABLE       ${MINGW_PREFIX}-moc)
 SET(QT_RCC_EXECUTABLE       ${MINGW_PREFIX}-rcc)
 SET(QT_UIC_EXECUTABLE       ${MINGW_PREFIX}-uic)
 SET(QT_LRELEASE_EXECUTABLE  ${MINGW_PREFIX}-lrelease)
-
-# neon config
-SET(NEON_CONFIG_EXECUTABLE  ${CMAKE_FIND_ROOT_PATH}/bin/neon-config)
-# /usr/i686-w64-mingw32/sys-root/mingw/bin/neon-config
@@ -5,6 +5,7 @@ This sample uses the registry plugin, so you need to download that if you don't

 !define APPNAME "UAC_RealWorldFullyLoadedDualMode"
 !define ELEVATIONTITLE "${APPNAME}: Elevate" ;displayed during elevation on our custom page
+!define SMSUBDIR $StartMenuFolder ;"${APPNAME}"
 !define UNINSTALLER_NAME "Uninstall ${APPNAME}.exe"
 !define UNINSTALLER_REGSECTION "${APPNAME}"
 !define RegPath.MSUninstall "Software\Microsoft\Windows\CurrentVersion\Uninstall"
@@ -199,7 +200,10 @@ UAC::Exec "" "Notepad.exe" "$Windir\Win.INI" "$InstDir"
 FunctionEnd

 Function CreateSMShortcuts
-CreateShortcut "$SMPrograms\${APPNAME}.lnk" "$Windir\Notepad.exe"
+StrCpy ${SMSUBDIR} $9 ;stupid sync
+CreateDirectory "$SMPrograms\${SMSUBDIR}"
+CreateShortcut "$SMPrograms\${SMSUBDIR}\${APPNAME}.lnk" "$Windir\Notepad.exe"
+CreateShortcut "$SMPrograms\${SMSUBDIR}\Uninstall ${APPNAME}.lnk" "$InstDir\${UNINSTALLER_NAME}"
 FunctionEnd
 Function CreateDeskShortcuts
 CreateShortcut "$Desktop\${APPNAME}.lnk" "$Windir\Notepad.exe"
@@ -218,6 +222,7 @@ ${registry::Unload}
 SectionEnd

 Section "Startmenu Shortcuts"
+StrCpy $9 ${SMSUBDIR} ;this is stupid as hell, we need correct ${SMSUBDIR} in the outer process, this is the only way (plugins cannot enum "custom" var's AFAIK)
 ${UAC.CallFunctionAsUser} CreateSMShortcuts
 SectionEnd
 Section "Desktop Shortcut"
@@ -226,7 +231,9 @@ SectionEnd

 Section Uninstall
 Delete "$InstDir\${UNINSTALLER_NAME}"
-Delete "$SMPrograms\${APPNAME}.lnk"
+Delete "$SMPrograms\${SMSUBDIR}\${APPNAME}.lnk"
+Delete "$SMPrograms\${SMSUBDIR}\Uninstall ${APPNAME}.lnk"
+RMDir "$SMPrograms\${SMSUBDIR}"
 Delete "$Desktop\${APPNAME}.lnk"

 RMDir "$InstDir"
@@ -1,108 +0,0 @@
-if (UNIX)
-  # Suffix for Linux
-  SET(LIB_SUFFIX
-    CACHE STRING "Define suffix of directory name (32/64)"
-  )
-
-  SET(EXEC_INSTALL_PREFIX
-    "${CMAKE_INSTALL_PREFIX}"
-    CACHE PATH  "Base directory for executables and libraries"
-  )
-  SET(SHARE_INSTALL_PREFIX
-    "${CMAKE_INSTALL_PREFIX}/share"
-    CACHE PATH "Base directory for files which go to share/"
-  )
-  SET(DATA_INSTALL_PREFIX
-    "${SHARE_INSTALL_PREFIX}/${APPLICATION_SHORT_NAME}"
-    CACHE PATH "The parent directory where applications can install their data")
-
-  # The following are directories where stuff will be installed to
-  SET(BIN_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/bin"
-    CACHE PATH "The ${APPLICATION_SHORT_NAME} binary install dir (default prefix/bin)"
-  )
-  SET(SBIN_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/sbin"
-    CACHE PATH "The ${APPLICATION_SHORT_NAME} sbin install dir (default prefix/sbin)"
-  )
-  SET(LIB_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
-    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/lib)"
-  )
-  SET(LIBEXEC_INSTALL_DIR
-    "${EXEC_INSTALL_PREFIX}/libexec"
-    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/libexec)"
-  )
-  SET(PLUGIN_INSTALL_DIR
-    "${LIB_INSTALL_DIR}/${APPLICATION_SHORT_NAME}"
-    CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${APPLICATION_SHORT_NAME})"
-  )
-  SET(INCLUDE_INSTALL_DIR
-    "${CMAKE_INSTALL_PREFIX}/include"
-    CACHE PATH "The subdirectory to the header prefix (default prefix/include)"
-  )
-
-  SET(DATA_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}"
-    CACHE PATH "The parent directory where applications can install their data (default prefix/share/${APPLICATION_SHORT_NAME})"
-  )
-  SET(HTML_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}/doc/HTML"
-    CACHE PATH "The HTML install dir for documentation (default data/doc/html)"
-  )
-  SET(ICON_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}/icons"
-    CACHE PATH "The icon install dir (default data/icons/)"
-  )
-  SET(SOUND_INSTALL_DIR
-    "${DATA_INSTALL_PREFIX}/sounds"
-    CACHE PATH "The install dir for sound files (default data/sounds)"
-  )
-
-  SET(LOCALE_INSTALL_DIR
-    "${SHARE_INSTALL_PREFIX}/locale"
-    CACHE PATH "The install dir for translations (default prefix/share/locale)"
-  )
-
-  SET(XDG_APPS_DIR
-    "${SHARE_INSTALL_PREFIX}/applications/"
-    CACHE PATH "The XDG apps dir"
-  )
-  SET(XDG_DIRECTORY_DIR
-    "${SHARE_INSTALL_PREFIX}/desktop-directories"
-    CACHE PATH "The XDG directory"
-  )
-
-  IF(NOT "${EXEC_INSTALL_PREFIX}" STREQUAL "/usr")
-    SET(SYSCONFDIR_INSTALL_PREFIX "${EXEC_INSTALL_PREFIX}")
-  endif()
-
-  SET(SYSCONF_INSTALL_DIR
-    "${SYSCONFDIR_INSTALL_PREFIX}/etc"
-    CACHE PATH "The ${APPLICATION_SHORT_NAME} sysconfig install dir (default prefix/etc)"
-  )
-  SET(MAN_INSTALL_DIR
-    "${SHARE_INSTALL_PREFIX}/man"
-    CACHE PATH "The ${APPLICATION_SHORT_NAME} man install dir (default prefix/man)"
-  )
-  SET(INFO_INSTALL_DIR
-    "${SHARE_INSTALL_PREFIX}/info"
-    CACHE PATH "The ${APPLICATION_SHORT_NAME} info install dir (default prefix/info)"
-  )
-endif (UNIX)
-
-if (WIN32)
-  # Same same
-  set(SHARE_INSTALL_PREFIX "share" CACHE PATH "-")
-  set(BIN_INSTALL_DIR "." CACHE PATH "-")
-  set(SBIN_INSTALL_DIR "." CACHE PATH "-")
-  set(LIB_INSTALL_DIR "lib" CACHE PATH "-")
-  set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-")
-  set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-")
-  set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-")
-  set(ICON_INSTALL_DIR "." CACHE PATH "-")
-  set(SOUND_INSTALL_DIR "." CACHE PATH "-")
-  set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-")
-  set(SYSCONF_INSTALL_DIR "config" CACHE PATH "-")
-  set(MAN_INSTALL_DIR "man" CACHE PATH "-")
-endif (WIN32)
@@ -1,21 +1,20 @@
-
-IF( DEFINED CSYNC_BUILD_PATH )
-  SET(CSYNC_LIBRARY_PATH ${CSYNC_BUILD_PATH})
-  SET(CSYNC_BINARY_DIR ${CSYNC_BUILD_PATH})
-
-  IF(WIN32)
-    SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.dll)
-  ELSEIF( APPLE )
-    SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.dylib)
-  ELSE()
-    SET(CSYNC_LIBRARY ${CSYNC_BUILD_PATH}/src/libocsync.so)
-  ENDIF()
+IF(EXISTS "${CMAKE_SOURCE_DIR}/../csync/src/csync.h")
+  SET(CSYNC_INCLUDE_PATH ${CMAKE_SOURCE_DIR}/../csync/src/)
 ELSE()
-  FIND_LIBRARY(CSYNC_LIBRARY NAMES ocsync HINTS $ENV{CSYNC_DIR})
+  FIND_PATH(CSYNC_INCLUDE_PATH NAMES csync.h HINTS $ENV{CSYNC_DIR} )
 ENDIF()

-IF(NOT DEFINED CSYNC_INCLUDE_PATH)
-  FIND_PATH(CSYNC_INCLUDE_PATH NAMES csync.h HINTS $ENV{CSYNC_DIR} )
+IF( DEFINED CSYNC_LIBRARY_PATH AND DEFINED CSYNC_INCLUDE_PATH )
+  IF( WIN32 )
+    SET(CSYNC_LIBRARY ${CSYNC_LIBRARY_PATH}/src/libocsync.dll)
+  ELSEIF ( APPLE )
+    SET(CSYNC_LIBRARY ${CSYNC_LIBRARY_PATH}/src/libocsync.dylib)
+  ELSE()
+    SET(CSYNC_LIBRARY ${CSYNC_LIBRARY_PATH}/src/libocsync.so)
+  ENDIF( )
+  SET(CSYNC_BINARY_DIR ${CSYNC_LIBRARY_PATH})
+ELSE()
+  FIND_LIBRARY(CSYNC_LIBRARY NAMES ocsync HINTS $ENV{CSYNC_DIR})
 ENDIF()

 SET(CSYNC_INCLUDE_DIR ${CSYNC_INCLUDE_PATH})
@@ -23,6 +22,7 @@ SET(CSYNC_INCLUDE_DIR ${CSYNC_INCLUDE_PATH})
 # handle the QUIETLY and REQUIRED arguments and set CSYNC_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Csync DEFAULT_MSG CSYNC_LIBRARY CSYNC_INCLUDE_PATH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Csync DEFAULT_MSG
+  CSYNC_LIBRARY CSYNC_INCLUDE_PATH)

 MARK_AS_ADVANCED( CSYNC_INCLUDE_PATH CSYNC_LIBRARY )
@@ -4,12 +4,12 @@
 # also defined, but not for general use are
 #  INOTIFY_LIBRARY, where to find the inotify library.

-find_path(INOTIFY_INCLUDE_DIR sys/inotify.h 
-          HINTS /usr/include/${CMAKE_LIBRARY_ARCHITECTURE})
+find_path(INOTIFY_INCLUDE_DIR sys/inotify.h)
 mark_as_advanced(INOTIFY_INCLUDE_DIR)

-# all listed variables are TRUE
+
 # handle the QUIETLY and REQUIRED arguments and set INOTIFY_FOUND to TRUE if
+# all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(INOTIFY DEFAULT_MSG INOTIFY_INCLUDE_DIR)

@@ -1,73 +0,0 @@
-# - Try to find Neon
-# Once done this will define
-#
-#  NEON_FOUND - system has Neon
-#  NEON_INCLUDE_DIRS - the Neon include directory
-#  NEON_LIBRARIES - Link these to use Neon
-#  NEON_DEFINITIONS - Compiler switches required for using Neon
-#
-#  Copyright (c) 2011 Andreas Schneider <asn@cryptomilk.org>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-find_package(PkgConfig)
-if (PKG_CONFIG_FOUND)
-    pkg_check_modules(_NEON neon)
-endif (PKG_CONFIG_FOUND)
-
-include(GNUInstallDirs)
-
-find_path(NEON_INCLUDE_DIRS
-NAMES
-    neon/ne_basic.h
-HINTS
-    ${_NEON_INCLUDEDIR}
-    ${CMAKE_INSTALL_INCLUDEDIR}
-)
-
-find_library(NEON_LIBRARIES
-NAMES
-    neon
-HINTS
-    ${_NEON_LIBDIR}
-    ${CMAKE_INSTALL_LIBDIR}
-    ${CMAKE_INSTALL_PREFIX}/lib
-    ${CMAKE_INSTALL_PREFIX}/lib64
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Neon DEFAULT_MSG NEON_LIBRARIES NEON_INCLUDE_DIRS)
-
-# show the NEON_INCLUDE_DIRS and NEON_LIBRARIES variables only in the advanced view
-mark_as_advanced(NEON_INCLUDE_DIRS NEON_LIBRARIES)
-
-# Check if neon was compiled with LFS support, if so, the NE_LFS variable has to
-# be defined in the owncloud module.
-# If neon was not compiled with LFS its also ok since the underlying system
-# than probably supports large files anyway.
-IF( CMAKE_FIND_ROOT_PATH )
-	FIND_PROGRAM( NEON_CONFIG_EXECUTABLE NAMES neon-config HINTS ${CMAKE_FIND_ROOT_PATH}/bin )
-ELSE( CMAKE_FIND_ROOT_PATH )
-	FIND_PROGRAM( NEON_CONFIG_EXECUTABLE NAMES neon-config )
-ENDIF( CMAKE_FIND_ROOT_PATH )
-
-IF ( NEON_CONFIG_EXECUTABLE )
-	MESSAGE(STATUS "neon-config executable: ${NEON_CONFIG_EXECUTABLE}")
-	# neon-config --support lfs
-	EXECUTE_PROCESS( COMMAND ${NEON_CONFIG_EXECUTABLE} "--support" "lfs"
-			    RESULT_VARIABLE LFS
-			    OUTPUT_STRIP_TRAILING_WHITESPACE )
-
-	IF (LFS EQUAL 0)
-		MESSAGE(STATUS "libneon has been compiled with LFS support")
-		SET(NEON_WITH_LFS 1 PARENT_SCOPE)
-	ELSE (LFS EQUAL 0)
-		MESSAGE(STATUS "libneon has not been compiled with LFS support, rely on OS")
-	ENDIF (LFS EQUAL 0)
-ELSE  ( NEON_CONFIG_EXECUTABLE )
-    MESSAGE(STATUS, "neon-config could not be found.")
-ENDIF ( NEON_CONFIG_EXECUTABLE )
@@ -1,18 +0,0 @@
-# - Try to find QtKeyChain
-# Once done this will define
-#  QTKEYCHAIN_FOUND - System has QtKeyChain
-#  QTKEYCHAIN_INCLUDE_DIRS - The QtKeyChain include directories
-#  QTKEYCHAIN_LIBRARIES - The libraries needed to use QtKeyChain
-#  QTKEYCHAIN_DEFINITIONS - Compiler switches required for using LibXml2
-
-find_path(QTKEYCHAIN_INCLUDE_DIR qtkeychain/keychain.h)
-
-find_library(QTKEYCHAIN_LIBRARY NAMES libqtkeychain qtkeychain)
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set QTKEYCHAIN_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(QtKeyChain  DEFAULT_MSG
-	QTKEYCHAIN_LIBRARY QTKEYCHAIN_INCLUDE_DIR)
-
-mark_as_advanced(QTKEYCHAIN_INCLUDE_DIR QTKEYCHAIN_LIBRARY )
@@ -1,123 +0,0 @@
-# - Returns a version string from Git
-#
-# These functions force a re-configure on each git commit so that you can
-# trust the values of the variables in your build system.
-#
-#  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
-#
-# Returns the refspec and sha hash of the current head revision
-#
-#  git_describe(<var> [<additional arguments to git describe> ...])
-#
-# Returns the results of git describe on the source tree, and adjusting
-# the output so that it tests false if an error occurs.
-#
-#  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
-#
-# Returns the results of git describe --exact-match on the source tree,
-# and adjusting the output so that it tests false if there was no exact
-# matching tag.
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-if(__get_git_revision_description)
-	return()
-endif()
-set(__get_git_revision_description YES)
-
-# We must run the following at "include" time, not at function call time,
-# to find the path to this module rather than the path to a calling list file
-get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
-
-function(get_git_head_revision _refspecvar _hashvar)
-	set(GIT_PARENT_DIR "${CMAKE_SOURCE_DIR}")
-	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
-		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
-		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
-		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
-			# We have reached the root directory, we are not in git
-			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			return()
-		endif()
-		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	endwhile()
-	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
-	if(NOT EXISTS "${GIT_DATA}")
-		file(MAKE_DIRECTORY "${GIT_DATA}")
-	endif()
-
-	if(NOT EXISTS "${GIT_DIR}/HEAD")
-		return()
-	endif()
-	set(HEAD_FILE "${GIT_DATA}/HEAD")
-	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
-
-	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
-		"${GIT_DATA}/grabRef.cmake"
-		@ONLY)
-	include("${GIT_DATA}/grabRef.cmake")
-
-	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
-	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
-endfunction()
-
-function(git_describe _var)
-	if(NOT GIT_FOUND)
-		find_package(Git QUIET)
-	endif()
-	get_git_head_revision(refspec hash)
-	if(NOT GIT_FOUND)
-		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-	if(NOT hash)
-		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-
-	# TODO sanitize
-	#if((${ARGN}" MATCHES "&&") OR
-	#	(ARGN MATCHES "||") OR
-	#	(ARGN MATCHES "\\;"))
-	#	message("Please report the following error to the project!")
-	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
-	#endif()
-
-	#message(STATUS "Arguments to execute_process: ${ARGN}")
-
-	execute_process(COMMAND
-		"${GIT_EXECUTABLE}"
-		describe
-		${hash}
-		${ARGN}
-		WORKING_DIRECTORY
-		"${CMAKE_SOURCE_DIR}"
-		RESULT_VARIABLE
-		res
-		OUTPUT_VARIABLE
-		out
-		ERROR_QUIET
-		OUTPUT_STRIP_TRAILING_WHITESPACE)
-	if(NOT res EQUAL 0)
-		set(out "${out}-${res}-NOTFOUND")
-	endif()
-
-	set(${_var} "${out}" PARENT_SCOPE)
-endfunction()
-
-function(git_get_exact_tag _var)
-	git_describe(out --exact-match ${ARGN})
-	set(${_var} "${out}" PARENT_SCOPE)
-endfunction()
@@ -1,38 +0,0 @@
-# 
-# Internal file for GetGitRevisionDescription.cmake
-#
-# Requires CMake 2.6 or newer (uses the 'function' command)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-set(HEAD_HASH)
-
-file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
-
-string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
-if(HEAD_CONTENTS MATCHES "ref")
-	# named branch
-	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
-	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
-		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
-	elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}")
-		configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
-		set(HEAD_HASH "${HEAD_REF}")
-	endif()
-else()
-	# detached HEAD
-	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
-endif()
-
-if(NOT HEAD_HASH)
-	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
-	string(STRIP "${HEAD_HASH}" HEAD_HASH)
-endif()
@@ -1,157 +0,0 @@
-# This file defines the Feature Logging macros.
-#
-# MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL [REQUIRED [MIN_VERSION [COMMENTS]]])
-#   Logs the information so that it can be displayed at the end
-#   of the configure run
-#   VAR : TRUE or FALSE, indicating whether the feature is supported
-#   FEATURE: name of the feature, e.g. "libjpeg"
-#   DESCRIPTION: description what this feature provides
-#   URL: home page
-#   REQUIRED: TRUE or FALSE, indicating whether the featue is required
-#   MIN_VERSION: minimum version number. empty string if unneeded
-#   COMMENTS: More info you may want to provide.  empty string if unnecessary
-#
-# MACRO_DISPLAY_FEATURE_LOG()
-#   Call this to display the collected results.
-#   Exits CMake with a FATAL error message if a required feature is missing
-#
-# Example:
-#
-# INCLUDE(MacroLogFeature)
-#
-# FIND_PACKAGE(JPEG)
-# MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "Support JPEG images" "http://www.ijg.org" TRUE "3.2a" "")
-# ...
-# MACRO_DISPLAY_FEATURE_LOG()
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-# Copyright (c) 2006, Allen Winter, <winter@kde.org>
-# Copyright (c) 2009, Sebastian Trueg, <trueg@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-IF (NOT _macroLogFeatureAlreadyIncluded)
-   SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
-   IF (EXISTS ${_file})
-      FILE(REMOVE ${_file})
-   ENDIF (EXISTS ${_file})
-
-   SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
-   IF (EXISTS ${_file})
-      FILE(REMOVE ${_file})
-   ENDIF (EXISTS ${_file})
-
-   SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
-   IF (EXISTS ${_file})
-      FILE(REMOVE ${_file})
-  ENDIF (EXISTS ${_file})
-
-  SET(_macroLogFeatureAlreadyIncluded TRUE)
-
-  INCLUDE(FeatureSummary)
-
-ENDIF (NOT _macroLogFeatureAlreadyIncluded)
-
-
-MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _comments)
-
-   STRING(TOUPPER "${ARGV4}" _required)
-   SET(_minvers "${ARGV5}")
-   SET(_comments "${ARGV6}")
-
-   IF (${_var})
-     SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
-   ELSE (${_var})
-     IF ("${_required}" STREQUAL "TRUE")
-       SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
-     ELSE ("${_required}" STREQUAL "TRUE")
-       SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
-     ENDIF ("${_required}" STREQUAL "TRUE")
-   ENDIF (${_var})
-
-   SET(_logtext "   * ${_package}")
-
-   IF (NOT ${_var})
-      IF (${_minvers} MATCHES ".*")
-        SET(_logtext "${_logtext} (${_minvers} or higher)")
-      ENDIF (${_minvers} MATCHES ".*")
-      SET(_logtext "${_logtext}  <${_url}>\n     ")
-   ELSE (NOT ${_var})
-     SET(_logtext "${_logtext} - ")
-   ENDIF (NOT ${_var})
-
-   SET(_logtext "${_logtext}${_description}")
-
-   IF (NOT ${_var})
-      IF (${_comments} MATCHES ".*")
-        SET(_logtext "${_logtext}\n     ${_comments}")
-      ENDIF (${_comments} MATCHES ".*")
-#      SET(_logtext "${_logtext}\n") #double-space missing features?
-   ENDIF (NOT ${_var})
-
-   FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n")
-
-   IF(COMMAND SET_PACKAGE_INFO)  # in FeatureSummary.cmake since CMake 2.8.3
-     SET_PACKAGE_INFO("${_package}" "\"${_description}\"" "${_url}" "\"${_comments}\"")
-   ENDIF(COMMAND SET_PACKAGE_INFO)
-
-ENDMACRO(MACRO_LOG_FEATURE)
-
-
-MACRO(MACRO_DISPLAY_FEATURE_LOG)
-   IF(COMMAND FEATURE_SUMMARY) # in FeatureSummary.cmake since CMake 2.8.3
-      FEATURE_SUMMARY(FILENAME ${CMAKE_CURRENT_BINARY_DIR}/FindPackageLog.txt
-                      WHAT ALL)
-   ENDIF(COMMAND FEATURE_SUMMARY)
-
-   SET(_missingFile ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
-   SET(_enabledFile ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
-   SET(_disabledFile ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
-
-   IF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
-     SET(_printSummary TRUE)
-   ENDIF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
-
-   IF(_printSummary)
-     SET(_missingDeps 0)
-     IF (EXISTS ${_enabledFile})
-       FILE(READ ${_enabledFile} _enabled)
-       FILE(REMOVE ${_enabledFile})
-       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n-----------------------------------------------------------------------------\n${_enabled}")
-     ENDIF (EXISTS ${_enabledFile})
-
-
-     IF (EXISTS ${_disabledFile})
-       SET(_missingDeps 1)
-       FILE(READ ${_disabledFile} _disabled)
-       FILE(REMOVE ${_disabledFile})
-       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n-----------------------------------------------------------------------------\n${_disabled}")
-     ENDIF (EXISTS ${_disabledFile})
-
-
-     IF (EXISTS ${_missingFile})
-       SET(_missingDeps 1)
-       FILE(READ ${_missingFile} _requirements)
-       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- You must install these packages before continuing.\n-----------------------------------------------------------------------------\n${_requirements}")
-       FILE(REMOVE ${_missingFile})
-       SET(_haveMissingReq 1)
-     ENDIF (EXISTS ${_missingFile})
-
-
-     IF (NOT ${_missingDeps})
-       SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- Congratulations! All external packages have been found.")
-     ENDIF (NOT ${_missingDeps})
-
-
-     MESSAGE(${_summary})
-     MESSAGE("-----------------------------------------------------------------------------\n")
-
-
-     IF(_haveMissingReq)
-       MESSAGE(FATAL_ERROR "Exiting: Missing Requirements")
-     ENDIF(_haveMissingReq)
-
-   ENDIF(_printSummary)
-
-ENDMACRO(MACRO_DISPLAY_FEATURE_LOG)
@@ -1,47 +0,0 @@
-# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
-# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
-# This macro is a combination of OPTION() and FIND_PACKAGE(), it
-# works like FIND_PACKAGE(), but additionally it automatically creates
-# an option name WITH_<name>, which can be disabled via the cmake GUI.
-# or via -DWITH_<name>=OFF
-# The standard <name>_FOUND variables can be used in the same way
-# as when using the normal FIND_PACKAGE()
-
-# Copyright (c) 2006-2010 Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-# This is just a helper macro to set a bunch of variables empty.
-# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both:
-macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var)
-   if(DEFINED ${_name}_${_var})
-      set(${_name}_${_var} "")
-   endif(DEFINED ${_name}_${_var})
-
-   string(TOUPPER ${_name} _nameUpper)
-   if(DEFINED ${_nameUpper}_${_var})
-      set(${_nameUpper}_${_var}  "")
-   endif(DEFINED ${_nameUpper}_${_var})
-endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var)
-
-
-macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
-   option(WITH_${_name} "Search for ${_name} package" ON)
-   if (WITH_${_name})
-      find_package(${_name} ${ARGN})
-   else (WITH_${_name})
-      string(TOUPPER ${_name} _nameUpper)
-      set(${_name}_FOUND FALSE)
-      set(${_nameUpper}_FOUND FALSE)
-
-      _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS)
-      _mofp_set_empty_if_defined(${_name} INCLUDE_DIR)
-      _mofp_set_empty_if_defined(${_name} INCLUDES)
-      _mofp_set_empty_if_defined(${_name} LIBRARY)
-      _mofp_set_empty_if_defined(${_name} LIBRARIES)
-      _mofp_set_empty_if_defined(${_name} LIBS)
-      _mofp_set_empty_if_defined(${_name} FLAGS)
-      _mofp_set_empty_if_defined(${_name} DEFINITIONS)
-   endif (WITH_${_name})
-endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
@@ -1,12 +1,14 @@
 ;ownCloud installer script.

-!define APPLICATION_SHORTNAME "@APPLICATION_EXECUTABLE@"
+!define APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@"
 !define APPLICATION_NAME "@APPLICATION_NAME@"
 !define APPLICATION_VENDOR "@APPLICATION_VENDOR@"
 !define APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@.exe"
 !define APPLICATION_DOMAIN "@APPLICATION_DOMAIN@"
 !define APPLICATION_LICENSE "@APPLICATION_LICENSE@"
-!define WIN_SETUP_BITMAP_PATH "@WIN_SETUP_BITMAP_PATH@"
+
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.${APPLICATION_DOMAIN}"
+

 ;-----------------------------------------------------------------------------
 ; Some installer script options (comment-out options not required)
@@ -18,6 +20,7 @@
 !define OPTION_SECTION_SC_START_MENU
 !define OPTION_SECTION_SC_DESKTOP
 !define OPTION_SECTION_SC_QUICK_LAUNCH
+!define OPTION_SECTION_SC_AUTOSTART
 !define OPTION_FINISHPAGE
 !define OPTION_FINISHPAGE_LAUNCHER
 ; !define OPTION_FINISHPAGE_RELEASE_NOTES
@@ -30,15 +33,14 @@
 !endif
 !define MING_BIN "${MING_PATH}/bin"
 !define MING_LIB "${MING_PATH}/lib"
-!define MING_SHARE "${MING_PATH}/share"
 !define BUILD_PATH "@CMAKE_BINARY_DIR@"
 !define SOURCE_PATH "@CMAKE_SOURCE_DIR@"
 !define QT_DLL_PATH "${MING_BIN}"
-!define ACCESSIBLE_DLL_PATH "${MING_LIB}/qt4/plugins/accessible"
 !define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
 !define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"

 !define CSYNC_LIBRARY_DIR "@CSYNC_LIBRARY_DIR@"
+!define CSYNC_PLUGIN_DIR "@CSYNC_PLUGIN_DIR@"
 !define CSYNC_CONFIG_DIR "@CSYNC_CONFIG_DIR@"

 !define NSI_PATH "${source_path}/admin/win/nsi"
@@ -61,6 +63,7 @@
 ; Initial installer setup and definitions.
 ;-----------------------------------------------------------------------------
 Name "@CPACK_NSIS_PACKAGE_NAME@"
+Caption "${APPLICATION_NAME} Setup"
 BrandingText "${APPLICATION_NAME} ${VERSION}  -- ${BUILD_TIME}"
 OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
 InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
@@ -100,12 +103,14 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !define MUI_ABORTWARNING
 !define MUI_ICON ${NSI_PATH}\installer.ico
 !define MUI_UNICON ${NSI_PATH}\installer.ico
-!define MUI_WELCOMEFINISHPAGE_BITMAP ${WIN_SETUP_BITMAP_PATH}/welcome.bmp
+!define MUI_WELCOMEFINISHPAGE_BITMAP ${NSI_PATH}\welcome_${APPLICATION_SHORTNAME}.bmp
+!define MUI_WELCOMEPAGE_TITLE "Welcome to the @CPACK_PACKAGE_NAME@ ${VERSION} Setup Wizard"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation.$\r$\n$\r$\n$_CLICK"
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP  ${WIN_SETUP_BITMAP_PATH}/page_header.bmp
+!define MUI_HEADERIMAGE_BITMAP ${NSI_PATH}\page_header_${APPLICATION_SHORTNAME}.bmp
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_FINISHPAGE_LINK "www.${APPLICATION_DOMAIN}"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.${APPLICATION_DOMAIN}"
+!define MUI_FINISHPAGE_TITLE "@CPACK_PACKAGE_NAME@ Setup Completed"
+!define MUI_FINISHPAGE_LINK "Click here to visit the @CPACK_PACKAGE_NAME@ website."
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !ifdef OPTION_FINISHPAGE_RELEASE_NOTES
   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
@@ -123,7 +128,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 ;-----------------------------------------------------------------------------
 !insertmacro MUI_PAGE_WELCOME
 !ifdef OPTION_LICENSE_AGREEMENT
-   !insertmacro MUI_PAGE_LICENSE "${APPLICATION_LICENSE}"
+   !insertmacro MUI_PAGE_LICENSE "${source_path}/${APPLICATION_LICENSE}"
 !endif
 Page custom PageReinstall PageLeaveReinstall
 !insertmacro MUI_PAGE_COMPONENTS
@@ -265,7 +270,7 @@ FunctionEnd
 #   INSTALLER SECTIONS                                                       #
 #                                                                            #
 ##############################################################################
-Section "${APPLICATION_NAME}" SEC_APPLICATION
+Section "${APPLICATION_NAME}" SEC_OWNCLOUD
   SectionIn 1 2 3 RO
   SetDetailsPrint listonly

@@ -281,24 +286,29 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   !ifndef INSTALL_PATH
        ;Main executable.
        File "${BUILD_PATH}\bin\${APPLICATION_EXECUTABLE}"
-        File "${BUILD_PATH}\src\lib${APPLICATION_SHORTNAME}sync.dll"
+        File "${BUILD_PATH}\src\libowncloudsync.dll"
+        File "${BUILD_PATH}\src\mirall_ca.qm"
+        File "${BUILD_PATH}\src\mirall_cs_CZ.qm"
+        File "${BUILD_PATH}\src\mirall_de.qm"
+        File "${BUILD_PATH}\src\mirall_el.qm"
+        File "${BUILD_PATH}\src\mirall_en.qm"
+        File "${BUILD_PATH}\src\mirall_es.qm"
+        File "${BUILD_PATH}\src\mirall_fr.qm"
+        File "${BUILD_PATH}\src\mirall_it.qm"
+        File "${BUILD_PATH}\src\mirall_ja_JP.qm"
+        File "${BUILD_PATH}\src\mirall_pl.qm"
+        File "${BUILD_PATH}\src\mirall_pt_BR.qm"
+        File "${BUILD_PATH}\src\mirall_pt_PT.qm"
+        File "${BUILD_PATH}\src\mirall_ru.qm"
+        File "${BUILD_PATH}\src\mirall_sk_SK.qm"
+        File "${BUILD_PATH}\src\mirall_sl.qm"
+        File "${BUILD_PATH}\src\mirall_sv.qm"

-        File "${BUILD_PATH}\src\mirall_*.qm"
-        ; Make sure only to copy qt, not qt_help, etc
-        File "${MING_SHARE}\qt4\translations\qt_??.qm"
-        File "${MING_SHARE}\qt4\translations\qt_??_??.qm"
-        File "${MING_SHARE}\qt4\translations\qtkeychain_*.qm"
-
-        SetOutPath "$INSTDIR\accessible"
-        File "${ACCESSIBLE_DLL_PATH}\qtaccessiblewidgets4.dll"
-        SetOutPath "$INSTDIR\imageformats"
-        File "${IMAGEFORMATS_DLL_PATH}\qgif4.dll"
-        File "${IMAGEFORMATS_DLL_PATH}\qjpeg4.dll"
-        File "${IMAGEFORMATS_DLL_PATH}\qico4.dll"
-
-        SetOutPath "$INSTDIR\sqldrivers"
-        File "${SQLITE_DLL_PATH}\qsqlite4.dll"
+        SetOutPath "$INSTDIR\modules"
+        ; FIXME: fix installation dir of module, currently needs manual copying to
+        ; /usr/i686-w64-mingw32/sys-root/mingw/bin/csync_modules/

+        File "${CSYNC_PLUGIN_DIR}/ocsync_owncloud.dll"
        SetOutPath "$INSTDIR"
   !endif

@@ -306,28 +316,29 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION

   ;License & release notes.
   File "@CPACK_RESOURCE_FILE_LICENSE@"
-   ;File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt
+   File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt

   ;QT stuff:
   File "${QT_DLL_PATH}\QtCore4.dll"
   File "${QT_DLL_PATH}\QtGui4.dll"
   File "${QT_DLL_PATH}\QtNetwork4.dll"
-   File "${QT_DLL_PATH}\QtSql4.dll"
   File "${QT_DLL_PATH}\QtXml4.dll"
-   File "${QT_DLL_PATH}\QtWebKit4.dll"

-   ;QtKeyChain stuff
-   File "${MING_BIN}\libqtkeychain.dll"
-
-   File "${CSYNC_LIBRARY_DIR}\libocsync.dll"
+   File "${CSYNC_LIBRARY_DIR}/libocsync.dll"
   File "${MING_BIN}\libsqlite3-0.dll"
+   File "${MING_BIN}\libiniparser.dll"
+   File "${MING_BIN}\libdl.dll"
   File "${MING_BIN}\libpng15-15.dll"

   ; ownCloud plugin
+   File "${MING_BIN}\libgcrypt-11.dll"
+   File "${MING_BIN}\libgnutls-26.dll"
+   File "${MING_BIN}\libgpg-error-0.dll"
   File "${MING_BIN}\libintl-8.dll"
   File "${MING_BIN}\libneon-27.dll"
   File "${MING_BIN}\libproxy.dll"
   File "${MING_BIN}\libmodman.dll"
+   File "${MING_BIN}\libtasn1-3.dll"
   File "${MING_BIN}\libxml2-2.dll"

   ;MinGW stuff
@@ -336,12 +347,13 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION

   ; Other
   ;File "${MING_BIN}\libpng15-15.dll"
-   File "${MING_BIN}\libjpeg-8.dll"
+   ;File "${MING_BIN}\libjpeg-8.dll"
   File "${MING_BIN}\zlib1.dll"
-   File "${MING_BIN}\libcrypto-10.dll"
-   File "${MING_BIN}\libssl-10.dll"
+   File "${MING_BIN}\libcrypto-8.dll"
+   File "${MING_BIN}\libssl-8.dll"

   ; CSync configs
+   File "${CSYNC_CONFIG_DIR}/ocsync.conf"
   File "${SOURCE_PATH}/sync-exclude.lst"

 SectionEnd
@@ -349,13 +361,18 @@ SectionEnd
 SectionGroup "Shortcuts"

 !ifdef OPTION_SECTION_SC_START_MENU
-   ${MementoSection} "Start Menu Program Shortcut" SEC_START_MENU
+   ${MementoSection} "Start Menu Program Group" SEC_START_MENU
      SectionIn 1 2 3
      SetDetailsPrint textonly
-      DetailPrint "Adding shortcut for ${APPLICATION_NAME} to the Start Menu."
+      DetailPrint "Adding shortcuts for the ${APPLICATION_NAME} program group to the Start Menu."
      SetDetailsPrint listonly
      SetShellVarContext all
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
+      RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
+      CreateDirectory "$SMPROGRAMS\${APPLICATION_NAME}"
+      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
+      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_EXECUTABLE}"
+      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Release notes.lnk" "$INSTDIR\NOTES.txt"
+      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe"
      SetShellVarContext current
   ${MementoSectionEnd}
 !endif
@@ -382,15 +399,27 @@ SectionGroup "Shortcuts"

 SectionGroupEnd

+!ifdef OPTION_SECTION_SC_AUTOSTART
+   ${MementoSection} "Autostart" SEC_AUTOSTART
+      SectionIn 1 2
+      SetDetailsPrint textonly
+      DetailPrint "Creating Windows Start Entry"
+      SetDetailsPrint listonly
+      WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Run" \
+               "${APPLICATION_NAME}" "$INSTDIR\${APPLICATION_EXECUTABLE}" 
+  ${MementoSectionEnd}
+!endif
+
 ${MementoSectionDone}

 ; Installer section descriptions
 ;--------------------------------
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APPLICATION} "${APPLICATION_NAME} essentials."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} shortcut."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} program group."
 !insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for ${APPLICATION_NAME}."
 !insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for ${APPLICATION_NAME}."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_AUTOSTART} "Register ${APPLICATION_NAME} to run on Windows startup."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

 Section -post
@@ -493,10 +522,15 @@ Section Uninstall

   DeleteRegKey HKCR "${APPLICATION_NAME}"

+   ;Windows Start entry
+   !ifdef OPTION_SECTION_SC_AUTOSTART
+      DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "${APPLICATION_NAME}"
+   !endif
+
   ;Start menu shortcuts.
   !ifdef OPTION_SECTION_SC_START_MENU
      SetShellVarContext all
-      Delete "$SMPROGRAMS\${APPLICATION_NAME}.lnk"
+      RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
      SetShellVarContext current
   !endif

@@ -1,131 +0,0 @@
-include (MacroOptionalFindPackage)
-include (MacroLogFeature)
-
-
-option(BUILD_WITH_QT4 "Build with Qt4 no matter if Qt5 was found" ON)
-
-if( NOT BUILD_WITH_QT4 )
-    find_package(Qt5Core QUIET)
-    if( Qt5Core_DIR )
-        find_package(Qt5Widgets QUIET)
-        find_package(Qt5Quick QUIET)
-        find_package(Qt5PrintSupport QUIET)
-        find_package(Qt5WebKit QUIET)
-        find_package(Qt5Location QUIET)
-        find_package(Qt5Network QUIET)
-        find_package(Qt5Sensors QUIET)
-        find_package(Qt5Xml QUIET)
-#        find_package(Qt5WebKitWidgets QUIET)
-
-        message(STATUS "Using Qt 5!")
-
-       # We need this to find the paths to qdbusxml2cpp and co
-        if (WITH_DBUS)
-            find_package(Qt5DBus REQUIRED)
-            include_directories(${Qt5DBus_INCLUDES})
-            add_definitions(${Qt5DBus_DEFINITIONS})
-        endif (WITH_DBUS)
-
-        include_directories(${Qt5Widgets_INCLUDES})
-        add_definitions(${Qt5Widgets_DEFINITIONS})
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-#        set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-
-
-        macro(qt_wrap_ui)
-            qt5_wrap_ui(${ARGN})
-        endmacro()
-
-        macro(qt_add_resources)
-            qt5_add_resources(${ARGN})
-        endmacro()
-
-#        find_package(Qt5LinguistTools REQUIRED)
-        macro(qt_add_translation)
-#            qt5_add_translation(${ARGN})
-        endmacro()
-
-        macro(qt_add_dbus_interface)
-            qt5_add_dbus_interface(${ARGN})
-        endmacro()
-
-        macro(qt_add_dbus_adaptor)
-            qt5_add_dbus_adaptor(${ARGN})
-        endmacro()
-
-        macro(qt_wrap_cpp)
-            qt5_wrap_cpp(${ARGN})
-        endmacro()
-
-        macro(install_qt_executable)
-            install_qt5_executable(${ARGN})
-        endmacro()
-
-        macro(setup_qt)
-        endmacro()
-
-        set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
-
-        #Enable deprecated symbols
-        add_definitions("-DQT_DISABLE_DEPRECATED_BEFORE=0")
-    endif()
-endif()
-if( NOT Qt5Core_DIR )
-    message(STATUS "Could not find Qt5, searching for Qt4 instead...")
-
-    set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork" "QtGui" "QtWebkit")
-    if( BUILD_TESTS )
-        list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
-    endif()
-
-    macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
-    macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
-
-    macro(qt5_use_modules)
-    endmacro()
-
-    macro(qt_wrap_ui)
-        qt4_wrap_ui(${ARGN})
-    endmacro()
-
-    macro(qt_add_resources)
-        qt4_add_resources(${ARGN})
-    endmacro()
-
-    macro(qt_add_translation)
-        qt4_add_translation(${ARGN})
-    endmacro()
-
-    macro(qt_add_dbus_interface)
-      qt4_add_dbus_interface(${ARGN})
-    endmacro()
-
-    macro(qt_add_dbus_adaptor)
-        qt4_add_dbus_adaptor(${ARGN})
-    endmacro()
-
-    macro(qt_wrap_cpp)
-        qt4_wrap_cpp(${ARGN})
-    endmacro()
-
-    macro(install_qt_executable)
-        install_qt4_executable(${ARGN})
-    endmacro()
-
-    macro(setup_qt)
-        set(QT_USE_QTGUI TRUE)
-        set(QT_USE_QTSQL TRUE)
-        set(QT_USE_QTNETWORK TRUE)
-        set(QT_USE_QTXML TRUE)
-        set(QT_USE_QTWEBKIT TRUE)
-        set(QT_USE_QTDBUS TRUE)
-
-        include( ${QT_USE_FILE} )
-    endmacro()
-endif()
-
-if( Qt5Core_DIR )
-    set( HAVE_QT5 TRUE )
-else( Qt5Core_DIR )
-    set( HAVE_QT5 FALSE )
-endif( Qt5Core_DIR )
@@ -1,20 +0,0 @@
-if(CMAKE_COMPILER_IS_GNUCXX)
-    execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-                    OUTPUT_VARIABLE GCC_VERSION)
-    if(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
-        set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wpedantic -Wno-long-long")
-    else(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
-        set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Wno-long-long")
-    endif(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
-endif(CMAKE_COMPILER_IS_GNUCXX)
-if(CMAKE_CXX_COMPILER MATCHES "clang")
-    set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Wno-long-long")
-endif(CMAKE_CXX_COMPILER MATCHES "clang")
-# TODO: handle msvc compilers warnings?
-
-if(DEFINED MIRALL_FATAL_WARNINGS)
-    if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER MATCHES "clang")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-    endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER MATCHES "clang")
-    # TODO: handle msvc compilers warnings?
-endif(DEFINED MIRALL_FATAL_WARNINGS)
@@ -2,17 +2,7 @@
 #define CONFIG_H

 #cmakedefine USE_INOTIFY 1
-#cmakedefine WITH_QTKEYCHAIN 1
+#cmakedefine WITH_CSYNC 1

-#cmakedefine GIT_SHA1 "@GIT_SHA1@"
-#cmakedefine APPLICATION_DOMAIN @APPLICATION_DOMAIN@
 #cmakedefine THEME_CLASS @THEME_CLASS@
-#cmakedefine THEME_INCLUDE @THEME_INCLUDE@
-
-#cmakedefine APPLICATION_NAME "@APPLICATION_NAME@"
-#cmakedefine APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@"
-#cmakedefine APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@"
-
-#cmakedefine SYSCONFDIR "@SYSCONFDIR@"
-#cmakedefine DATADIR "@DATADIR@"
 #endif
@@ -9,77 +9,42 @@ if(SPHINX_FOUND)
    set(SPHINX_QCH_DIR      "${CMAKE_CURRENT_BINARY_DIR}/qthelp")
    set(SPHINX_HTMLHELP_DIR "${CMAKE_CURRENT_BINARY_DIR}/htmlhelp")
    set(MSHTML_COMPILER     wine 'C:\\Program Files\\HTML Help Workshop\\hhc.exe')
-    # assets
-    set(LATEX_LOGO          "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf")

    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY)
-
-    if(WITH_DOC)
-       add_custom_target(doc ALL DEPENDS doc-html doc-man COMMENT "Building documentation...")
-       install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-       install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR})
-    else(WITH_DOC)
-       add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
-    endif(WITH_DOC)
-
-    if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ocdoc/_shared_assets")
-       add_dependencies(doc doc-html-org)
-       add_dependencies(doc doc-html-com)
-    endif()
-
+    add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...")
    if(PDFLATEX_FOUND)
        # if this still fails on Debian/Ubuntu, run
        # apt-get install texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
        add_custom_target(doc-latex  ${SPHINX_EXECUTABLE}
 		                     -q -c . -b latex
-				     -d ${SPHINX_CACHE_DIR}/latex
-				     -D latex_logo=${LATEX_LOGO}
+				     -d ${SPHINX_CACHE_DIR}
 				     ${CMAKE_CURRENT_SOURCE_DIR}
 				     ${SPHINX_PDF_DIR} )
-        add_custom_target(doc-pdf $(MAKE) -C ${SPHINX_PDF_DIR} all-pdf
+        add_custom_target(doc-pdf make -C ${SPHINX_PDF_DIR} all-pdf
 		                  DEPENDS doc-latex )
        add_dependencies(doc doc-pdf)
-        if (WITH_DOC)
-           install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-        endif (WITH_DOC)
    endif(PDFLATEX_FOUND)
    if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE})
        add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE}
 		                          -q -c . -b qthelp
-				          -d ${SPHINX_CACHE_DIR}/qthelp
+				          -d ${SPHINX_CACHE_DIR}
 					  ${CMAKE_CURRENT_SOURCE_DIR}
 					  ${SPHINX_QCH_DIR} )
        add_custom_target( doc-qch ${QT_QCOLLECTIONGENERATOR_EXECUTABLE}
 		                   ${SPHINX_QCH_DIR}/*.qhcp
 				   DEPENDS doc-qch-sphinx )
        add_dependencies(doc doc-qch)
-        if (WITH_DOC)
-            install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-        endif (WITH_DOC)
    endif()
    add_custom_target( doc-html ${SPHINX_EXECUTABLE}
 	                        -q -c . -b html
-				-d ${SPHINX_CACHE_DIR}/html
+				-d ${SPHINX_CACHE_DIR}
 				${CMAKE_CURRENT_SOURCE_DIR}
-				${SPHINX_HTML_DIR}/unthemed )
-    add_custom_target( doc-html-org ${SPHINX_EXECUTABLE}
-	                        -q -c . -b html
-				-d ${SPHINX_CACHE_DIR}/html
-                                -D html_theme=owncloud_org
-				${CMAKE_CURRENT_SOURCE_DIR}
-				${SPHINX_HTML_DIR}/org )
-    add_custom_target( doc-html-com ${SPHINX_EXECUTABLE}
-	                        -q -c . -b html
-				-d ${SPHINX_CACHE_DIR}/html
-                                -D html_theme=owncloud_com
-				${CMAKE_CURRENT_SOURCE_DIR}
-				${SPHINX_HTML_DIR}/com )
+				${SPHINX_HTML_DIR} )
    add_custom_target( doc-man  ${SPHINX_EXECUTABLE}
 	                        -q -c . -b man
-				-d ${SPHINX_CACHE_DIR}/man
+				-d ${SPHINX_CACHE_DIR}
 				${CMAKE_CURRENT_SOURCE_DIR}
 				${SPHINX_MAN_DIR} )
-
    ## Building CHM files requires HTML Help Workshop. Since it requires wine
    ## with special dependencies, it's impossible to write a cmake check for it.
    ## This is why doc-chm is not a dependency for doc. Instead, run
@@ -88,7 +53,7 @@ if(SPHINX_FOUND)
    add_custom_target( doc-chm-sphinx  ${SPHINX_EXECUTABLE}
 	                               -q -c . -b htmlhelp
 	                               -D html_theme=basic
-                                       -d ${SPHINX_CACHE_DIR}/htmlhelp
+                                       -d ${SPHINX_CACHE_DIR}
                                       ${CMAKE_CURRENT_SOURCE_DIR}
                                       ${SPHINX_HTMLHELP_DIR} )
    add_custom_target( doc-chm pushd ${SPHINX_HTMLHELP_DIR}; ${MSHTML_COMPILER} *.hhp; popd
@@ -0,0 +1,153 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/OwncloudDocumentation.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/OwncloudDocumentation.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/OwncloudDocumentation"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/OwncloudDocumentation"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
@@ -1,37 +0,0 @@
-Setting up an Account
-=====================
-
-If no account has been configured, ownCloud Client will automatically assist
-you in connecting to your ownCloud Server after the application has been
-started.
-
-As a first step, specify the URL to your Server, just
-like you would when you open your ownCloud instance inside a browser.
-
-.. image:: images/wizard_url.png
-   :scale: 50 %
-
-.. note:: Make sure to use ``https://`` if the server supports it. Otherwise,
-   your password and all data will be transferred to the server unencrypted.
-   This makes it easy for third parties to intercept your communication, and
-   getting hold of your password!
-
-Next, you are prompted for your username and password. Again, use the same
-credentials that you would use to log on via the web interface.
-
-.. image:: images/wizard_user.png
-   :scale: 50 %
-
-Finally, choose the folder that ownCloud Client is supposed to sync the
-contents of your ownCloud account with. By default, this is a folder
-called `ownCloud`, which will reside in your home directory.
-
-.. image:: images/wizard_targetfolder.png
-   :scale: 50 %
-
-After pressing `Connect`, ownCloud Client will commence with the syncing
-process. The next screen will give you the opportunity to review your
-settings:
-
-.. image:: images/wizard_overview.png
-   :scale: 50 %
@@ -1,14 +0,0 @@
-Advanced Usage
-==============
-
-.. index:: Advanced Usage
-
-Options
-------
-.. index:: command line switches, command line, options, parameters
-.. include:: options.rst
-
-Config File
-----------
-.. index:: config file
-.. include:: conffile.rst
@@ -1,6 +1,5 @@
-Appendix B: Architecture
-========================
-
+Architecture
+============
 .. index:: architecture 

 The ownCloud project provides desktop sync clients to synchronize the
@@ -12,10 +11,11 @@ csync was written to synchronize with ownCloud’s built-in WebDAV server.

 The ownCloud sync client is based on a tool called mirall initially written by
 Duncan Mac Vicar. Later Klaas Freitag joined the project and enhanced it to work
-with ownCloud server.
+with ownCloud server. Both mirall and ownCloud Client (oCC) build from the same
+source, currently hosted in the ownCloud source repo on gitorious.

-ownCloud Client is written in C++ using the `Qt Framework`_. As a result, the
-ownCloud Client runs on the three important platforms Linux, Windows and MacOS.
+oCC is written in C++ using the `Qt Framework`_. As a result oCC runs on the
+three important platforms Linux, Windows and MacOS.

 .. _csync: http://www.csync.org
 .. _`Qt Framework`: http://www.qt-project.org
@@ -23,8 +23,8 @@ ownCloud Client runs on the three important platforms Linux, Windows and MacOS.
 The Sync Process
 ----------------

-First it is important to recall what syncing is: It tries to keep the files
-on two repositories the same. That means if a file is added to one repository
+First it is important to recall what syncing is. Syncing tries to keep the files
+on both repositories the same. That means if a file is added to one repository
 it is going to be copied to the other repository. If a file is changed on one
 repository, the change is propagated to the other repository. Also, if a file
 is deleted on one side, it is deleted on the other. As a matter of fact, in
@@ -34,13 +34,8 @@ server is always master.
 This is the major difference to other systems like a file backup where just
 changes and new files are propagated but files never get deleted.

-The ownCloud Client checks both repositories for changes frequently after a
-certain time span. That is refered to as a sync run. In between the local
-repository is monitored by a file system monitor system that starts a sync run
-immediately if something was edited, added or removed.
-
-Sync by Time versus ETag
------------------------
+Sync Direction and Strategies
+-----------------------------
 .. index:: time stamps, file times, etag, unique id 

 Until the release of ownCloud 4.5 and ownCloud Client 1.1, ownCloud employed
@@ -49,7 +44,7 @@ synced to the other repository: the files modification time.

 The *modification timestamp* is part of the files metadata. It is available on
 every relevant filesystem and is the natural indicator for a file change.
-Modification timestamps do not require special action to create and have
+modification timestamps do not require special action to create and have
 a general meaning. One design goal of csync is to not require a special server
 component, that’s why it was chosen as the backend component.

@@ -62,24 +57,29 @@ machines.
 Since this strategy is rather fragile without NTP, ownCloud 4.5 introduced a
 unique number, which changes whenever the file changes. Although it is a unique
 value, it is not a hash of the file, but a randomly chosen number, which it will
-transmit in the Etag_ field. Since the file number is guaranteed to change if
-the file changes, it can now be used to determine if one of the files has
-changed.
+transmit in the Etag_ field. The client will store this number in a
+per-directory database, located in the application directory (version 1.1) or
+as a hidden file right in the directory to be synced (later versions).
+Since the file number is guaranteed to change if the file changes, it can now be
+used to determine if one of the files has changed.

-.. note:: ownCloud Client 1.1 and newer require file ID capabilities on the
-   ownCloud server, hence using them with a server earlier than 4.5.0 is
-   not supported.
-
-Before the 1.3.0 release of the client the sync process might create faux
-conflict files if time deviates. The original and the conflict files only
-differed in the timestamp, but not in content. This behaviour was changed
-towards a binary check if the files are different.
+.. todo:: describe what happens if both sides change

+If the per-directory database gets removed, oCC's CSync backend will fall back
+to a time-stamp based sync process to rebuild the database. Thus it should be
+made sure that both server and client synchronized to NTP time before
+restarting the client after a database removal. If time deviates, the sync
+process might create faux conflict files, which only differ in their time.
+Those need to be cleaned up manually later on and will not be synced back
+to the server. However, no files will get deleted in this process.
+  
 Just like files, directories also hold a unique id, which changes whenever
 one of the contained files or directories gets modified. Since this is a
 recursive process, it significantly reduces the effort required for a sync
 cycle, because the client will only walk directories with a modified unique id.

+.. note:: oCC 1.1 and newer require file ID capabilities on the ownCloud server,
+  hence using them with a server earlier than 4.5.0 is not supported.

 This table outlines the different sync methods attempted depending
 on server/client combination:
@@ -106,56 +106,3 @@ are involved and one of them is not in sync with NTP time.
 .. _`NTP time synchronisation`: http://en.wikipedia.org/wiki/Network_Time_Protocol
 .. _Etag: http://en.wikipedia.org/wiki/HTTP_ETag

-Comparison and Conflict Cases
-----------------------------
-
-In a sync run the client first has to detect if one of the two repositories have
-changed files. On the local repository, the client traverses the file
-tree and compares the modification time of each file with the value it was 
-before. The previous value is stored in the client's database. If it is not, it
-means that the file has been added to the local repository. Note that on 
-the local side, the modificaton time a good attribute to detect changes because
-it does not depend on time shifts and such.
-
-For the remote (ie. ownCloud) repository, the client compares the ETag of each
-file with it's previous value. Again the previous value is queried from the
-database. If the ETag is still the same, the file has not changed.
-
-In case a file has changed on both, the local and the remote repository since
-the last sync run, it can not easily be decided which version of the file is
- the one that should be used. However, changes to any side must not be lost.
-
-That is called a **conflict case**. The client solves it by creating a conflict
-file of the older of the two files and save the newer one under the original
-file name. Conflict files are always created on the client and never on the
-server. The conflict file has the same name as the original file appended with
-the timestamp of the conflict detection.
-
-
-.. _ignored-files-label:
-
-Ignored Files
-------------
-
-ownCloud Client will refuse to sync the following files:
-
-* Files matched by one of the pattern in :ref:`ignoredFilesEditor-label`
-* Files containing characters that do not work on certain file systems.
-  Currently, these characters are: `\, :, ?, *, ", >, <, |`
-* Files starting in ``.csync_journal.db`` (reserved for journalling)
-
-The Sync Journal
----------------
-
-The client stores the ETag number in a per-directory database,
-called the journal.  It is a hidden file right in the directory
-to be synced.
-
-If the journal database gets removed, ownCloud Client's CSync backend will
-rebuild the database by comparing the files and their modification times. Thus
-it should be made sure that both server and client synchronized with NTP time
-before restarting the client after a database removal.
-
-Pressing ``F5`` in the Account Settings Dialog that allows to "reset" the
-journal. That can be used to recreate the journal database. Use this only
-if advised to do so by the developer or support staff.
@@ -0,0 +1,87 @@
+Adding 3rd-Party Branding
+=========================
+
+The ownCloud Client supports theming in the setup assistant dialog in both the
+account setting and the result window. These customizations do not require a
+recompile of the client.
+
+The dialogs have places where custom content can be inserted. Please take a look
+on the screenshot below. For example the connection wizard has the two green
+rectangles as well as the area at the bottom with the black line and the red
+text.
+
+The content places can be altered by a file called ``custom.ini`` which contains
+content for the specific places in the dialogs.
+
+On windows, the custom.ini has to be stored at
+
+-----------------+------------------------------------------------------------+
+| OS              | Path                                                       |
+=================+============================================================+
+| Windows (64 bit)| ``%ProgramFiles(x86)%\ownCloud\custom.ini``                |
+-----------------+------------------------------------------------------------+
+| Windows (32 bit)| ``%ProgramFiles%\ownCloud\custom.ini``                     |
+-----------------+------------------------------------------------------------+
+| Mac OS          | ``owncloud.app/Contents/Resources/custom.ini``             |
+-----------------+------------------------------------------------------------+
+| Linux           | ``/etc/ownCloud/custom.ini``                               |
+-----------------+------------------------------------------------------------+
+
+The config file needs to be in a usual `Windows INI file format`_.
+
+Under the group definition [GUICustomize] the following keys can be set:
+
+* ``oCSetupTop``: The top area of the connect wizard, account page.
+* ``oCSetupSide``: The side area of the connect wizard, account page.
+* ``ocSetupBottom``: The bottom area of the connect wizard, account page
+* ``oCSetupResultTop``: The top area of the connect wizard result page.
+* ``oCSetupFixUrl``: A fixed url to the ownCloud instance. If this is set, the
+  user can not access the url entry field and it is hidden.
+
+The keys can be set to either an image file or a `rich text`_ snippet, which
+must be enclosed with  double quotes. Image files must be addressed by the
+complete file name. On windows, the pathes should be noted with slashes
+instead of backslashes. Instead of absolute file pathes, you can use
+the ``%RESOURCES`` placeholder (note the single ``%``!).
+
+Example::
+
+  %RESOURCES/custom/myimage_top.png
+
+.. note:: ``%RESOURCES`` is currently undefined on Linux, it points to the
+          directory location of ``custom.ini`` on all other platforms.
+
+Example
+~~~~~~~
+
+A config file ``custom.ini`` like this::
+
+  [GUICustomize]
+  oCSetupTop=/home/kf/owncloud.com/topimg.png
+  oCSetupSide=/home/kf/owncloud.com/sideimg.png
+  oCSetupBottom="
+  <hr />
+  The Power of now: ownCloud Client
+
+  This nice ownCloud Client was presented by <a
+  href="http://owncloud.com">ownCloud Inc.</a>
+  "
+  oCSetupResultTop=/home/kf/owncloud.com/topimg.png
+
+will produce this setup dialog:
+
+.. figure:: images/branding_setup.png
+
+  Setup Dialog Customization
+
+Packaging remarks
+~~~~~~~~~~~~~~~~~
+
+While you do not need to rebuild the client, you will need to repackage
+the client on your own. This also means you will have to resign those
+packages with your own signing key.
+
+.. _`Windows INI file format`: http://en.wikipedia.org/wiki/INI_file
+.. _`rich text`: http://qt-project.org/doc/qt-5.0/richtext-html-subset.html 
+
+
@@ -1,17 +1,10 @@
-.. _building-label:
-
-Appendix A: Building the Client
-===============================
+Building the Client
+===================

 This section explains how to build the ownCloud Client from source
 for all major platforms. You should read this section if you want
 to development on the desktop client.

-Note that the building instruction are subject to change as development 
-proceeds. It is important to check the version which is to built.
-
-This instructions were updated to work with ownCloud Client 1.5.
-
 Linux
 -----

@@ -27,25 +20,20 @@ Linux
 Mac OS X
 --------

-Next to XCode (and the command line tools!), you will need some
-extra dependencies.
-
-You can install these dependencies via MacPorts_ or Homebrew_.
+Follow the `generic build instructions`_.
+ 
+You can install the missing dependencies via MacPorts_ or Homebrew_.
 This is only needed on the build machine, since non-standard libs
 will be deployed in the app bundle.

-The tested and preferred way is to use HomeBrew_. The ownCloud team has
-its own repository which contains non-standard recipes.  Add it with::
+The only exception to this rule is libiniparser_, which lacks a decent
+build system. If you are using Homebrew_, you can just add it::

-  brew tap owncloud/owncloud
+  brew tap dschmidt/owncloud
+  brew install iniparser

-Next, install the missing dependencies::
-
-  brew install $(brew deps ocsync) 
-  brew install $(brew deps mirall)
-
-  
-To build mirall and csync, follow the `generic build instructions`_.
+Otherwise, you need to copy the header and lib files to
+``/usr/local/include`` and ``/usr/local/lib`` respectively. 

 .. note::
  You should not call ``make install`` at any time, since the product of the
@@ -57,54 +45,38 @@ Windows (cross-compile)

 Due to the amount of dependencies that csync entails, building the client
 for Windows is **currently only supported on openSUSE**, by using the MinGW
-cross compiler. You can set up openSUSE 12.1, 12.2 or 13.1 in a virtual machine
+cross compiler. You can set up openSUSE 12.1 or 12.2 in a virtual machine
 if you do not have it installed already.

 In order to cross-compile, the following repositories need to be added
-via YaST or ``zypper ar`` (adjust when using openSUSE 12.2 or 13.1)::
+via YaST or ``zypper ar`` (adjust when using openSUSE 12.2)::

-  zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_12.1/windows:mingw:win32.repo
-  zypper ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_12.1/windows:mingw.repo
+  http://download.opensuse.org/repositories/isv:/ownCloud:/devel:/mingw:/win32/openSUSE_12.1/isv:ownCloud:devel:mingw:win32.repo
+  http://download.opensuse.org/repositories/windows:/mingw/openSUSE_12.1/windows:mingw.repo
+  http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_12.1/windows:mingw:win32.repo

 Next, install the cross-compiler packages and the cross-compiled dependencies::

-  zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
-                 mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
-                 mingw32-headers mingw32-runtime site-config mingw32-libqt4-sql \
-                 mingw32-libqt4-sql-sqlite mingw32-libsqlite-devel \
-                 mingw32-dlfcn-devel mingw32-libssh2-devel kdewin-png2ico \
-                 mingw32-libqt4 mingw32-libqt4-devel mingw32-libgcrypt \
-                 mingw32-libgnutls mingw32-libneon-openssl mingw32-libneon-devel \
-                 mingw32-libbeecrypt mingw32-libopenssl mingw32-openssl \
-                 mingw32-libpng-devel mingw32-libsqlite mingw32-qtkeychain \
-                 mingw32-qtkeychain-devel mingw32-dlfcn mingw32-libintl-devel \
-                 mingw32-libneon-devel mingw32-libopenssl-devel mingw32-libproxy-devel \
-                 mingw32-libxml2-devel mingw32-zlib-devel
+  zypper si -d mingw32-csync
+  zypper install kdewin-png2ico mingw32-libqt4 mingw32-libqt4-devel
+                 mingw32-libgcrypt mingw32-libgnutls mingw32-gnutls \
+                 mingw32-libneon mingw32-libbeecrypt mingw32-libopenssl \
+                 mingw32-openssl

-For the installer, the NSIS installer package is also required::
+For the installer, the NSIS installer packages are also required::

-  zypper install mingw32-cross-nsis
-
-..  Usually, the following would be needed as well, but due to a bug in mingw, they
-    will currently not build properly from source.
-
-    mingw32-cross-nsis-plugin-processes mingw32-cross-nsis-plugin-uac
-
-You will also need to manually download and install the following files with
-``rpm -ivh <package>`` (They will also work with openSUSE 12.2 and newer)::
-
-  rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-processes-0-1.1.x86_64.rpm
-  rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-uac-0-3.1.x86_64.rpm
+  zypper install mingw32-cross-nsis mingw32-cross-nsis-plugin-processes \
+                 mingw32-cross-nsis-plugin-uac 

 Now, follow the `generic build instructions`_, but pay attention to
 the following differences:

 1. For building ``libocsync``, you need to use ``mingw32-cmake`` instead
   of cmake.
-2. for building ``mirall``, you need to use ``cmake`` again, but make sure
-   to append the following parameter::
-3. Also, you need to specify *absolute pathes* for ``CSYNC_LIBRARY_PATH``
+2. Also, you need to specify *absolute pathes* for ``CSYNC_LIBRARY_PATH``
   and ``CSYNC_LIBRARY_PATH`` when running ``cmake`` on mirall.
+3. for building ``mirall``, you need to use ``cmake`` again, but make sure
+   to append the following parameter::

  ``-DCMAKE_TOOLCHAIN_FILE=../mirall/admin/win/Toolchain-mingw32-openSUSE.cmake``

@@ -124,7 +96,7 @@ CMake and Mirall can be downloaded at ownCloud's `Client Download Page`_.
 If you want to build the leading edge version of the client, you should
 use the latest versions of Mirall and CSync via Git_, like so::

-  git clone git://git.csync.org/users/owncloud/csync.git ocsync
+  git clone git://git.csync.org/users/freitag/csync.git ocsync
  git clone git://github.com/owncloud/mirall.git

 Next, create build directories::
@@ -133,49 +105,43 @@ Next, create build directories::
  mkdir mirall-build

 This guide assumes that all directories are residing next to each other.
-Next, make sure to check out the branch called 'ocsync' in the newly checked out
+Next, make sure to check out the 'dav' branch in the newly checked out
 `ocsync` directory::

  cd ocsync
-  git checkout ocsync
+  git checkout dav

-The first package to build is CSync::
+The first package to buidld is CSync::

  cd ocsync-build
-  cmake -DCMAKE_BUILD_TYPE="Debug" ../ocsync
+  cmake -DCMAKE_BUILD_TYPE="Debug" -DLOG_TO_CALLBACK=ON -DWITH_LOG4C=OFF ../ocsync
  make

 You probably have to satisfy some dependencies. Make sure to install all the
-needed development packages. You will need ``sqlite3`` as well as ``neon`` for 
-the ownCloud module. Take special care about ``neon``. If that is missing, the 
-cmake run will succeed but silently not build the ownCloud module.
-
-``libssh`` and ``libsmbclient`` are optional and not required for the client
-to work. If you want to install the client, run ``make install`` as a final step.
+needed development packages. You will need ``iniparser``, ``sqlite3`` as well as
+``neon`` for the ownCloud module. ``libssh`` and ``libsmbclient`` are optional
+and not required for the client to work. If you want to install the client, run
+``make install`` as a final step.

 Next, we build mirall::

  cd ../mirall-build
  cmake -DCMAKE_BUILD_TYPE="Debug" ../mirall \
-        -DCSYNC_BUILD_PATH=/path/to/ocsync-build \
-        -DCSYNC_INCLUDE_PATH=/path/to/ocsync/src
+        -DCSYNC_LIBRARY_PATH=../ocsync-build \
+        -DCSYNC_INCLUDE_PATH=../ocsync/src

-Note that it is important to use absolute pathes for the include- and library
-directories. If this succeeds, call ``make``. The owncloud binary should appear
-in the ``bin`` directory. You can also run ``make install`` to install the client to
+If this succeeds, call ``make``. The owncloud binary should appear in the
+``bin`` directory. You can also run ``make install`` to install the client to
 ``/usr/local/bin``.

-To build an installer/app bundle (requires the mingw32-cross-nsis packages on Windows)::
+To build in installer (requires the mingw32-cross-nsis packages)::

  make package

-Known cmake parameters:
-
-* WITH_DOC=TRUE: create doc and manpages via running ``make``; also adds install statements to be able to install it via ``make install``.
-
 .. _`ownCloud repository from OBS`: http://software.opensuse.org/download/package?project=isv:ownCloud:devel&package=owncloud-client
 .. _CSync: http://www.csync.org
 .. _`Client Download Page`: http://owncloud.org/sync-clients/
 .. _Git: http://git-scm.com
 .. _MacPorts: http://www.macports.org
 .. _Homebrew: http://mxcl.github.com/homebrew/
+.. _libiniparser: http://ndevilla.free.fr/iniparser/
@@ -28,7 +28,7 @@ import sys, os
 extensions = ['sphinx.ext.todo']

 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/templates']
+#templates_path = ['templates']

 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -41,7 +41,7 @@ master_doc = 'index'

 # General information about the project.
 project = u'ownCloud Client Manual'
-copyright = u'2013, The ownCloud developers'
+copyright = u'2012, The ownCloud developers'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -64,7 +64,7 @@ release = '@VERSION@'

 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build','scripts/*']
+exclude_patterns = ['_build']

 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -95,7 +95,7 @@ pygments_style = 'sphinx'
 #html_theme_options = {}

 # Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/themes']
+#html_theme_path = ['themes']

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
@@ -120,7 +120,7 @@ html_short_title = "Client Manual"
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['@CMAKE_CURRENT_SOURCE_DIR@/ocdoc/_shared_assets/static']
+#html_static_path = ['static']

 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -213,12 +213,12 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('owncloud.1', 'owncloud', u'File synchronisation desktop utility.',
-     [u'The ownCloud developers'], 1),
+    ('index', 'owncloud', u'ownCloud Client Manual',
+     [u'The ownCloud developers'], 1)
 ]

 # If true, show URL addresses after external links.
-man_show_urls = True
+#man_show_urls = False


 # -- Options for Texinfo output ------------------------------------------------
@@ -248,7 +248,7 @@ texinfo_documents = [
 epub_title = u'ownCloud Client Manual'
 epub_author = u'The ownCloud developers'
 epub_publisher = u'The ownCloud developers'
-epub_copyright = u'2013, The ownCloud developers'
+epub_copyright = u'2012, The ownCloud developers'

 # The language of the text. It defaults to the language option
 # or en if the language is not set.
@@ -1,26 +0,0 @@
-ownCloud Client reads a configuration file.
-
-On Linux it can be found in:
-        ``$HOME/.local/share/data/ownCloud/owncloud.cfg``
-
-On Windows it can be found in:
-        ``%LOCALAPPDATA%\ownCloud\owncloud.cfg``
-
-On Mac it can be found in:
-        ``$HOME/Library/Application Support/ownCloud``
-
-
-It contains settings in the ini file format known from Windows. 
-
-.. note:: Changes here should be done carefully as wrong settings can cause disfunctionality.
-
-.. note:: Changes may be overwritten by using ownCloud's configuration dialog.
-
-These are config settings that may be changed:
-
-``remotePollinterval`` (default: ``30000``)
-        Poll time for the remote repository in milliseconds
-
-``maxLogLines`` (default:  ``20000``)
-        Maximum count of log lines shown in the log window
-
@@ -4,8 +4,8 @@ Glossary
 .. glossary::
   :sorted:

-   ownCloud Sync Client
   ownCloud Client
+   oCC
     Name of the official ownCloud syncing client for desktop, which runs on
     Windows, Mac OS X and Linux. It is based Mirall, and uses the CSync
     sync engine for synchronization with the ownCloud server.
@@ -23,7 +23,6 @@ Glossary
     exist in the client directory.

   unique id
-   ETag
     ID assigned to every file starting with ownCloud server 4.5 and submitted
     via the HTTP ``Etag``. Used to check if files on client and server have
     changed.
@@ -1,4 +1,10 @@
-.. _contents:
+.. ownCloud Documentation documentation master file, created by
+   sphinx-quickstart on Mon Oct 22 23:16:40 2012.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+ownCloud Desktop Client
+***********************

 Contents
 ========
@@ -6,12 +12,10 @@ Contents
 .. toctree::
   :maxdepth: 2

-   introduction
-   accountsetup
-   visualtour
-   advancedusage
-
+   install
+   usage 
   building 
+   branding
   architecture
   troubleshooting
   glossary 
@@ -0,0 +1,36 @@
+Installation
+============
+
+General
+-------
+
+The latest version of ownCloud client can be obtained at
+http://owncloud.org/sync-clients/.
+
+Windows
+-------
+
+ownCloud client for Windows is provided as a NSIS-based setup file for
+machine-wide install.
+
+Mac OS X
+--------
+
+Installing the ownCloud client on your Mac follows the normal app installation
+pattern: 
+
+1. Download the installation file Click ownCloud-1.1.1.dmg, a window with the
+2. ownCloud icon opens In that window, drag the ownCloud application into the
+3. ‘Applications’ folder on the right hand side From ‘Applications’, choose
+   ownCloud
+
+Linux
+------
+
+The ownCloud client is provided as in a convenient repository for a wide range
+of popular Linux distributions. If you want to build the sources instead.
+
+Supported distributions are CentOS/RHEL, Fedora, SLES, openSUSE, Ubuntu and
+Debian.
+
+To support other distributions, a source build is required.
@@ -1,37 +0,0 @@
-Introduction
-============
-
-This is the documentation for the ownCloud Sync Client, also referred to as
-the ownCloud Client.
-
-The ownCloud Sync Client is a desktop program you install on your computer.
-Specify one ore more directories on the local machine to sync your ownCloud
-server, and always have your latest files wherever you are. Make a change to the
-files on one computer, it will flow across the others using these desktop sync
-clients.
-
-ownCloud Client is available for Windows, Mac OS X and various Linux
-distributions. See below for details on how to obtain the Client.
-
-Obtaining the Client
--------------------
-
-The latest version of the ownCloud Client can be obtained at
-http://owncloud.org/sync-clients/.
-
-ownCloud client for **Windows** is provided as a NSIS-based setup file for
-machine-wide install. Installing the ownCloud client on **Mac OS** follows
-the normal app bundle installation pattern:
-
-1. Download the installation file: Click ``ownCloud-x.y.z.dmg``, a window with
-   the ownCloud icon opens.
-2. In that window, drag the ownCloud application into the ``Applications``
-   folder.
-3. On the right hand side From ``Applications``, choose ``ownCloud``.
-
-The ownCloud Client is also provided as in a convenient repository for a wide
-range of popular **Linux distributions**. If you want to build the sources
-instead.
-
-Supported distributions are Fedora, openSUSE, Ubuntu and Debian.
-To support other distributions, a is required, see :ref:`building-label`
@@ -1,20 +0,0 @@
-ownCloud Client supports the following command line switches:
-
-``--logwindow``
-        open a window to show log output.
-
-``--logfile`` `<filename>`
-        write log output to file <filename>.
-
-``--logdir`` `<name>`
-        write each sync log output in a new file in directory <name>
-
-``--logexpire`` `<hours>`
-        removes logs older than <hours> hours. (to be used with --logdir)
-
-``--logflush``
-        flush the log file after every write.
-
-``--confdir`` `<dirname>`
-        Use the given configuration directory.
-
@@ -1,37 +0,0 @@
-owncloud(1)
-----------
-
-
-SYNOPSIS
-========
-*owncloud* [`OPTIONS`...]
-
-
-DESCRIPTION
-===========
-ownCloud is a file synchronisation desktop utility based on mirall.
-It synchronizes files on your local machine with an ownCloud Server. If you
-make a change to the files on one computer, it will flow across the others
-using this desktop sync clients.
-
-Normally you start the client by click on the desktop icon or start from the
-application menu. After starting an ownCloud icon appears in the system tray.
-
-Options
-=======
-.. include:: options.rst
-
-Config File
-===========
-.. include:: conffile.rst
-
-BUGS
-====
-
-Please report bugs at https://github.com/owncloud/core/issues.
-
-
-SEE ALSO
-========
- `csync(1)`
-
@@ -4,12 +4,9 @@ Doc Build Convenience Scripts
 * ``htmlhelp.sh``: A script to install Microsoft HTML Workshop on Linux or Mac OS using Wine, along with some dependencies.
 * ``htmlhelp.reg``: Registry file to override some DLLs with their native version and set the right Windows version.

-Those files have been taken from the `HTML Help Project`_.
+Those files have been taken from the HTML Help Project (http://code.google.com/p/htmlhelp/wiki/HHW4Wine).

 License
 -------

-The HTML Help Project has licensed_ its software under LGPLv2.1 terms
-
-.. _HTML Help Project: http://code.google.com/p/htmlhelp/wiki/HHW4Wine
-.. _licensed: https://code.google.com/p/htmlhelp/source/browse/trunk/pyhtmlhelp/COPYING
+The HTML Help Project has licensed its software under LGPLv3 terms.
@@ -1,136 +1,28 @@
-Appendix C: Troubleshooting
-===========================
+Troubleshooting
+===============

-If the client fails to start syncing it basically can have two
-basic reasons: Either the server setup has a problem or the client
-has a bug. When reporting bugs, it is crucial to find out what part
-of the system causes the problem.
-
-Identifying basic functionality problems
----------------------------------------
-
-:Perform a general ownCloud Server test:
-  A very first check is to verify that you can log on to ownClouds web 
-  application. Assuming your ownCloud instance is installed at 
-  ``http://yourserver.com/owncloud``, type
-  ``http://yourserver.com/owncloud/`` into your browsers address bar.
-   
-  If you are not prompted to enter your user name and password, or if you 
-  see a red warning box on the page, your server setup is not correct or needs
-  fixes. Please verify that your server installation is working correctly.
-
-:Ensure the WebDAV API is working:
-  If all desktop clients fail to connect to ownCloud, but the access via the
-  web interface works, the problem often is a mis-configuration of the WebDAV
-  API.
-
-  The ownCloud client uses the built-in WebDAV access of the server content.
+:All of my desktop clients fail to connect to ownCloud:
  Verify that you can log on to ownClouds WebDAV server. Assuming your ownCloud
  instance is installed at ``http://yourserver.com/owncloud``, type
  ``http://yourserver.com/owncloud/remote.php/webdav`` into your browsers
-  address bar.
+  address bar. 
+
+  If you are not prompted to enter your user name and password, please verify
+  that your server installation is working correctly.

  If you are prompted, but the authentication fails even though the credentials
  your provided are correct, please ensure that your authentication backend
  is configured properly.

-:Use a WebDAV command line tool to test:  
-  A more sophisticated test is to use a WebDAV command line client and log
-  into the ownCloud WebDAV server, such as a little app called cadaver,
-  available on Linux. It can be used to further verify that the WebDAV server is
-  running properly, for example by performing PROPFIND calls:

-  ``propget .`` called within cadaver will return some properties of the current
-  directory and thus be a successful WebDAV connect.
-
-Isolating other issues
----------------------
-
-If the sync result is unreliable, please ensure that the folder synced with
-ownCloud is not shared with other syncing apps.
-
-.. note:: Syncing the same directory with ownCloud and other sync software such
-          as Unison, rsync, Microsoft Windows Offline Folders or cloud services
-          such as DropBox or Microsoft SkyDrive is not supported and should
-          not be attempted. In the worst case, doing so can result in data
-          loss.
-
-If some files do not get take a look at the sync protocol. Some files are
-automatically automatically being ignored because they are system files,
-others get ignored because their file name contains characters that cannot
-be represented on certain file systems. See :ref:`_ignored-files-label` for
-details.
-
-If you are operating your own server and use the local storage backend (the
-default), make sure that ownCloud has exclusive access to the directory.
-
-.. note:: The data directory on the server is exclusive to ownCloud and must
-          not be modified manually.
-
-If you are using a different backend, you can try to exclude a bug in the
-backend by reverting to the local backend.
-
-Logfiles
--------
-
-Doing effective debugging requires to provide as much as relevant logs as
-possible. The log output can help you with tracking down problem, and if you 
-report a bug, you're advised to include the output.
-
-Client Logfile
-~~~~~~~~~~~~~~
-
-Start the client with ``--logwindow``. That opens a window providing a view
-on the current log. It provides a Save button to let you save the log to a 
-file.
-
-You can also open a log window for an already running session, by simply 
-starting the client again with this parameter. Syntax:
+:The desktop client fails for an unknown reason:
+  Start the client with ``--logwindow``. You can also open a log window for an
+  already running session, by simply starting the client again with this
+  parameter. Syntax:

  * Windows: ``C:\Program Files (x86)\ownCloud\owncloud.exe --logwindow``
  * Mac OS X: ``/Applications/owncloud.app/Contents/MacOS/owncloud --logwindow``
  * Linux: ``owncloud --logwindow``

-It is also possible to directly log to a directory, which is an useful option
-in case the problem only happens ocassionally. In that case it is better to
-create a huge amount of data, as the log window has a limited buffer.
-
-To write logs to disk, start the client with ``--logfile <file>``, where
-``<file`` is the file you want to log to, or ``--logdir <dir>``, where ``<dir>``
-is an existing directory. In case of ``--logdir``, each sync run will create a
-new file. To limit the amount of data that accumulates over time, there is another
-useful parameter: ``--logexpire <hours>```. If that is combined with ```--logdir```
-the client automatically erases log data in that directory that is older than the
-given expiry period.
-
-For example, for a long running test where you intend to keep the log data of the
-last two days, this would be the command line:
-
-```
-owncloud --logdir /tmp/owncloud_logs --logexpire 48
-```
-
-ownCloud server Logfile
-~~~~~~~~~~~~~~~~~~~~~~~
-
-The ownCloud server maintains an ownCloud specific logfile as well. It can and
-must be enabled through the ownCloud Administration page. There you can adjust
-the loglevel. It is advisable to set it to a verbose level like ``Debug`` or
-``Info``.
-  
-The logfile can be viewed either in the web interface or can be found in the
-filesystem in the ownCloud server data dir.
-
-Webserver Logfiles
-~~~~~~~~~~~~~~~~~~
-
-Also, please take a look at your webservers error log file to check if there
-are problems. For Apache on Linux, the error logs usually can be found at
-``/var/log/apache2``. A file called ``error_log`` shows errors like PHP code
-problems. A file called ``access_log`` usually records all requests handled
-by the server. Especially the access_log is a very good debugging tool as the
-log line contains a lot of information of every request and it's result.
-  
-More information about the apache logging can be found at
-``http://httpd.apache.org/docs/current/logs.html``.
-
+  The log output can help you with tracking down problem, and if you report
+  a bug, it's useful to include the output.
@@ -0,0 +1,66 @@
+Usage
+=====
+.. index:: usage, client sync usage
+
+To start ownCloud Client, click on the desktop icon or start it from the
+application menu. In the system tray, an ownCloud icon appears.
+
+.. index:: start application
+
+A left click on the tray icon open a status dialog which gives an overview on
+the configured sync folders and allows to add and remove more sync folder
+connections as well as pausing a sync connection.
+
+A right click on the tray icon gives other configuration options.
+
+
+Command line switches
+---------------------
+.. index:: command line switches, command line, options, parameters
+
+
+ownCloud Client supports the following command line switches:
+
+--------------------------+------------------------------------------------+
+| Switch                   | Action                                         |
+==========================+================================================+
+| ``--logwindow``          | open a window to show log output at startup.   |
+--------------------------+------------------------------------------------+
+| ``--logfile <filename>`` | write log output to file.                      |
+--------------------------+------------------------------------------------+
+| ``--flushlog``           | flush the log file after every write.          |
+--------------------------+------------------------------------------------+
+
+Config File
+-----------
+.. index:: config file
+
+ownCloud Client reads a configuration file which on Linux can be found at ``$HOME/.local/share/data/ownCloud/owncloud.cfg``
+.. todo:: Windows, Mac?
+It contains settings in the ini file format known from Windows. 
+
+.. note:: Changes here should be done carefully as wrong settings can cause disfunctionality.
+
+
+These are config settings that may be changed:
+
+---------------------------+-----------+--------------+-----------+-----------------------------------------------------+
+| Setting                   | Data Type | Unit         | Default   | Description                                         |
+===========================+===========+==============+===========+=====================================================+
+| ``remotePollinterval``    | integer   | milliseconds | ``30000`` | Poll time for the remote repository                 |
+---------------------------+-----------+--------------+-----------+-----------------------------------------------------+
+| ``localPollinterval``     | integer   | milliseconds | ``10000`` | Poll time for local repository                      |
+---------------------------+-----------+--------------+-----------+-----------------------------------------------------+
+| ``PollTimerExceedFactor`` | integer   | n/a          | ``10``    | Poll Timer Exceed Factor                            |
+---------------------------+-----------+--------------+-----------+-----------------------------------------------------+
+| ``maxLogLines``           | integer   | lines        | ``20000`` | Maximum count of log lines shown in the log window  |
+---------------------------+-----------+--------------+-----------+-----------------------------------------------------+
+
+* ``remotePollinterval`` is for systems which have notify for local file system changes (Linux only currently)
+  this is the frequency it polls for remote changes. The following two values are ignored.
+
+* ``localPollinterval`` is for systems which poll the local file system (currently Win and Mac) this is the
+  frequency they poll locally. The ``remotePollInterval`` is ignored on these systems.
+
+* ``PollTimerExceedFactor`` sets  the exceed factor is the factor after which a remote poll is done. That means the effective
+  frequency for remote poll is ``localPollInterval * pollTimerExceedFactor``.
@@ -1,189 +0,0 @@
-Visual Tour
-===========
-
-.. index:: visual tour, usage
-
-ownCloud Client stays in the background, and is visible as an
-icon in your system tray (Windows, KDE), status bar (Mac OS X)
-or notification area (Ubuntu), like so:
-
-.. image:: images/icon.png
-
-If a setup is still required, it will open the setup. Otherwise, the
-main menu is opened, which provides several options and displays
-progress information:
-
-.. image:: images/menu.png
-
-Here is an explanation of the individual items in the menu:
-
-* ``Open ownCloud in browser``: Opens the ownCloud web interface
-* ``Open folder 'ownCloud'``: Opens the local folder. If you have
-  defined multiple sync targets, you should see multiple entries
-  here.
-* **Disk space indicator**: Shows how much space is used up on the server.
-* Operation indicator: Shows the status of the current sync process, or
-  ``Up to date`` if server and client are in sync.
-* **Recent Changes**: shows the last six files modified by sync operations,
-  and provides access to the Sync status, which lists all changes
-  since the last restart of ownCloud Client.
-* ``Settings...``: provides access to the settings menu.
-* ``Help``: Opens a browser to display this help.
-* ``Quit ownCloud``: Quits ownCloud, ending a currently running sync run.
-
-The settings dialog is split up in three categories: ``Account Settings``,
-``General Settings`` and ``Network Settings``:
-
-Account Settings
-~~~~~~~~~~~~~~~~
-
-.. index:: account settings, user, password, Server URL
-
-The ``Account Settings`` tab provides an executive summary about the synced
-folders in your account and allows to modify them. It also provides a more
-detailed report about the storage usage. Finally, it allows to change
-the files that ownCloud Client should ignore (for details, see the
-``Ignored Files Editor`` section below), and to modify various aspects
-of the current account settings, such as user name, password and server URL.
-
-.. image:: images/settings_account.png
-   :scale: 50 %
-
-General Settings
-~~~~~~~~~~~~~~~~
-
-.. index:: general settings, auto start, startup, desktop notifications
-
-The tab provides several useful options:
-
-.. image:: images/settings_general.png
-   :scale: 50 %
-
-* **Launch on System Startup**: This option is automatically activated
-  once a user has conimaged his account. Unchecking the box will cause
-  ownCloud client to not launch on startup for a particular user.
-* **Show Desktop Nofications**: Do not show bubble notifications whenever
-  a set of sync operations has been performed.
-* **Use Monochrome Icons**: Use less obstrusive icons. Especially useful
-  on Mac OS.
-
-The acout menu provides information about authors as well as detailed
-information about the build conditions. Those are particularly valuable
-when filing a bug report.
-
-Network Settings
-~~~~~~~~~~~~~~~~
-
-.. index:: proxy settings, SOCKS, bandwith, throttling, limiting
-
-This tab consollidates ``Proxy Settings`` and ``Bandwith Limiting``:
-
-.. image:: images/settings_network.png
-   :scale: 50 %
-
-Proxy Settings
-^^^^^^^^^^^^^^
-
-* ``No Proxy``: Check this if ownCloud Client should circumvent the default
-  proxy conimaged on the system.
-* ``Use system proxy``: Default, will follow the systems proxy settings.
-  On Linux, this will only pick up the value of the variable ``http_proxy``.
-* ``Specify proxy manually as``: Allows to specify custom proxy settings.
-  If you require to go through a HTTP(S) proxy server such as Squid or Microsoft
-  Forefront TMG, pick ``HTTP(S)``. ``SOCKSv5`` on the other hand is particulary
-  useful in special company LAN setups, or in combination with the OpenSSH
-  dynamic application level forwarding feature (see ``ssh -D``).
-* ``Host``: Enter the host name or IP address of your proxy server, followed
-  by the port number. HTTP proxies usually listen on Ports 8080 (default) or
-  3128. SOCKS server usually listen on port 1080.
-* ``Proxy Server requires authentication``: Should be checked if the proxy
-  server does not allow anonymous usage. If you check this option, you must
-  provide username and password in the fields below, or ownless Cloud will no
-  longer be able to connect successfully.
-
-Bandwidth Limiting
-^^^^^^^^^^^^^^^^^^
-
-The ``Download Bandwidth`` (i.e. the bandwidth available for data flowing
-from the ownCloud Server to the client) can be either ``Unlimited``
-(the default), or limited to a custom value, specified in bytes
-
-The ``Upload Bandwith`` (i.e. the bandwith available for data flowing
-from the ownCloud Client to the server) additionally has the option
-to ``Limit automatically``: When this option is checked, the ownCloud
-Client will surrender available upstream bandwith to other applications.
-Use this option if you expirience problems with real time communication,
-such as Skype or other VoIP software, in conjunction with ownCloud Client.
-This is commonly the case with asymmetric internet connection, such as
-certain DSL lines with very limited upstream capacity.
-
-ownCloud Client will pick up changes immediately, but ongoing operations
-will finish using the old settings.
-
-The Sync Status Display
-~~~~~~~~~~~~~~~~~~~~~~~
-
-.. index:: sync status
-
-The ``Sync Status`` window, which can be invoked from either from the main
-menu (``Recent Changes`` -> ``Details...``) or the ``Account Settings``
-(``Info`` button), will provide you with an in-depth summary of the recent
-sync activity. It will also show files that have not been synched (ignored
-files). Those are ignored either because they are listed in the ignored
-files list (see ``Ignored Files Editor`` section below), or because they
-cannot be synced in a cross-platform manner because they contain special
-characters that cannot be stored on certain file systems.
-
-.. image:: images/sync_protocol.png
-   :scale: 50 %
-
-.. _ignoredFilesEditor-label:
-
-The Ignored Files Editor
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. index:: ignored files, exclude files, pattern
-
-The ignored files editor allows adding patterns for files or directories
-that should be excluded from the sync process. Next to normal characters,
-wildcards can be used to match an arbitrary number of characters, designated
-by an asterisk (``*``) or a single character, designated by a question mark
-(``?``).
-
-Global defaults cannot be directly modified within the editor. Hovering
-with the mouse will reveal the location of the global exclude definition
-file.
-
-In addition to this list, ownCloud Client always excludes files with
-characters that cannot be synched down to other file systems,
-see :ref:`ignored-files-label`.
-
-.. note:: Modifying the global exclude definition file might render the
-   client unusable or cause undesired behavior.
-
-.. note:: Custom entries are currently not validated for syntactical
-   correctness by the editor, but might fail to load correctly.
-
-.. image:: images/ignored_files_editor.png
-   :scale: 50%
-
-Pattern Matching
-^^^^^^^^^^^^^^^^
-
-To match file names against the exclude patterns, the unix standard C
-library function fnmatch is used. It checks the filename against the pattern
-using standard shell wildcard pattern matching. Check `The opengroup website
-<http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13_01>`
-for the gory details.
-
-The path that is checked is the relative path unter the sync root directory.
-
-Examples:
-^^^^^^^^^
-+-----------+------------------------------+
-| Pattern   | Matches                      |
-+===========+==============================+
-| ``~$*``   | ``~$foo``, ``~$example.doc`` |
-+-----------+------------------------------+
-| ``fl?p``  | ``flip``, ``flap``           |
-+-----------+------------------------------+
@@ -1,46 +0,0 @@
-### Expected behaviour
-Tell us what should happen
-
-### Actual behaviour
-Tell us what happens instead
-
-### Steps to reproduce
-1. 
-2. 
-3. 
-
-### Server configuration
-Operating system:
-
-Web server: 
-
-Database:
-
-PHP version:
-
-ownCloud version:
-
-Storage backend:
-
-### Client configuration
-Client version:
-
-Operating system:
-
-OS language:
-
-Installation path of client:
-
-### Logs
-
-Please use Gist (https://gist.github.com/) or a similar code paster for longer
-logs.
-
-```Template for output < 10 lines```
-
-1. Output of `owncloud --logwindow` or `owncloud --logfile log.txt`
-
-2. Web server error log:
-
-3. ownCloud log (data/owncloud.log):
-
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Categories=Utility;X-SuSE-SyncUtility;
-Type=Application
-Exec=@APPLICATION_EXECUTABLE@
-Name=@APPLICATION_NAME@ desktop sync client 
-GenericName=Folder Sync
-Icon=@APPLICATION_EXECUTABLE@
-Keywords=@APPLICATION_NAME@;syncing;file;sharing;
@@ -1,18 +1,37 @@
 <RCC>
    <qresource prefix="/mirall">
+        <file>resources/mirall-32.png</file>
+        <file>resources/mirall-64.png</file>
+        <file>resources/mirall-128.png</file>
+        <file>resources/folder-grey-32.png</file>
+        <file>resources/folder-remote-32.png</file>
+        <file>resources/folder-grey-22.png</file>
+        <file>resources/folder-remote-22.png</file>
+        <file>resources/mirall-22.png</file>
+        <file>resources/mirall-48.png</file>
+        <file>resources/folder-grey-48.png</file>
+        <file>resources/folder-remote-48.png</file>
        <file>resources/dialog-close.png</file>
        <file>resources/dialog-ok.png</file>
        <file>resources/dialog-cancel.png</file>
-        <file>resources/folder-remote-32.png</file>
-        <file>resources/folder-remote.png</file>
-        <file>resources/folder-sync.png</file>
-        <file>resources/folder-grey.png</file>
-        <file>resources/task-ongoing.png</file>
        <file>resources/view-refresh.png</file>
+        <file>resources/folder-favorites.png</file>
+        <file>resources/folder-sync-48.png</file>
+        <file>resources/folder-important.png</file>
+        <file>resources/folder-grey.png</file>
+        <file>resources/owncloud_splash.png</file>
+        <file>resources/task-ongoing.png</file>
+
+        <file>resources/owncloud-icon-22.png</file>
+        <file>resources/owncloud-icon-32.png</file>
+        <file>resources/owncloud-icon-48.png</file>
+        <file>resources/owncloud-icon-64.png</file>
+        <file>resources/owncloud-icon-128.png</file>
+        <file>resources/owncloud-framed-64.png</file>
+        <file>resources/owncloud-error-48.png</file>
+        <file>resources/owncloud-sync-48.png</file>
+        <file>resources/owncloud-sync-ok-48.png</file>
+
        <file>resources/warning-16.png</file>
-        <file>resources/settings.png</file>
-        <file>resources/activity.png</file>
-        <file>resources/network.png</file>
-        <file>resources/owncloud_logo_blue.png</file>
    </qresource>
 </RCC>
@@ -19,14 +19,14 @@
   viewBox="0 0 32 31.999997"
   enable-background="new 0 0 595.275 311.111"
   xml:space="preserve"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="icon-light.svg"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="icon.svg"
   inkscape:export-filename="/home/user/owncloud/core/img/icon.png"
   inkscape:export-xdpi="89.826416"
   inkscape:export-ydpi="89.826416"><metadata
   id="metadata327"><rdf:RDF><cc:Work
       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
   id="defs325"><linearGradient
   inkscape:collect="always"
   xlink:href="#SVGID_1_"
@@ -289,7 +289,7 @@
   x2="-2.4040222"
   y2="18.967093" /><linearGradient
   inkscape:collect="always"
-   xlink:href="#SVGID_9_"
+   xlink:href="#linearGradient3587-6-5-26"
   id="linearGradient7623"
   x1="58.866638"
   y1="24.928007"
@@ -297,7 +297,7 @@
   y2="93.882034"
   gradientUnits="userSpaceOnUse"
   gradientTransform="matrix(0.25,0,0,0.25,0,0.500024)" /></defs><sodipodi:namedview
-   pagecolor="#000000"
+   pagecolor="#ffffff"
   bordercolor="#666666"
   borderopacity="1"
   objecttolerance="10"
@@ -306,14 +306,14 @@
   inkscape:pageopacity="0"
   inkscape:pageshadow="2"
   inkscape:window-width="1280"
-   inkscape:window-height="800"
+   inkscape:window-height="774"
   id="namedview323"
   showgrid="true"
-   inkscape:zoom="16"
-   inkscape:cx="24.701671"
-   inkscape:cy="13.807816"
+   inkscape:zoom="8"
+   inkscape:cx="32.984032"
+   inkscape:cy="11.601392"
   inkscape:window-x="0"
-   inkscape:window-y="-31"
+   inkscape:window-y="26"
   inkscape:window-maximized="1"
   inkscape:current-layer="Layer_1"
   units="px"
@@ -800,7 +800,7 @@
   id="path7625"
   d="m 14.488658,7.6997589 c -2.381798,0 -4.30607,1.92427 -4.30607,4.3060701 0,0.98178 0.32692,1.88539 0.878102,2.60897 1.195708,-1.38395 2.960465,-2.2628 4.93087,-2.2628 0.964013,0 1.878155,0.21467 2.70185,0.59103 0.06669,-0.3016 0.101318,-0.61527 0.101318,-0.9372 0,-2.3818001 -1.92427,-4.3060701 -4.30607,-4.3060701 z m -5.6232205,1.99261 c -1.240375,0 -2.2374675,1.0055301 -2.2374675,2.2459101 0,0.4016 0.10361,0.78106 0.28707,1.10607 0.74849,-0.42223 1.61383,-0.66702 2.5329825,-0.66702 0.088705,0 0.1741425,0.004 0.2617425,0.008 -0.00993,-0.1253 -0.016875,-0.25124 -0.016875,-0.3795 0,-0.69087 0.15005,-1.34819 0.41372,-1.94196 C 9.7516025,9.8258189 9.3262675,9.6923689 8.86545,9.6923689 z M 19.487078,11.237489 c -0.09164,0 -0.179965,0.0113 -0.270185,0.0169 0.03903,0.24606 0.06755,0.49451 0.06755,0.75145 0,0.39985 -0.05085,0.78569 -0.143535,1.15673 1.08665,0.60136 1.989072,1.50116 2.583642,2.59208 0.616705,-0.32106 1.30466,-0.52521 2.03483,-0.57414 -0.18818,-2.20687 -2.016472,-3.94301 -4.272297,-3.94301 z m -3.495518,1.60422 c -3.33285,0 -6.0284975,2.69542 -6.0284975,6.0285 0,3.33272 2.6955105,6.0285 6.0284975,6.0285 3.33299,0 6.0285,-2.69579 6.0285,-6.0285 0,-3.33307 -2.695647,-6.0285 -6.0285,-6.0285 z m -6.5435375,0.0253 c -2.58566,0 -4.6775725,2.09191 -4.6775725,4.67757 0,1.52213 0.7252325,2.8696 1.8490775,3.72349 0.47379,-0.91381 1.425375,-1.53668 2.5245375,-1.53668 0.132845,0 0.260355,0.0161 0.38839,0.0338 -0.040192,-0.29242 -0.0591,-0.59159 -0.0591,-0.89499 0,-1.4506 0.47218,-2.79202 1.274933,-3.87546 -0.48052,-0.60129 -0.8244005,-1.32376 -0.970978,-2.11082 -0.1086325,-0.008 -0.218725,-0.0169 -0.3292875,-0.0169 z m 14.6575255,2.78628 c -0.785125,0 -1.520585,0.20045 -2.169923,0.54037 0.368715,0.81673 0.574143,1.72291 0.574143,2.67652 0,1.78555 -0.71789,3.406849 -1.88285,4.584699 0.85582,0.95013 2.097512,1.54512 3.47863,1.54512 2.58566,0 4.677575,-2.091919 4.677575,-4.677579 0,-2.585661 -2.091915,-4.66913 -4.677575,-4.66913 z M 4.3145118,16.269679 C 1.9326443,16.269679 0,18.185439 0,20.567309 c 0,2.38187 1.9326443,4.31451 4.3145118,4.31451 0.9065732,0 1.7463732,-0.282451 2.4401082,-0.75989 -0.286665,-0.44545 -0.4559375,-0.978001 -0.4559375,-1.54512 0,-0.294361 0.043432,-0.57714 0.1266475,-0.84433 -1.29874,-0.93858 -2.1445912,-2.46595 -2.1445912,-4.18787 0,-0.4375 0.057653,-0.86054 0.1604237,-1.26649 -0.042658,-0.001 -0.083686,-0.008 -0.1266507,-0.008 z m 25.3213812,3.69816 c -0.127065,0 -0.250018,0.0145 -0.371505,0.0338 0.0067,0.1074 0.0084,0.21176 0.0084,0.32084 0,1.37337 -0.541883,2.61988 -1.41847,3.54618 0.43125,0.50149 1.064697,0.819 1.781532,0.819 1.30572,0 2.364118,-1.04996 2.364118,-2.35568 0,-1.30572 -1.058398,-2.36411 -2.364118,-2.36411 z m -20.491828,0.25329 c -1.3056525,0 -2.3556725,1.05002 -2.3556725,2.35568 0,1.30565 1.05002,2.36411 2.3556725,2.36411 1.0008,0 1.850283,-0.62448 2.195253,-1.5029 -0.84174,-0.8573 -1.446688,-1.951 -1.7139855,-3.16623 C 9.468915,20.239449 9.31015,20.221129 9.144065,20.221129 z"
   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.2;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /><path
-   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.80000000000000004;color:#000000;fill:url(#linearGradient7623);fill-opacity:1.0;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.8;color:#000000;fill:url(#linearGradient7623);fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
   d="m 14.488658,6.699758 c -2.381798,0 -4.30607,1.92427 -4.30607,4.306071 0,0.98178 0.32692,1.88539 0.878102,2.60897 1.195708,-1.38395 2.960465,-2.2628 4.93087,-2.2628 0.964013,0 1.878155,0.21467 2.70185,0.59103 0.06669,-0.3016 0.101318,-0.61527 0.101318,-0.9372 0,-2.381801 -1.92427,-4.306071 -4.30607,-4.306071 z m -5.6232205,1.99261 c -1.240375,0 -2.2374675,1.00554 -2.2374675,2.245911 0,0.4016 0.10361,0.78106 0.28707,1.10607 0.74849,-0.42223 1.61383,-0.66702 2.5329825,-0.66702 0.088705,0 0.1741425,0.004 0.2617425,0.008 -0.00993,-0.1253 -0.016875,-0.25124 -0.016875,-0.3795 0,-0.69086 0.15005,-1.348191 0.41372,-1.941961 -0.3550075,-0.23805 -0.7803425,-0.3715 -1.24116,-0.3715 z m 10.6216405,1.545121 c -0.09164,0 -0.179965,0.0113 -0.270185,0.0169 0.03903,0.24606 0.06755,0.49452 0.06755,0.75145 0,0.39985 -0.05085,0.78569 -0.143535,1.15673 1.08665,0.60137 1.989072,1.50116 2.583642,2.59208 0.616705,-0.32106 1.30466,-0.5252 2.03483,-0.57414 -0.18818,-2.20687 -2.016472,-3.94301 -4.272297,-3.94301 z m -3.495518,1.60422 c -3.33285,0 -6.0284975,2.69542 -6.0284975,6.0285 0,3.33272 2.6955105,6.0285 6.0284975,6.0285 3.33299,0 6.0285,-2.69579 6.0285,-6.0285 0,-3.33307 -2.695647,-6.0285 -6.0285,-6.0285 z m -6.5435375,0.0253 c -2.58566,0 -4.6775725,2.09191 -4.6775725,4.67758 0,1.52212 0.7252325,2.86959 1.8490775,3.72348 0.47379,-0.913811 1.425375,-1.53668 2.5245375,-1.53668 0.132845,0 0.260355,0.0161 0.38839,0.0338 -0.040192,-0.29242 -0.0591,-0.59159 -0.0591,-0.89499 0,-1.4506 0.47218,-2.792019 1.274933,-3.875459 -0.48052,-0.60129 -0.8244005,-1.32376 -0.970978,-2.11082 -0.1086325,-0.008 -0.218725,-0.0169 -0.3292875,-0.0169 z m 14.6575255,2.78628 c -0.785125,0 -1.520585,0.20045 -2.169923,0.54037 0.368715,0.81673 0.574143,1.72291 0.574143,2.67652 0,1.78555 -0.71789,3.406849 -1.88285,4.584699 0.85582,0.95013 2.097512,1.54512 3.47863,1.54512 2.58566,0 4.677575,-2.091919 4.677575,-4.677579 0,-2.585661 -2.091915,-4.66913 -4.677575,-4.66913 z M 4.3145118,15.269679 C 1.9326443,15.269679 0,17.185439 0,19.567309 c 0,2.38187 1.9326443,4.31451 4.3145118,4.31451 0.9065732,0 1.7463732,-0.282451 2.4401082,-0.75989 -0.286665,-0.44545 -0.4559375,-0.978001 -0.4559375,-1.54512 0,-0.294361 0.043432,-0.57714 0.1266475,-0.84433 -1.29874,-0.93858 -2.1445912,-2.46595 -2.1445912,-4.18786 0,-0.43751 0.057653,-0.86055 0.1604237,-1.2665 -0.042658,-10e-4 -0.083686,-0.008 -0.1266507,-0.008 z m 25.3213812,3.69816 c -0.127065,0 -0.250018,0.0145 -0.371505,0.0338 0.0067,0.1074 0.0084,0.21176 0.0084,0.32084 0,1.37337 -0.541883,2.61988 -1.41847,3.54618 0.43125,0.50149 1.064697,0.819 1.781532,0.819 1.30572,0 2.364118,-1.04996 2.364118,-2.35568 0,-1.30572 -1.058398,-2.36411 -2.364118,-2.36411 z m -20.491828,0.25329 c -1.3056525,0 -2.3556725,1.05002 -2.3556725,2.35568 0,1.30565 1.05002,2.36411 2.3556725,2.36411 1.0008,0 1.850283,-0.62448 2.195253,-1.5029 -0.84174,-0.8573 -1.446688,-1.951 -1.7139855,-3.16623 C 9.468915,19.239449 9.31015,19.221129 9.144065,19.221129 z"
   id="circle238"
   inkscape:export-filename="/home/user/owncloud/core/img/logo.png"
@@ -1,22 +0,0 @@
-Digia Qt LGPL Exception version 1.1
-
-As an additional permission to the GNU Lesser General Public License version
-2.1, the object code form of a "work that uses the Library" may incorporate
-material from a header file that is part of the Library. You may distribute
-such object code under terms of your choice, provided that:
-(i) the header files of the Library have not been modified; and
-(ii) the incorporated material is limited to numerical parameters, data
-structure layouts, accessors, macros, inline functions and
-templates; and
-(iii) you comply with the terms of Section 6 of the GNU Lesser General
-Public License version 2.1.
-
-Moreover, you may apply this exception to a modified version of the Library,
-provided that such modification does not involve copying material from the
-Library into the modified Library's header files unless such material is
-limited to (i) numerical parameters; (ii) data structure layouts;
-(iii) accessors; and (iv) small macros, templates and inline functions of
-five lines or less in length.
-
-Furthermore, you are not required to apply this additional permission to a
-modified version of the Library.
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Klaas Freitag	c48acf19d7	Updated Changelog for 1.1.3.	2012-11-30 14:59:18 +01:00
Klaas Freitag	e3bbb0fffe	Update to version 1.3.0	2012-11-30 14:53:58 +01:00
Klaas Freitag	d1884f7b0b	Updated version to 1.1.3pre1	2012-11-29 21:27:45 +01:00