sync acetoneiso 2.2.2-2 from debian sid

[Nick Andrik]

Binary package hint: acetoneiso

please sync acetoneiso from version 2.2.1-1ubuntu1 (ubuntu) to version 2.2.2-2 (debian).
it includes a new upstream version and some packaging fixes.

Ubuntu specific changes have been merged in the debian package.

-----------------------------------------------
Here is the corresponding debdiff of the binary packages, the debdiff of the source ones is too long (because of new upstream version):
> debdiff acetoneiso_2.2.1-1ubuntu1_i386.deb acetoneiso_2.2.2-2_i386.deb
File lists identical (after any substitutions)

Control files: lines which differ (wdiff format)
------------------------------------------------
Depends: libc6 (>= 2.3.6-6~), libgcc1 (>= 1:4.1.1), libphonon4 (>= [-4:4.7.0really4.4.1),-] {+4:4.2.0),+} libqt4-dbus (>= [-4:4.7.0~beta1), libqt4-webkit,-] {+4:4.5.3), libqt4-webkit (>= 4:4.5.3),+} libqtcore4 (>= [-4:4.7.0~beta1),-] {+4:4.6.1),+} libqtgui4 (>= [-4:4.7.0~beta1),-] {+4:4.5.3),+} libstdc++6 (>= 4.1.1), phonon, fuseiso, fuse-utils, [-konqueror | nautilus | dolphin-kde4 | konqueror-kde4,-] genisoimage, cdrdao, p7zip-full, gnupg-agent, gnupg2, pinentry-qt4
Installed-Size: [-1596-] {+1624+}
Maintainer: [-Ubuntu Developers <email address hidden>-]
[-Original-Maintainer:-] Nick Andrik <email address hidden>
Suggests: [-mencoder-] {+mencoder, konqueror | nautilus | thunar | dolphin+}
Version: [-2.2.1-1ubuntu1-] {+2.2.2-2+}

[Fabrice Coutadeur (fabricesp)]

This can't be a sync as we modified the package in Ubuntu, and the change should be kept.
Please update this bug report with the corresponding debdiff and put back the status as new

Thanks,
Fabrice

[Nick Andrik (andrikos)]

Fabrice you are right, I hadn't checked the version in maverick

QT Webkit has been removed from libqt4-dev on version 4:4.7.0~beta2-1 and has become an independent package (libqt4-webkit-dev) depending on libqt4-dev. In debian this version of libqt4-* is in experimental for now.

Is this change going to stay for sure? If yes, I can resolve the issue by putting
  libqt4-dev (< 4:4.7.0~beta2-1) | libqt4-webkit-dev,
in the build depends list, have the package uploaded in debian and then ask merge by dropping the ubuntu-specific changes.

What do you think?

PS: I also subscribe Felix to the bug, since he was the one that did the change in ubuntu.

[Felix Geyer (debfx)]

The package libqt4-webkit-dev will be renamed to libqtwebkit-dev (which is used by Debian) very soon.
So I recommend changing the Depends field to "libqt4-dev (<< 4:4.7.0~beta2) | libqtwebkit-dev," in the Debian package.
Once the QtWebkit package has been renamed acetoneiso can be synced.

[Nick Andrik (andrikos)]

I have followed the suggestion from Felix.
The new version 2.2.2-2 from debian should be ok

Is there anything else I should do now?

[Fabrice Coutadeur (fabricesp)]

Hi,

FYI, ss of today, it FTBFS because the libqtwebkit-dev is still named libqt4-webkit-dev.

Fabrice

[Nick Andrik (andrikos)]

Oh, I see.

I thought libqtwebkit-dev was available as of here:
https://launchpad.net/ubuntu/maverick/+package/libqtwebkit-dev

Should I do something in order to have the package sync'ed when the library will be renamed?

Nick

[Felix Geyer (debfx)]

The new qtwebkit packages are in the archive now.

[Launchpad Janitor (janitor)]

