Merge lp://staging/~xnox/ubuntu/quantal/bombono-dvd/boost1.49 into lp://staging/ubuntu/quantal/bombono-dvd

Proposed by Dimitri John Ledkov
Status: Merged
Merge reported by: Dimitri John Ledkov
Merged at revision: not available
Proposed branch: lp://staging/~xnox/ubuntu/quantal/bombono-dvd/boost1.49
Merge into: lp://staging/ubuntu/quantal/bombono-dvd
Diff against target: 656 lines (+576/-10)
7 files modified
.pc/01_glib.patch/src/mgui/author/gb_devices.c (+526/-0)
.pc/applied-patches (+1/-0)
debian/changelog (+15/-0)
debian/control (+4/-4)
debian/patches/01_glib.patch (+29/-0)
debian/patches/series (+1/-0)
src/mgui/author/gb_devices.c (+0/-6)
To merge this branch: bzr merge lp://staging/~xnox/ubuntu/quantal/bombono-dvd/boost1.49
Reviewer Review Type Date Requested Status
Oliver Grawert Approve
Didier Roche-Tolomelli Needs Information
Ubuntu branches Pending
Review via email: mp+107730@code.staging.launchpad.net

Description of the change

 bombono-dvd (1.2.1-0ubuntu3) quantal; urgency=low
 .
   * Bump standards version to 3.9.3
   * Build-depend on unversioned boost libraries:
     libboost-filesystem1.46-dev -> libboost-filesystem-dev
     libboost-regex1.46-dev -> libboost-regex-dev
   * debian/patches/01_glib.patch: Cherrypick a patch from upstream to fix
     FTBFS with new glib.
   * Move desktop file, mime and icons from bombono-dvd-data to
     bombono-dvd. This fixes lintian desktop-command-not-in-package, and
     should make MIME & software centre integration to work correctly.
   * Adjust breaks & replaces to <= 1.2.1-ubuntu2, because of above.
   * Add python dependency to bombono-dvd-data to fix lintian error
     python-script-but-no-python-dep. It could be overridden, but this
     dependency doesn't hurt.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Hey Dmitrijs, thanks for this patch and help to make ubuntu better.

However, I'm not a fan on the change of moving for arch independent files from -data to bombono-dvd package. I think the lintian warning about "no desktop file in the package" should be overriden IMHO as bombono-dvd dep on bombono-dvd-data. What's the issue exactly on software-center? Can we fix it?

review: Needs Information
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

On 30/05/12 09:33, Didier Roche wrote:
> Review: Needs Information
>
> Hey Dmitrijs, thanks for this patch and help to make ubuntu better.
>
> However, I'm not a fan on the change of moving for arch independent
> files from -data to bombono-dvd package. I think the lintian warning
> about "no desktop file in the package" should be overriden IMHO as
> bombono-dvd dep on bombono-dvd-data. What's the issue exactly on
> software-center? Can we fix it?
>

I'm not a fan of moving files from -all to -any package, either.

software-package-data & mime-data scan individual packages and extact
binaries, desktop files, icons & mime data.

I know before it happened to me with Xiphos, because packages which do
not have both:
 - binary in /usr/bin
 - and desktop file
where not considered as 'apps', their icon did not show up in the
software centre, and it ends up as 'advance app' without an icon. Mime
finding also did not work, because it would install -all package,
instead of -any package, which actually has the binary to open the
project file.

I would test software-centre, but it is currently crashing for me (there
are bugs reported / uploads pending).

--
Regards,
Dmitrijs.

14. By Dimitri John Ledkov

* debian/control:
  + Bump standards version to 3.9.3
  + Build-depend on unversioned boost libraries:
    libboost-filesystem1.46-dev -> libboost-filesystem-dev
    libboost-regex1.46-dev -> libboost-regex-dev
  + Add python dependency to bombono-dvd-data to fix lintian error
    python-script-but-no-python-dep. It could be overridden, but this
    dependency doesn't hurt.
* debian/patches/01_glib.patch:
  + Cherrypick a patch from upstream to fix FTBFS with new glib.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

> Hey Dmitrijs, thanks for this patch and help to make ubuntu better.
>
> However, I'm not a fan on the change of moving for arch independent files from
> -data to bombono-dvd package. I think the lintian warning about "no desktop
> file in the package" should be overriden IMHO as bombono-dvd dep on bombono-
> dvd-data. What's the issue exactly on software-center? Can we fix it?

Ok, there is no issue with software-center it correctly shows bombono-dvd app, even though the desktop file is in the 'technical' package -data. So software-centre has improved archive parsing functionality.

I have reverted the changes of moving files about.

I did not add the lintian overrides.

Please consider uploading this revision.

Revision history for this message
Oliver Grawert (ogra) wrote :

looks fine, uploaded ...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches