[atomix] 06/09: Rebase icon-path.patch fix-locale-dir.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository atomix.

commit a2d0d4e59a3cd5fb47f84e61c9786bdf77597f95
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Oct 3 13:13:31 2015 +0200

    Rebase icon-path.patch fix-locale-dir.patch
---
 debian/patches/fix-locale-dir.patch |  2 +-
 debian/patches/icon-path.patch      | 21 +++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/patches/fix-locale-dir.patch b/debian/patches/fix-locale-dir.patch
index e3b0326..849fc7f 100644
--- a/debian/patches/fix-locale-dir.patch
+++ b/debian/patches/fix-locale-dir.patch
@@ -8,7 +8,7 @@ Forwarded: not needed
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 79ddfac..163ebb7 100644
+index 55bd8a3..f6389a0 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir) \
diff --git a/debian/patches/icon-path.patch b/debian/patches/icon-path.patch
new file mode 100644
index 0000000..860b257
--- /dev/null
+++ b/debian/patches/icon-path.patch
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sat, 3 Oct 2015 13:13:13 +0200
+Subject: icon path
+
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index 5b90401..6198620 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -650,7 +650,7 @@ static AtomixApp *create_gui (void)
+ 
+   g_object_unref (builder);
+ 
+-  icon_path = g_build_filename (DATADIR,
++  icon_path = g_build_filename ("/usr/share/",
+ 							    "pixmaps",
+ 							    "atomix-icon.png",
+ 							    NULL);
diff --git a/debian/patches/series b/debian/patches/series
index 9dad806..1e63601 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-locale-dir.patch
+icon-path.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/atomix.git