Please Merge icon-slicer 0.3-2 (universe) from Debian unstable (main).

Bug #385066 reported by Charlie_Smotherman
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
icon-slicer (Debian)
Fix Released
Unknown
icon-slicer (Ubuntu)
Fix Released
Wishlist
Unassigned

Bug Description

Please merge icon-slicer 0.3-2 (universe) from Debian unstable (main).

Explanation of the Ubuntu delta and why it can be dropped:
The Delta was created by a new version included into Ubuntu.
debian/compat
 Upstream bumped debian/compat to 6
debian/copyright
 Upstream has changed to the porposed machine readable format.
debian/watch
 The only changes where the additon of a comment and the
 manipulation of white space
debian/control
 The sentence length of the long discription has been manipulated
 by upstream to maintain 80 chart length.
 Upstream added Vcs fields
 Package now Build-Depends on cdbs, devscripts, dh_buildinfo, help2man
 Upstream dropped Build-Depends on xbase-client
 Upstream changed the Section to devel

The only remaining change that needs to be kept is the src/main.c change that fixes Hotspot ignoring the y coordinate.

Changelog since current karmic version 0.3-1ubuntu3:

icon-slicer (0.3-2) unstable; urgency=low

  * Remove TopGit noise (from merged-in cdbs-skel).
  * Tighten build-dependency on debhelper.

 -- Jonas Smedegaard <email address hidden> Tue, 05 May 2009 14:29:17 +0200

Changed in icon-slicer (Ubuntu):
importance: Undecided → Wishlist
Revision history for this message
Daniel Holbach (dholbach) wrote :

Did you get in touch with Arvind Autar to see if he's OK with getting the package overwritten?

Also: what about the change in src/main.c? The Debian version does not have it:
- * Bug fix for creating cursors using a separate hotspot
- image file. Fixes issue where hotspot was created in the wrong place.
- (LP: #339044)

summary: - Sync icon-slicer 0.3-2 (universe) from Debian unstable (main).
+ Please Merge icon-slicer 0.3-2 (universe) from Debian unstable (main).
description: updated
Revision history for this message
Charlie_Smotherman (cjsmo) wrote :

I checked the debian 0.3-2.orig.tar.gz and 0.3-2.diff.gz for the src/main.c fix and found that it is not present. AFAIK the patch in LP #339044 was never sent to the debian maintainer.

The src/main.c fix was introduced in the 0.3-1ubuntu3 upload as a direct edit of the source (LP: #339044). For me to reflect this change in the 0.3-2ubuntu1 merge I had to introduce a patch system. The scr/main.c change is now represented in the 0.3-2ubuntu1.diff.gz.

Attaching icon-slicer_1ubuntu3_2ubuntu1_diff which shows the differences between 0.3-1ubuntu1 and 0.3-2ubuntu1
Attaching icon-slicer_0.3-2_2ubuntu1_diff which shows the differences between 0.3-2 and 0.3-2ubuntu1.

Revision history for this message
Charlie_Smotherman (cjsmo) wrote :
Revision history for this message
Charlie_Smotherman (cjsmo) wrote :
Revision history for this message
Charlie_Smotherman (cjsmo) wrote :

It seems that Arvind Autar no longer maintains icon-slicer, it is now maintained by the Debian QA collaborative maintenance team. I checked to see if the src/main.c patch was included upstream at http://git.debian.org/?p=collab-maint/icon-slicer.git;a=blob;f=src/main.c;h=4f5056a7e77fa850261e1ac4bf32aff063008dbd;hb=dcb0ac6d639534a2475de1e3a6b3dc84d7c3eb83 and it seems this patch was never forwarded upstream

Revision history for this message
Charlie_Smotherman (cjsmo) wrote :

Wow!! Thanks to Jonas Smedegaard, a new version of icon-slicer is now available in debian with the main.c patch (thx Tim Swast) included (please see debian bug). Setting this bug to fix released. icon-slicer-0.3-3 should be picked up during the next auto-sync. Thanks dholbach for all your help. :)

Charlie Smotherman

Changed in icon-slicer (Ubuntu):
status: New → Fix Released
Changed in icon-slicer (Debian):
status: Unknown → 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.