Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (3333e2104d2e178a7e99ad5afdd9ac1b12984560)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (3333e2104d2e178a7e99ad5afdd9ac1b12984560)
  • Date: Mon, 15 Aug 2011 11:16:13 -0500

GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor AT ver.si>:

kde4-bindings/kde4-bindings-profile/CONFLICTS | 1 +
kde4-bindings/kde4-bindings-profile/HISTORY | 4 ++++
kde4-bindings/kimono/CONFLICTS | 1 +
kde4-bindings/kimono/HISTORY | 3 +++
kde4-bindings/korundum/CONFLICTS | 1 +
kde4-bindings/korundum/HISTORY | 3 +++
kde4-bindings/kross-interpreters/CONFLICTS | 1 +
kde4-bindings/kross-interpreters/HISTORY | 3 +++
kde4-bindings/perlkde/CONFLICTS | 1 +
kde4-bindings/perlkde/HISTORY | 3 +++
kde4-bindings/perlqt/CONFLICTS | 1 +
kde4-bindings/perlqt/HISTORY | 3 +++
kde4-bindings/pykde4/HISTORY | 1 +
kde4-bindings/qtruby/CONFLICTS | 1 +
kde4-bindings/qtruby/HISTORY | 3 +++
kde4-bindings/qyoto/CONFLICTS | 1 +
kde4-bindings/qyoto/HISTORY | 3 +++
kde4-bindings/smokegen/CONFLICTS | 1 +
kde4-bindings/smokegen/HISTORY | 3 +++
kde4-bindings/smokekde/CONFLICTS | 1 +
kde4-bindings/smokekde/HISTORY | 1 +
kde4-bindings/smokeqt/CONFLICTS | 1 +
kde4-bindings/smokeqt/HISTORY | 1 +
kde4-edu/blinken/CONFLICTS | 1 +
kde4-edu/blinken/HISTORY | 3 +++
kde4-edu/cantor/CONFLICTS | 1 +
kde4-edu/cantor/HISTORY | 3 +++
kde4-edu/kalgebra/CONFLICTS | 1 +
kde4-edu/kalgebra/HISTORY | 3 +++
kde4-edu/kalzium/CONFLICTS | 1 +
kde4-edu/kalzium/HISTORY | 1 +
kde4-edu/kanagram/CONFLICTS | 1 +
kde4-edu/kanagram/HISTORY | 3 +++
kde4-edu/kbruch/CONFLICTS | 1 +
kde4-edu/kbruch/HISTORY | 3 +++
kde4-edu/kde4-edu-profile/CONFLICTS | 1 +
kde4-edu/kde4-edu-profile/HISTORY | 4 ++++
kde4-edu/kgeography/CONFLICTS | 1 +
kde4-edu/kgeography/HISTORY | 3 +++
kde4-edu/khangman/CONFLICTS | 1 +
kde4-edu/khangman/HISTORY | 3 +++
kde4-edu/kig/CONFLICTS | 1 +
kde4-edu/kig/HISTORY | 3 +++
kde4-edu/kiten/CONFLICTS | 1 +
kde4-edu/kiten/HISTORY | 3 +++
kde4-edu/klettres/CONFLICTS | 1 +
kde4-edu/klettres/HISTORY | 3 +++
kde4-edu/kmplot/CONFLICTS | 1 +
kde4-edu/kmplot/HISTORY | 3 +++
kde4-edu/kstars/CONFLICTS | 1 +
kde4-edu/kstars/HISTORY | 3 +++
kde4-edu/ktouch/CONFLICTS | 1 +
kde4-edu/ktouch/HISTORY | 3 +++
kde4-edu/kturtle/CONFLICTS | 1 +
kde4-edu/kturtle/HISTORY | 3 +++
kde4-edu/kwordquiz/CONFLICTS | 1 +
kde4-edu/kwordquiz/HISTORY | 3 +++
kde4-edu/libkdeedu/CONFLICTS | 1 +
kde4-edu/libkdeedu/HISTORY | 3 +++
kde4-edu/marble/CONFLICTS | 1 +
kde4-edu/marble/HISTORY | 3 +++
kde4-edu/parley/CONFLICTS | 1 +
kde4-edu/parley/HISTORY | 3 +++
kde4-edu/rocs/CONFLICTS | 1 +
kde4-edu/rocs/HISTORY | 3 +++
kde4-edu/step/CONFLICTS | 3 ++-
kde4-edu/step/HISTORY | 3 +++
kde4-graphics/gwenview/CONFLICTS | 1 +
kde4-graphics/gwenview/HISTORY | 3 +++
kde4-graphics/kamera/CONFLICTS | 1 +
kde4-graphics/kamera/HISTORY | 3 +++
kde4-graphics/kcolorchooser/CONFLICTS | 1 +
kde4-graphics/kcolorchooser/HISTORY | 3 +++
kde4-graphics/kde4-graphics-profile/CONFLICTS | 1 +
kde4-graphics/kde4-graphics-profile/HISTORY | 4 ++++
kde4-graphics/kdegraphics-strigi-analyzer/CONFLICTS | 1 +
kde4-graphics/kdegraphics-strigi-analyzer/HISTORY | 1 +
kde4-graphics/kdegraphics-thumbnailers/CONFLICTS | 1 +
kde4-graphics/kdegraphics-thumbnailers/HISTORY | 3 +++
kde4-graphics/kgamma/CONFLICTS | 1 +
kde4-graphics/kgamma/HISTORY | 3 +++
kde4-graphics/kolourpaint/CONFLICTS | 1 +
kde4-graphics/kolourpaint/HISTORY | 3 +++
kde4-graphics/kruler/CONFLICTS | 1 +
kde4-graphics/kruler/HISTORY | 3 +++
kde4-graphics/ksaneplugin/CONFLICTS | 1 +
kde4-graphics/ksaneplugin/HISTORY | 3 +++
kde4-graphics/ksnapshot/CONFLICTS | 1 +
kde4-graphics/ksnapshot/HISTORY | 3 +++
kde4-graphics/libkdcraw/CONFLICTS | 1 +
kde4-graphics/libkdcraw/HISTORY | 3 +++
kde4-graphics/libkexiv2/CONFLICTS | 1 +
kde4-graphics/libkexiv2/HISTORY | 3 +++
kde4-graphics/libkipi/CONFLICTS | 1 +
kde4-graphics/libkipi/HISTORY | 3 +++
kde4-graphics/libksane/CONFLICTS | 1 +
kde4-graphics/libksane/HISTORY | 3 +++
kde4-graphics/mobipocket/CONFLICTS | 1 +
kde4-graphics/mobipocket/HISTORY | 3 +++
kde4-graphics/okular/CONFLICTS | 1 +
kde4-graphics/okular/HISTORY | 3 +++
kde4-graphics/svgpart/CONFLICTS | 1 +
kde4-graphics/svgpart/HISTORY | 3 +++
kde4/kate/HISTORY | 3 +++
kde4/kate/TRIGGERS | 1 +
kde4/konsole/HISTORY | 3 +++
kde4/konsole/TRIGGERS | 1 +
107 files changed, 209 insertions(+), 1 deletion(-)

