Please merge uswsusp 0.8-1.2 (universe) from Debian unstable (main)

Bug #604910 reported by Bilal Akhtar
14
This bug affects 1 person
Affects Status Importance Assigned to Milestone
uswsusp (Ubuntu)
Fix Released
Wishlist
Unassigned

Bug Description

Binary package hint: uswsusp

Please review attached debdiffs.

Tags: patch

Related branches

Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

Will use requestsync in the future.

Changed in uswsusp (Ubuntu):
importance: Undecided → Wishlist
Revision history for this message
Fabrice Coutadeur (fabricesp) wrote :

Hi,

Actually, looking at the source, we still have some differences in debian/rules (--enabe-usplash instead of --enable-splashy and do not run debconf-updatepo), and we still apply the patch, so could you please check with Devid Antonio Filoni if it's ok to sync and loose this changes?

I think it should be ok to sync, as I assume that if we want to get rid of usplash, this include --enable in configure, the patch, .. and not running debconf-updatepo is not enough for justifying to diverge, but I think it's better to check with him.

Thanks,

Fabrice

Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

ok, I have mailed him and have subscribed Devid to this bug as well.

Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

No reply from Devid. What should we do? Fabrice, please see for yourself if this is ok. IMHO, it should be good.

Revision history for this message
Stefano Rivera (stefanor) wrote :

It doesn't build, so a sync is out of the question:

The following packages have unmet dependencies:
  pbuilder-satisfydepends-dummy: Depends: libsplashy1-dev which is a virtual package.

Changed in uswsusp (Ubuntu):
status: New → Incomplete
Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

Wierd, I cannot figure out why build fails.

Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

Package libsplashy1-dev is very much in maverick.

Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

Nope, my problem. We still need to go ahead with a merge.

summary: - Please sync uswsusp 0.8-1.2 (universe) from Debian unstable (main)
+ Please merge uswsusp 0.8-1.2 (universe) from Debian unstable (main)
description: updated
Changed in uswsusp (Ubuntu):
status: Incomplete → Confirmed
Revision history for this message
Stefano Rivera (stefanor) wrote :

 Um, why do we add a disabled patch?

Changed in uswsusp (Ubuntu):
status: Confirmed → Incomplete
Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

What do you mean by 'disabled' patch?

Revision history for this message
Fabrice Coutadeur (fabricesp) wrote :

A patch that is not installed (commented out in the series file): this is what is happening with the usplash_support.patch patch. So this patch should not be added in the merge package.

Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

Fabrice and Stefano,
Perhaps this patch *may* be needed in a future version. Its just disabled. It is not being applied, so I think its fine to include it in the package but disable it.

Changed in uswsusp (Ubuntu):
status: Incomplete → Confirmed
Revision history for this message
Fabrice Coutadeur (fabricesp) wrote :

This is not a version we want in Ubuntu. Debian is blocking it because of several critical bugs:
Debian bug 550725 in uswsusp "uswsusp: Cases serious corruption on Ext4, with swap image file" [Critical,Open] http://bugs.debian.org/550725
Debian bug 503337 in uswsusp "On upgrades the default power off mode ends up as reboot" [Serious,Open] http://bugs.debian.org/503337

Putting as incomplete, until it's clear that at least those bugs got fixed.

Sorry,
Fabrice

Changed in uswsusp (Ubuntu):
status: Confirmed → Incomplete
Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

I would like to point out a few things here:

1) The linked debian bugs are valid for the current version as well.

2) The current maverick package suggests 'splashy' (a package that has been removed from Ubuntu) and has --enable-usplash in debian/rules, while usplash support has been removed from the package already.

3) After all, the debian version we are merging is fixing a bug tracked in BTS!

Changed in uswsusp (Ubuntu):
status: Incomplete → Confirmed
Revision history for this message
Stefano Rivera (stefanor) wrote :

Bilal, if you want to go ahead with this, remove the disabled patch completely. It's in our bzr history now, can be found if needed again.

Revision history for this message
Stefano Rivera (stefanor) wrote :

Unsubscribing sponsors, please resubscribe when ready.

Changed in uswsusp (Ubuntu):
status: Confirmed → Incomplete
Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

Stefano,
The disabled patch was removed before you commented about it. The merge is ready.

Changed in uswsusp (Ubuntu):
status: Incomplete → Confirmed
Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

The only change between this patch and the one before comment 18 is that by email address in the changelog has been changed to reflect my ubuntu membership.

Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package uswsusp - 0.8-1.2ubuntu1

---------------
uswsusp (0.8-1.2ubuntu1) maverick; urgency=low

  * Merge from debian unstable. (LP: #604910) Remaining changes:
    - Remove splashy support from debian/rules.
    - Remove splashy from Suggests.
    - Remove libsplashy1-dev from Build-Depends.
    - debian/rules: don't run debconf-updatepo in clean target.
 -- Bilal Akhtar <email address hidden> Sun, 08 Aug 2010 11:47:01 +0530

Changed in uswsusp (Ubuntu):
status: Confirmed → Fix Released
tags: added: patch
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.