Merge ~sudipmuk/ubuntu/+source/zeitgeist:merge-lp2044300-noble into ubuntu/+source/zeitgeist:debian/sid

[Sudip Mukherjee]

[Sudip Mukherjee (sudipmuk)]

PPA: https://launchpad.net/~sudipmuk/+archive/ubuntu/zeitgeist-merge/

Test Steps:
1. install gnome-activity-journal in a noble installation.
2. gnome-activity-journal will fail to run.
3. update zeitgeist with this version.
4. Run gnome-activity-journal now and it will execute.

[Utkarsh Gupta (utkarsh)]

Hey there!

Thanks for raising this much, much appreciated. This is great as-is but here are some points that'd make it EVEN better:

- https://git.launchpad.net/~sudipmuk/ubuntu/+source/zeitgeist/commit/?id=95fd328c45f72fa0f3895900216ad0726e86139e -> it misses the DEP-3 headers. I am aware that you're just rebasing the new version and you're not really adding the patch itself. But whilst at it, if you could really add DEP-3 headers to a patch, that'd be EXCELLENT!

See: https://git.launchpad.net/~sudipmuk/ubuntu/+source/zeitgeist/commit/?id=a6cff2e5ac675b90cc574a26dc953f452aa9a00c for example. It has the DEP-3 headers and tells me why it's needed, some bug history, et al.

I generally look at it because sometimes we shouldn't really be merging stuff as-is and carry-forwarding the tech-debt but actively be looking at drop the delta wherever and whenever possible.

Now, OTOH, look at https://git.launchpad.net/~sudipmuk/ubuntu/+source/zeitgeist/commit/?id=e940d9763d0fba97dc8504ed382e01210a43f08d -> it gives me a quick description but doesn't tell me if it's coming from upstream or was it written by downstream, is there an upstream bug? a downstream bug? or? and I spend my time looking at things, et al. That's why DEP-3 headers are really useful.

- https://git.launchpad.net/~sudipmuk/ubuntu/+source/zeitgeist/commit/?id=2ab99989a22d2e07bfc28e5eae942bd8283c1aa7 -> did you verify if that's still needed? why? :)

So except for the above question and a general pointer (first point), it mostly looks good! :D

review: Needs Information

[Sudip Mukherjee (sudipmuk)]

Hi Utkarsh,

Thanks for looking into this.

On Sat, 25 Nov 2023 at 17:04, Utkarsh Gupta
<email address hidden> wrote:
>
> Review: Needs Information
>
> Hey there!
>
> Thanks for raising this much, much appreciated. This is great as-is but here are some points that'd make it EVEN better:
>
> - https://git.launchpad.net/~sudipmuk/ubuntu/+source/zeitgeist/commit/?id=95fd328c45f72fa0f3895900216ad0726e86139e -> it misses the DEP-3 headers. I am aware that you're just rebasing the new version and you're not really adding the patch itself. But whilst at it, if you could really add DEP-3 headers to a patch, that'd be EXCELLENT!

I could not find any bug report which might explain this patch. Seems
to be an Ubuntu specific patch and introduced in
zeitgeist_0.9.14-0ubuntu1.

>
> See: https://git.launchpad.net/~sudipmuk/ubuntu/+source/zeitgeist/commit/?id=a6cff2e5ac675b90cc574a26dc953f452aa9a00c for example. It has the DEP-3 headers and tells me why it's needed, some bug history, et al.
>
> I generally look at it because sometimes we shouldn't really be merging stuff as-is and carry-forwarding the tech-debt but actively be looking at drop the delta wherever and whenever possible.
>
> Now, OTOH, look at https://git.launchpad.net/~sudipmuk/ubuntu/+source/zeitgeist/commit/?id=e940d9763d0fba97dc8504ed382e01210a43f08d -> it gives me a quick description but doesn't tell me if it's coming from upstream or was it written by downstream, is there an upstream bug? a downstream bug? or? and I spend my time looking at things, et al. That's why DEP-3 headers are really useful.