This bug was fixed in the package acetoneiso - 2.2.2-2

---------------
acetoneiso (2.2.2-2) unstable; urgency=low

  * debian/control:
    - Added libwebkit-dev build-dependency, since libqt4-dev
      [>= 4:4.7.0~beta2-1] does not included QT Webkit any more

acetoneiso (2.2.2-1) unstable; urgency=low

  * New upstream release
    - added support for Lxde(PCManFM) file manager. Patch provided from Andrea
      Florio
    - splitting an image in multiple parts no longer uses compression
      algorithm (Dominik Dera)
    - fixed a bug that prevented database from listing images when the path
      had accented characters in it
    - fixed bug that ignored saved path destination when downloading a video
      from Youtube (Guido Cordaro)
    - fixed utube.h warnings that occured when compiling sources
    - fixed some filters in qdialogs
    - removed useless qmessagebox warning when mounting an image and file
      manager was set to none
    - updated AcetoneISO.desktop file according to the freedesktop.org
      desktop-entry-spec-1.1. Thanks to Anatoly Lyutin

  * debian/watch:
    - Updated the watch link
  * debian/control:
    - Bumped up standards version to 3.9.0
    - Downgraded the file manager dependency list to suggestion, added thunar
      and dophin and removed dolphin-kde4 and konqueror-kde4
    - Restricted the architecture to linux-any; fuse is not yet available for
      kfreebsd
  * Switch to dpkg-source 3.0 (quilt) format
    - debian/source/format:
      + Added file with "3.0 (quilt)" content
    - debian/rules:
      + Removed patchsys-quilt.mk include
    - debian/control:
      + Removed quilt build-dependency
    - debian/README.source:
      + Removed no longer needed file
  * Changes remaining:
    - Correct Spelling errors:
      + debian/patches/correct-spelling-errors: Fix some typos in the source
        files
      + debian/rules: Generate automatically the updated .qm translation files
    - /debian/paches/change-name-and-version-in-help: Correct the executable
      name and version for when the program is run with the --help argument
    - /debian/paches/add_manpage: Added manpage for the application
 -- Nick Andrik <email address hidden> Wed, 14 Jul 2010 09:49:06 +0200

[Fabrice Coutadeur (fabricesp)]

Hi,

Now it is, but for whatever reason, it still FTBFS. What about inverting the 2 dependencies, so that it take first libqtwebkit-dev first, and if not, libqt4-dev? It seems like as it find libqt4-dev, even if not the right version, it take it always.

Thanks,
Fabrice

[Nick Andrik (andrikos)]

I subscribed also Michael in this bug since he made the last ubuntu specific changes in the package.

I have prepared the -3 revision with the dependency line like this:
  libqtwebkit-dev | libqt4-dev (<< 4:4.7.0~beta2),
I tried this in my PPA for both maverick and lucid and it seems to be ok (you can check the packages in my PPA).

This package will be uploaded on debian experimental and when libqtwebkit-dev moves to sid it will also move there. Is it possible to sync from experimental or do we need to wait for the package to enter the sid distribution?

Nick

[Michael Bienia (geser)]

Yes, it is possible to sync (or merge) from experimental.

The current Ubuntu changes are needed because of bugs in the Ubuntu infrastructure:
- bug 594916: buildd doesn't correctly check versioned ORed build-dependencies
- bug 605002: Soyuz doesn't accept upload with "Architecture: linux-any"

Changing the order of the build dependencies works around the first problem but the second still remains. So we would need to merge -3 from experimental to replace "linux-any" to "any" as else we don't get any buildds in Ubuntu currently.

[Nick Andrik (andrikos)]

OK, in this point I guess that the best route is to leave things as they are now.

When #605002 (and/or #604981) get fixed we can drop the ubuntu specific changes and sync with the -3 revision.
Until then, I am closing this bug, since the 2.2.2-2 version has been merged and this is the important from a user prespective.

Nick