Merge 0.11.0-3 from Debian Sid

Bug #1635701 reported by Simon Quigley
10
This bug affects 1 person
Affects Status Importance Assigned to Milestone
lxqt-l10n (Ubuntu)
Fix Released
Undecided
Unassigned
lxqt-session (Ubuntu)
Fix Released
Undecided
Unassigned

Bug Description

To start getting LXQt 0.11 into the Ubuntu Archive, we need to merge liblxqt 0.11.0-2 from Debian Sid.

Simon Quigley (tsimonq2)
Changed in liblxqt (Ubuntu):
assignee: nobody → Simon Quigley (tsimonq2)
status: New → In Progress
Revision history for this message
Simon Quigley (tsimonq2) wrote :

Julien, since you were the last person who uploaded, I'm wondering if a manual merge is still needed or if we can just sync.

It seems the translations were moved to lxqt-l10n, so we might not need liblxqt-data any more.

What do you think?

Revision history for this message
Julien Lavergne (gilir) wrote :

It will probably be possible to sync it directly, I just worry about the soname management. Could you do a diff between the current version on Ubuntu and the one in Debian, and include it here for review ?

Regarding the replacement of liblxqt-data, it's probably the lxqt-l10n package which need an additional conflicts / replaces with liblxqt-data

Revision history for this message
Simon Quigley (tsimonq2) wrote :

Hey Julien,

We don't currently have liblxqt 0.11.0-* in the Ubuntu archive, only 0.10.0-*, but here's the output you wanted anyways:

$ debdiff liblxqt_0.10.0-1ubuntu1.dsc liblxqt_0.11.0-2.dsc | pastebinit
http://paste.ubuntu.com/23371596/

 > Regarding the replacement of liblxqt-data, it's probably the lxqt-l10n package which need an
 > additional conflicts / replaces with liblxqt-data

I'll see if I can figure this out.

Revision history for this message
Julien Lavergne (gilir) wrote :

Thanks, the diff looks OK, except for 2 things :

It needs libqtxdg 2.0, so it needs to be sync before liblxqt (See https://launchpad.net/ubuntu/+source/libqtxdg)

There is 2 missings symbols between the 2 versions (see the diff) :
- (c++)"LXQt::PageSelectWidget::sizeHint() const@Base" 0.9.0+20150911
- (c++)"LXQt::ScreenSaver::xdgProcess_finished(int, QProcess::ExitStatus)@Base" 0.9.0+20150911

Usually, that needs a soname bump, but upstream didn't do it, and Debian didn't force it either. But, since liblxqt is only used in LXQt, and we are going to rebuild all the components, that's not a big issue.

When libqtxdg is synced in z, you can test build liblxqt, and if it's OK, it can be sync also.

Jeremy Bícha (jbicha)
affects: liblxqt (Ubuntu) → lxqt-l10n (Ubuntu)
Changed in lxqt-l10n (Ubuntu):
assignee: Simon Quigley (tsimonq2) → nobody
status: In Progress → Fix Committed
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package lxqt-session - 0.11.0-2ubuntu1

---------------
lxqt-session (0.11.0-2ubuntu1) zesty; urgency=medium

  * Sync with Debian (LP: #1635701). Remaining changes:
    - debian/control: Don't depend on lxqt-common
    - debian/postinst & debian/prerm
      + Use lxqt-session directly, so lxqt-common is not a hard dependency.

lxqt-session (0.11.0-2) unstable; urgency=medium

  * Cherry-picking upstream release 0.11.0
  * Synced debian foo with experimental
  * Bumped Standards to 3.9.8, no changes needed
  * Bumped compat to 10
  * Removed --parallel from rules, standard in compat 10
  * Bumped build dependency debhelper (>= 10)
  * Bumped minimum version libqtxdg-dev (>= 2.0.0)
  * Bumped minimum version liblxqt-dev (>= 0.11.0)
  * Added build dependency libqt5svg5-dev
  * Added build dependency libqtxdgiconloader-dev
  * Added build dependency xdg-user-dirs
  * Move Pre-Depends lxqt-common to Depends
  * Added Depends x11-xkb-utils
  * Added Recommends lxqt-session-l10n
  * Fixed copyrights Format field to https
  * Fixed VCS fields, using plain /git/
  * Fixed VCS fields, point to the right branch
  * Added new files and license to copyright
  * Changed LIBUDEV_MONITOR to WITH_LIBUDEV
  * Added translation control to rules
  * Set CMAKE_BUILD_TYPE=RelWithDebInfo
  * Exported LC_ALL=C.UTF-8, make builds reproducible

 -- Jeremy Bicha <email address hidden> Wed, 14 Dec 2016 11:37:32 -0500

Changed in lxqt-session (Ubuntu):
status: New → Fix Released
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package lxqt-l10n - 0.11.1-1ubuntu2

---------------
lxqt-l10n (0.11.1-1ubuntu2) zesty; urgency=medium

  * Add a liblxqt-data transitional package too to ease upgrades
    (LP: #1635701)

 -- Jeremy Bicha <email address hidden> Wed, 14 Dec 2016 02:51:18 -0500

Changed in lxqt-l10n (Ubuntu):
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.