Feature #9358

Delete icons which we do not use from liveusb-creator

Added by Anonymous 2015-05-07 21:41:00 . Updated 2015-07-19 05:44:18 .

Status:
Resolved
Priority:
Normal
Assignee:
Category:
Installation
Target version:
Tails_1.5
Start date:
2015-05-07
Due date:
% Done:

100%

Feature Branch:
451f:liveusb-creator:feature/gtk3+9358-noicons
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Installer
Deliverable for:

Description

Don’t install the upstream fedora icons in the binary package. => OK, verified by:

dpkg --contents  liveusb-creator_3.11.6+tails1-16+jessie3_all.deb

Check licensing compatibility so that we don’t have to drop them from the source package .

Subtasks

History

#1 Updated by intrigeri 2015-05-07 23:12:10

  • Status changed from New to Confirmed
  • Target version set to Tails_1.4

#2 Updated by Anonymous 2015-05-08 10:28:11

I’ve sent an email to the upstream author in the meantime as i could not find any other info as of now.

#3 Updated by intrigeri 2015-05-08 11:03:34

What exact file is this ticket about? (I see the Git tree currently contains 7 PNG files and 1 SVG file, not sure which ones we’re using.)

#4 Updated by Anonymous 2015-05-08 13:45:22

All icons only exist in the source package, except one which the binary will install to /usr/share/pixmaps/usb-creator-gtk.svg which actually seems to be a creation by Ubuntu, according to the commit message “Import Ubuntu’s usb-creator icon.” According to https://bazaar.launchpad.net/~usb-creator-hackers/usb-creator/trunk/view/head:/debian/copyright this file is GPL3 and © Canonical.

Oh and we install this file but we do not use it from what i can tell. => update: that is actually incorrect.

So I guess i should delete those files either via postinst or using the Files-Exluded directive. What do you think is the better approach? On the long term, they should probably be deleted from the upstream source.

#5 Updated by intrigeri 2015-05-08 14:15:43

> All icons only exist in the source package,

I don’t think that’s correct: at least tails-liveusb-header.png is definitely used in the UI. IIRC, such data files are embedded in liveusb/resources_rc.py, that’s generated/updated with make gui, which is apparently configured by data/resources.qrc. See the gui target in Makefile for details.

While we’re at it, the files we don’t actually use (if any) could be dropped from resources.qrc and in turn from resources_rc.py.

> except one which the binary will install to /usr/share/pixmaps/usb-creator-gtk.svg which actually seems to be a creation by Ubuntu, according to the commit message “Import Ubuntu’s usb-creator icon.”

FYI, README has clear copyright and licensing information about that file :)

#6 Updated by Anonymous 2015-05-08 14:51:51

intrigeri wrote:
> > All icons only exist in the source package,
>
> I don’t think that’s correct: at least tails-liveusb-header.png is definitely used in the UI. IIRC,

Correct.

> such data files are embedded in liveusb/resources_rc.py, that’s generated/updated with make gui, which is apparently configured by data/resources.qrc. See the gui target in Makefile for details.
>
> While we’re at it, the files we don’t actually use (if any) could be dropped from resources.qrc and in turn from resources_rc.py.

There are 2 files in there which do not seem to be used anywhere indeed. I can try to tackle that.

> > except one which the binary will install to /usr/share/pixmaps/usb-creator-gtk.svg which actually seems to be a creation by Ubuntu, according to the commit message “Import Ubuntu’s usb-creator icon.”
>
> FYI, README has clear copyright and licensing information about that file :)

Indeed…

This icon file is used on by GNOME as an icon for Tails installer, so we need to keep it.

#7 Updated by intrigeri 2015-05-09 04:18:13

  • Status changed from Confirmed to In Progress

#8 Updated by Anonymous 2015-05-12 06:59:49

  • % Done changed from 0 to 10

The logos in the source are CC-BY-SA (that is dfsg compatible): https://github.com/lmacken/liveusb-creator/commit/1bc9210577cdb1e544768effad1c273b222cb02b

#9 Updated by Anonymous 2015-05-12 20:31:12

  • Tracker changed from Bug to Feature
  • Target version changed from Tails_1.4 to Tails_1.4.1