This one seems to fix LP: #962265 but I could not find a way to be
sure and so not confident enough to add DEP-3 headers to the patch.
Again, this also was introduced in zeitgeist_0.9.14-0ubuntu1.

>
> - https://git.launchpad.net/~sudipmuk/ubuntu/+source/zeitgeist/commit/?id=2ab99989a22d2e07bfc28e5eae942bd8283c1aa7 -> did you verify if that's still needed? why? :)

Yes, this is still needed. My initial build failed as I did not have
this one disabled. I have done a diff of the buildinfo and saw there
are version mismatch of many packages between Debian and Ubuntu. One
of the mismatch is still causing the issue in Ubuntu, but I don't know
which one yet.

--
Regards
Sudip

[Simon Chopin (schopin)]

Hi!

Thank you for the contribution, and for following up on Utkarsh's review.

Luckily, the person that did the 0.9.14-0ubuntu1 (ricotz) is still around, so I asked them directly what this was for: https://irclogs.ubuntu.com/2023/11/29/%23ubuntu-devel.html#t14:12

TL;DR: we're not sure why the patch exists, and it's likely it's not needed anymore.

Would you be willing to test a version with that patch dropped?

[Sudip Mukherjee (sudipmuk)]

Hi Simon,

On Wed, 29 Nov 2023 at 18:37, Simon Chopin <email address hidden> wrote:
>
> Hi!
>
> Thank you for the contribution, and for following up on Utkarsh's review.
>
> Luckily, the person that did the 0.9.14-0ubuntu1 (ricotz) is still around, so I asked them directly what this was for: https://irclogs.ubuntu.com/2023/11/29/%23ubuntu-devel.html#t14:12

Thanks for following up with Rico.

>
> TL;DR: we're not sure why the patch exists, and it's likely it's not needed anymore.
>
> Would you be willing to test a version with that patch dropped?

I have dropped the patch "add_datahub_autostart_delay.patch" and
tested on a Noble installation and did not notice any problem.
And so the branch is now updated and also pushed to new PPA at
https://launchpad.net/~sudipmuk/+archive/ubuntu/zeitgeist-merge-1/

--
Regards
Sudip

[Graham Inggs (ginggs)]

Please mention the dropped patch in the changelog and the reason (outside of Remaining Changes), something like:

  * Dropped add_datahub_autostart_delay.patch, no longer required

or

  * Dropped changes:
    - add_datahub_autostart_delay.patch, no longer required

9f3e8e5... by Sudip Mukherjee on 2023-12-06

d/p/nodisplay_autostart.patch: Don't show in Startup Applications

Signed-off-by: Sudip Mukherjee <email address hidden>

2fba154... by Sudip Mukherjee on 2023-12-06

d/p/pre_populator.patch: Pre-populate the log with some events

Signed-off-by: Sudip Mukherjee <email address hidden>

[Sudip Mukherjee (sudipmuk)]

> Please mention the dropped patch in the changelog and the reason (outside of
> Remaining Changes), something like:
>
> * Dropped add_datahub_autostart_delay.patch, no longer required
>
> or
>
> * Dropped changes:
> - add_datahub_autostart_delay.patch, no longer required

sorry, missed that. I have now re-done the changes as the git commit to drop the patch was also missing.

[Andreas Hasenack (ahasenack)]

Tags ok, thanks for pushing those!

First pass:

