[gentoo-commits] proj/kde:master commit in: sets/, Documentation/maintainers/

["Alexey Shvetsov" <alexxy@gentoo.org>]

commit:     1c3bdee0bd340dc6ada713c0dae5058f52547468
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 14:05:41 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 14:05:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1c3bdee0

[sets] Drop kactivitid
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

---
 Documentation/maintainers/git-hooks-commit-msg |    3 +++
 sets/kdebase-runtime-live                      |    1 -
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Documentation/maintainers/git-hooks-commit-msg b/Documentation/maintainers/git-hooks-commit-msg
index 374b6cd..80e95f4 100755
--- a/Documentation/maintainers/git-hooks-commit-msg
+++ b/Documentation/maintainers/git-hooks-commit-msg
@@ -22,6 +22,9 @@ fi
 if [[ -n `grep -e '^\[Documentation' <<< "$summary"` ]] ; then
 	# Do not enforce usage of repoman where it makes no sense
 	exit 0
+elif [[ -n `grep -e '^\[sets' <<< "$summary"` ]] ; then
+	# Do not enforce usage of repoman where it makes no sense
+	exit 0
 elif grep '^NO_REPOMAN' "$FILE" >& /dev/null ; then
 	# Allow i-know-what-i-am-doing override
 	sed -i -e '/^NO_REPOMAN/d' "$FILE"

diff --git a/sets/kdebase-runtime-live b/sets/kdebase-runtime-live
index 5f70720..72bd939 100644
--- a/sets/kdebase-runtime-live
+++ b/sets/kdebase-runtime-live
@@ -1,4 +1,3 @@
-~kde-base/activitymanager-9999
 ~kde-base/attica-9999
 ~kde-base/drkonqi-9999
 ~kde-base/kcmshell-9999