New commits:
commit 3333e2104d2e178a7e99ad5afdd9ac1b12984560
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kde4-bindings-profile: it conflicts with kdebindings4

commit 0f1c682ebd68d0af1435328400f720b038b0aee6
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

smokeqt: it conflicts with kdebindings4

commit 283228a6400490d805fef07dd347989e5feaf22b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

smokekde: it conflicts with kdebindings4

commit b15d69ee9df278a524702b53da6cb9a4fd22eccd
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

smokegen: it conflicts with kdebindings4

commit ea23a0bd1bd5033d5cdf091a3856a7b260c529a8
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

qyoto: it conflicts with kdebindings4

commit 7c72c1fb62b5fd220a9788d3715dadc07fe90587
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

qtruby: it conflicts with kdebindings4

commit 8407aae6b0bc0821f6792205cf1700c5cbc0c3bf
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

pykde4: it conflicts with kdebindings4

commit 6c58f471d2dcf064c6bf4ae838020abb40f54e2c
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

perlqt: it conflicts with kdebindings4

commit 213ada03d7e3f5a8716dbf11e88140f29841d888
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

perlkde: it conflicts with kdebindings4

commit e4e0b7a8da26bef8953bcc7c78b4043ebe499f8e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kross-interpreters: it conflicts with kdebindings4

commit b70bc983036f601a7a33d8ec714030bc12c29b5a
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

korundum: it conflicts with kdebindings4

commit 685d2b2c1d6d22acab47d182c28d91d3c9807f2b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kimono: it conflicts with kdebindings4

commit f012a70ec7b9f4724284b47ae8fa9f28e973737f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kde4-graphics-profile: it conflicts with kdegraphics4

commit 07afe8a9f5d8d21bf9ee5f5e24708c6233133304
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kde4-edu-profile: it conflicts with kdeedu4

commit 01e830b45369e3237c8cba7235fb0536d76b8280
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

svgpart: it conflicts with kdegraphics4

commit 2436f4f595c6ae3d8e68f4142d874f6587304f12
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

okular: it conflicts with kdegraphics4

commit 0e7eca359bfed3ae9018c783633a950d73c42406
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

mobipocket: it conflicts with kdegraphics4

commit a656448159641e323f120f33fa6ff0a91d28cdd7
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libksane: it conflicts with kdegraphics4

commit 9695632cf1461b0c37c92e9ef76abac883dd8999
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libkipi: it conflicts with kdegraphics4

commit d4083b6a39fb1a1d737d2a7f1afd541749af566c
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libkexiv2: it conflicts with kdegraphics4

