Sync blender 3.4.1+dfsg-2 (universe) from Debian unstable (main)

[Hans Joachim Desserud]

Please sync blender 3.4.1+dfsg-2 (universe) from Debian unstable (main)

Explanation of the Ubuntu delta and why it can be dropped:
  * No-change rebuild for python3.11 as default.
  * Merge from Debian unstable. Remaining changes:
    - Build-depend on newer libtbb2-dev instead of libtbb-dev.

After changing build-dependency and then changing back again, the delta is effectively empty.

Changelog entries since current lunar version 3.3.1+dfsg-1ubuntu3:

blender (3.4.1+dfsg-2) unstable; urgency=medium

  * debian/patches/: patchset updated (Closes: #1029006)

 -- Matteo F. Vescovi <email address hidden> Tue, 17 Jan 2023 22:34:10 +0100

blender (3.4.1+dfsg-1) unstable; urgency=medium

  * New upstream release
    - debian/patches/: patchset refreshed against v3.4.1
  * debian/control:
    - libepoxy-dev b-dep added
    - libpotrace-dev b-dep added

 -- Matteo F. Vescovi <email address hidden> Sat, 14 Jan 2023 14:44:55 +0100

[Erich Eickmeyer (eeickmeyer)]

Hi Hans, I have to disagree:

>Explanation of the Ubuntu delta and why it can be dropped:
> * No-change rebuild for python3.11 as default.
> * Merge from Debian unstable. Remaining changes:
> - Build-depend on newer libtbb2-dev instead of libtbb-dev.

>After changing build-dependency and then changing back again, the delta is effectively empty.

Looking at the debian/control file in the upstream [1], I see the older libtbb-dev still being build-depend, meaning the delta is still necessary which means a merge still must be done, albeit with a minimal delta.

[1] https://salsa.debian.org/multimedia-team/blender/-/blob/master/debian/control

[Hans Joachim Desserud (hjd)]

Fair enough. I must admit I'm not familiar with the libtbb-dev changes and I might be missing something here. :)

I am somewhat confused now though. Looks like requestsync skipped a bullet point when listing the Ubuntu delta. Looking at
https://patches.ubuntu.com/b/blender/blender_3.3.1+dfsg-1ubuntu3.patch

My interpretation is that the build dependency was switched from version-less to version2. But then it was later switched back to version-less (although possibly from a different source package).

So based on the diff in the patch above, the only delta I can see is the changelog entries and replacing Maintainer in the control file.

[Erich Eickmeyer (eeickmeyer)]

Unfortunately, requestsync isn't a perfect tool for evaluating merges or syncs. A better tool might be merge-o-matic when determining what the net delta might be, and even then it's not perfect. Manual intervention is often required when merging or evaluating if a wholesale sync is justified. This is why an evaluation from a MOTU (such as myself) or a Core Developer comes along and takes a closer look, which is why I disagreed since we have a slight divergence in build dependencies.

As the change to libtbb2-dev was only made back in August, I'm very reluctant to do a wholesale sync without a great deal of justification. Honestly, I'm surprised the Debian multimedia team didn't make that change.

[Erich Eickmeyer (eeickmeyer)]

After discussing with other devs, I was reminded that libtbb-dev is actually the newer version (from onetbb) and this does, in fact, qualify for a wholesale sync.

[Erich Eickmeyer (eeickmeyer)]

This bug was fixed in the package blender - 3.4.1+dfsg-2

---------------
blender (3.4.1+dfsg-2) unstable; urgency=medium

  * debian/patches/: patchset updated (Closes: #1029006)

 -- Matteo F. Vescovi <email address hidden> Tue, 17 Jan 2023 22:34:10 +0100

blender (3.4.1+dfsg-1) unstable; urgency=medium

  * New upstream release
    - debian/patches/: patchset refreshed against v3.4.1
  * debian/control:
    - libepoxy-dev b-dep added
    - libpotrace-dev b-dep added

 -- Matteo F. Vescovi <email address hidden> Sat, 14 Jan 2023 14:44:55 +0100