1 |
commit: 2a126886eb92f3e15ac4d729b5e83d6b3dc79be3 |
2 |
Author: Dennis Schridde <devurandom <AT> gmx <DOT> net> |
3 |
AuthorDate: Thu Jul 28 15:24:52 2011 +0000 |
4 |
Commit: Dennis Schridde <devurandom <AT> gmx <DOT> net> |
5 |
CommitDate: Thu Jul 28 15:24:52 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2a126886 |
7 |
|
8 |
[Documentation/maintainers/regenerate-files] Amend commit 1facba9e50e9b88fad02576edc127f1f109efa26 |
9 |
|
10 |
Forgot to commit several files. Sorry. |
11 |
|
12 |
Original commit message follows: |
13 |
[Documentation/maintainers/regenerate-files] Bumped RELEASE version for sets |
14 |
|
15 |
The sets were for kde-4.6, while 4.7 is currently in unstable. |
16 |
This created conflicts like kde-base/kdebase-wallpapers-4.6.5 vs. |
17 |
kde-base/kde-wallpapers-4.7.0 |
18 |
|
19 |
--- |
20 |
Documentation/maintainers/regenerate-files | 2 +- |
21 |
sets/kde | 1 + |
22 |
sets/kdeaccessibility | 2 -- |
23 |
sets/kdebase-apps | 1 + |
24 |
sets/kdebase-workspace | 2 +- |
25 |
sets/kdebindings | 14 ++++++++++---- |
26 |
sets/kdelibs | 1 + |
27 |
7 files changed, 15 insertions(+), 8 deletions(-) |
28 |
|
29 |
diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files |
30 |
index fe41a72..feb30f1 100755 |
31 |
--- a/Documentation/maintainers/regenerate-files |
32 |
+++ b/Documentation/maintainers/regenerate-files |
33 |
@@ -78,7 +78,7 @@ fi |
34 |
popd > /dev/null |
35 |
|
36 |
# regenerate unversioned sets |
37 |
-RELEASE=${RELEASE:-4.6} |
38 |
+RELEASE=${RELEASE:-4.7} |
39 |
pushd ../../sets/ > /dev/null |
40 |
for set in *-${RELEASE}; do |
41 |
newfile=${set/%-${RELEASE}} |
42 |
|
43 |
diff --git a/sets/kde b/sets/kde |
44 |
index 1ab8add..d8c740a 100644 |
45 |
--- a/sets/kde |
46 |
+++ b/sets/kde |
47 |
@@ -9,6 +9,7 @@ kde-base/kdeplasma-addons:4 |
48 |
@kdeadmin |
49 |
@kdeartwork |
50 |
@kdebase |
51 |
+@kdedeps |
52 |
@kdeedu |
53 |
@kdegames |
54 |
@kdegraphics |
55 |
|
56 |
diff --git a/sets/kdeaccessibility b/sets/kdeaccessibility |
57 |
index 117312f..b6a0c86 100644 |
58 |
--- a/sets/kdeaccessibility |
59 |
+++ b/sets/kdeaccessibility |
60 |
@@ -1,8 +1,6 @@ |
61 |
# Autogenerated by regenerate-files, DO NOT EDIT. |
62 |
kde-base/jovie:4 |
63 |
kde-base/kaccessible:4 |
64 |
-kde-base/kdeaccessibility-colorschemes:4 |
65 |
-kde-base/kdeaccessibility-iconthemes:4 |
66 |
kde-base/kdeaccessibility-meta:4 |
67 |
kde-base/kmag:4 |
68 |
kde-base/kmousetool:4 |
69 |
|
70 |
diff --git a/sets/kdebase-apps b/sets/kdebase-apps |
71 |
index f42ca8c..cb3dcbb 100644 |
72 |
--- a/sets/kdebase-apps |
73 |
+++ b/sets/kdebase-apps |
74 |
@@ -6,6 +6,7 @@ kde-base/keditbookmarks:4 |
75 |
kde-base/kfind:4 |
76 |
kde-base/kfmclient:4 |
77 |
kde-base/konqueror:4 |
78 |
+kde-base/konq-plugins:4 |
79 |
kde-base/konsole:4 |
80 |
kde-base/kwrite:4 |
81 |
kde-base/libkonq:4 |
82 |
|
83 |
diff --git a/sets/kdebase-workspace b/sets/kdebase-workspace |
84 |
index 42feedf..235d1d6 100644 |
85 |
--- a/sets/kdebase-workspace |
86 |
+++ b/sets/kdebase-workspace |
87 |
@@ -4,7 +4,7 @@ kde-base/kcheckpass:4 |
88 |
kde-base/kcminit:4 |
89 |
kde-base/kdebase-cursors:4 |
90 |
kde-base/kdebase-startkde:4 |
91 |
-kde-base/kdebase-wallpapers:4 |
92 |
+kde-base/kde-wallpapers:4 |
93 |
kde-base/kdm:4 |
94 |
kde-base/kephal:4 |
95 |
kde-base/khotkeys:4 |
96 |
|
97 |
diff --git a/sets/kdebindings b/sets/kdebindings |
98 |
index 16ea7d7..b9d5067 100644 |
99 |
--- a/sets/kdebindings |
100 |
+++ b/sets/kdebindings |
101 |
@@ -1,9 +1,15 @@ |
102 |
# Autogenerated by regenerate-files, DO NOT EDIT. |
103 |
-kde-base/kdebindings-csharp:4 |
104 |
kde-base/kdebindings-meta:4 |
105 |
-kde-base/kdebindings-perl:4 |
106 |
-kde-base/kdebindings-ruby:4 |
107 |
+kde-base/kimono:4 |
108 |
+kde-base/korundum:4 |
109 |
kde-base/krossjava:4 |
110 |
kde-base/krosspython:4 |
111 |
+kde-base/krossruby:4 |
112 |
+kde-base/perlkde:4 |
113 |
+kde-base/perlqt:4 |
114 |
kde-base/pykde4:4 |
115 |
-kde-base/smoke:4 |
116 |
+kde-base/smokegen:4 |
117 |
+kde-base/smokekde:4 |
118 |
+kde-base/smokeqt:4 |
119 |
+kde-base/qtruby:4 |
120 |
+kde-base/qyoto:4 |
121 |
|
122 |
diff --git a/sets/kdelibs b/sets/kdelibs |
123 |
index 6ef6e01..5f5b83a 100644 |
124 |
--- a/sets/kdelibs |
125 |
+++ b/sets/kdelibs |
126 |
@@ -3,3 +3,4 @@ kde-base/kde-env:4 |
127 |
kde-base/kdelibs:4 |
128 |
kde-base/kdepimlibs:4 |
129 |
kde-base/oxygen-icons:4 |
130 |
+kde-base/katepart:4 |