commit 4a79fa8dbc2c50ff0b2d66b3d49f3c0abca7bde6
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libkdcraw: it conflicts with kdegraphics4

commit 287a8317448149389d004dc8d8293b00bf9d9b83
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

ksnapshot: it conflicts with kdegraphics4

commit 07d295ceb069a80f52d0bc2e5abc7b3e18f7098f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

ksaneplugin: it conflicts with kdegraphics4

commit d5494bbf1473acdbe61dfb0bfa20b7d90fd1314e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kruler: it conflicts with kdegraphics4

commit 2cd14f8e89210bd174f598fcd5132a610a712b2d
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kolourpaint: it conflicts with kdegraphics4

commit ca49650bed01016dc1513ed6fdc278a58eb4c07a
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kgamma: it conflicts with kdegraphics4

commit aba226e5a3ae24b464cc66c11eb4e50e43e81f28
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdegraphics-thumbnailers: it conflicts with kdegraphics4

commit f7aec50683eccb5d834d9aafc56e98dd125ed8a3
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdegraphics-strigi-analyzer: it conflicts with kdegraphics4

commit 709f98ffd4690e47b1fd25a1c7a539618f18e5b0
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kcolorchooser: it conflicts with kdegraphics4

commit fa23060ad56a77d953a5f7de33da3d7306e2696b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kamera: it conflicts with kdegraphics4

commit 18835261ed37fcb0d390c5bbb423b0a5125ecd90
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

gwenview: it conflicts with kdegraphics4

commit 2d1943b412dde28fb28ec95bf1c815ca85282dce
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

konsole: added tiggers to check for missing files

commit d1c34a34b7ae37fab95022c7c14bd6ff3dc5b196
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kate: added triggers to avoid missing files

commit 18ae0dc1d9648bf3915f8844330f8e81f8bb88b9
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

step: it conflicts with kdeedu4

commit 0a393800c173ae6e9444b583f8a6445f7658f084
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

rocs: it conflicts with kdeedu4

commit 1f5ad49b2050c3b27744912b493151b0437d9152
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

parley: it conflicts with kdeedu4

commit 26ce7ccde50f6a6e7cf17871bd82a84cf69ae2e8
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

marble: it conflicts with kdeedu4

commit 587753be54f4e6b3165fb2f6e91e094fbfc4bc51
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

libkdeedu: it conflicts with kdeedu4

commit 5adcc2ae6ff5f08bbbf3c70f82a7ecc42d2ed784
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kwordquiz: it conflicts with kdeedu4

commit cc1bc12bde35435b2ba6dfe76fb24e5c5a5e2534
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kturtle: it conflicts with kdeedu4

commit 54ddd846afc133fe0ae6f928bd759f27542bf36f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

ktouch: it conflicts with kdeedu4

commit 9eebcce57f6308a48f957bd9af175ad09300e8ef
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kstars: it conflicts with kdeedu4

commit b67ec9f3fcd5d14b146185e0a7cd1bede0c50a95
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kmplot: it conflicts with kdeedu4

commit 10bd51c7ae6727e264e6e05dcc74dbdc6c61a14d
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

klettres: it conflicts with kdeedu4

commit c75d75fa50b0c208b8b8b9c6aa43a2e6c1b8d638
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kiten: it conflicts with kdeedu4

commit c05bfe3b2407cce7cb479b7f65311ce07d777388
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kig: it conflicts with kdeedu4

commit e6692d29fdedc8192833f8908339627848273d73
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

khangman: it conflicts with kdeedu4

commit 9fdff1549b4a13ef53e29a9f2b0f06fa9428d922
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kgeography: it conflicts with kdeedu4

commit 37dec3488ad163810864b9a4abb0fef3e455154d
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kbruch: it conflicts with kdeedu4

commit ec6c1bfa03544e3ecd59e67a174524c8f1457195
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kanagram: it conflicts with kdeedu4

commit ac7470cae508e39dfecca235492670ab6abbd034
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kalzium: it conflicts with kdeedu4

commit 09f8a1031b4ee45dfee66861b64e1fbf701094d1
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kalgebra: it conflicts with kdeedu4

commit 9e6257d3f8a67a9406535ac29fb5dbfda6254ddb
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

cantor: it conflicts with kdeedu4

commit a9666da2a18e4b4179e2380734a1a53541ad79e9
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

blinken: it conflicts with kdeedu4

