From ab32f305929c4da515616e61890f0d638b06fb33 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Mon, 5 Aug 2019 04:05:43 +0200
Subject: [pkg] cleanup icons

---
 branding/assets/riseup/icon.bmp                | Bin 0 -> 65674 bytes
 branding/assets/riseup/icon.icns               | Bin 4286 -> 1359609 bytes
 branding/assets/riseup/riseupvpn.icns          | Bin 1359609 -> 0 bytes
 branding/assets/riseup/riseupvpn.ico           | Bin 4286 -> 0 bytes
 branding/templates/debian/app.desktop-template |   2 +-
 branding/templates/osx/generate.py             |   2 +-
 branding/templates/windows/template.nsi        |   2 +-
 7 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 branding/assets/riseup/icon.bmp
 mode change 100755 => 100644 branding/assets/riseup/icon.icns
 delete mode 100644 branding/assets/riseup/riseupvpn.icns
 delete mode 100755 branding/assets/riseup/riseupvpn.ico

(limited to 'branding')

diff --git a/branding/assets/riseup/icon.bmp b/branding/assets/riseup/icon.bmp
new file mode 100644
index 0000000..9e918e4
Binary files /dev/null and b/branding/assets/riseup/icon.bmp differ
diff --git a/branding/assets/riseup/icon.icns b/branding/assets/riseup/icon.icns
old mode 100755
new mode 100644
index c65c9e1..b4c9a20
Binary files a/branding/assets/riseup/icon.icns and b/branding/assets/riseup/icon.icns differ
diff --git a/branding/assets/riseup/riseupvpn.icns b/branding/assets/riseup/riseupvpn.icns
deleted file mode 100644
index b4c9a20..0000000
Binary files a/branding/assets/riseup/riseupvpn.icns and /dev/null differ
diff --git a/branding/assets/riseup/riseupvpn.ico b/branding/assets/riseup/riseupvpn.ico
deleted file mode 100755
index c65c9e1..0000000
Binary files a/branding/assets/riseup/riseupvpn.ico and /dev/null differ
diff --git a/branding/templates/debian/app.desktop-template b/branding/templates/debian/app.desktop-template
index eb831f7..761e3a9 100644
--- a/branding/templates/debian/app.desktop-template
+++ b/branding/templates/debian/app.desktop-template
@@ -7,7 +7,7 @@ Comment[es]=VPN Facil de ${name}
 Comment[de]=Easy VPN by ${name}
 Exec=${binaryName} %U
 Terminal=false
-Icon=riseupvpn
+Icon=icon
 Categories=Network;Application;
 StartupNotify=true
 X-AppInstall-Package=${binaryName}
diff --git a/branding/templates/osx/generate.py b/branding/templates/osx/generate.py
index 528605d..440ee34 100644
--- a/branding/templates/osx/generate.py
+++ b/branding/templates/osx/generate.py
@@ -32,7 +32,7 @@ VERSION = data.get('version', 'unknown')
 APP_PATH = os.path.abspath(here + '/../dist/' + APPNAME + ".app")
 STAGING = os.path.abspath(here + '/../staging/')
 ASSETS = os.path.abspath(here + '/../assets/')
-ICON = os.path.join(ASSETS, APPNAME.lower() + '.icns')
+ICON = os.path.join(ASSETS, 'icon.icns')
 SCRIPTS = os.path.join(os.path.abspath(here), 'scripts')
 INFO_PLIST = APP_PATH + '/Contents/Info.plist'
 HELPER_PLIST = os.path.join(SCRIPTS, 'se.leap.bitmask-helper.plist')
diff --git a/branding/templates/windows/template.nsi b/branding/templates/windows/template.nsi
index 00118e1..3f049f9 100755
--- a/branding/templates/windows/template.nsi
+++ b/branding/templates/windows/template.nsi
@@ -30,7 +30,7 @@ RequestExecutionLevel admin
 
 
 
-!define BITMAP_FILE riseupvpn.bmp
+!define BITMAP_FILE icon.bmp
 
 !define MUI_ICON "..\assets\$applicationNameLower.ico"
 !define MUI_UNICON "..\assets\$applicationNameLower.ico"
-- 
cgit v1.2.3