#10 Updated by Anonymous 2015-06-28 10:03:37

  • Target version changed from Tails_1.4.1 to Tails_1.5

#11 Updated by intrigeri 2015-07-04 03:13:37

  • blocks #8538 added

#12 Updated by Anonymous 2015-07-04 08:35:51

u wrote:
> intrigeri wrote:
> > > All icons only exist in the source package,
> >
> > I don’t think that’s correct: at least tails-liveusb-header.png is definitely used in the UI. IIRC,
>
> Correct.
>
> > such data files are embedded in liveusb/resources_rc.py, that’s generated/updated with make gui, which is apparently configured by data/resources.qrc. See the gui target in Makefile for details.
> >
> > While we’re at it, the files we don’t actually use (if any) could be dropped from resources.qrc and in turn from resources_rc.py.
>
> There are 2 files in there which do not seem to be used anywhere indeed. I can try to tackle that.

Probably no need anymore to take this out because we are porting the installer to GTK3.

#13 Updated by Anonymous 2015-07-04 08:40:24

  • Subject changed from Check licensing compatibility of upstream icons to Delete icons which we do not use from liveusb-creator

As we port the whole thing to GTK3 now, we shall simply delete the images which we do not use.

#14 Updated by Anonymous 2015-07-06 02:43:29

  • Assignee set to intrigeri
  • % Done changed from 10 to 20
  • QA Check set to Ready for QA
  • Feature Branch set to 451f:liveusb-creator:feature/gtk_noicons

#15 Updated by intrigeri 2015-07-06 04:36:17

  • Category set to Installation
  • Assignee deleted (intrigeri)
  • QA Check changed from Ready for QA to Dev Needed
  • Feature Branch changed from 451f:liveusb-creator:feature/gtk_noicons to 451f:liveusb-creator:feature/gtk3_noicons

Apparently, this branch deletes data/usb-creator-gtk.svg, that is used in the .desktop file.

#16 Updated by Anonymous 2015-07-06 05:00:11

  • Assignee set to intrigeri
  • QA Check changed from Dev Needed to Ready for QA
  • Feature Branch changed from 451f:liveusb-creator:feature/gtk3_noicons to 451f:liveusb-creator:feature/gtk3+9358-noicons

created a new branch.

#17 Updated by intrigeri 2015-07-06 06:08:06

  • Assignee deleted (intrigeri)
  • % Done changed from 20 to 70
  • QA Check changed from Ready for QA to Dev Needed

Merged into liveusb-creator:feature/gtk3, with a fix (commit 2c181fc) on top. However:

  • data/refresh.png isn’t used anymore, why keep it?
  • same for data/liveusb-creator-nsi.bmp

#18 Updated by Anonymous 2015-07-14 04:22:49

  • Assignee set to intrigeri
  • QA Check changed from Dev Needed to Ready for QA

#19 Updated by intrigeri 2015-07-18 04:50:27

  • Assignee deleted (intrigeri)
  • QA Check changed from Ready for QA to Dev Needed

I see no change that I haven’t merged yet on your branch, which currently doesn’t address the concerns I’ve raised on Feature #9358#note-17. Maybe you forgot to push it?

#20 Updated by Anonymous 2015-07-18 07:58:32

deleted the two other unused images you mentioned and repushed.

#21 Updated by Anonymous 2015-07-18 07:58:42

  • Assignee set to intrigeri
  • QA Check changed from Dev Needed to Ready for QA

#22 Updated by intrigeri 2015-07-18 08:09:28

  • Assignee deleted (intrigeri)
  • QA Check changed from Ready for QA to Dev Needed

u wrote:
> deleted the two other unused images you mentioned and repushed.

I still see data/refresh.png on your branch => please remove it (and of course, test). Thanks!

#23 Updated by Anonymous 2015-07-19 05:26:49

  • Assignee set to intrigeri
  • QA Check changed from Dev Needed to Ready for QA

there we go again.

#24 Updated by intrigeri 2015-07-19 05:44:18

  • Status changed from In Progress to Resolved
  • Assignee deleted (intrigeri)
  • % Done changed from 70 to 100
  • QA Check changed from Ready for QA to Pass

Yay, merged!