diff --git a/kde4-bindings/kde4-bindings-profile/CONFLICTS
b/kde4-bindings/kde4-bindings-profile/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/kde4-bindings-profile/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/kde4-bindings-profile/HISTORY
b/kde4-bindings/kde4-bindings-profile/HISTORY
new file mode 100644
index 0000000..4919f50
--- /dev/null
+++ b/kde4-bindings/kde4-bindings-profile/HISTORY
@@ -0,0 +1,4 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
+ * BUILD, CONFLICTS, DEPENDS, DETAILS, FINAL, INSTALL, PRE_BUILD:
added missing HISTORY file
+
diff --git a/kde4-bindings/kimono/CONFLICTS b/kde4-bindings/kimono/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/kimono/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/kimono/HISTORY b/kde4-bindings/kimono/HISTORY
index 2858b4c..f032151 100644
--- a/kde4-bindings/kimono/HISTORY
+++ b/kde4-bindings/kimono/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
+
2011-08-04 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-bindings/korundum/CONFLICTS
b/kde4-bindings/korundum/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/korundum/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/korundum/HISTORY b/kde4-bindings/korundum/HISTORY
index 2858b4c..f032151 100644
--- a/kde4-bindings/korundum/HISTORY
+++ b/kde4-bindings/korundum/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
+
2011-08-04 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-bindings/kross-interpreters/CONFLICTS
b/kde4-bindings/kross-interpreters/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/kross-interpreters/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/kross-interpreters/HISTORY
b/kde4-bindings/kross-interpreters/HISTORY
index 2858b4c..f032151 100644
--- a/kde4-bindings/kross-interpreters/HISTORY
+++ b/kde4-bindings/kross-interpreters/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
+
2011-08-04 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-bindings/perlkde/CONFLICTS b/kde4-bindings/perlkde/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/perlkde/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/perlkde/HISTORY b/kde4-bindings/perlkde/HISTORY
index 2858b4c..f032151 100644
--- a/kde4-bindings/perlkde/HISTORY
+++ b/kde4-bindings/perlkde/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
+
2011-08-04 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-bindings/perlqt/CONFLICTS b/kde4-bindings/perlqt/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/perlqt/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/perlqt/HISTORY b/kde4-bindings/perlqt/HISTORY
index 2858b4c..f032151 100644
--- a/kde4-bindings/perlqt/HISTORY
+++ b/kde4-bindings/perlqt/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
+
2011-08-04 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-bindings/pykde4/HISTORY b/kde4-bindings/pykde4/HISTORY
index 9849f30..8702c22 100644
--- a/kde4-bindings/pykde4/HISTORY
+++ b/kde4-bindings/pykde4/HISTORY
@@ -1,4 +1,5 @@
2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
* PRE_BUILD: added sedit to find phonon

2011-08-04 Bor Kraljič <pyrobor AT ver.si>
diff --git a/kde4-bindings/qtruby/CONFLICTS b/kde4-bindings/qtruby/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/qtruby/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/qtruby/HISTORY b/kde4-bindings/qtruby/HISTORY
index 2858b4c..f032151 100644
--- a/kde4-bindings/qtruby/HISTORY
+++ b/kde4-bindings/qtruby/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
+
2011-08-04 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-bindings/qyoto/CONFLICTS b/kde4-bindings/qyoto/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/qyoto/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/qyoto/HISTORY b/kde4-bindings/qyoto/HISTORY
index 2858b4c..f032151 100644
--- a/kde4-bindings/qyoto/HISTORY
+++ b/kde4-bindings/qyoto/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
+
2011-08-04 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-bindings/smokegen/CONFLICTS
b/kde4-bindings/smokegen/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/smokegen/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/smokegen/HISTORY b/kde4-bindings/smokegen/HISTORY
index 2858b4c..f032151 100644
--- a/kde4-bindings/smokegen/HISTORY
+++ b/kde4-bindings/smokegen/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
+
2011-08-04 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-bindings/smokekde/CONFLICTS
b/kde4-bindings/smokekde/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/smokekde/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/smokekde/HISTORY b/kde4-bindings/smokekde/HISTORY
index c2a05b4..8854636 100644
--- a/kde4-bindings/smokekde/HISTORY
+++ b/kde4-bindings/smokekde/HISTORY
@@ -1,4 +1,5 @@
2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
* DEPENDS: added missing dependencies

2011-08-04 Bor Kraljič <pyrobor AT ver.si>
diff --git a/kde4-bindings/smokeqt/CONFLICTS b/kde4-bindings/smokeqt/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/smokeqt/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/smokeqt/HISTORY b/kde4-bindings/smokeqt/HISTORY
index 9a1d58f..30b72bc 100644
--- a/kde4-bindings/smokeqt/HISTORY
+++ b/kde4-bindings/smokeqt/HISTORY
@@ -1,4 +1,5 @@
2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
* DEPENDS: added missing dependencies

