[X2Go-Commits] [x2goclient] 04/10: general: move x2goplugin.rc to x2gobrowserplugin-*/src/res/ and reference in x2goclient.pro.

[git-admin at x2go.org]

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

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit 826860ced4242b662ccba17a2ebe2bee780f3889
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Feb 13 21:22:02 2015 +0100

    general: move x2goplugin.rc to x2gobrowserplugin-*/src/res/ and reference in x2goclient.pro.
---
 debian/changelog                                   |    2 ++
 .../src/res/x2goplugin.rc                          |    0
 x2goclient.pro                                     |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e6ab718..a1d3c58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -103,6 +103,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
     - Rename SRC_DIR to TOP_DIR in shipped Makefile.
     - Rename qtbrowserplugin-<ver>-opensource to x2gobrowserplugin-<ver> and
       reference in x2goclient.pro.
+    - Move x2goplugin.rc to x2gobrowserplugin-*/src/res/ and reference in
+      x2goclient.pro.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 12:01:43 +0100
 
diff --git a/x2goplugin.rc b/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc
similarity index 100%
rename from x2goplugin.rc
rename to x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc
diff --git a/x2goclient.pro b/x2goclient.pro
index 25fc895..447096c 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -209,5 +209,5 @@ plugin {
 		CONFIG += qaxserver
 		include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri)
 	}
-	RC_FILE = x2goplugin.rc
+	RC_FILE = x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc
 }

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git