$ git range-diff sudipmuk/old/debian..sudipmuk/logical/1.0.3-4ubuntu1 sudipmuk/new/debian..merge-lp2044300-noble
 1: f024545 = 1: b4d8957 d/p/add_datahub_autostart_delay.patch: Delay datahub autostart
 2: 77a362f = 2: 4b3347e d/p/nodisplay_autostart.patch: Don't show in Startup Applications
 3: a30b8dd ! 3: ca050ff d/p/pre_populator.patch: Pre-populate the log with some events
    @@ debian/patches/pre_populator.patch (new)
     +Description: Pre-populate the log with some events so that the dash isn't empty on first run.
     +
     +=== modified file 'src/Makefile.am'
    ++Bug-Ubuntu: https://launchpad.net/bugs/962265
    ++Forwarded: not-needed
     +---
     + datahub/Makefile.am | 1
     + datahub/pre-populator.vala | 117 +++++++++++++++++++++++++++++++++++++++++
 -: ------- > 4: 209e96a Drop d/p/add_datahub_autostart_delay.patch: no longer required
 -: ------- > 5: 66af12c Modify skip-failing-tests.patch: skip the test that still fails in Ubuntu as in the previous version
 -: ------- > 6: 23099ff merge-changelogs
 -: ------- > 7: 1fcd0ed reconstruct-changelog
 -: ------- > 8: c71981c update-maintainer
 -: ------- > 9: f2c0fec changelog

a) I see you added a bit of dep3 headers to d/p/pre_populator.patch

b) 209e96a (drop add_datahub_autostart_delay) is almost a revert of b4d8957 (add datahub_autostart_delay), but had to also touch nodisplay_autostart.patch because of context. In general, when dropping patches, you can just not apply it when rebasing on top of new/debian. No need to apply and then revert. Then in the range-diff output we would clearly see that one commit was dropped, and another one was added to nodisplay_autostart.patch to adjust for the changed context.

c) 66af12c Modify skip-failing-tests.patch: skip the test that still fails in Ubuntu as in the previous version

That is an "added change". It's delta we didn't have before, and that you are adding now. We like to call out to these in the changelog with a "Added changes" entry, like below:

  * Merge with Debian unstable. Remaining changes: (LP: #2044300)
    - Add nodisplay_autostart.patch: Don't show in Startup Applications
    - Add pre_populator.patch: Pre-populate the log with some events
      so that the Unity dash isn't empty on first run.
  * Added changes:
    - Modify skip-failing-tests.patch: skip the test that still fails
      in Ubuntu as in the previous version.
  * Dropped changes:
    - add_datahub_autostart_delay.patch, no longer required.

In the next merge, the "added changes" can be part of the "remaining changes", if it still makes sense to keep.

That being said, are you saying that in ubuntu we need to skip more tests than in debian? What is the reason again, different package versions? We like to know why, so that it's easier to re-evaluate the patch in the future, and see if we can stop disabling tests.

[Andreas Hasenack (ahasenack)]

Do we know if d/p/pre_populator.patch is still necessary? The linked bug is about unity, and we don't ship than anymore for quite some time.

review: Needs Information

[Sudip Mukherjee (sudipmuk)]

Hi Andreas,

Thanks for looking into this.

On Fri, 8 Dec 2023 at 21:41, Andreas Hasenack
<email address hidden> wrote:
>
> Tags ok, thanks for pushing those!
>
> First pass:
>
>
> $ git range-diff sudipmuk/old/debian..sudipmuk/logical/1.0.3-4ubuntu1 sudipmuk/new/debian..merge-lp2044300-noble
> 1: f024545 = 1: b4d8957 d/p/add_datahub_autostart_delay.patch: Delay datahub autostart
> 2: 77a362f = 2: 4b3347e d/p/nodisplay_autostart.patch: Don't show in Startup Applications
> 3: a30b8dd ! 3: ca050ff d/p/pre_populator.patch: Pre-populate the log with some events
> @@ debian/patches/pre_populator.patch (new)
> +Description: Pre-populate the log with some events so that the dash isn't empty on first run.
> +
> +=== modified file 'src/Makefile.am'
> ++Bug-Ubuntu: https://launchpad.net/bugs/962265
> ++Forwarded: not-needed
> +---
> + datahub/Makefile.am | 1
> + datahub/pre-populator.vala | 117 +++++++++++++++++++++++++++++++++++++++++
> -: ------- > 4: 209e96a Drop d/p/add_datahub_autostart_delay.patch: no longer required
> -: ------- > 5: 66af12c Modify skip-failing-tests.patch: skip the test that still fails in Ubuntu as in the previous version
> -: ------- > 6: 23099ff merge-changelogs
> -: ------- > 7: 1fcd0ed reconstruct-changelog
> -: ------- > 8: c71981c update-maintainer
> -: ------- > 9: f2c0fec changelog
>
> a) I see you added a bit of dep3 headers to d/p/pre_populator.patch