2011-08-04 Bor Kraljič <pyrobor AT ver.si>
diff --git a/kde4-edu/blinken/CONFLICTS b/kde4-edu/blinken/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/blinken/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/blinken/HISTORY b/kde4-edu/blinken/HISTORY
index c6b5af2..5c55288 100644
--- a/kde4-edu/blinken/HISTORY
+++ b/kde4-edu/blinken/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-edu/cantor/CONFLICTS b/kde4-edu/cantor/CONFLICTS
index 71620d4..f2066e1 100755
--- a/kde4-edu/cantor/CONFLICTS
+++ b/kde4-edu/cantor/CONFLICTS
@@ -1 +1,2 @@
+conflicts kdeedu4 y &&
conflicts cantor y
diff --git a/kde4-edu/cantor/HISTORY b/kde4-edu/cantor/HISTORY
index e286c94..3b0960a 100644
--- a/kde4-edu/cantor/HISTORY
+++ b/kde4-edu/cantor/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-edu/kalgebra/CONFLICTS b/kde4-edu/kalgebra/CONFLICTS
index 4da2a9a..6f900ba 100755
--- a/kde4-edu/kalgebra/CONFLICTS
+++ b/kde4-edu/kalgebra/CONFLICTS
@@ -1 +1,2 @@
+conflicts kdeedu4 y &&
conflicts kalgebra y
diff --git a/kde4-edu/kalgebra/HISTORY b/kde4-edu/kalgebra/HISTORY
index c72e81a..a3efb56 100644
--- a/kde4-edu/kalgebra/HISTORY
+++ b/kde4-edu/kalgebra/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-edu/kalzium/CONFLICTS b/kde4-edu/kalzium/CONFLICTS
index 2ff8b80..2a3fc65 100755
--- a/kde4-edu/kalzium/CONFLICTS
+++ b/kde4-edu/kalzium/CONFLICTS
@@ -1 +1,2 @@
+conflicts kdeedu4 y &&
conflicts kalzium y
diff --git a/kde4-edu/kalzium/HISTORY b/kde4-edu/kalzium/HISTORY
index 95698cd..3d4f1ad 100644
--- a/kde4-edu/kalzium/HISTORY
+++ b/kde4-edu/kalzium/HISTORY
@@ -1,4 +1,5 @@
2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
* DEPENDS: fixed dependencies

