Control: tag -1 patch
Hi,
On 12.10.2014 13:31, Santiago Vila wrote:
The icons should be named "chromium.png", not product_logo_etc_etc.png.
Indeed, I'm sorry about my broken patch for #764373.
I didn't notice this when testing that patch, because the chromium.svg
image worked fine, but it was not added again to the uploaded package.
Michael, why don't you want to have the chromium.svg file?
The following patch (untested) might fix this bug:
diff --git a/debian/chromium.install b/debian/chromium.install
index 8dd3de4..820ccb7 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -17,9 +17,9 @@ debian/chromium.xml
usr/share/gnome-control-center/default-apps
debian/chromium.desktop usr/share/applications
chrome/app/theme/chromium/product_logo_48.png usr/share/pixmaps/chromium.png
-chrome/app/theme/chromium/product_logo_22.png
usr/share/icons/hicolor/22x22/apps
-chrome/app/theme/chromium/product_logo_24.png
usr/share/icons/hicolor/24x24/apps
-chrome/app/theme/chromium/product_logo_48.png
usr/share/icons/hicolor/48x48/apps
-chrome/app/theme/chromium/product_logo_64.png
usr/share/icons/hicolor/64x64/apps
-chrome/app/theme/chromium/product_logo_128.png
usr/share/icons/hicolor/128x128/apps
-chrome/app/theme/chromium/product_logo_256.png
usr/share/icons/hicolor/256x256/apps
+chrome/app/theme/chromium/product_logo_22.png
usr/share/icons/hicolor/22x22/apps/chromium.png
+chrome/app/theme/chromium/product_logo_24.png
usr/share/icons/hicolor/24x24/apps/chromium.png
+chrome/app/theme/chromium/product_logo_48.png
usr/share/icons/hicolor/48x48/apps/chromium.png
+chrome/app/theme/chromium/product_logo_64.png
usr/share/icons/hicolor/64x64/apps/chromium.png
+chrome/app/theme/chromium/product_logo_128.png
usr/share/icons/hicolor/128x128/apps/chromium.png
+chrome/app/theme/chromium/product_logo_256.png
usr/share/icons/hicolor/256x256/apps/chromium.png
Unfortunately this does not work, because dh_install can't rename files
and thus the first line leads to:
/usr/share/pixmaps/chromium.png/product_logo_48.png
Attached patch uses dh-exec to rename the files and fixes this issue
properly. For this to work, debian/chromium.install has to be made
executable.
Best regards,
Andreas
diff --git a/debian/chromium.install b/debian/chromium.install
old mode 100644
new mode 100755
index 8dd3de4..81fd9e3
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -1,3 +1,5 @@
+#! /usr/bin/dh-exec
+
out/Release/chromium usr/lib/chromium
out/Release/chrome-sandbox usr/lib/chromium
@@ -16,10 +18,10 @@ debian/chromium.xml usr/share/gnome-control-center/default-apps
debian/chromium.desktop usr/share/applications
-chrome/app/theme/chromium/product_logo_48.png usr/share/pixmaps/chromium.png
-chrome/app/theme/chromium/product_logo_22.png usr/share/icons/hicolor/22x22/apps
-chrome/app/theme/chromium/product_logo_24.png usr/share/icons/hicolor/24x24/apps
-chrome/app/theme/chromium/product_logo_48.png usr/share/icons/hicolor/48x48/apps
-chrome/app/theme/chromium/product_logo_64.png usr/share/icons/hicolor/64x64/apps
-chrome/app/theme/chromium/product_logo_128.png usr/share/icons/hicolor/128x128/apps
-chrome/app/theme/chromium/product_logo_256.png usr/share/icons/hicolor/256x256/apps
+chrome/app/theme/chromium/product_logo_48.png => usr/share/pixmaps/chromium.png
+chrome/app/theme/chromium/product_logo_22.png => usr/share/icons/hicolor/22x22/apps/chromium.png
+chrome/app/theme/chromium/product_logo_24.png => usr/share/icons/hicolor/24x24/apps/chromium.png
+chrome/app/theme/chromium/product_logo_48.png => usr/share/icons/hicolor/48x48/apps/chromium.png
+chrome/app/theme/chromium/product_logo_64.png => usr/share/icons/hicolor/64x64/apps/chromium.png
+chrome/app/theme/chromium/product_logo_128.png => usr/share/icons/hicolor/128x128/apps/chromium.png
+chrome/app/theme/chromium/product_logo_256.png => usr/share/icons/hicolor/256x256/apps/chromium.png
diff --git a/debian/control b/debian/control
index 8c48c4e..b5e1bb5 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Homepage: http://www.chromium.org/Home
Build-Depends:
clang (>= 3.5),
debhelper (>= 9),
+ dh-exec,
gyp,
python3,
pkg-config,
