Merge remote branch 'upstream/master' into refs/top-bases/t/query-typed-props

* upstream/master:
  Release 0.92.0
  don't choke if timestamp property is missing
  Cleanup AUTHORS file
  Add missed deps
  Actualize sweet recipe; add metadatareader.so symlink to support inplace run
  Tweak HACKING file

6 files changed, 42 insertions, 25 deletions

diff --git a/AUTHORS b/AUTHORS
index 815ace9..9928b94 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,4 +21,4 @@ Tomeu Vizoso <tomeu@sugarlabs.org>
 
 Current maintainers
 ~~~~~~~~~~~~~~~~~~~
-Aleksey Lim <alsroot@member.fsf.org>
+http://wiki.sugarlabs.org/go/Development_Team/Release/Modules#Glucose
diff --git a/HACKING b/HACKING
index 5c3a436..021f49e 100644
--- a/HACKING
+++ b/HACKING
@@ -1,15 +1,29 @@
+How to contribute
+=================
+
+Useful notes how to contribute to the project.
+
 Before committing
-~~~~~~~~~~~~~~~~~
-All source files need to be passed through sugar-lint[1] command.
+-----------------
+All source files need to be passed through `sugar-lint`_ command.
 Follow sugar-lint home page instructions and especially
-"Lint files before committing" section.
-
+`"Lint files before committing"` section.
 
 Send patches
-~~~~~~~~~~~~
-Create your patches using "git format" command and send them to all maintainers
-from AUTHORS file with CCing to sugar-devel@lists.sugarlabs.org.
-The easiest way it just using "git send-email" command.
+------------
+Create your patches using ``git format`` command and send them to all
+maintainers from the :ref:`AUTHORS <AUTHORS>` file. The easiest way it just
+using ``git send-email`` command. Patches might be CCed to
+sugar-devel@lists.sugarlabs.org to attract more people to review.
+
+Gitorious forks
+---------------
+Another useful way to contribute, especially for big improvements, is creating
+Gitorious forks and request them for merge to the trunk.
 
+* http://blog.gitorious.org/2009/05/09/weve-made-a-few-changes/
+  (see `"Merge requests"` topic)
+* http://blog.gitorious.org/2009/07/15/new-merge-request-functionality/
+* http://blog.gitorious.org/2009/11/06/awesome-code-review/
 
-[1] http://wiki.sugarlabs.org/go/Activity_Team/Sugar_Lint
+.. _sugar-lint: http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Lint
diff --git a/configure.ac b/configure.ac
index cf72e11..10f2487 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sugar-datastore],[0.90.0],[],[sugar-datastore])
+AC_INIT([sugar-datastore],[0.92.0],[],[sugar-datastore])
 
 AC_PREREQ([2.59])
 
diff --git a/src/carquinyol/datastore.py b/src/carquinyol/datastore.py
index 837de35..41ec2c3 100644
--- a/src/carquinyol/datastore.py
+++ b/src/carquinyol/datastore.py
@@ -140,6 +140,9 @@ class DataStore(dbus.service.Object):
                         if os.path.exists(path):
                             props['filesize'] = os.stat(path).st_size
                             update_metadata = True
+                    if 'timestamp' not in props:
+                        props['timestamp'] = str(int(time.time()))
+                        update_metadata = True
                     if 'creation_time' not in props:
                         if 'ctime' in props:
                             try:
diff --git a/src/carquinyol/metadatareader.so b/src/carquinyol/metadatareader.so
new file mode 120000
index 0000000..bf6931a
--- /dev/null
+++ b/src/carquinyol/metadatareader.so
@@ -0,0 +1 @@
+.libs/metadatareader.so
\ No newline at end of file
diff --git a/sweets.recipe b/sweets.recipe
index 9616cb9..b861c35 100644
--- a/sweets.recipe
+++ b/sweets.recipe
@@ -1,4 +1,4 @@
-[DEFAULT]
+[Application]
 sweet     = sugar-datastore
 summary   = Backend of the Sugar Journal
 license   = LGPLv2.1+
@@ -7,27 +7,26 @@ homepage  = http://git.sugarlabs.org/projects/sugar-datastore
 version   = 0.90.0
 stability = testing
 
-[Component]
+exec      = %(BUILDDIR)s/bin/datastore-service
+binding   = PATH %(BUILDDIR)s/bin
+            PYTHONPATH %(BUILDDIR)s/src
+            XDG_DATA_DIRS share
 requires  = sugar-toolkit; python-cjson; xapian-bindings-python
-binding   = PATH bin; PYTHONPATH python; XDG_DATA_DIRS share
+
+[Archive]
 arch      = any
 
 [Build]
-requires  = pkg-config; intltool >= 0.33; make; gcc-c; python
-cleanup   = make distclean; ./autogen.sh
-configure = ./configure
+requires  = gnome-common; pkg-config
+            intltool >= 0.33; libtool; make; gcc-c; python
+configure = make distclean;
+            ./autogen.sh
                 --prefix=%(PREFIX)s
-                am_cv_python_pythondir=%(PREFIX)s/python
-                am_cv_python_pyexecdir=%(PREFIX)s/python
+                am_cv_python_pythondir=%(PREFIX)s/src
+                am_cv_python_pyexecdir=%(PREFIX)s/src
                 CFLAGS="%(CFLAGS)s"
 make      = make
 install   = make DESTDIR=%(DESTDIR)s install
-implement = %(install)s &&
-            rm -rf %(DESTDIR)s/%(PREFIX)s/bin &&
-            rm -rf %(DESTDIR)s/%(PREFIX)s/python &&
-            ln -s %(BUILDDIR)s/bin %(DESTDIR)s/%(PREFIX)s/ &&
-            ln -s %(BUILDDIR)s/src %(DESTDIR)s/%(PREFIX)s/python &&
-            ln -fs .libs/metadatareader.so src/carquinyol/
 
 [Source]
 exec      = ./autogen.sh && make distcheck