2011-08-02 Bor Kraljič <pyrobor AT ver.si>
diff --git a/kde4-edu/kanagram/CONFLICTS b/kde4-edu/kanagram/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/kanagram/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/kanagram/HISTORY b/kde4-edu/kanagram/HISTORY
index c6b5af2..5c55288 100644
--- a/kde4-edu/kanagram/HISTORY
+++ b/kde4-edu/kanagram/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-edu/kbruch/CONFLICTS b/kde4-edu/kbruch/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/kbruch/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/kbruch/HISTORY b/kde4-edu/kbruch/HISTORY
index c6b5af2..5c55288 100644
--- a/kde4-edu/kbruch/HISTORY
+++ b/kde4-edu/kbruch/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-edu/kde4-edu-profile/CONFLICTS
b/kde4-edu/kde4-edu-profile/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/kde4-edu-profile/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/kde4-edu-profile/HISTORY
b/kde4-edu/kde4-edu-profile/HISTORY
new file mode 100644
index 0000000..8f5f815
--- /dev/null
+++ b/kde4-edu/kde4-edu-profile/HISTORY
@@ -0,0 +1,4 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+ * BUILD, CONFLICTS, DEPENDS, DETAILS, FINAL, INSTALL, PRE_BUILD:
added missing HISTORY file
+
diff --git a/kde4-edu/kgeography/CONFLICTS b/kde4-edu/kgeography/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/kgeography/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/kgeography/HISTORY b/kde4-edu/kgeography/HISTORY
index c6b5af2..5c55288 100644
--- a/kde4-edu/kgeography/HISTORY
+++ b/kde4-edu/kgeography/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-edu/khangman/CONFLICTS b/kde4-edu/khangman/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/khangman/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/khangman/HISTORY b/kde4-edu/khangman/HISTORY
index c6b5af2..5c55288 100644
--- a/kde4-edu/khangman/HISTORY
+++ b/kde4-edu/khangman/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-edu/kig/CONFLICTS b/kde4-edu/kig/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/kig/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/kig/HISTORY b/kde4-edu/kig/HISTORY
index c6b5af2..5c55288 100644
--- a/kde4-edu/kig/HISTORY
+++ b/kde4-edu/kig/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-edu/kiten/CONFLICTS b/kde4-edu/kiten/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/kiten/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/kiten/HISTORY b/kde4-edu/kiten/HISTORY
index c6b5af2..5c55288 100644
--- a/kde4-edu/kiten/HISTORY
+++ b/kde4-edu/kiten/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-edu/klettres/CONFLICTS b/kde4-edu/klettres/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/klettres/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/klettres/HISTORY b/kde4-edu/klettres/HISTORY
index c6b5af2..5c55288 100644
--- a/kde4-edu/klettres/HISTORY
+++ b/kde4-edu/klettres/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-edu/kmplot/CONFLICTS b/kde4-edu/kmplot/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/kmplot/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/kmplot/HISTORY b/kde4-edu/kmplot/HISTORY
index c873149..97f2a38 100644
--- a/kde4-edu/kmplot/HISTORY
+++ b/kde4-edu/kmplot/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-edu/kstars/CONFLICTS b/kde4-edu/kstars/CONFLICTS
index 2acff3e..14c49a6 100755
--- a/kde4-edu/kstars/CONFLICTS
+++ b/kde4-edu/kstars/CONFLICTS
@@ -1 +1,2 @@
+conflicts kdeedu4 y &&
conflicts kstars y
diff --git a/kde4-edu/kstars/HISTORY b/kde4-edu/kstars/HISTORY
index da5a025..46ede87 100644
--- a/kde4-edu/kstars/HISTORY
+++ b/kde4-edu/kstars/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-edu/ktouch/CONFLICTS b/kde4-edu/ktouch/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/ktouch/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/ktouch/HISTORY b/kde4-edu/ktouch/HISTORY
index c6b5af2..5c55288 100644
--- a/kde4-edu/ktouch/HISTORY
+++ b/kde4-edu/ktouch/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-edu/kturtle/CONFLICTS b/kde4-edu/kturtle/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/kturtle/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/kturtle/HISTORY b/kde4-edu/kturtle/HISTORY
index c6b5af2..5c55288 100644
--- a/kde4-edu/kturtle/HISTORY
+++ b/kde4-edu/kturtle/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-edu/kwordquiz/CONFLICTS b/kde4-edu/kwordquiz/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/kwordquiz/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/kwordquiz/HISTORY b/kde4-edu/kwordquiz/HISTORY
index c6b5af2..5c55288 100644
--- a/kde4-edu/kwordquiz/HISTORY
+++ b/kde4-edu/kwordquiz/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-edu/libkdeedu/CONFLICTS b/kde4-edu/libkdeedu/CONFLICTS
index 810f99b..4627d17 100755
--- a/kde4-edu/libkdeedu/CONFLICTS
+++ b/kde4-edu/libkdeedu/CONFLICTS
@@ -1 +1,2 @@
+conflicts kdeedu4 y &&
conflicts libkdeedu y
diff --git a/kde4-edu/libkdeedu/HISTORY b/kde4-edu/libkdeedu/HISTORY
index a6644b2..d81aa8f 100644
--- a/kde4-edu/libkdeedu/HISTORY
+++ b/kde4-edu/libkdeedu/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-edu/marble/CONFLICTS b/kde4-edu/marble/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/marble/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/marble/HISTORY b/kde4-edu/marble/HISTORY
index 4efed6a..cf16bcb 100644
--- a/kde4-edu/marble/HISTORY
+++ b/kde4-edu/marble/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-edu/parley/CONFLICTS b/kde4-edu/parley/CONFLICTS
new file mode 100755
index 0000000..fb0f140
--- /dev/null
+++ b/kde4-edu/parley/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdeedu4 y
diff --git a/kde4-edu/parley/HISTORY b/kde4-edu/parley/HISTORY
index c6b5af2..5c55288 100644
--- a/kde4-edu/parley/HISTORY
+++ b/kde4-edu/parley/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-edu/rocs/CONFLICTS b/kde4-edu/rocs/CONFLICTS
index a846713..50d0585 100755
--- a/kde4-edu/rocs/CONFLICTS
+++ b/kde4-edu/rocs/CONFLICTS
@@ -1 +1,2 @@
+conflicts kdeedu4 y &&
conflicts rocs y
diff --git a/kde4-edu/rocs/HISTORY b/kde4-edu/rocs/HISTORY
index 42efabc..741a006 100644
--- a/kde4-edu/rocs/HISTORY
+++ b/kde4-edu/rocs/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-edu/step/CONFLICTS b/kde4-edu/step/CONFLICTS
index 8dc9d3d..6f24f57 100755
--- a/kde4-edu/step/CONFLICTS
+++ b/kde4-edu/step/CONFLICTS
@@ -1,2 +1,3 @@
-conflicts step
+conflicts kdeedu4 y &&
+conflicts step y

