[merkaartor] 02/04: Install additional icon sizes in hicolor theme.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Apr 17 18:57:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository merkaartor.
commit 0946f1c09c8d766f9bb810e154ce7759deef2e8a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Apr 17 20:10:39 2016 +0200
Install additional icon sizes in hicolor theme.
---
debian/Icons/128x128/merkaartor.png | Bin 0 -> 33958 bytes
debian/Icons/16x16/merkaartor.png | Bin 0 -> 1030 bytes
debian/Icons/192x192/merkaartor.png | Bin 0 -> 68817 bytes
debian/Icons/22x22/merkaartor.png | Bin 0 -> 1624 bytes
debian/Icons/24x24/merkaartor.png | Bin 0 -> 1849 bytes
debian/Icons/256x256/merkaartor.png | Bin 0 -> 113391 bytes
debian/Icons/32x32/merkaartor.png | Bin 0 -> 2972 bytes
debian/Icons/36x36/merkaartor.png | Bin 0 -> 3640 bytes
debian/Icons/40x40/merkaartor.png | Bin 0 -> 4364 bytes
debian/Icons/42x42/merkaartor.png | Bin 0 -> 4746 bytes
debian/Icons/512x512/merkaartor.png | Bin 0 -> 384401 bytes
debian/Icons/64x64/merkaartor.png | Bin 0 -> 10057 bytes
debian/Icons/72x72/merkaartor.png | Bin 0 -> 12385 bytes
debian/Icons/80x80/merkaartor.png | Bin 0 -> 14910 bytes
debian/Icons/8x8/merkaartor.png | Bin 0 -> 555 bytes
debian/Icons/96x96/merkaartor.png | Bin 0 -> 20628 bytes
debian/changelog | 1 +
debian/patches/hicolor-icons.patch | 69 ++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 18 ++++++++++
debian/source/include-binaries | 16 +++++++++
21 files changed, 105 insertions(+)
diff --git a/debian/Icons/128x128/merkaartor.png b/debian/Icons/128x128/merkaartor.png
new file mode 100644
index 0000000..c85f7ea
Binary files /dev/null and b/debian/Icons/128x128/merkaartor.png differ
diff --git a/debian/Icons/16x16/merkaartor.png b/debian/Icons/16x16/merkaartor.png
new file mode 100644
index 0000000..446f0e4
Binary files /dev/null and b/debian/Icons/16x16/merkaartor.png differ
diff --git a/debian/Icons/192x192/merkaartor.png b/debian/Icons/192x192/merkaartor.png
new file mode 100644
index 0000000..2df1b9a
Binary files /dev/null and b/debian/Icons/192x192/merkaartor.png differ
diff --git a/debian/Icons/22x22/merkaartor.png b/debian/Icons/22x22/merkaartor.png
new file mode 100644
index 0000000..83bfb54
Binary files /dev/null and b/debian/Icons/22x22/merkaartor.png differ
diff --git a/debian/Icons/24x24/merkaartor.png b/debian/Icons/24x24/merkaartor.png
new file mode 100644
index 0000000..472b90c
Binary files /dev/null and b/debian/Icons/24x24/merkaartor.png differ
diff --git a/debian/Icons/256x256/merkaartor.png b/debian/Icons/256x256/merkaartor.png
new file mode 100644
index 0000000..ca8de94
Binary files /dev/null and b/debian/Icons/256x256/merkaartor.png differ
diff --git a/debian/Icons/32x32/merkaartor.png b/debian/Icons/32x32/merkaartor.png
new file mode 100644
index 0000000..91621f2
Binary files /dev/null and b/debian/Icons/32x32/merkaartor.png differ
diff --git a/debian/Icons/36x36/merkaartor.png b/debian/Icons/36x36/merkaartor.png
new file mode 100644
index 0000000..d07aef1
Binary files /dev/null and b/debian/Icons/36x36/merkaartor.png differ
diff --git a/debian/Icons/40x40/merkaartor.png b/debian/Icons/40x40/merkaartor.png
new file mode 100644
index 0000000..7b4e3d0
Binary files /dev/null and b/debian/Icons/40x40/merkaartor.png differ
diff --git a/debian/Icons/42x42/merkaartor.png b/debian/Icons/42x42/merkaartor.png
new file mode 100644
index 0000000..b2dfaa2
Binary files /dev/null and b/debian/Icons/42x42/merkaartor.png differ
diff --git a/debian/Icons/512x512/merkaartor.png b/debian/Icons/512x512/merkaartor.png
new file mode 100644
index 0000000..dde4fe7
Binary files /dev/null and b/debian/Icons/512x512/merkaartor.png differ
diff --git a/debian/Icons/64x64/merkaartor.png b/debian/Icons/64x64/merkaartor.png
new file mode 100644
index 0000000..b673b2a
Binary files /dev/null and b/debian/Icons/64x64/merkaartor.png differ
diff --git a/debian/Icons/72x72/merkaartor.png b/debian/Icons/72x72/merkaartor.png
new file mode 100644
index 0000000..763f226
Binary files /dev/null and b/debian/Icons/72x72/merkaartor.png differ
diff --git a/debian/Icons/80x80/merkaartor.png b/debian/Icons/80x80/merkaartor.png
new file mode 100644
index 0000000..9ddcec0
Binary files /dev/null and b/debian/Icons/80x80/merkaartor.png differ
diff --git a/debian/Icons/8x8/merkaartor.png b/debian/Icons/8x8/merkaartor.png
new file mode 100644
index 0000000..b68f5ee
Binary files /dev/null and b/debian/Icons/8x8/merkaartor.png differ
diff --git a/debian/Icons/96x96/merkaartor.png b/debian/Icons/96x96/merkaartor.png
new file mode 100644
index 0000000..268b7bf
Binary files /dev/null and b/debian/Icons/96x96/merkaartor.png differ
diff --git a/debian/changelog b/debian/changelog
index 972649a..d136da0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
merkaartor (0.18.2-7) UNRELEASED; urgency=medium
* Enable all hardening buildflags.
+ * Install additional icon sizes in hicolor theme.
-- Bas Couwenberg <sebastic at debian.org> Sun, 17 Apr 2016 19:42:38 +0200
diff --git a/debian/patches/hicolor-icons.patch b/debian/patches/hicolor-icons.patch
new file mode 100644
index 0000000..05a64d3
--- /dev/null
+++ b/debian/patches/hicolor-icons.patch
@@ -0,0 +1,69 @@
+Description: Install additional hicolor icon sizes.
+ Debian Policy requires at least 22x22 PNG icons.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/openstreetmap/merkaartor/pull/101
+
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -288,9 +288,58 @@ contains (PROTOBUF, 1) {
+ unix:!macx {
+ desktop.path = $${PREFIX}/share/applications
+ desktop.files = merkaartor.desktop
+- desktopicons.path = $${PREFIX}/share/icons/hicolor/48x48/apps/
+- desktopicons.files = $$PWD/../Icons/48x48/merkaartor.png
+- INSTALLS += desktop desktopicons
++ desktopicon8x8.path = $${PREFIX}/share/icons/hicolor/8x8/apps/
++ desktopicon8x8.files = $$PWD/../Icons/8x8/merkaartor.png
++ desktopicon16x16.path = $${PREFIX}/share/icons/hicolor/16x16/apps/
++ desktopicon16x16.files = $$PWD/../Icons/16x16/merkaartor.png
++ desktopicon22x22.path = $${PREFIX}/share/icons/hicolor/22x22/apps/
++ desktopicon22x22.files = $$PWD/../Icons/22x22/merkaartor.png
++ desktopicon24x24.path = $${PREFIX}/share/icons/hicolor/24x24/apps/
++ desktopicon24x24.files = $$PWD/../Icons/24x24/merkaartor.png
++ desktopicon32x32.path = $${PREFIX}/share/icons/hicolor/32x32/apps/
++ desktopicon32x32.files = $$PWD/../Icons/32x32/merkaartor.png
++ desktopicon36x36.path = $${PREFIX}/share/icons/hicolor/36x36/apps/
++ desktopicon36x36.files = $$PWD/../Icons/36x36/merkaartor.png
++ desktopicon40x40.path = $${PREFIX}/share/icons/hicolor/40x40/apps/
++ desktopicon40x40.files = $$PWD/../Icons/40x40/merkaartor.png
++ desktopicon42x42.path = $${PREFIX}/share/icons/hicolor/42x42/apps/
++ desktopicon42x42.files = $$PWD/../Icons/42x42/merkaartor.png
++ desktopicon48x48.path = $${PREFIX}/share/icons/hicolor/48x48/apps/
++ desktopicon48x48.files = $$PWD/../Icons/48x48/merkaartor.png
++ desktopicon64x64.path = $${PREFIX}/share/icons/hicolor/64x64/apps/
++ desktopicon64x64.files = $$PWD/../Icons/64x64/merkaartor.png
++ desktopicon72x72.path = $${PREFIX}/share/icons/hicolor/72x72/apps/
++ desktopicon72x72.files = $$PWD/../Icons/72x72/merkaartor.png
++ desktopicon80x80.path = $${PREFIX}/share/icons/hicolor/80x80/apps/
++ desktopicon80x80.files = $$PWD/../Icons/80x80/merkaartor.png
++ desktopicon96x96.path = $${PREFIX}/share/icons/hicolor/96x96/apps/
++ desktopicon96x96.files = $$PWD/../Icons/96x96/merkaartor.png
++ desktopicon128x128.path = $${PREFIX}/share/icons/hicolor/128x128/apps/
++ desktopicon128x128.files = $$PWD/../Icons/128x128/merkaartor.png
++ desktopicon192x192.path = $${PREFIX}/share/icons/hicolor/192x192/apps/
++ desktopicon192x192.files = $$PWD/../Icons/192x192/merkaartor.png
++ desktopicon256x256.path = $${PREFIX}/share/icons/hicolor/256x256/apps/
++ desktopicon256x256.files = $$PWD/../Icons/256x256/merkaartor.png
++ desktopicon512x512.path = $${PREFIX}/share/icons/hicolor/512x512/apps/
++ desktopicon512x512.files = $$PWD/../Icons/512x512/merkaartor.png
++ INSTALLS += desktop \
++ desktopicon8x8 \
++ desktopicon16x16 \
++ desktopicon22x22 \
++ desktopicon24x24 \
++ desktopicon32x32 \
++ desktopicon36x36 \
++ desktopicon40x40 \
++ desktopicon42x42 \
++ desktopicon48x48 \
++ desktopicon64x64 \
++ desktopicon72x72 \
++ desktopicon80x80 \
++ desktopicon96x96 \
++ desktopicon128x128 \
++ desktopicon192x192 \
++ desktopicon256x256 \
++ desktopicon512x512
+ }
+
+
diff --git a/debian/patches/series b/debian/patches/series
index e1ccda3..0c90756 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ unknown-typo.patch
occurrence-typo.patch
suppress-typo.patch
immediately-typo.patch
+hicolor-icons.patch
diff --git a/debian/rules b/debian/rules
index 0e0e0dd..b525d75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,12 +17,30 @@ export QT_SELECT=5
override_dh_auto_clean:
dh_auto_clean
cd translations && make clean
+ $(RM) -r Icons/8x8
+ $(RM) -r Icons/16x16
+ $(RM) -r Icons/22x22
+ $(RM) -r Icons/24x24
+ $(RM) -r Icons/32x32
+ $(RM) -r Icons/36x36
+ $(RM) -r Icons/40x40
+ $(RM) -r Icons/42x42
+ $(RM) -r Icons/64x64
+ $(RM) -r Icons/72x72
+ $(RM) -r Icons/80x80
+ $(RM) -r Icons/96x96
+ $(RM) -r Icons/128x128
+ $(RM) -r Icons/192x192
+ $(RM) -r Icons/256x256
+ $(RM) -r Icons/512x512
+
override_dh_clean:
dh_clean src/revision.h
rm -rf binaries
override_dh_auto_configure:
+ cp -r debian/Icons/* Icons/
echo '#define SVNREV $(SVNREV)' > src/revision.h
cd translations && make release
qmake Merkaartor.pro \
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..8c16fc4
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,16 @@
+debian/Icons/8x8/merkaartor.png
+debian/Icons/16x16/merkaartor.png
+debian/Icons/22x22/merkaartor.png
+debian/Icons/24x24/merkaartor.png
+debian/Icons/32x32/merkaartor.png
+debian/Icons/36x36/merkaartor.png
+debian/Icons/40x40/merkaartor.png
+debian/Icons/42x42/merkaartor.png
+debian/Icons/64x64/merkaartor.png
+debian/Icons/72x72/merkaartor.png
+debian/Icons/80x80/merkaartor.png
+debian/Icons/96x96/merkaartor.png
+debian/Icons/128x128/merkaartor.png
+debian/Icons/192x192/merkaartor.png
+debian/Icons/256x256/merkaartor.png
+debian/Icons/512x512/merkaartor.png
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git
More information about the Pkg-grass-devel
mailing list