Gentoo Archives: gentoo-commits

From: Alexey Shvetsov <alexxy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: sets/, Documentation/maintainers/
Date: Mon, 26 Sep 2011 14:07:27
Message-Id: 1c3bdee0bd340dc6ada713c0dae5058f52547468.alexxy@gentoo
1 commit: 1c3bdee0bd340dc6ada713c0dae5058f52547468
2 Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 26 14:05:41 2011 +0000
4 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 26 14:05:41 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1c3bdee0
7
8 [sets] Drop kactivitid
9 Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>
10
11 ---
12 Documentation/maintainers/git-hooks-commit-msg | 3 +++
13 sets/kdebase-runtime-live | 1 -
14 2 files changed, 3 insertions(+), 1 deletions(-)
15
16 diff --git a/Documentation/maintainers/git-hooks-commit-msg b/Documentation/maintainers/git-hooks-commit-msg
17 index 374b6cd..80e95f4 100755
18 --- a/Documentation/maintainers/git-hooks-commit-msg
19 +++ b/Documentation/maintainers/git-hooks-commit-msg
20 @@ -22,6 +22,9 @@ fi
21 if [[ -n `grep -e '^\[Documentation' <<< "$summary"` ]] ; then
22 # Do not enforce usage of repoman where it makes no sense
23 exit 0
24 +elif [[ -n `grep -e '^\[sets' <<< "$summary"` ]] ; then
25 + # Do not enforce usage of repoman where it makes no sense
26 + exit 0
27 elif grep '^NO_REPOMAN' "$FILE" >& /dev/null ; then
28 # Allow i-know-what-i-am-doing override
29 sed -i -e '/^NO_REPOMAN/d' "$FILE"
30
31 diff --git a/sets/kdebase-runtime-live b/sets/kdebase-runtime-live
32 index 5f70720..72bd939 100644
33 --- a/sets/kdebase-runtime-live
34 +++ b/sets/kdebase-runtime-live
35 @@ -1,4 +1,3 @@
36 -~kde-base/activitymanager-9999
37 ~kde-base/attica-9999
38 ~kde-base/drkonqi-9999
39 ~kde-base/kcmshell-9999