diff --git a/kde4-edu/step/HISTORY b/kde4-edu/step/HISTORY
index 4d73cfe..701a664 100644
--- a/kde4-edu/step/HISTORY
+++ b/kde4-edu/step/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdeedu4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-graphics/gwenview/CONFLICTS
b/kde4-graphics/gwenview/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/gwenview/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/gwenview/HISTORY b/kde4-graphics/gwenview/HISTORY
index ac4c8d2..5aaf90e 100644
--- a/kde4-graphics/gwenview/HISTORY
+++ b/kde4-graphics/gwenview/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-graphics/kamera/CONFLICTS b/kde4-graphics/kamera/CONFLICTS
index ae80576..8a6268b 100755
--- a/kde4-graphics/kamera/CONFLICTS
+++ b/kde4-graphics/kamera/CONFLICTS
@@ -1 +1,2 @@
+conflicts kdegraphics4 y &&
conflicts kamera y
diff --git a/kde4-graphics/kamera/HISTORY b/kde4-graphics/kamera/HISTORY
index aef53e3..4e5fc3c 100644
--- a/kde4-graphics/kamera/HISTORY
+++ b/kde4-graphics/kamera/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-graphics/kcolorchooser/CONFLICTS
b/kde4-graphics/kcolorchooser/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/kcolorchooser/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/kcolorchooser/HISTORY
b/kde4-graphics/kcolorchooser/HISTORY
index 3c6473c..55075c9 100644
--- a/kde4-graphics/kcolorchooser/HISTORY
+++ b/kde4-graphics/kcolorchooser/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-graphics/kde4-graphics-profile/CONFLICTS
b/kde4-graphics/kde4-graphics-profile/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/kde4-graphics-profile/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/kde4-graphics-profile/HISTORY
b/kde4-graphics/kde4-graphics-profile/HISTORY
new file mode 100644
index 0000000..0f4a1da
--- /dev/null
+++ b/kde4-graphics/kde4-graphics-profile/HISTORY
@@ -0,0 +1,4 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+ * BUILD, CONFLICTS, DEPENDS, DETAILS, FINAL, INSTALL, PRE_BUILD:
added missing HISTORY file
+
diff --git a/kde4-graphics/kdegraphics-strigi-analyzer/CONFLICTS
b/kde4-graphics/kdegraphics-strigi-analyzer/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/kdegraphics-strigi-analyzer/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/kdegraphics-strigi-analyzer/HISTORY
b/kde4-graphics/kdegraphics-strigi-analyzer/HISTORY
index 891c43b..2d5df17 100644
--- a/kde4-graphics/kdegraphics-strigi-analyzer/HISTORY
+++ b/kde4-graphics/kdegraphics-strigi-analyzer/HISTORY
@@ -1,4 +1,5 @@
2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
* DEPENDS: TIFF -> tiff

2011-08-02 Bor Kraljič <pyrobor AT ver.si>
diff --git a/kde4-graphics/kdegraphics-thumbnailers/CONFLICTS
b/kde4-graphics/kdegraphics-thumbnailers/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/kdegraphics-thumbnailers/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/kdegraphics-thumbnailers/HISTORY
b/kde4-graphics/kdegraphics-thumbnailers/HISTORY
index 51d40f4..0610a17 100644
--- a/kde4-graphics/kdegraphics-thumbnailers/HISTORY
+++ b/kde4-graphics/kdegraphics-thumbnailers/HISTORY
@@ -1,2 +1,5 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE,DEPENDS,DETAILS: spell created
diff --git a/kde4-graphics/kgamma/CONFLICTS b/kde4-graphics/kgamma/CONFLICTS
index 4372118..a282691 100755
--- a/kde4-graphics/kgamma/CONFLICTS
+++ b/kde4-graphics/kgamma/CONFLICTS
@@ -1 +1,2 @@
+conflicts kdegraphics4 y &&
conflicts kgamma
diff --git a/kde4-graphics/kgamma/HISTORY b/kde4-graphics/kgamma/HISTORY
index a89294b..2e510f1 100644
--- a/kde4-graphics/kgamma/HISTORY
+++ b/kde4-graphics/kgamma/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-graphics/kolourpaint/CONFLICTS
b/kde4-graphics/kolourpaint/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/kolourpaint/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/kolourpaint/HISTORY
b/kde4-graphics/kolourpaint/HISTORY
index d4a0292..11e7d96 100644
--- a/kde4-graphics/kolourpaint/HISTORY
+++ b/kde4-graphics/kolourpaint/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: added SHORT and long description