Yes, Utkarsh asked me to add the dep3 headers, and that bug seems to
the reason of the patch but tbh, I am not entirely sure as there is no
other information in the patch or changelog.

>
> b) 209e96a (drop add_datahub_autostart_delay) is almost a revert of b4d8957 (add datahub_autostart_delay), but had to also touch nodisplay_autostart.patch because of context. In general, when dropping patches, you can just not apply it when rebasing on top of new/debian. No need to apply and then revert. Then in the range-diff output we would clearly see that one commit was dropped, and another one was added to nodisplay_autostart.patch to adjust for the changed context.

Yes, that's what I did initially. But if you see
https://github.com/canonical/ubuntu-maintainers-handbook/blob/main/PackageMerging.md#split-commits
the step mentioned splitting the old changes in logincal changes. And
https://github.com/canonical/ubuntu-maintainers-handbook/blob/main/PackageMerging.md#purpose-of-logical-tag
explains why the logincal change has been done. To quote that "The
logical tag is the cleanest possible representation of a previous
Ubuntu delta". And, so when I rebase those logical changes on top of
new/debian those commits will be added. So, unless I modify the commit
while adding the logical changes, I think there is no other way to
drop the patch. And modifying while making the logical change means I
am not splitting the old delta properly. But please correct me if I am
wrong.

>
> c) 66af12c Modify skip-failing-tests.patch: skip the test that still fails in Ubuntu as in the previous version
>
> That is an "added change". It's delta we didn't have before, and that you are adding now. We...

[Sudip Mukherjee (sudipmuk)]

On Fri, 8 Dec 2023 at 21:42, Andreas Hasenack
<email address hidden> wrote:
>
> Review: Needs Information
>
> Do we know if d/p/pre_populator.patch is still necessary? The linked bug is about unity, and we don't ship than anymore for quite some time.

Please correct me if I'm wrong but I think Unity is now renamed as
Lomiri which is still being used by UBports,

--
Regards
Sudip

[Andreas Hasenack (ahasenack)]

> So, unless I modify the commit while adding the logical changes,

That's what I meant. You keep the logical tag intact, it still represents the clean delta, but when applying it on top of new/debian, then you can do whatever you want. And here is where you would drop a change that was adopted by debian, for example.

[Sudip Mukherjee (sudipmuk)]

On Mon, 11 Dec 2023 at 13:08, Andreas Hasenack
<email address hidden> wrote:
>
> > So, unless I modify the commit while adding the logical changes,
>
> That's what I meant. You keep the logical tag intact, it still represents the clean delta, but when applying it on top of new/debian, then you can do whatever you want. And here is where you would drop a change that was adopted by debian, for example.

Right, Sorry I was confused before. I have now pushed again and
hopefully I have done the right thing this time.

--
Regards
Sudip

[Sudip Mukherjee (sudipmuk)]

> Tags ok, thanks for pushing those!
>

<snip>
.
>
> That being said, are you saying that in ubuntu we need to skip more tests than
> in debian? What is the reason again, different package versions? We like to
> know why, so that it's easier to re-evaluate the patch in the future, and see
> if we can stop disabling tests.

I am blocked here. Now commented on the upstream issue at https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/issues/4.

b62e3b1... by Sudip Mukherjee on 2023-12-25

d/p/fix-monitor-test.patch: do not link with libzeitgeist-datamodel

Signed-off-by: Sudip Mukherjee <email address hidden>

933342c... by Sudip Mukherjee on 2023-12-25

merge-changelogs

02ccd0e... by Sudip Mukherjee on 2023-12-25

reconstruct-changelog

663dfe7... by Sudip Mukherjee on 2023-12-25

update-maintainer

ea43938... by Sudip Mukherjee on 2023-12-25

changelog

[Sudip Mukherjee (sudipmuk)]

