This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 239179db3b76c4d93fb7cb67af378b5a5caf2919 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:02:37 2015 +0100 general: move txt/ to res/text/ and update references in: - x2goclient.pro - Makefile - debian/rules - x2goclient.spec --- Makefile | 4 ++-- debian/changelog | 5 +++++ debian/rules | 6 +++--- {txt => res/txt}/encodings | 0 {txt => res/txt}/packs | 0 x2goclient.pro | 4 ++-- x2goclient.spec | 4 ++-- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 0aac144..bde4f0c 100755 --- a/Makefile +++ b/Makefile @@ -57,8 +57,8 @@ clean: clean_client clean_plugin clean_man clean_pluginprovider find . -maxdepth 3 -name 'qrc_*.cpp' -exec rm -vf {} + -type f rm -f x2goclient rm -f x2goclient.tag - rm -f txt/changelog - rm -f txt/git-info + rm -f res/txt/changelog + rm -f res/txt/git-info clean_client: rm -fr $(CLIENT_DIR) diff --git a/debian/changelog b/debian/changelog index 63c5479..3e0dcdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -193,6 +193,11 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium + resources.rcc to res/ and update references in x2goclient.pro and src/ui/helpdialog.ui. - Reference new src directory as include dir in x2goclient.pro. + - Move txt/ to res/text/ and update references in + + x2goclient.pro + + Makefile + + debian/rules + + x2goclient.spec -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/debian/rules b/debian/rules index 8f05dda..288b6a8 100755 --- a/debian/rules +++ b/debian/rules @@ -9,15 +9,15 @@ export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) dh $@ --parallel --with apache2 || dh $@ --parallel override_dh_auto_configure: - cp debian/changelog txt/changelog - if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog txt/git-info; fi + cp debian/changelog res/txt/changelog + if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog res/txt/git-info; fi dh_auto_configure override_dh_auto_clean: dh_auto_clean # clean stray .qm files that are not handled by clean rule in upstream Makefile rm -Rf res/i18n/x2goclient_*.qm - rm -f txt/changelog + rm -f res/txt/changelog override_dh_strip: dh_strip -p x2goclient --dbg-package=x2goclient-dbg diff --git a/txt/encodings b/res/txt/encodings similarity index 100% rename from txt/encodings rename to res/txt/encodings diff --git a/txt/packs b/res/txt/packs similarity index 100% rename from txt/packs rename to res/txt/packs diff --git a/x2goclient.pro b/x2goclient.pro index 15b1178..9ac24a5 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -155,12 +155,12 @@ DEPENDPATH += . INCLUDEPATH += src RESOURCES += res/resources.rcc -exists(txt/git-info) { +exists(res/txt/git-info) { message("Configuring with --git-info") RESOURCES += res/git.rcc } -exists(txt/changelog) { +exists(res/txt/changelog) { message("Configuring with --changelog") RESOURCES += res/changelog.rcc } diff --git a/x2goclient.spec b/x2goclient.spec index 937557a..41ae8ea 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -150,8 +150,8 @@ the X2Go Plugin via an Apache webserver. # Fix up install issues sed -i -e 's/-o root -g root//' Makefile sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile -test -f ChangeLog && cp ChangeLog txt/changelog || test -f debian/changelog && cp debian/changelog txt/changelog || true -test -f ChangeLog.gitlog && cp ChangeLog.gitlog txt/git-info || true +test -f ChangeLog && cp ChangeLog res/txt/changelog || test -f debian/changelog && cp debian/changelog res/txt/changelog || true +test -f ChangeLog.gitlog && cp ChangeLog.gitlog res/txt/git-info || true %if 0%{?el5} sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@%{_libdir}/qt4/bin/qmake@' Makefile sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_libdir}/qt4/bin/lrelease@' Makefile -- Alioth's /srv/git/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git