diff --git a/kde4-graphics/kruler/CONFLICTS b/kde4-graphics/kruler/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/kruler/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/kruler/HISTORY b/kde4-graphics/kruler/HISTORY
index 2858b4c..b7a2aaf 100644
--- a/kde4-graphics/kruler/HISTORY
+++ b/kde4-graphics/kruler/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-04 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-graphics/ksaneplugin/CONFLICTS
b/kde4-graphics/ksaneplugin/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/ksaneplugin/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/ksaneplugin/HISTORY
b/kde4-graphics/ksaneplugin/HISTORY
index 68179c6..affff26 100644
--- a/kde4-graphics/ksaneplugin/HISTORY
+++ b/kde4-graphics/ksaneplugin/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-graphics/ksnapshot/CONFLICTS
b/kde4-graphics/ksnapshot/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/ksnapshot/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/ksnapshot/HISTORY b/kde4-graphics/ksnapshot/HISTORY
index 8406bae..a01717a 100644
--- a/kde4-graphics/ksnapshot/HISTORY
+++ b/kde4-graphics/ksnapshot/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-graphics/libkdcraw/CONFLICTS
b/kde4-graphics/libkdcraw/CONFLICTS
index ffe6608..4655c27 100755
--- a/kde4-graphics/libkdcraw/CONFLICTS
+++ b/kde4-graphics/libkdcraw/CONFLICTS
@@ -1 +1,2 @@
+conflicts kdegraphics4 y &&
conflicts libkdcraw
diff --git a/kde4-graphics/libkdcraw/HISTORY b/kde4-graphics/libkdcraw/HISTORY
index 077b575..13e3464 100644
--- a/kde4-graphics/libkdcraw/HISTORY
+++ b/kde4-graphics/libkdcraw/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-graphics/libkexiv2/CONFLICTS
b/kde4-graphics/libkexiv2/CONFLICTS
index d7946a0..ae247b9 100755
--- a/kde4-graphics/libkexiv2/CONFLICTS
+++ b/kde4-graphics/libkexiv2/CONFLICTS
@@ -1 +1,2 @@
+conflicts kdegraphics4 y &&
conflicts libkexiv2 y
diff --git a/kde4-graphics/libkexiv2/HISTORY b/kde4-graphics/libkexiv2/HISTORY
index 886703e..6f45fdf 100644
--- a/kde4-graphics/libkexiv2/HISTORY
+++ b/kde4-graphics/libkexiv2/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-graphics/libkipi/CONFLICTS b/kde4-graphics/libkipi/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/libkipi/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/libkipi/HISTORY b/kde4-graphics/libkipi/HISTORY
index 3c6473c..55075c9 100644
--- a/kde4-graphics/libkipi/HISTORY
+++ b/kde4-graphics/libkipi/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-graphics/libksane/CONFLICTS
b/kde4-graphics/libksane/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/libksane/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/libksane/HISTORY b/kde4-graphics/libksane/HISTORY
index 68179c6..affff26 100644
--- a/kde4-graphics/libksane/HISTORY
+++ b/kde4-graphics/libksane/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-graphics/mobipocket/CONFLICTS
b/kde4-graphics/mobipocket/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/mobipocket/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/mobipocket/HISTORY
b/kde4-graphics/mobipocket/HISTORY
index c6b5af2..a5018ad 100644
--- a/kde4-graphics/mobipocket/HISTORY
+++ b/kde4-graphics/mobipocket/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-03 Bor Kraljič <pyrobor AT ver.si>
* CONFIGURE, DEPENDS, DETAILS: spell created

diff --git a/kde4-graphics/okular/CONFLICTS b/kde4-graphics/okular/CONFLICTS
index 8e73918..5cb3b84 100755
--- a/kde4-graphics/okular/CONFLICTS
+++ b/kde4-graphics/okular/CONFLICTS
@@ -1 +1,2 @@
+conflicts kdegraphics4 y &&
conflicts okular y
diff --git a/kde4-graphics/okular/HISTORY b/kde4-graphics/okular/HISTORY
index a406172..98489c0 100644
--- a/kde4-graphics/okular/HISTORY
+++ b/kde4-graphics/okular/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4-graphics/svgpart/CONFLICTS b/kde4-graphics/svgpart/CONFLICTS
new file mode 100755
index 0000000..06a3f0e
--- /dev/null
+++ b/kde4-graphics/svgpart/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdegraphics4 y
\ No newline at end of file
diff --git a/kde4-graphics/svgpart/HISTORY b/kde4-graphics/svgpart/HISTORY
index 3c6473c..55075c9 100644
--- a/kde4-graphics/svgpart/HISTORY
+++ b/kde4-graphics/svgpart/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdegraphics4
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4/kate/HISTORY b/kde4/kate/HISTORY
index e1180e2..c3be504 100644
--- a/kde4/kate/HISTORY
+++ b/kde4/kate/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * TRIGGERS: added triggers to avoid missing files
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4/kate/TRIGGERS b/kde4/kate/TRIGGERS
new file mode 100755
index 0000000..bd708e2
--- /dev/null
+++ b/kde4/kate/TRIGGERS
@@ -0,0 +1 @@
+on_cast kdesdk4 check_self
diff --git a/kde4/konsole/HISTORY b/kde4/konsole/HISTORY
index e1180e2..44ea55f 100644
--- a/kde4/konsole/HISTORY
+++ b/kde4/konsole/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * TRIGGERS: added tiggers to check for missing files
+
2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: changed SOURCE_URL to stable
updated spell to 4.7.0
diff --git a/kde4/konsole/TRIGGERS b/kde4/konsole/TRIGGERS
new file mode 100755
index 0000000..1123df8
--- /dev/null
+++ b/kde4/konsole/TRIGGERS
@@ -0,0 +1 @@
+on_cast kdebase4 check_self



  • [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (3333e2104d2e178a7e99ad5afdd9ac1b12984560), Bor Kraljič, 08/15/2011

Archive powered by MHonArc 2.6.24.

Top of Page