Merge lp:~cyphermox/ubuntu-mono/secure-icons into lp:~ubuntu-art-pkg/ubuntu-mono/trunk

[Mathieu Trudel-Lapierre]

Add a script (written with the big help of Paul Sladen) to composite new icons at install time for nm-applet: those will be the icons used for VPN and secure wireless networks since they cannot be composited dynamically by nm-applet when using libappindicator.

[Paul Sladen (sladen)]

I thinking was at package build time, rather than package postinst, but lets give it a whirl and see what happens, and need to sanity check what happens at package removal.

It's probably possible to simply down to something like:

  for icon in ubuntu-mono-{dark,light}/{22,24}/nm-signal-{00,25,50,75,100} ; do
      .../scavenge.py -o $(icon)-secure.svg $(icon).svg $(padlock).svg
  done

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

Ack, very right, this is missing a prerm or postrm script to clean up the additional files.

I had understood from our discussion that you meant package postinst, not build time -- if we want to deal with build time simply it will increase the package's (deb) size slightly, but then we won't need to ship the scavenge script separately from a possible svgtools bundle. It's easy to just add the new files to the bzr branch directly.

In light of trying to avoid increasing size unnecessarily, I'd be for shipping "reusable parts" that can be composited to create the full set of icons, but I'm not sure how much this is scalable, feasible, etc. I think it can probably complicate things or at least the impact of simple changes across the icon set.

[Paul Sladen (sladen)]

Yes, I've fixed up debian/copyright, moved the script and added a prerm aswell as postinst handling for abort, but at the moment I'm experimenting with rewriting it as a Makefile so that they files are included in the package (don't worry, compression will nullify the increase) and on the LiveCD the files have already been postinsted anyway.

review: Needs Fixing

[Paul Sladen (sladen)]

Merged and sponsored with tweaks:

ubuntu-mono (0.0.24) natty; urgency=low

  * scavenge.py, debian/install: Add and install new scavenge.py script to
    patch multiple svg icons together.
  * ubuntu-mono.postinst: call scavenge.py to generate "secure" icons for
    nm-applet to use for VPNs and to denote wireless security.
  * debian/control: add a python Depends for the compositor script.

  [Paul Sladen]
  * debian/copyright: mention GPL-3+ for debian/scavenge.py
  * Makefile: replace postinst/prerm with Makefile

 -- Mathieu Trudel-Lapierre <email address hidden> Wed, 05 Jan 2011 09:15:31 -0500

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-15 12:37:21 +0000
+++ debian/changelog	2011-01-05 17:35:11 +0000
@@ -1,3 +1,13 @@
+ubuntu-mono (0.0.24) UNRELEASED; urgency=low
+
+  * scavenge.py, debian/install: Add and install new scavenge.py script to
+    patch multiple svg icons together.
+  * ubuntu-mono.postinst: call scavenge.py to generate "secure" icons for
+    nm-applet to use for VPNs and to denote wireless security.
+  * debian/control: add a python Depends for the compositor script.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 05 Jan 2011 09:15:31 -0500
+
 ubuntu-mono (0.0.23) natty; urgency=low
 
   * debian/control: Add Vcs-Bzr.
 
=== modified file 'debian/control'
--- debian/control	2010-11-15 12:37:02 +0000
+++ debian/control	2011-01-05 17:35:11 +0000
@@ -13,7 +13,8 @@
 Depends: ${misc:Depends},
          humanity-icon-theme,
          gnome-icon-theme,
-         hicolor-icon-theme
+         hicolor-icon-theme,
+         python
 Description: Ubuntu Mono Icon theme
  Dark and Light panel icons to make your desktop beautiful
 
 
=== modified file 'debian/install'
--- debian/install	2010-03-04 11:27:44 +0000
+++ debian/install	2011-01-05 17:35:11 +0000
@@ -1,1 +1,2 @@
 ubuntu-mono-dark ubuntu-mono-light LoginIcons usr/share/icons
+scavenge.py usr/share/ubuntu-mono/tools
 
=== added file 'debian/ubuntu-mono.postinst'
--- debian/ubuntu-mono.postinst	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-mono.postinst	2011-01-05 17:35:11 +0000
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+set -e
+
+compositor=/usr/share/ubuntu-mono/tools/scavenge.py 
+
+case $1 in
+	configure)
+		# Post-process additional icons to composite.
+		for type in light dark; do
+			for iconsize in \
+			/usr/share/icons/ubuntu-mono-$type/status/22 \
+			/usr/share/icons/ubuntu-mono-$type/status/24 \
+			;
+			do
+				$compositor -o $iconsize/nm-device-wired-secure.svg  \
+					$iconsize/nm-device-wired.svg \
+					$iconsize/nm-vpn-lock.svg
+				$compositor -o $iconsize/nm-signal-00-secure.svg \
+					$iconsize/nm-signal-00.svg \
+					$iconsize/nm-vpn-lock.svg
+				$compositor -o $iconsize/nm-signal-25-secure.svg \
+					$iconsize/nm-signal-25.svg \
+					$iconsize/nm-vpn-lock.svg
+				$compositor -o $iconsize/nm-signal-50-secure.svg \
+					$iconsize/nm-signal-50.svg \
+					$iconsize/nm-vpn-lock.svg
+				$compositor -o $iconsize/nm-signal-75-secure.svg \
+					$iconsize/nm-signal-75.svg \
+					$iconsize/nm-vpn-lock.svg
+				$compositor -o $iconsize/nm-signal-100-secure.svg \
+					$iconsize/nm-signal-100.svg \
+					$iconsize/nm-vpn-lock.svg
+				$compositor -o $iconsize/gsm-3g-none-secure.svg \
+					$iconsize/gsm-3g-none.svg \
+					$iconsize/nm-vpn-lock.svg
+				$compositor -o $iconsize/gsm-3g-low-secure.svg \
+					$iconsize/gsm-3g-low.svg \
+					$iconsize/nm-vpn-lock.svg
+				$compositor -o $iconsize/gsm-3g-medium-secure.svg \
+					$iconsize/gsm-3g-medium.svg \
+					$iconsize/nm-vpn-lock.svg
+				$compositor -o $iconsize/gsm-3g-high-secure.svg \
+					$iconsize/gsm-3g-high.svg \
+					$iconsize/nm-vpn-lock.svg
+				$compositor -o $iconsize/gsm-3g-full-secure.svg \
+					$iconsize/gsm-3g-full.svg \
+					$iconsize/nm-vpn-lock.svg
+			done
+			update-icon-caches /usr/share/icons/ubuntu-mono-$type
+		done
+		;;
+	*)
+		;;
+esac
 
