Please merge zeitgeist 1.0.4-5 (universe) from Debian unstable (main)

[Sudip Mukherjee]

Please merge zeitgeist 1.0.4-5 (universe) from Debian unstable (main)

Explanation of the Ubuntu delta:

Carry forward three previous Ubuntu specific patch.
1. add_datahub_autostart_delay.patch
2. nodisplay_autostart.patch
3. pre_populator.patch

Extra change for this version:

The monitor-test was skipped in the previous version as it was failing. That test has now been enabled in Debian but is still failing in Ubuntu. And, so the extra change for this version was to disable it for now.

[Sudip Mukherjee (sudipmuk)]

debdiff from Debian 1.0.4-5 is attached. The debdiff between zeitgeist_1.0.3-4ubuntu1 and this version is quite big, and I can upload if necessary.

[Utkarsh Gupta (utkarsh)]

Here's a review I put on the MP but I'll put it here for posterity:

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

[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

[Sudip Mukherjee (sudipmuk)]

new debdiff from Debian 1.0.4-5 is attached. The debdiff between zeitgeist_1.0.3-4ubuntu1 and this version is quite big, and I can upload if necessary.
A new patch has been added which will fix the test in Ubuntu. Also forwrded the patch in an unstream issue.
Build log is at https://launchpadlibrarian.net/705607547/buildlog_ubuntu-noble-amd64.zeitgeist_1.0.4-5ubuntu1_BUILDING.txt.gz

[Launchpad Janitor (janitor)]

This bug was fixed in the package zeitgeist - 1.0.4-5ubuntu1

---------------
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.

zeitgeist (1.0.4-5) unstable; urgency=medium

  * fix source helper tool copyright-check
    + work with Path::Tiny 0.144
    + avoid insecure shell expansion
  * add patch cherry-picked upstream to support Python 3.11;
    closes: bug#1032125, thanks to s3v
  * declare compliance with Debian Policy 4.6.2
  * update copyright info: update coverage

zeitgeist (1.0.4-4) unstable; urgency=medium

  * update source helper script copyright-check
  * update copyright info:
    + use field License-Grant
    + update coverage

zeitgeist (1.0.4-3) unstable; urgency=medium

  * add patch cherry-picked upstream
    to fix wrong parameter for Event.full() ctor
  * declare compliance with Debian Policy 4.6.1
  * update copyright info:
    + merge Files sections with identical licensing
    + sort copyright holders
    + use field Reference
    + update coverage
  * add source helper script copyright-check
  * use semantic newlines
    in long descriptions and copyright file License grants
  * build-depend on dh-sequence-pkgkde-symbolshelper
    (not pkg-kde-tools)
  * build-depend on dh-sequence-gir
    (not gobject-introspection)
  * build-depend on dh-sequence-python3
    (not dh-python)
  * tighten packaging shell files

zeitgeist (1.0.4-2) unstable; urgency=medium

  * relax to (build-)depend unversioned
    on libdee-dev libgirepository1.0-dev libglib2.0-dev
    libgtk-3-dev libjson-glib-dev libsqlite3-dev
    libtelepathy-glib-dev valac:
    needed versions satisfied in all supported releases of Debian
  * drop ancient Breaks/Replaces,
    and relax to have zeitgeist-datahub depend unversioned
    on zeitgeist-core
  * declare compliance with Debian Policy 4.6.0
    (not too spcifically on 4.6.0.1)
  * set Rules-Requires-Root: no
  * new maintainer: Debian semweb Team,
    with myself as uploader;
    closes: bug#919274
  * install upstream NEWS and README.md with all binary packages
    (not only with zeitgeist-core)
  * update patch DEP-3 headers
  * install ontology files in binary package zeitgeist,
    and mention that in long description
  * update patch skip-failing-tests.patch
    to enable no longer failing tests
  * fix wrap test checking in dbus-run-session
    (although dbus-related tests still fail but in different way now);
    build-depend on dbus-daemon;
    closes: bug#836060, thanks to Simon McVittie
  * drop no longer needed calls to dpkg-maintscript-helper
    in maintainer scripts

zeitgeist (1.0.4-1) experimental; urgency=medium

  [ upstream ]
  * new release

  [ Jonas Smedegaard ]
  * adopt package: set myself as maintainer
  * ...