Pushed new changes. A new patch which will fix the test in Ubuntu. Also forwrded the patch in an unstream issue.
Buildlog is at https://launchpadlibrarian.net/705607547/buildlog_ubuntu-noble-amd64.zeitgeist_1.0.4-5ubuntu1_BUILDING.txt.gz

[Aaron Rainbolt (arraybolt3)]

Latest iteration looks good to me, with the minor exception of the DEP-3 header on /debian/patches/pre_populator.patch. tsimonq2 is uploading with the header fixed.

[Simon Quigley (tsimonq2)]

review: Approve

[Andreas Hasenack (ahasenack)]

This was uploaded and is in noble already, marking the MP as merged.

diff --git a/debian/changelog b/debian/changelog
index 965789a..358f22b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+zeitgeist (1.0.4-5ubuntu1) noble; urgency=low
+
+  * Merge with Debian unstable. Remaining changes: (LP: #2044300)
+    - Add nodisplay_autostart.patch: Don't show in Startup Applications
+    - Add pre_populator.patch: Pre-populate the log with some events
+      so that the Unity dash isn't empty on first run.
+  * Added changes:
+    - Add fix-monitor-test.patch: monitor test is failing in Ubuntu if it
+      is linked with libzeitgeist-datamodel.
+  * Dropped changes:
+    - add_datahub_autostart_delay.patch, no longer required.
+
+ -- Sudip Mukherjee <[e-mail]>  Mon, 25 Dec 2023 17:37:52 +0000
+
 zeitgeist (1.0.4-5) unstable; urgency=medium
 
   * fix source helper tool copyright-check
@@ -125,6 +139,17 @@ zeitgeist (1.0.3-5) unstable; urgency=medium
 
  -- Jelmer Vernooij <[e-mail]>  Tue, 24 Aug 2021 20:22:44 +0100
 
+zeitgeist (1.0.3-4ubuntu1) hirsute; urgency=low
+
+  [ Ubuntu Merge-o-Matic ]
+  * Merge from Debian unstable. Remaining changes:
+    - Add add_datahub_autostart_delay.patch: Don't start for a little while
+    - Add nodisplay_autostart.patch: Don't show in Startup Applications
+    - Add pre_populator.patch: Pre-populate the log with some events
+      so that the Unity dash isn't empty on first run.
+
+ -- Brian Murray <[e-mail]>  Fri, 02 Apr 2021 10:19:47 -0700
+
 zeitgeist (1.0.3-4) unstable; urgency=medium
 
   * QA upload.
@@ -159,6 +184,22 @@ zeitgeist (1.0.3-1) unstable; urgency=medium
 
  -- Boyuan Yang <[e-mail]>  Thu, 31 Dec 2020 15:04:29 -0500
 
+zeitgeist (1.0.2-3ubuntu2) focal; urgency=medium
+
+  * No-change rebuild for libgcc-s1 package name change.
+
+ -- Matthias Klose <[e-mail]>  Sun, 22 Mar 2020 17:04:32 +0100
+
+zeitgeist (1.0.2-3ubuntu1) focal; urgency=medium
+
+  * Resynchronize with Debian. Remaining changes:
+    - Add add_datahub_autostart_delay.patch: Don't start for a little while
+    - Add nodisplay_autostart.patch: Don't show in Startup Applications
+    - Add pre_populator.patch: Pre-populate the log with some events
+      so that the Unity dash isn't empty on first run.
+
+ -- Rico Tzschichholz <[e-mail]>  Tue, 28 Jan 2020 14:51:17 +0100
+
 zeitgeist (1.0.2-3) unstable; urgency=high
 
   * QA upload.
diff --git a/debian/control b/debian/control
index 8faff93..b541fbc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: zeitgeist
 Section: utils
 Priority: optional
-Maintainer: Debian semweb Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian semweb Team <[e-mail]>
 Uploaders:
  Jonas Smedegaard <[e-mail]>,
 Build-Depends:
diff --git a/debian/patches/fix-monitor-test.patch b/debian/patches/fix-monitor-test.patch
new file mode 100644
index 0000000..8230082
--- /dev/null
+++ b/debian/patches/fix-monitor-test.patch
@@ -0,0 +1,43 @@
+Description: do not link with libzeitgeist-datamodel
+Forwarded: https://gitlab.freedesktop.org/zeitgeist/zeitgeist/-/issues/27
+Last-Update: 2023-12-25
+---
+
+diff --git a/test/c/Makefile.am b/test/c/Makefile.am
+index 9a840c2b..46612eb3 100644
+--- a/test/c/Makefile.am
++++ b/test/c/Makefile.am
+@@ -21,6 +21,12 @@ AM_LDFLAGS = \
+ 	$(ZEITGEIST_LIBS) \
+ 	$(NULL)
+ 
++test_monitor_LDFLAGS = \
++       $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
++       $(GIO_UNIX_LIBS) \
++       $(ZEITGEIST_LIBS) \
++       $(NULL)
++
+ check_PROGRAMS = \
+ 	test-timerange \
+ 	test-timestamp \
+diff --git a/test/direct/Makefile.am b/test/direct/Makefile.am
+index 56061c28..780c5acd 100644
+--- a/test/direct/Makefile.am
++++ b/test/direct/Makefile.am
+@@ -43,6 +43,13 @@ AM_LDFLAGS = \
+ 	$(top_builddir)/src/libzeitgeist-engine.la \
+ 	$(NULL)
+ 
++monitor_test_LDFLAGS = \
++       -export-dynamic -no-undefined \
++       $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
++       $(top_builddir)/libzeitgeist/libzeitgeist-internal.la \
++       $(top_builddir)/src/libzeitgeist-engine.la \
++       $(NULL)
++
+ check_PROGRAMS = \
+ 	datamodel-test \
+ 	datasource-test \
+-- 
+2.39.2
+
diff --git a/debian/patches/nodisplay_autostart.patch b/debian/patches/nodisplay_autostart.patch
new file mode 100644
index 0000000..145a2a3
--- /dev/null
+++ b/debian/patches/nodisplay_autostart.patch
@@ -0,0 +1,14 @@
+Description: Clean up Startup Applications dialog by hiding default apps
+Author: Michael Terry <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/803917
+Forwarded: not-needed
+---
+ data/zeitgeist-datahub.desktop.in |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/data/zeitgeist-datahub.desktop.in
++++ b/data/zeitgeist-datahub.desktop.in
+@@ -5,2 +5,3 @@ Exec=zeitgeist-datahub
+ Terminal=false
+ Type=Application
++NoDisplay=true
diff --git a/debian/patches/pre_populator.patch b/debian/patches/pre_populator.patch
new file mode 100644
index 0000000..7986db5
--- /dev/null
+++ b/debian/patches/pre_populator.patch
@@ -0,0 +1,153 @@
+Description: Pre-populate the log with some events so that the dash isn't empty on first run.
+
+=== modified file 'src/Makefile.am'
+Bug-Ubuntu: https://launchpad.net/bugs/962265
+Forwarded: not-needed
+---
+ datahub/Makefile.am            |    1 
+ datahub/pre-populator.vala     |  117 +++++++++++++++++++++++++++++++++++++++++
+ datahub/zeitgeist-datahub.vala |    3 +
+ 3 files changed, 121 insertions(+)
+
+--- a/datahub/Makefile.am
++++ b/datahub/Makefile.am
+@@ -30,6 +30,7 @@ zeitgeist_datahub_VALASOURCES = \
+ 	desktop-launch-listener.vala \
+ 	kde-recent-document-provider.vala \
+ 	recent-manager-provider.vala \
++	pre-populator.vala \
+ 	utils.vala \
+ 	zeitgeist-datahub.vala \
+ 	$(NULL)
+--- /dev/null
++++ b/datahub/pre-populator.vala
+@@ -0,0 +1,117 @@
++/*
++ * Copyright (C) 2012 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by Michal Hruby <[e-mail]>
++ *
++ */
++
++using Zeitgeist;
++
++public class PrePopulator : DataProvider
++{
++  public PrePopulator (DataHub datahub)
++  {
++    GLib.Object (unique_id: "com.canonical,datahub,pre-populator",
++                 name: "Pre-populate the log",
++                 description: "Pushes a couple of events so Ubuntu Dash home is not empty when doing new install",
++                 datahub: datahub);
++  }
++
++  // if vala didn't have bug in construct-only properties, the properties
++  // would be construct-only
++  public override string unique_id { get; construct set; }
++  public override string name { get; construct set; }
++  public override string description { get; construct set; }
++
++  public override DataHub datahub { get; construct set; }
++  public override bool enabled { get; set; default = true; }
++  public override bool register { get; construct set; default = true; }
++
++  construct
++  {
++  }
++
++  public override void start ()
++  {
++    this.prepare_events.begin ();
++  }
++
++  private Event event_for_desktop_file (string desktop_file, int64 timestamp)
++  {
++    var event = new Event ();
++    event.timestamp = timestamp;
++    var subject = new Subject ();
++
++    event.actor = "application://zeitgeist-datahub.desktop";
++    event.interpretation = Zeitgeist.ZG.ACCESS_EVENT;
++    event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
++    event.add_subject (subject);
++
++    subject.uri = "application://%s".printf (desktop_file);
++    subject.interpretation = Zeitgeist.NFO.SOFTWARE;
++    subject.manifestation = Zeitgeist.NFO.SOFTWARE_ITEM;
++    subject.mimetype = "application/x-desktop";
++
++    return event;
++  }
++
++  private async void prepare_events ()
++  {
++    var arr = new GenericArray<Event> ();
++    var ts = Timestamp.from_now ();
++    // the timestamp is in milliseconds, we can safely increment it
++    // (dash will display latest first)
++    arr.add (event_for_desktop_file ("rhythmbox.desktop", ++ts));
++    arr.add (event_for_desktop_file ("org.gnome.Calculator.desktop", ++ts));
++    arr.add (event_for_desktop_file ("org.gnome.gedit.desktop", ++ts));
++    arr.add (event_for_desktop_file ("org.gnome.Totem.desktop", ++ts));
++    arr.add (event_for_desktop_file ("thunderbird.desktop", ++ts));
++    arr.add (event_for_desktop_file ("yelp.desktop", ++ts));
++
++    try
++    {
++      var log = new Zeitgeist.Log ();
++      var ids = yield log.find_event_ids (new TimeRange.anytime (),
++                                          new GLib.GenericArray<Zeitgeist.Event> (),
++                                          StorageState.ANY,
++                                          1,
++                                          ResultType.MOST_RECENT_EVENTS,
++                                          null);
++
++      if (ids.length == 0)
++      {
++        // pre-populate only if there are no events at all
++        items_available (arr);
++
++        Timeout.add_seconds (5, prepare_events.callback);
++        yield;
++      }
++
++      var registry = new DataSourceRegistry ();
++      // this is one-time only module, disable ourselves when done
++      yield registry.set_data_source_enabled (unique_id, false, null);
++    }
++    catch (Error err)
++    {
++      warning ("%s", err.message);
++    }
++  }
++
++  public override void stop ()
++  {
++  }
++}
++
+--- a/datahub/zeitgeist-datahub.vala
++++ b/datahub/zeitgeist-datahub.vala
+@@ -122,6 +122,9 @@ public class DataHub : Object, DataHubSe
+ 
+     providers.prepend (new DesktopLaunchListener (this));
+ 
++    // Ubuntu-specific
++    providers.prepend (new PrePopulator (this));
++
+     foreach (unowned DataProvider prov in providers)
+     {
+       bool enabled = true;
diff --git a/debian/patches/series b/debian/patches/series
index b3195fe..b930c90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,6 @@
 skip-failing-tests.patch
 startup-database-vacuum.patch
 add_german_translation.patch
+nodisplay_autostart.patch
+pre_populator.patch
+fix-monitor-test.patch