=== added file 'scavenge.py'
--- scavenge.py	1970-01-01 00:00:00 +0000
+++ scavenge.py	2011-01-05 17:35:11 +0000
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+# Copyright 2011 Canonical Ltd.  Distributed under the terms of the GNU GPLv3 or later.
+# Combines multiple SVG files into a single SVG in batch mode
+# 2011-01-04 Mathieu Trudel-Lapierre <[e-mail]>
+# 2011-01-05 Paul Sladen <[e-mail]>
+
+import xml.dom.minidom
+import sys
+import optparse
+
+def commandline():
+    # Parse commandline
+    parser = optparse.OptionParser(usage = '%prog [options] INPUT.svg [MOREINPUT.svg] -o OUTPUT.svg')
+    parser.add_option("-n", "--dry-run", dest = "do_write",
+                      default = True, action = "store_false",
+                      help = "dry run: do not write output file, just test")
+    parser.add_option("-o", "--output", dest = "output",
+                      help = "full output path for processed SVG file")
+    options, args = parser.parse_args()
+
+    # Validate
+    if len(args) < 1:
+        parser.error("one or more input SVG files required")
+    if options.do_write and not options.output:
+        parser.error("SVG output filename required")
+
+    return options, args
+
+def main():
+    options, args = commandline()
+
+    # Open first SVG and then composite others on top as overlays
+    base = xml.dom.minidom.parse(args[0])
+    newline = lambda: base.createTextNode('\n')
+
+    for overlay in args[1:]:
+        comment = base.createComment(" imported from '%s' " % overlay)
+        dom = xml.dom.minidom.parse(overlay)
+
+        # Pull-in '<svg>' tag, clear attributes and rename to '<g>'
+        g = base.importNode(dom.getElementsByTagName("svg")[0], deep = True)
+        [g.removeAttribute(k) for k in g.attributes.keys() if k != 'id']
+        g.tagName = 'g'
+
+        # Insert into first SVG with comments and spacing
+        for node in newline(), comment, newline(), g, newline():
+            base.documentElement.appendChild(node)
+
+    if options.do_write:
+        base.writexml(open(options.output, "w"))
+
+if __name__=='__main__':
+    main()