From 402cd846509c45a8888aa60b69ca8818acd2c73c Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Sat, 14 Nov 2015 07:31:50 +0300 Subject: [PATCH] submodules updated. --- cmake/backbone | 2 +- pkgs/gentoo/app-misc/gtkbuilder-test/Manifest | 2 +- .../app-misc/gtkbuilder-test/gtkbuilder-test-9999.ebuild | 1 - po/{gtkbuilder-test-0.pot => gtkbuilder-test.pot} | 4 ++-- po/ru/{gtkbuilder-test-0.po => gtkbuilder-test.po} | 8 ++++---- ui/glade/CMakeLists.txt | 7 ++----- ui/glade/gtkbuilder-test.glade | 4 ++-- util/backbone | 2 +- 8 files changed, 13 insertions(+), 17 deletions(-) rename po/{gtkbuilder-test-0.pot => gtkbuilder-test.pot} (90%) rename po/ru/{gtkbuilder-test-0.po => gtkbuilder-test.po} (77%) diff --git a/cmake/backbone b/cmake/backbone index 4b74a70..02f3a0f 160000 --- a/cmake/backbone +++ b/cmake/backbone @@ -1 +1 @@ -Subproject commit 4b74a70c2806e160ac2ae1cfe8a960cee8d490d4 +Subproject commit 02f3a0f7d969534872799b45a95d3c5a6fef14c3 diff --git a/pkgs/gentoo/app-misc/gtkbuilder-test/Manifest b/pkgs/gentoo/app-misc/gtkbuilder-test/Manifest index 2d7c9c7..9ed5f0e 100644 --- a/pkgs/gentoo/app-misc/gtkbuilder-test/Manifest +++ b/pkgs/gentoo/app-misc/gtkbuilder-test/Manifest @@ -1 +1 @@ -EBUILD gtkbuilder-test-9999.ebuild 767 SHA256 d65ba8e68d7753bceb7e63391e12e9c1c4de8faec247fb253eeb42497b05b3b4 SHA512 17ee4f4254627d0745e74a10a48eab08897fec1d4410314c9e93963b1fe54a3803c0632d810da18eed203f4918ede365b177042e201eaede501c3696824d1e33 WHIRLPOOL 76e36661015cbfe94bc63edff81471928ec767f1e52ef7151e0d59ddd728cd9c0e2c19c17341057bdddefa02aa2ee258a28f3649502889ee78bbde5350b85e24 +EBUILD gtkbuilder-test-9999.ebuild 745 SHA256 e39f430473f82371abf815406be83cc40541a82c9e7a1de2355de55012136bff SHA512 75d557b1603dbd2ed87b3e45da21d6bef1abe005882a1048f5b189be0411fe24f62ae7a34c23ed5ac1e4048fcf23252e910692137b6820c32521768a47d69b17 WHIRLPOOL 84f81880930cf38ad7dbe811b02f624ee83358b72f0c026387b80b08d44ebd568df939cb8523d63da47fb4fa1a449f36b620db173dbdbfff0e5bdc2d8f675249 diff --git a/pkgs/gentoo/app-misc/gtkbuilder-test/gtkbuilder-test-9999.ebuild b/pkgs/gentoo/app-misc/gtkbuilder-test/gtkbuilder-test-9999.ebuild index 9962e82..29e57e9 100644 --- a/pkgs/gentoo/app-misc/gtkbuilder-test/gtkbuilder-test-9999.ebuild +++ b/pkgs/gentoo/app-misc/gtkbuilder-test/gtkbuilder-test-9999.ebuild @@ -27,7 +27,6 @@ LICENSE="LGPL-3" IUSE="" DEPEND=">=dev-lang/vala-0.26 - >=dev-libs/glib-2.40 >=dev-libs/libgee-0.16" RDEPEND="${DEPEND}" diff --git a/po/gtkbuilder-test-0.pot b/po/gtkbuilder-test.pot similarity index 90% rename from po/gtkbuilder-test-0.pot rename to po/gtkbuilder-test.pot index 996ac9d..c488526 100644 --- a/po/gtkbuilder-test-0.pot +++ b/po/gtkbuilder-test.pot @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the gtkbuilder-test-0 package. +# This file is distributed under the same license as the gtkbuilder-test package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: gtkbuilder-test-0\n" +"Project-Id-Version: gtkbuilder-test\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-22 23:45+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/ru/gtkbuilder-test-0.po b/po/ru/gtkbuilder-test.po similarity index 77% rename from po/ru/gtkbuilder-test-0.po rename to po/ru/gtkbuilder-test.po index 6e7affb..28d6969 100644 --- a/po/ru/gtkbuilder-test-0.po +++ b/po/ru/gtkbuilder-test.po @@ -1,11 +1,11 @@ -# Russian translations for gtkbuilder-test-0 package. -# Copyright (C) 2015 THE gtkbuilder-test-0'S COPYRIGHT HOLDER -# This file is distributed under the same license as the gtkbuilder-test-0 package. +# Russian translations for gtkbuilder-test package. +# Copyright (C) 2015 THE gtkbuilder-test'S COPYRIGHT HOLDER +# This file is distributed under the same license as the gtkbuilder-test package. # , 2015. # msgid "" msgstr "" -"Project-Id-Version: gtkbuilder-test-0\n" +"Project-Id-Version: gtkbuilder-test\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-22 23:45+0300\n" "PO-Revision-Date: 2015-10-22 23:45+0300\n" diff --git a/ui/glade/CMakeLists.txt b/ui/glade/CMakeLists.txt index 0ccfd4b..548088d 100644 --- a/ui/glade/CMakeLists.txt +++ b/ui/glade/CMakeLists.txt @@ -1,5 +1,2 @@ -SET (REL_INSTALL_DIR "share/${PROJECT_LOWERCASE_NAME}-${MAJOR}/ui") -SET (ABS_INSTALL_DIR "${CMAKE_BINARY_DIR}/${REL_INSTALL_DIR}") -FILE (MAKE_DIRECTORY "${ABS_INSTALL_DIR}") -EXECUTE_PROCESS (COMMAND ln "-s" "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_LOWERCASE_NAME}.glade" "${ABS_INSTALL_DIR}/${PROJECT_LOWERCASE_NAME}.glade") -INSTALL (FILES ${PROJECT_LOWERCASE_NAME}.glade DESTINATION "${REL_INSTALL_DIR}") +SET (GladeFile ${PROJECT_LOWERCASE_NAME}) +INCLUDE (GladeCommonRules) diff --git a/ui/glade/gtkbuilder-test.glade b/ui/glade/gtkbuilder-test.glade index 8b3af1c..4b14b0a 100644 --- a/ui/glade/gtkbuilder-test.glade +++ b/ui/glade/gtkbuilder-test.glade @@ -1,6 +1,6 @@ - - + + False diff --git a/util/backbone b/util/backbone index bc270b7..d4e233a 160000 --- a/util/backbone +++ b/util/backbone @@ -1 +1 @@ -Subproject commit bc270b7a0fdbbaec24dbd4af307bda242bed5c2b +Subproject commit d4e233ae72412f4dfef9b7c39ae7a1b6667fb446