[X2Go-Commits] [x2goclient] 01/04: general: Move *.rc and *.rcc files back to top directory for now.

git-admin at x2go.org git-admin at x2go.org
Sat Feb 14 00:22:18 CET 2015


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

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

commit 84caf7ae709a64ffd2aece1d66a6894b7bd72ed0
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Feb 13 23:20:29 2015 +0100

    general: Move *.rc and *.rcc files back to top directory for now.
    
    Resources must be in the resource file's base directory or a sub-directory.
---
 src/res/changelog.rcc => changelog.rcc |    0
 debian/changelog                       |    2 ++
 src/res/git.rcc => git.rcc             |    0
 src/res/resources.rcc => resources.rcc |    0
 x2goclient.pro                         |    8 ++++----
 src/res/x2goclient.rc => x2goclient.rc |    0
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/res/changelog.rcc b/changelog.rcc
similarity index 100%
rename from src/res/changelog.rcc
rename to changelog.rcc
diff --git a/debian/changelog b/debian/changelog
index 0d95f10..2afe203 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -116,6 +116,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
     - Update .gitignore with more temporary files.
     - Make x2goclient.pro consistent: replace tabs with spaces, put quotes
       around messages, remove or add whitespace where applicable.
+    - Move *.rc and *.rcc files back to top directory for now. Resources must
+      be in the resource file's base directory or a sub-directory.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 12:01:43 +0100
 
diff --git a/src/res/git.rcc b/git.rcc
similarity index 100%
rename from src/res/git.rcc
rename to git.rcc
diff --git a/src/res/resources.rcc b/resources.rcc
similarity index 100%
rename from src/res/resources.rcc
rename to resources.rcc
diff --git a/x2goclient.pro b/x2goclient.pro
index f30b1a5..23579d2 100644
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -125,7 +125,7 @@ plugin {
   TARGET = x2goplugin
 }
 else {
-  RC_FILE = src/res/x2goclient.rc
+  RC_FILE = x2goclient.rc
   SOURCES += src/x2goclient.cpp
   TARGET = x2goclient
   DEFINES += CFGCLIENT
@@ -153,16 +153,16 @@ else:message("No translation files in project")
 TEMPLATE = app
 DEPENDPATH += .
 INCLUDEPATH += .
-RESOURCES += src/res/resources.rcc
+RESOURCES += resources.rcc
 
 exists(txt/git-info) {
   message("Configuring with --git-info")
-  RESOURCES += src/res/git.rcc
+  RESOURCES += git.rcc
 }
 
 exists(txt/changelog) {
   message("Configuring with --changelog")
-  RESOURCES += src/res/changelog.rcc
+  RESOURCES += changelog.rcc
 }
 
 linux-g++ {
diff --git a/src/res/x2goclient.rc b/x2goclient.rc
similarity index 100%
rename from src/res/x2goclient.rc
rename to x2goclient.rc

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


More information about the x2go-commits mailing list