summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2013-03-24 09:41:22 +0100
committerSebastien Helleu <flashcode@flashtux.org>2013-03-24 09:41:22 +0100
commit4b4d80bdc5c81f92a4bb17b83bb29b155c6d8ff4 (patch)
treeac0e8e24c14d3ff630c2ca60f5b747a594301809
parentcac2342165fe36ce3929c116497324f363c2a35e (diff)
downloadweechat-4b4d80bdc5c81f92a4bb17b83bb29b155c6d8ff4.zip
core: install icon file (patch #7972)
-rw-r--r--CMakeLists.txt3
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.am3
3 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 617b9324c..8e502e19b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,6 +132,9 @@ SET(includedir "\${prefix}/include")
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig)
+# icon
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/32x32/apps)
+
# packages
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
SET(CPACK_PACKAGE_VENDOR "Sebastien Helleu")
diff --git a/ChangeLog b/ChangeLog
index f54a7f23f..2737270cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
-v0.4.1-dev, 2013-03-22
+v0.4.1-dev, 2013-03-24
This document lists all changes for each version.
@@ -14,6 +14,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
Version 0.4.1 (under dev!)
--------------------------
+* core: install icon file (patch #7972)
* core: fix refresh of item "completion": clear it after any action that is
changing content of command line and after switch of buffer (bug #38214)
* core: add support of multiple layouts (task #11274)
diff --git a/Makefile.am b/Makefile.am
index fd204dc83..69c4419db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,5 +65,8 @@ ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = weechat.pc
+icondir = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = weechat.png
+
clean-local:
$(RM) config-git.h