diff --git a/package/kde31/arts31/arts31.cache b/package/kde31/arts/arts.cache
similarity index 76%
rename from package/kde31/arts31/arts31.cache
rename to package/kde31/arts/arts.cache
index d6e4bdb75..762efade1 100644
--- a/package/kde31/arts31/arts31.cache
+++ b/package/kde31/arts/arts.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/arts31/arts31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,17 +20,17 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073156800 Sat Jan  3 20:06:40 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062170601 Fri Aug 29 17:23:21 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-arts31.log 9-arts31.log
 
-[BUILDTIME] 60335 (9)
-[SIZE] 5.06 MB, 194 files
+[BUILDTIME] 60776 (9)
+[SIZE] 5.06 MB, 198 files
 
 [DEP] alsa arts31 audiofile bash binutils bzip2 coreutils diffutils expat
-[DEP] fam file findutils freetype gawk gcc3 glib glibc23 grep libjpeg
+[DEP] fam file findutils freetype gawk gcc3 glib22 glibc23 grep libjpeg
 [DEP] libpng linux24-header mad make mktemp net-tools ogg-vorbis perl5
-[DEP] pkgconfig qt qt31 sed sysfiles tar util-linux xfree86 zlib
+[DEP] pkgconfig qt31 sed sysfiles tar util-linux xfree86 zlib
 
diff --git a/package/kde31/arts31/arts31.conf b/package/kde31/arts/arts.conf
similarity index 91%
rename from package/kde31/arts31/arts31.conf
rename to package/kde31/arts/arts.conf
index ebb86296e..9afac3bbe 100644
--- a/package/kde31/arts31/arts31.conf
+++ b/package/kde31/arts/arts.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/arts31/arts31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,4 +21,4 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 NO_SANITY_CHECK=1
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/arts31/arts31.desc b/package/kde31/arts/arts.desc
similarity index 91%
rename from package/kde31/arts31/arts31.desc
rename to package/kde31/arts/arts.desc
index edb15b6e7..429506fbd 100644
--- a/package/kde31/arts31/arts31.desc
+++ b/package/kde31/arts/arts.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/arts31/arts31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -39,8 +39,8 @@
 
 [L] GPL
 [S] Stable
-[V] 1.1.4
+[V] 1.1.95
 [P] X -----5---9 309.000
 
-[D] 1532090272 arts-1.1.4.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 1924372502 arts-1.1.95.tar.bz2 ftp://ftp.kde.org/pub/kde/unstable/3.1.95/src/
 
diff --git a/package/kde31/kde-i18n-de31/kde-i18n-de31.cache b/package/kde31/kde-i18n-de/kde-i18n-de.cache
similarity index 81%
rename from package/kde31/kde-i18n-de31/kde-i18n-de31.cache
rename to package/kde31/kde-i18n-de/kde-i18n-de.cache
index 0d2de2daa..d1dadd589 100644
--- a/package/kde31/kde-i18n-de31/kde-i18n-de31.cache
+++ b/package/kde31/kde-i18n-de/kde-i18n-de.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kde-i18n-de31/kde-i18n-de31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,16 +20,16 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073242501 Sun Jan  4 19:55:01 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062298124 Sun Aug 31 04:48:44 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kde-i18n-de31.log 9-kde-i18n-de31.log
 
-[BUILDTIME] 8326 (9)
+[BUILDTIME] 7888 (9)
 [SIZE] 20.07 MB, 1554 files
 
-[DEP] bash bzip2 coreutils diffutils findutils gcc3 gettext grep
+[DEP] bash bzip2 coreutils diffutils findutils gawk gcc3 gettext grep
 [DEP] kde-i18n-de31 kdelibs31 libxml2 make mktemp net-tools perl5 sed
 [DEP] sysfiles tar util-linux
 
diff --git a/package/kde31/kde-i18n-de31/kde-i18n-de31.conf b/package/kde31/kde-i18n-de/kde-i18n-de.conf
similarity index 91%
rename from package/kde31/kde-i18n-de31/kde-i18n-de31.conf
rename to package/kde31/kde-i18n-de/kde-i18n-de.conf
index 67d64f35e..033df797d 100644
--- a/package/kde31/kde-i18n-de31/kde-i18n-de31.conf
+++ b/package/kde31/kde-i18n-de/kde-i18n-de.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kde-i18n-de31/kde-i18n-de31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,6 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
 createdocs=0
 
diff --git a/package/kde31/kde-i18n-de31/kde-i18n-de31.desc b/package/kde31/kde-i18n-de/kde-i18n-de.desc
similarity index 90%
rename from package/kde31/kde-i18n-de31/kde-i18n-de31.desc
rename to package/kde31/kde-i18n-de/kde-i18n-de.desc
index 7e8a61554..535ea15d3 100644
--- a/package/kde31/kde-i18n-de31/kde-i18n-de31.desc
+++ b/package/kde31/kde-i18n-de/kde-i18n-de.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kde-i18n-de31/kde-i18n-de31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -37,8 +37,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 621.000
 
-[D] 371832705 kde-i18n-de-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/kde-i18n/
+[D] 0 kde-i18n-de-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/kde-i18n/
 
diff --git a/package/kde31/kde-i18n-es31/kde-i18n-es31.cache b/package/kde31/kde-i18n-es/kde-i18n-es.cache
similarity index 75%
rename from package/kde31/kde-i18n-es31/kde-i18n-es31.cache
rename to package/kde31/kde-i18n-es/kde-i18n-es.cache
index 6c51274a0..0ac99bcee 100644
--- a/package/kde31/kde-i18n-es31/kde-i18n-es31.cache
+++ b/package/kde31/kde-i18n-es/kde-i18n-es.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kde-i18n-es31/kde-i18n-es31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,16 +20,16 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073243955 Sun Jan  4 20:19:15 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062299796 Sun Aug 31 05:16:36 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kde-i18n-es31.log 9-kde-i18n-es31.log
 
-[BUILDTIME] 7699 (9)
+[BUILDTIME] 6825 (9)
 [SIZE] 12.93 MB, 1400 files
 
-[DEP] bash bzip2 coreutils diffutils findutils gcc3 gettext grep
-[DEP] kde-i18n-es31 kdelibs31 libxml2 make mktemp net-tools perl5 sed
-[DEP] sysfiles tar util-linux
+[DEP] bash bzip2 coreutils diffutils findutils gawk gcc3 gettext grep
+[DEP] kde-i18n-es31 kdelibs31 make mktemp net-tools perl5 sed sysfiles
+[DEP] tar util-linux
 
diff --git a/package/kde31/kde-i18n-es31/kde-i18n-es31.conf b/package/kde31/kde-i18n-es/kde-i18n-es.conf
similarity index 91%
rename from package/kde31/kde-i18n-es31/kde-i18n-es31.conf
rename to package/kde31/kde-i18n-es/kde-i18n-es.conf
index fc996fd1c..0cf86025f 100644
--- a/package/kde31/kde-i18n-es31/kde-i18n-es31.conf
+++ b/package/kde31/kde-i18n-es/kde-i18n-es.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kde-i18n-es31/kde-i18n-es31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,6 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
 createdocs=0
 
diff --git a/package/kde31/kde-i18n-es31/kde-i18n-es31.desc b/package/kde31/kde-i18n-es/kde-i18n-es.desc
similarity index 90%
rename from package/kde31/kde-i18n-es31/kde-i18n-es31.desc
rename to package/kde31/kde-i18n-es/kde-i18n-es.desc
index 0b1d30e05..9e3cec8af 100644
--- a/package/kde31/kde-i18n-es31/kde-i18n-es31.desc
+++ b/package/kde31/kde-i18n-es/kde-i18n-es.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kde-i18n-es31/kde-i18n-es31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -37,8 +37,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 624.000
 
-[D] 3875045204 kde-i18n-es-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/kde-i18n/
+[D] 0 kde-i18n-es-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/kde-i18n/
 
diff --git a/package/kde31/kde-i18n-fr31/kde-i18n-fr31.cache b/package/kde31/kde-i18n-fr/kde-i18n-fr.cache
similarity index 79%
rename from package/kde31/kde-i18n-fr31/kde-i18n-fr31.cache
rename to package/kde31/kde-i18n-fr/kde-i18n-fr.cache
index ceae77050..cb4780f06 100644
--- a/package/kde31/kde-i18n-fr31/kde-i18n-fr31.cache
+++ b/package/kde31/kde-i18n-fr/kde-i18n-fr.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kde-i18n-fr31/kde-i18n-fr31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,16 +20,16 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073244109 Sun Jan  4 20:21:49 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062299917 Sun Aug 31 05:18:37 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kde-i18n-fr31.log 9-kde-i18n-fr31.log
 
-[BUILDTIME] 8768 (9)
-[SIZE] 17.50 MB, 1700 files
+[BUILDTIME] 10778 (9)
+[SIZE] 17.36 MB, 1690 files
 
-[DEP] bash bzip2 coreutils diffutils findutils gcc3 gettext grep
+[DEP] bash bzip2 coreutils diffutils findutils gawk gcc3 gettext grep
 [DEP] kde-i18n-fr31 kdelibs31 libxml2 make mktemp net-tools perl5 sed
 [DEP] sysfiles tar util-linux
 
diff --git a/package/kde31/kde-i18n-fr31/kde-i18n-fr31.conf b/package/kde31/kde-i18n-fr/kde-i18n-fr.conf
similarity index 91%
rename from package/kde31/kde-i18n-fr31/kde-i18n-fr31.conf
rename to package/kde31/kde-i18n-fr/kde-i18n-fr.conf
index 3eb09c8c8..b58d938fd 100644
--- a/package/kde31/kde-i18n-fr31/kde-i18n-fr31.conf
+++ b/package/kde31/kde-i18n-fr/kde-i18n-fr.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kde-i18n-fr31/kde-i18n-fr31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,6 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
 createdocs=0
 
diff --git a/package/kde31/kde-i18n-fr31/kde-i18n-fr31.desc b/package/kde31/kde-i18n-fr/kde-i18n-fr.desc
similarity index 90%
rename from package/kde31/kde-i18n-fr31/kde-i18n-fr31.desc
rename to package/kde31/kde-i18n-fr/kde-i18n-fr.desc
index f8982c3e4..0705f5af6 100644
--- a/package/kde31/kde-i18n-fr31/kde-i18n-fr31.desc
+++ b/package/kde31/kde-i18n-fr/kde-i18n-fr.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kde-i18n-fr31/kde-i18n-fr31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -37,8 +37,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 625.000
 
-[D] 893615438 kde-i18n-fr-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/kde-i18n/
+[D] 0 kde-i18n-fr-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/kde-i18n/
 
diff --git a/package/kde31/kde-i18n-it31/kde-i18n-it31.cache b/package/kde31/kde-i18n-it/kde-i18n-it.cache
similarity index 84%
rename from package/kde31/kde-i18n-it31/kde-i18n-it31.cache
rename to package/kde31/kde-i18n-it/kde-i18n-it.cache
index 628ea2146..7f94593ed 100644
--- a/package/kde31/kde-i18n-it31/kde-i18n-it31.cache
+++ b/package/kde31/kde-i18n-it/kde-i18n-it.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kde-i18n-it31/kde-i18n-it31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,14 +20,14 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073242586 Sun Jan  4 19:56:26 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062298224 Sun Aug 31 04:50:24 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kde-i18n-it31.log 9-kde-i18n-it31.log
 
-[BUILDTIME] 6495 (9)
-[SIZE] 11.52 MB, 1114 files
+[BUILDTIME] 8225 (9)
+[SIZE] 11.26 MB, 1080 files
 
 [DEP] bash bzip2 coreutils diffutils findutils gcc3 gettext grep
 [DEP] kde-i18n-it31 kdelibs31 libxml2 make mktemp net-tools perl5 sed
diff --git a/package/kde31/kde-i18n-it31/kde-i18n-it31.conf b/package/kde31/kde-i18n-it/kde-i18n-it.conf
similarity index 91%
rename from package/kde31/kde-i18n-it31/kde-i18n-it31.conf
rename to package/kde31/kde-i18n-it/kde-i18n-it.conf
index 47d0c1e79..242b4390d 100644
--- a/package/kde31/kde-i18n-it31/kde-i18n-it31.conf
+++ b/package/kde31/kde-i18n-it/kde-i18n-it.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kde-i18n-it31/kde-i18n-it31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,6 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
 createdocs=0
 
diff --git a/package/kde31/kde-i18n-it31/kde-i18n-it31.desc b/package/kde31/kde-i18n-it/kde-i18n-it.desc
similarity index 90%
rename from package/kde31/kde-i18n-it31/kde-i18n-it31.desc
rename to package/kde31/kde-i18n-it/kde-i18n-it.desc
index aea4c596c..f28b24405 100644
--- a/package/kde31/kde-i18n-it31/kde-i18n-it31.desc
+++ b/package/kde31/kde-i18n-it/kde-i18n-it.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kde-i18n-it31/kde-i18n-it31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -37,8 +37,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 622.000
 
-[D] 506060455 kde-i18n-it-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/kde-i18n/
+[D] 0 kde-i18n-it-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/kde-i18n/
 
diff --git a/package/kde31/kdeaddons31/kdeaddons31.cache b/package/kde31/kdeaccessibility/kdeaccessibility.cache
similarity index 66%
rename from package/kde31/kdeaddons31/kdeaddons31.cache
rename to package/kde31/kdeaccessibility/kdeaccessibility.cache
index a2789827a..8f12c5730 100644
--- a/package/kde31/kdeaddons31/kdeaddons31.cache
+++ b/package/kde31/kdeaccessibility/kdeaccessibility.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdeaddons31/kdeaddons31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,19 +20,19 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073264032 Mon Jan  5 01:53:52 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062313838 Sun Aug 31 09:10:38 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdeaddons31.log 9-kdeaddons31.log
 
-[BUILDTIME] 147404 (9)
-[SIZE] 5.51 MB, 339 files
+[BUILDTIME] 146626 (9)
+[SIZE] 5.56 MB, 403 files
 
-[DEP] alsa arts31 audiofile bash binutils bzip2 coreutils diffutils expat
-[DEP] fam file findutils freetype gawk gcc3 gettext glib12 glibc23 grep
-[DEP] gtk+12 kdeaddons31 kdebase31 kdegames31 kdelibs31 kdemultimedia31
-[DEP] libart_lgpl23 libjpeg libpng libsdl linux24-header mad make mktemp
-[DEP] net-tools ogg-vorbis pcre perl5 qt qt31 sed sysfiles tar util-linux
-[DEP] xfree86 xmms zlib
+[DEP] alsa arts31 audiofile bash binutils bzip2 coreutils diffutils
+[DEP] esound expat fam file findutils freetype gawk gcc3 gettext glib12
+[DEP] glibc23 grep gtk+12 kdeaddons31 kdebase31 kdegames31 kdelibs31
+[DEP] kdemultimedia31 libart_lgpl23 libjpeg libpng libsdl linux24-header
+[DEP] mad make mktemp net-tools ogg-vorbis pcre perl5 qt31 sed sysfiles
+[DEP] tar util-linux xfree86 xmms zlib
 
diff --git a/package/kde31/kdeaddons31/kdeaddons31.conf b/package/kde31/kdeaccessibility/kdeaccessibility.conf
similarity index 91%
rename from package/kde31/kdeaddons31/kdeaddons31.conf
rename to package/kde31/kdeaccessibility/kdeaccessibility.conf
index e2e854576..574c4693f 100644
--- a/package/kde31/kdeaddons31/kdeaddons31.conf
+++ b/package/kde31/kdeaccessibility/kdeaccessibility.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdeaddons31/kdeaddons31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/kdeaccessibility/kdeaccessibility.desc b/package/kde31/kdeaccessibility/kdeaccessibility.desc
new file mode 100644
index 000000000..e4e9d3ae9
--- /dev/null
+++ b/package/kde31/kdeaccessibility/kdeaccessibility.desc
@@ -0,0 +1,45 @@
+
+[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+[COPY] 
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY] Please add additional copyright information _after_ the line containing
+[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+[COPY] 
+[COPY] ROCK Linux: rock-src/package/kde31/kdeaddons31/kdeaddons31.desc
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+[COPY] 
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; either version 2 of the License, or
+[COPY] (at your option) any later version. A copy of the GNU General Public
+[COPY] License can be found at Documentation/COPYING.
+[COPY] 
+[COPY] Many people helped and are helping developing ROCK Linux. Please
+[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+[COPY] file for details.
+[COPY] 
+[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
+
+[I] KDE accessibility aids
+
+[T] Kdeaccessibility is a collection of accessibility aids for KDE.
+[T] It contains the following KDE Accessibility Aids: kmag, a screen
+[T] magnifier; kmousetool, a program for people whom it hurts to click the
+[T] mouse; and KMouth, a program that allows people who have lost their
+[T] voice to let their computer speak for them.
+
+[U] http://www.kde.org
+
+[A] The KDE-Team (see http://www.kde.org/people.html)
+[M] Rene Rebe <rene@rocklinux.org>
+
+[C] extra/tool extra/desktop/kde
+
+[L] GPL
+[S] Stable
+[V] 3.2.0
+[P] X -----5---9 652.000
+
+[D] 0 kdeaccessibility-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
+
diff --git a/package/kde31/kdeaddons/kdeaddons.cache b/package/kde31/kdeaddons/kdeaddons.cache
new file mode 100644
index 000000000..8f12c5730
--- /dev/null
+++ b/package/kde31/kdeaddons/kdeaddons.cache
@@ -0,0 +1,38 @@
+[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+[COPY] 
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY] Please add additional copyright information _after_ the line containing
+[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+[COPY] 
+[COPY] ROCK Linux: rock-src/package/kde31/kdeaddons31/kdeaddons31.cache
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+[COPY] 
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; either version 2 of the License, or
+[COPY] (at your option) any later version. A copy of the GNU General Public
+[COPY] License can be found at Documentation/COPYING.
+[COPY] 
+[COPY] Many people helped and are helping developing ROCK Linux. Please
+[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+[COPY] file for details.
+[COPY] 
+[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
+
+[TIMESTAMP] 1062313838 Sun Aug 31 09:10:38 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
+
+[LOGS] 5-kdeaddons31.log 9-kdeaddons31.log
+
+[BUILDTIME] 146626 (9)
+[SIZE] 5.56 MB, 403 files
+
+[DEP] alsa arts31 audiofile bash binutils bzip2 coreutils diffutils
+[DEP] esound expat fam file findutils freetype gawk gcc3 gettext glib12
+[DEP] glibc23 grep gtk+12 kdeaddons31 kdebase31 kdegames31 kdelibs31
+[DEP] kdemultimedia31 libart_lgpl23 libjpeg libpng libsdl linux24-header
+[DEP] mad make mktemp net-tools ogg-vorbis pcre perl5 qt31 sed sysfiles
+[DEP] tar util-linux xfree86 xmms zlib
+
diff --git a/package/kde31/kdeaddons/kdeaddons.conf b/package/kde31/kdeaddons/kdeaddons.conf
new file mode 100644
index 000000000..574c4693f
--- /dev/null
+++ b/package/kde31/kdeaddons/kdeaddons.conf
@@ -0,0 +1,23 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/kde31/kdeaddons31/kdeaddons31.conf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/kdeaddons31/kdeaddons31.desc b/package/kde31/kdeaddons/kdeaddons.desc
similarity index 91%
rename from package/kde31/kdeaddons31/kdeaddons31.desc
rename to package/kde31/kdeaddons/kdeaddons.desc
index 9ec9a7a37..ef5b298b0 100644
--- a/package/kde31/kdeaddons31/kdeaddons31.desc
+++ b/package/kde31/kdeaddons/kdeaddons.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdeaddons31/kdeaddons31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 652.000
 
-[D] 2377190770 kdeaddons-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdeaddons-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdeadmin31/kdeadmin31.cache b/package/kde31/kdeadmin/kdeadmin.cache
similarity index 71%
rename from package/kde31/kdeadmin31/kdeadmin31.cache
rename to package/kde31/kdeadmin/kdeadmin.cache
index 8eda52044..ccf0ce654 100644
--- a/package/kde31/kdeadmin31/kdeadmin31.cache
+++ b/package/kde31/kdeadmin/kdeadmin.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdeadmin31/kdeadmin31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,18 +20,17 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073228249 Sun Jan  4 15:57:29 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062276411 Sat Aug 30 22:46:51 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdeadmin31.log 9-kdeadmin31.log
 
-[BUILDTIME] 97990 (9)
-[SIZE] 3.69 MB, 239 files
+[BUILDTIME] 98606 (9)
+[SIZE] 3.72 MB, 271 files
 
-[DEP] bash binutils bzip2 coreutils cracklib diffutils expat fam file
-[DEP] findutils freetype gcc3 gettext glibc23 grep kdeadmin31 kdelibs31
+[DEP] bash binutils bzip2 coreutils diffutils expat fam file findutils
+[DEP] freetype gawk gcc3 gettext glibc23 grep kdeadmin31 kdelibs31
 [DEP] libart_lgpl23 libjpeg libpng linux24-header make mktemp net-tools
-[DEP] pam patch pcre perl5 qt qt31 sed shadow sysfiles tar util-linux
-[DEP] xfree86 zlib
+[DEP] pam pcre perl5 qt31 sed shadow sysfiles tar util-linux xfree86 zlib
 
diff --git a/package/kde31/kdeadmin31/kdeadmin31.conf b/package/kde31/kdeadmin/kdeadmin.conf
similarity index 91%
rename from package/kde31/kdeadmin31/kdeadmin31.conf
rename to package/kde31/kdeadmin/kdeadmin.conf
index 18b3c22a0..97fbf315c 100644
--- a/package/kde31/kdeadmin31/kdeadmin31.conf
+++ b/package/kde31/kdeadmin/kdeadmin.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdeadmin31/kdeadmin31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/kdeadmin31/kdeadmin31.desc b/package/kde31/kdeadmin/kdeadmin.desc
similarity index 91%
rename from package/kde31/kdeadmin31/kdeadmin31.desc
rename to package/kde31/kdeadmin/kdeadmin.desc
index 2d717735a..2187e295f 100644
--- a/package/kde31/kdeadmin31/kdeadmin31.desc
+++ b/package/kde31/kdeadmin/kdeadmin.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdeadmin31/kdeadmin31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -41,8 +41,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 591.000
 
-[D] 4081063337 kdeadmin-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdeadmin-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdeadmin31/libtool-fix.patch b/package/kde31/kdeadmin31/libtool-fix.patch
deleted file mode 100644
index 48464a2ab..000000000
--- a/package/kde31/kdeadmin31/libtool-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/kde31/kdeadmin31/libtool-fix.patch
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-
-A tiny "hack" for our /lib vs. /usr/lib situation. Too damn kde* uses an
-own copy of libtool - we need to verify how the official GNU beast behaves
-and maybe really fix that one.
-
-  - Rene Rebe <rene@rocklinux.org>
-
---- kdeadmin-3.1.4/admin/ltmain.sh.orig	2003-12-03 16:30:02.000000000 +0100
-+++ kdeadmin-3.1.4/admin/ltmain.sh	2003-12-03 16:30:56.000000000 +0100
-@@ -1963,9 +1963,12 @@
- 	    dir="$ladir"
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
--	  else
-+	  elif test -f "$libdir/$linklib" ; then
- 	    dir="$libdir"
- 	    absdir="$libdir"
-+	  else
-+	    dir="/lib"
-+	    absdir="/lib"
- 	  fi
- 	else
- 	  dir="$ladir/$objdir"
diff --git a/package/kde31/kdeadmin31/pam-fix.patch b/package/kde31/kdeadmin31/pam-fix.patch
deleted file mode 100644
index c7dd3f80e..000000000
--- a/package/kde31/kdeadmin31/pam-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/kde31/kdeadmin31/pam-fix.patch
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-
-We need libpam and libpam_misc for kuser.
-
-  - Rene Rebe <rene@rocklinux.org>
-
---- kdeadmin-3.1.4/configure.orig	2003-12-03 18:10:11.000000000 +0100
-+++ kdeadmin-3.1.4/configure	2003-12-03 18:11:29.000000000 +0100
-@@ -27469,7 +27469,7 @@
- #define HAVE_PAM 1
- _ACEOF
- 
--    PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
-+    PAMLIBS="$PAM_MISC_LIB -lpam -lpam_misc $LIBDL"
- 
-         echo "$as_me:$LINENO: checking for const pam_message" >&5
- echo $ECHO_N "checking for const pam_message... $ECHO_C" >&6
---- kdeadmin-3.1.4/kuser/Makefile.in.orig	2003-12-03 18:09:10.000000000 +0100
-+++ kdeadmin-3.1.4/kuser/Makefile.in	2003-12-03 18:10:02.000000000 +0100
-@@ -280,7 +280,7 @@
- AM_CXXFLAGS = $(KU_NIS) $(KU_QUOTA) $(QUOTACTL) -D_KU_DEBUG -D_SVID_SOURCE -D_GNU_SOURCE -DQT_NO_ASCII_CAST -DQT_NO_CAST_ASCII
- 
- kuser_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--kuser_LDADD = $(LIB_KDEUI) $(LIBCRYPT) $(LIBSHADOW) $(LIBGEN)
-+kuser_LDADD = $(LIB_KDEUI) $(LIBCRYPT) $(LIBSHADOW) $(PAMLIBS) $(LIBGEN)
- 
- 
- ####### Files
diff --git a/package/kde31/kdeartwork31/kdeartwork31.cache b/package/kde31/kdeartwork/kdeartwork.cache
similarity index 82%
rename from package/kde31/kdeartwork31/kdeartwork31.cache
rename to package/kde31/kdeartwork/kdeartwork.cache
index 04e6697ae..33e38db0f 100644
--- a/package/kde31/kdeartwork31/kdeartwork31.cache
+++ b/package/kde31/kdeartwork/kdeartwork.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdeartwork31/kdeartwork31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,17 +20,17 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073222689 Sun Jan  4 14:24:49 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062263132 Sat Aug 30 19:05:32 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdeartwork31.log 9-kdeartwork31.log
 
-[BUILDTIME] 63082 (9)
+[BUILDTIME] 61428 (9)
 [SIZE] 18.63 MB, 5781 files
 
 [DEP] bash binutils bzip2 coreutils diffutils expat fam file findutils
 [DEP] freetype gawk gcc3 gettext glibc23 grep kdeartwork31 kdebase31
 [DEP] kdelibs31 libart_lgpl23 libjpeg libpng linux24-header make mktemp
-[DEP] net-tools perl5 qt qt31 sed sysfiles tar util-linux xfree86 zlib
+[DEP] net-tools perl5 qt31 sed sysfiles tar util-linux xfree86 zlib
 
diff --git a/package/kde31/kdeartwork31/kdeartwork31.conf b/package/kde31/kdeartwork/kdeartwork.conf
similarity index 91%
rename from package/kde31/kdeartwork31/kdeartwork31.conf
rename to package/kde31/kdeartwork/kdeartwork.conf
index dfb30a323..adfe3fc52 100644
--- a/package/kde31/kdeartwork31/kdeartwork31.conf
+++ b/package/kde31/kdeartwork/kdeartwork.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdeartwork31/kdeartwork31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/kdeartwork31/kdeartwork31.desc b/package/kde31/kdeartwork/kdeartwork.desc
similarity index 91%
rename from package/kde31/kdeartwork31/kdeartwork31.desc
rename to package/kde31/kdeartwork/kdeartwork.desc
index 32f517847..f654f5c48 100644
--- a/package/kde31/kdeartwork31/kdeartwork31.desc
+++ b/package/kde31/kdeartwork/kdeartwork.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdeartwork31/kdeartwork31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 588.000
 
-[D] 3428141482 kdeartwork-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdeartwork-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdebase31/Xsession.post b/package/kde31/kdebase/Xsession.post
similarity index 100%
rename from package/kde31/kdebase31/Xsession.post
rename to package/kde31/kdebase/Xsession.post
diff --git a/package/kde31/kdebase31/Xsession.pre b/package/kde31/kdebase/Xsession.pre
similarity index 100%
rename from package/kde31/kdebase31/Xsession.pre
rename to package/kde31/kdebase/Xsession.pre
diff --git a/package/kde31/kdebase31/kdebase31.cache b/package/kde31/kdebase/kdebase.cache
similarity index 75%
rename from package/kde31/kdebase31/kdebase31.cache
rename to package/kde31/kdebase/kdebase.cache
index e59701c31..04ed8821b 100644
--- a/package/kde31/kdebase31/kdebase31.cache
+++ b/package/kde31/kdebase/kdebase.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdebase31/kdebase31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,19 +20,19 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073222014 Sun Jan  4 14:13:34 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062262441 Sat Aug 30 18:54:01 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdebase31.log 9-kdebase31.log
 
-[BUILDTIME] 651691 (9)
-[SIZE] 40.14 MB, 3519 files
+[BUILDTIME] 653521 (9)
+[SIZE] 40.53 MB, 3863 files
 
 [DEP] alsa arts31 audiofile bash binutils bzip2 coreutils diffutils
 [DEP] expat fam file findutils freetype gawk gcc3 gettext glibc23 grep
 [DEP] gzip kdebase31 kdelibs31 libart_lgpl23 libjpeg libpng libtiff
-[DEP] linux24-header lm_sensors m4 mad make mktemp ncurses net-tools
-[DEP] ogg-vorbis openmotif openssl pam pcre perl5 pkgconfig qt qt31 sed
-[DEP] shadow sysfiles tar util-linux xfree86 zlib
+[DEP] linux24-header m4 mad make mktemp ncurses net-tools ogg-vorbis
+[DEP] openmotif openssl pam pcre perl5 qt31 sed shadow sysfiles tar
+[DEP] util-linux xfree86 zlib
 
diff --git a/package/kde31/kdebase31/kdebase31.conf b/package/kde31/kdebase/kdebase.conf
similarity index 85%
rename from package/kde31/kdebase31/kdebase31.conf
rename to package/kde31/kdebase/kdebase.conf
index 5feae964e..ca11d068f 100644
--- a/package/kde31/kdebase31/kdebase31.conf
+++ b/package/kde31/kdebase/kdebase.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdebase31/kdebase31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,12 +20,12 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
 
 kde_base_pi()
 {
-	register_xdm kdm 'KDE v3.1 display manager' $bindir/kdm
-	register_wm kde 'KDE v3.1' /$prefix/bin/startkde
+	register_xdm kdm 'KDE v3.2 display manager' $bindir/kdm
+	register_wm kde 'KDE v3.2' /$prefix/bin/startkde
 
 	cp -fv $confdir/kdm.cron $root/etc/cron.daily/90-kdm
         chmod +x $root/etc/cron.daily/90-kdm
diff --git a/package/kde31/kdebase31/kdebase31.desc b/package/kde31/kdebase/kdebase.desc
similarity index 92%
rename from package/kde31/kdebase31/kdebase31.desc
rename to package/kde31/kdebase/kdebase.desc
index 1e95e30f6..7b6b12f85 100644
--- a/package/kde31/kdebase31/kdebase31.desc
+++ b/package/kde31/kdebase/kdebase.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdebase31/kdebase31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -42,8 +42,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 587.000
 
-[D] 2148126276 kdebase-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdebase-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdebase31/kdm.cron b/package/kde31/kdebase/kdm.cron
similarity index 100%
rename from package/kde31/kdebase31/kdm.cron
rename to package/kde31/kdebase/kdm.cron
diff --git a/package/kde31/kdebindings31/kdebindings31.cache b/package/kde31/kdebindings/kdebindings.cache
similarity index 79%
rename from package/kde31/kdebindings31/kdebindings31.cache
rename to package/kde31/kdebindings/kdebindings.cache
index 75f62348a..36a313bc3 100644
--- a/package/kde31/kdebindings31/kdebindings31.cache
+++ b/package/kde31/kdebindings/kdebindings.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdebindings31/kdebindings31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,18 +20,18 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073226110 Sun Jan  4 15:21:50 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062270570 Sat Aug 30 21:09:30 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdebindings31.log 9-kdebindings31.log
 
-[BUILDTIME] 334164 (9)
-[SIZE] 9.11 MB, 90 files
+[BUILDTIME] 340077 (9)
+[SIZE] 9.25 MB, 99 files
 
 [DEP] alsa bash binutils bzip2 coreutils diffutils expat fam file findutils
 [DEP] freetype gawk gcc3 gettext glib12 glibc23 grep gtk+12 kdebindings31
 [DEP] kdelibs31 libart_lgpl23 libjpeg libpng linux24-header make mktemp
-[DEP] net-tools openssl pcre perl5 python qt qt31 sed sysfiles tar tcltk
-[DEP] util-linux xfree86 zlib
+[DEP] net-tools openssl pcre perl5 python qt31 sed sysfiles tar util-linux
+[DEP] xfree86 zlib
 
diff --git a/package/kde31/kdebindings31/kdebindings31.conf b/package/kde31/kdebindings/kdebindings.conf
similarity index 91%
rename from package/kde31/kdebindings31/kdebindings31.conf
rename to package/kde31/kdebindings/kdebindings.conf
index b3cfe96c2..eb37e4e09 100644
--- a/package/kde31/kdebindings31/kdebindings31.conf
+++ b/package/kde31/kdebindings/kdebindings.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdebindings31/kdebindings31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
 
 # do not yet build q#
 var_append confopt " " "--without-mcs"
diff --git a/package/kde31/kdebindings31/kdebindings31.desc b/package/kde31/kdebindings/kdebindings.desc
similarity index 91%
rename from package/kde31/kdebindings31/kdebindings31.desc
rename to package/kde31/kdebindings/kdebindings.desc
index c17182f95..2775d8f51 100644
--- a/package/kde31/kdebindings31/kdebindings31.desc
+++ b/package/kde31/kdebindings/kdebindings.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdebindings31/kdebindings31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -39,8 +39,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 589.000
 
-[D] 217071183 kdebindings-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdebindings-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdeedu31/kdeedu31.cache b/package/kde31/kdeedu/kdeedu.cache
similarity index 80%
rename from package/kde31/kdeedu31/kdeedu31.cache
rename to package/kde31/kdeedu/kdeedu.cache
index d675c203c..3a74b2f70 100644
--- a/package/kde31/kdeedu31/kdeedu31.cache
+++ b/package/kde31/kdeedu/kdeedu.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdeedu31/kdeedu31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,17 +20,17 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073242389 Sun Jan  4 19:53:09 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062298013 Sun Aug 31 04:46:53 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdeedu31.log 9-kdeedu31.log
 
-[BUILDTIME] 181376 (9)
-[SIZE] 28.70 MB, 1296 files
+[BUILDTIME] 181484 (9)
+[SIZE] 28.77 MB, 1368 files
 
 [DEP] bash binutils bzip2 coreutils diffutils expat fam file findutils
 [DEP] freetype gawk gcc3 gettext glibc23 grep kdeedu31 kdelibs31
 [DEP] libart_lgpl23 libjpeg libpng linux24-header make mktemp net-tools
-[DEP] pcre perl5 qt qt31 sed sysfiles tar util-linux xfree86 zlib
+[DEP] pcre perl5 qt31 sed sysfiles tar util-linux xfree86 zlib
 
diff --git a/package/kde31/kdeedu31/kdeedu31.conf b/package/kde31/kdeedu/kdeedu.conf
similarity index 91%
rename from package/kde31/kdeedu31/kdeedu31.conf
rename to package/kde31/kdeedu/kdeedu.conf
index c525ec144..7846e7e3b 100644
--- a/package/kde31/kdeedu31/kdeedu31.conf
+++ b/package/kde31/kdeedu/kdeedu.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdeedu31/kdeedu31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/kdeedu31/kdeedu31.desc b/package/kde31/kdeedu/kdeedu.desc
similarity index 91%
rename from package/kde31/kdeedu31/kdeedu31.desc
rename to package/kde31/kdeedu/kdeedu.desc
index 632612674..76ebe0a22 100644
--- a/package/kde31/kdeedu31/kdeedu31.desc
+++ b/package/kde31/kdeedu/kdeedu.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdeedu31/kdeedu31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 620.000
 
-[D] 1154862669 kdeedu-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdeedu-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdegames31/kdegames31.cache b/package/kde31/kdegames/kdegames.cache
similarity index 79%
rename from package/kde31/kdegames31/kdegames31.cache
rename to package/kde31/kdegames/kdegames.cache
index e011c2e99..a3d489489 100644
--- a/package/kde31/kdegames31/kdegames31.cache
+++ b/package/kde31/kdegames/kdegames.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdegames31/kdegames31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,18 +20,18 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073240410 Sun Jan  4 19:20:10 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062296029 Sun Aug 31 04:13:49 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdegames31.log 9-kdegames31.log
 
-[BUILDTIME] 216633 (9)
-[SIZE] 17.88 MB, 2219 files
+[BUILDTIME] 215878 (9)
+[SIZE] 17.97 MB, 2342 files
 
 [DEP] alsa arts31 audiofile bash binutils bzip2 coreutils diffutils
 [DEP] expat fam file findutils freetype gawk gcc3 gettext glibc23 grep
 [DEP] kdegames31 kdelibs31 libart_lgpl23 libjpeg libpng linux24-header
-[DEP] mad make mktemp net-tools ogg-vorbis perl5 qt qt31 sed sysfiles
-[DEP] tar util-linux xfree86 zlib
+[DEP] mad make mktemp net-tools ogg-vorbis perl5 qt31 sed sysfiles tar
+[DEP] util-linux xfree86 zlib
 
diff --git a/package/kde31/kdegames31/kdegames31.conf b/package/kde31/kdegames/kdegames.conf
similarity index 91%
rename from package/kde31/kdegames31/kdegames31.conf
rename to package/kde31/kdegames/kdegames.conf
index 8f8bc7af5..f7724ca79 100644
--- a/package/kde31/kdegames31/kdegames31.conf
+++ b/package/kde31/kdegames/kdegames.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdegames31/kdegames31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/kdegames31/kdegames31.desc b/package/kde31/kdegames/kdegames.desc
similarity index 91%
rename from package/kde31/kdegames31/kdegames31.desc
rename to package/kde31/kdegames/kdegames.desc
index a404b12af..58b242ba7 100644
--- a/package/kde31/kdegames31/kdegames31.desc
+++ b/package/kde31/kdegames/kdegames.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdegames31/kdegames31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 618.000
 
-[D] 2751050312 kdegames-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdegames-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdegraphics31/kdegraphics31.cache b/package/kde31/kdegraphics/kdegraphics.cache
similarity index 85%
rename from package/kde31/kdegraphics31/kdegraphics31.cache
rename to package/kde31/kdegraphics/kdegraphics.cache
index 11d20e365..890d808b0 100644
--- a/package/kde31/kdegraphics31/kdegraphics31.cache
+++ b/package/kde31/kdegraphics/kdegraphics.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdegraphics31/kdegraphics31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,14 +20,14 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073286584 Mon Jan  5 08:09:44 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062333104 Sun Aug 31 14:31:44 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdegraphics31.log 9-kdegraphics31.log
 
-[BUILDTIME] 241748 (9)
-[SIZE] 12.83 MB, 847 files
+[BUILDTIME] 242775 (9)
+[SIZE] 12.87 MB, 899 files
 
 [DEP] bash binutils bzip2 coreutils diffutils expat fam file findutils
 [DEP] freetype gawk gcc3 gettext glibc23 glut grep imlib kdegraphics31
diff --git a/package/kde31/kdegraphics31/kdegraphics31.conf b/package/kde31/kdegraphics/kdegraphics.conf
similarity index 91%
rename from package/kde31/kdegraphics31/kdegraphics31.conf
rename to package/kde31/kdegraphics/kdegraphics.conf
index f50f9236d..549eceff3 100644
--- a/package/kde31/kdegraphics31/kdegraphics31.conf
+++ b/package/kde31/kdegraphics/kdegraphics.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdegraphics31/kdegraphics31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/kdegraphics31/kdegraphics31.desc b/package/kde31/kdegraphics/kdegraphics.desc
similarity index 91%
rename from package/kde31/kdegraphics31/kdegraphics31.desc
rename to package/kde31/kdegraphics/kdegraphics.desc
index a2aec4eb8..99ab3bc69 100644
--- a/package/kde31/kdegraphics31/kdegraphics31.desc
+++ b/package/kde31/kdegraphics/kdegraphics.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdegraphics31/kdegraphics31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 821.000
 
-[D] 4119717759 kdegraphics-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdegraphics-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdelibs31/config.hlp b/package/kde31/kdelibs/config.hlp
similarity index 94%
rename from package/kde31/kdelibs31/config.hlp
rename to package/kde31/kdelibs/config.hlp
index 2e9fc95ee..471be5522 100644
--- a/package/kde31/kdelibs31/config.hlp
+++ b/package/kde31/kdelibs/config.hlp
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdelibs31/config.hlp
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/package/kde31/kdelibs31/config.in b/package/kde31/kdelibs/config.in
similarity index 80%
rename from package/kde31/kdelibs31/config.in
rename to package/kde31/kdelibs/config.in
index ac424304e..2524a17b6 100644
--- a/package/kde31/kdelibs31/config.in
+++ b/package/kde31/kdelibs/config.in
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdelibs31/config.in
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,10 +20,10 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-if pkgcheck kdelibs31 X ; then
- 	menu_begin MENU_PKG_KDE31 'KDE 3.1 Package Options'
-		text 'Install prefix for KDE 3.1 Packages' \
-			ROCKCFG_PKG_KDE31_CORE_PREFIX "opt/kde31"
+if pkgcheck kdelibs X ; then
+ 	menu_begin MENU_PKG_KDE31 'KDE 3.2 Package Options'
+		text 'Install prefix for KDE 3.2 Packages' \
+			ROCKCFG_PKG_KDE32_CORE_PREFIX "opt/kde32"
 	menu_end
 fi
 
diff --git a/package/kde31/kdelibs/kde-32.conf b/package/kde31/kdelibs/kde-32.conf
new file mode 100644
index 000000000..d642abeb9
--- /dev/null
+++ b/package/kde31/kdelibs/kde-32.conf
@@ -0,0 +1,30 @@
+
+if [ "$prefix_auto" = 1 ] ; then
+  if [ "$NO_SANITY_CHECK" ] ; then
+	prefix=$ROCKCFG_PKG_KDE32_CORE_PREFIX
+  else 
+	for dir in usr opt/kde32 $ROCKCFG_PKG_KDE32_CORE_PREFIX ; do
+		[ -f "$root/$dir/bin/artsd" ] && prefix="$dir"
+	done
+
+	[ ! -f "$root/$prefix/bin/artsd" ] &&
+	abort "kdelibs (artsd) is not installed (in prefix $prefix)!"
+  fi
+
+  set_confopt
+fi
+
+# make sure the right qt and kde libs are used
+export LD_LIBRARY_PATH="$QTDIR/lib:/$prefix/lib:$LD_LIBRARY_PATH"
+
+# KDE specific configure options
+var_append confopt " " "--with-qt-dir=$QTDIR \
+                        --with-qt-includes=$QTDIR/include \
+                        --with-qt-libraries=$QTDIR/lib"
+
+# some feature and optimization settings ...
+
+var_append confopt " " "--with-xinerama --enable-dnotify"
+
+[ $arch = x86 ] && var_append confopt " " "--enable-fast-malloc=full"
+
diff --git a/package/kde31/kdelibs31/kdelibs31.cache b/package/kde31/kdelibs/kdelibs.cache
similarity index 82%
rename from package/kde31/kdelibs31/kdelibs31.cache
rename to package/kde31/kdelibs/kdelibs.cache
index 6fe9f8bae..eab4c5c8f 100644
--- a/package/kde31/kdelibs31/kdelibs31.cache
+++ b/package/kde31/kdelibs/kdelibs.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdelibs31/kdelibs31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,18 +20,18 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073215343 Sun Jan  4 12:22:23 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062252439 Sat Aug 30 16:07:19 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdelibs31.log 9-kdelibs31.log
 
-[BUILDTIME] 529127 (9)
-[SIZE] 27.97 MB, 3988 files
+[BUILDTIME] 529098 (9)
+[SIZE] 27.92 MB, 4004 files
 
 [DEP] alsa arts31 audiofile bash binutils bzip2 coreutils cups diffutils
 [DEP] expat fam file findutils freetype gawk gcc3 gettext glibc23 grep
 [DEP] kdelibs31 libart_lgpl23 libjpeg libpng libtiff libxml2 libxslt
 [DEP] linux24-header mad make mktemp net-tools ogg-vorbis openssl pcre
-[DEP] perl5 qt qt31 sed sysfiles tar util-linux xfree86 zlib
+[DEP] perl5 qt31 sed sysfiles tar util-linux xfree86 zlib
 
diff --git a/package/kde31/kdelibs31/kdelibs31.conf b/package/kde31/kdelibs/kdelibs.conf
similarity index 89%
rename from package/kde31/kdelibs31/kdelibs31.conf
rename to package/kde31/kdelibs/kdelibs.conf
index 8ce434c53..2edcf5374 100644
--- a/package/kde31/kdelibs31/kdelibs31.conf
+++ b/package/kde31/kdelibs/kdelibs.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdelibs31/kdelibs31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,11 +20,11 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
 
 kde_pm() {
         
-	cat > $root/etc/profile.d/kde31 <<-EOP
+	cat > $root/etc/profile.d/kde32 <<-EOP
 KDEDIR31=/$prefix
 KDEDIR=/$prefix
 PATH="\$PATH:\$KDEDIR/bin"
diff --git a/package/kde31/kdelibs31/kdelibs31.desc b/package/kde31/kdelibs/kdelibs.desc
similarity index 91%
rename from package/kde31/kdelibs31/kdelibs31.desc
rename to package/kde31/kdelibs/kdelibs.desc
index 665e44e11..913d94639 100644
--- a/package/kde31/kdelibs31/kdelibs31.desc
+++ b/package/kde31/kdelibs/kdelibs.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdelibs31/kdelibs31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 586.000
 
-[D] 2264416089 kdelibs-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdelibs-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdelibs/qt-3.3-fix.patch b/package/kde31/kdelibs/qt-3.3-fix.patch
new file mode 100644
index 000000000..8b9bd81be
--- /dev/null
+++ b/package/kde31/kdelibs/qt-3.3-fix.patch
@@ -0,0 +1,22 @@
+
+A official kde-3.2 + qt-3.3 adaption patch sent by:
+
+  - Raphael Langerhorst <raphael-langerhorst@gmx.at> 
+
+--- kdelibs-3.1.95/kdefx/kstyle.cpp.orig	2004-01-17 13:53:01.000000000 +0100
++++ kdelibs-3.1.95/kdefx/kstyle.cpp	2004-01-20 08:37:44.625573288 +0100
+@@ -971,14 +971,6 @@
+ 		case PM_MaximumDragDistance:
+ 			return -1;
+ 
+-#if QT_VERSION >= 0x030300
+-		case PM_MenuBarItemSpacing:
+-			return 3;
+-
+-		case PM_ToolBarItemSpacing:
+-			return 0;
+-#endif
+-
+ 		default:
+ 			return QCommonStyle::pixelMetric( m, widget );
+ 	}
diff --git a/package/kde31/kdelibs31/kde-31.conf b/package/kde31/kdelibs31/kde-31.conf
deleted file mode 100644
index 4ca4596a3..000000000
--- a/package/kde31/kdelibs31/kde-31.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-
-if [ "$prefix_auto" = 1 ] ; then
-  if [ "$NO_SANITY_CHECK" ] ; then
-	prefix=$ROCKCFG_PKG_KDE31_CORE_PREFIX
-  else 
-	for dir in usr opt/kde31 $ROCKCFG_PKG_KDE31_CORE_PREFIX ; do
-		[ -f "$root/$dir/bin/artsd" ] && prefix="$dir"
-	done
-
-	[ ! -f "$root/$prefix/bin/artsd" ] &&
-	abort "kdelibs (artsd) is not installed (in prefix $prefix)!"
-  fi
-
-  set_confopt
-fi
-
-# make sure the right qt and kde libs are used
-export LD_LIBRARY_PATH="$QTDIR/lib:/$prefix/lib:$LD_LIBRARY_PATH"
-
-# KDE specific configure options
-confopt="$confopt --with-qt-dir=$QTDIR --with-qt-includes=$QTDIR/include \
-         --with-qt-libraries=$QTDIR/lib --enable-dnotify"
-
-# --enable-final often breaks things ...
-
-# ALSA 1.0 API change workaround ... :-(
-var_append GCC_WRAPPER_APPEND " " \
-           "-DALSA_PCM_OLD_HW_PARAMS_API -DALSA_PCM_OLD_SW_PARAMS_API"
-
-# the ALSA headers are not ANSI C ...
-var_append GCC_WRAPPER_REMOVE " " "-ansi"
-
diff --git a/package/kde31/kdemultimedia31/kdemultimedia31.cache b/package/kde31/kdemultimedia/kdemultimedia.cache
similarity index 82%
rename from package/kde31/kdemultimedia31/kdemultimedia31.cache
rename to package/kde31/kdemultimedia/kdemultimedia.cache
index 4515d779b..23f8e38da 100644
--- a/package/kde31/kdemultimedia31/kdemultimedia31.cache
+++ b/package/kde31/kdemultimedia/kdemultimedia.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdemultimedia31/kdemultimedia31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,18 +20,18 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073237124 Sun Jan  4 18:25:24 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062292773 Sun Aug 31 03:19:33 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdemultimedia31.log 9-kdemultimedia31.log
 
-[BUILDTIME] 356067 (9)
-[SIZE] 19.73 MB, 1145 files
+[BUILDTIME] 377543 (9)
+[SIZE] 19.79 MB, 1196 files
 
 [DEP] alsa arts31 audiofile bash binutils bzip2 cdparanoia coreutils
 [DEP] diffutils expat fam file findutils freetype gawk gcc3 gettext
 [DEP] glibc23 grep kdelibs31 kdemultimedia31 lame libart_lgpl23 libjpeg
 [DEP] libpng libtiff linux24-header mad make mktemp net-tools ogg-vorbis
-[DEP] perl5 qt qt31 sed sysfiles tar util-linux xfree86 xine zlib
+[DEP] perl5 qt31 sed sysfiles tar util-linux xfree86 xine zlib
 
diff --git a/package/kde31/kdemultimedia31/kdemultimedia31.conf b/package/kde31/kdemultimedia/kdemultimedia.conf
similarity index 91%
rename from package/kde31/kdemultimedia31/kdemultimedia31.conf
rename to package/kde31/kdemultimedia/kdemultimedia.conf
index 4db845a86..c52bd4e04 100644
--- a/package/kde31/kdemultimedia31/kdemultimedia31.conf
+++ b/package/kde31/kdemultimedia/kdemultimedia.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdemultimedia31/kdemultimedia31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,5 +20,5 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
 
diff --git a/package/kde31/kdemultimedia31/kdemultimedia31.desc b/package/kde31/kdemultimedia/kdemultimedia.desc
similarity index 91%
rename from package/kde31/kdemultimedia31/kdemultimedia31.desc
rename to package/kde31/kdemultimedia/kdemultimedia.desc
index 2073719ee..6d345ab1c 100644
--- a/package/kde31/kdemultimedia31/kdemultimedia31.desc
+++ b/package/kde31/kdemultimedia/kdemultimedia.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdemultimedia31/kdemultimedia31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 596.000
 
-[D] 548048870 kdemultimedia-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdemultimedia-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdenetwork31/kdenetwork31.cache b/package/kde31/kdenetwork/kdenetwork.cache
similarity index 79%
rename from package/kde31/kdenetwork31/kdenetwork31.cache
rename to package/kde31/kdenetwork/kdenetwork.cache
index fe6dedf76..70f5a2bb1 100644
--- a/package/kde31/kdenetwork31/kdenetwork31.cache
+++ b/package/kde31/kdenetwork/kdenetwork.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdenetwork31/kdenetwork31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,18 +20,17 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073230977 Sun Jan  4 16:42:57 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062279798 Sat Aug 30 23:43:18 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdenetwork31.log 9-kdenetwork31.log
 
-[BUILDTIME] 269437 (9)
-[SIZE] 16.40 MB, 1236 files
+[BUILDTIME] 270044 (9)
+[SIZE] 16.44 MB, 1307 files
 
 [DEP] bash binutils bzip2 coreutils diffutils expat fam file findutils
 [DEP] freetype gawk gcc3 gettext glibc23 grep kdelibs31 kdenetwork31
 [DEP] libart_lgpl23 libjpeg libpng libtiff linux24-header make mktemp
-[DEP] net-tools openslp patch pcre perl5 qt qt31 sed sysfiles tar
-[DEP] util-linux xfree86 zlib
+[DEP] net-tools pcre perl5 qt31 sed sysfiles tar util-linux xfree86 zlib
 
diff --git a/package/kde31/kdenetwork31/kdenetwork31.conf b/package/kde31/kdenetwork/kdenetwork.conf
similarity index 91%
rename from package/kde31/kdenetwork31/kdenetwork31.conf
rename to package/kde31/kdenetwork/kdenetwork.conf
index b473c2621..f55b29cde 100644
--- a/package/kde31/kdenetwork31/kdenetwork31.conf
+++ b/package/kde31/kdenetwork/kdenetwork.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdenetwork31/kdenetwork31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/kdenetwork31/kdenetwork31.desc b/package/kde31/kdenetwork/kdenetwork.desc
similarity index 91%
rename from package/kde31/kdenetwork31/kdenetwork31.desc
rename to package/kde31/kdenetwork/kdenetwork.desc
index 644ff9599..094e33282 100644
--- a/package/kde31/kdenetwork31/kdenetwork31.desc
+++ b/package/kde31/kdenetwork/kdenetwork.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdenetwork31/kdenetwork31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 592.000
 
-[D] 1325908669 kdenetwork-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdenetwork-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdenetwork31/kmime_codec_qp.cpp.patch b/package/kde31/kdenetwork31/kmime_codec_qp.cpp.patch
deleted file mode 100644
index 3d37a7bb0..000000000
--- a/package/kde31/kdenetwork31/kmime_codec_qp.cpp.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/kde31/kdenetwork31/kmime_codec_qp.cpp.patch
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-Use of tainted arguments in exec is deprecated at /var/www/cgi-bin/cvsweb.cgi line 2043.
-===================================================================
-RCS file: /home2/webcvs/mirror/kdepim/libkdenetwork/kmime_codec_qp.cpp,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -p -r1.12 -r1.13
---- kdepim/libkdenetwork/kmime_codec_qp.cpp	2003/07/26 14:51:52	1.12
-+++ kdepim/libkdenetwork/kmime_codec_qp.cpp	2003/10/30 14:15:30	1.13
-@@ -189,6 +189,20 @@ public:
-   bool finish( char* & dcursor, const char * const dend );
- };
- 
-+// this doesn't access any member variables, so it can be defined static
-+// but then we can't call it from virtual functions
-+static int QuotedPrintableDecoder_maxDecodedSizeFor( int insize, bool withCRLF ) {
-+  // all chars unencoded:
-+  int result = insize;
-+  // but maybe all of them are \n and we need to make them \r\n :-o
-+  if ( withCRLF )
-+    result += insize;
-+
-+  // there might be an accu plus escape
-+  result += 2;
-+
-+  return result;
-+}
- 
- Encoder * QuotedPrintableCodec::makeEncoder( bool withCRLF ) const {
-   return new QuotedPrintableEncoder( withCRLF );
-@@ -198,6 +212,10 @@ Decoder * QuotedPrintableCodec::makeDeco
-   return new QuotedPrintableDecoder( withCRLF );
- }
- 
-+int QuotedPrintableCodec::maxDecodedSizeFor( int insize, bool withCRLF ) const {
-+    return QuotedPrintableDecoder_maxDecodedSizeFor(insize, withCRLF);
-+}
-+
- Encoder * Rfc2047QEncodingCodec::makeEncoder( bool withCRLF ) const {
-   return new Rfc2047QEncodingEncoder( withCRLF );
- }
-@@ -206,6 +224,10 @@ Decoder * Rfc2047QEncodingCodec::makeDec
-   return new QuotedPrintableDecoder( withCRLF, true );
- }
- 
-+int Rfc2047QEncodingCodec::maxDecodedSizeFor( int insize, bool withCRLF ) const {
-+    return QuotedPrintableDecoder_maxDecodedSizeFor(insize, withCRLF);
-+}
-+
- Encoder * Rfc2231EncodingCodec::makeEncoder( bool withCRLF ) const {
-   return new Rfc2047QEncodingEncoder( withCRLF, '%' );
- }
-@@ -214,12 +236,14 @@ Decoder * Rfc2231EncodingCodec::makeDeco
-   return new QuotedPrintableDecoder( withCRLF, true, '%' );
- }
- 
-+int Rfc2231EncodingCodec::maxDecodedSizeFor( int insize, bool withCRLF ) const {
-+    return QuotedPrintableDecoder_maxDecodedSizeFor(insize, withCRLF);
-+}
- 
-   /********************************************************/
-   /********************************************************/
-   /********************************************************/
- 
--
- bool QuotedPrintableDecoder::decode( const char* & scursor, const char * const send,
- 				     char* & dcursor, const char * const dend ) {
-   if ( mWithCRLF )
-@@ -402,7 +426,7 @@ bool QuotedPrintableEncoder::processNext
-     bufferFill += 16;
- 
-   assert( bufferFill >=0 && bufferFill <= 15 );
--  
-+
-   if ( !mFinishing && !mSawLineEnd &&
-        bufferFill < minBufferFillWithoutLineEnd )
-     return false;
-@@ -424,7 +448,7 @@ bool QuotedPrintableEncoder::processNext
-   else
-     // never needs encoding
-     mAccuNeedsEncoding = Never;
--  
-+
-   return true;
- }
- 
-@@ -485,7 +509,7 @@ bool QuotedPrintableEncoder::encode( con
-     // fill input buffer until eol has been reached or until the
-     // buffer is full, whatever comes first:
-     fillInputBuffer( scursor, send );
--    
-+
-     if ( processNextChar() )
-       // there was one...
-       createOutputBuffer( dcursor, dend );
-@@ -506,7 +530,7 @@ bool QuotedPrintableEncoder::encode( con
-   if ( mOutputBufferCursor ) flushOutputBuffer( dcursor, dend );
- 
-   return (scursor == send);
--   
-+
- } // encode
- 
- bool QuotedPrintableEncoder::finish( char* & dcursor,
diff --git a/package/kde31/kdenetwork31/kmime_codec_qp.h.patch b/package/kde31/kdenetwork31/kmime_codec_qp.h.patch
deleted file mode 100644
index 4262773b7..000000000
--- a/package/kde31/kdenetwork31/kmime_codec_qp.h.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/kde31/kdenetwork31/kmime_codec_qp.h.patch
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-Use of tainted arguments in exec is deprecated at /var/www/cgi-bin/cvsweb.cgi line 2043.
-===================================================================
-RCS file: /home2/webcvs/mirror/kdepim/libkdenetwork/kmime_codec_qp.h,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -p -r1.4 -r1.5
---- kdepim/libkdenetwork/kmime_codec_qp.h	2003/07/26 14:51:52	1.4
-+++ kdepim/libkdenetwork/kmime_codec_qp.h	2003/10/30 14:15:30	1.5
-@@ -54,19 +54,11 @@ public:
-     int result = 3*insize;
-     // then after 25 hexchars comes a soft linebreak: =(\r)\n
-     result += (withCRLF ? 3 : 2) * (insize/25);
--
-+    
-     return result;
-   }
- 
--  int maxDecodedSizeFor( int insize, bool withCRLF=false ) const {
--    // all chars unencoded:
--    int result = insize;
--    // but maybe all of them are \n and we need to make them \r\n :-o
--    if ( withCRLF )
--      result += insize;
--
--    return result;
--  }
-+  int maxDecodedSizeFor( int insize, bool withCRLF=false ) const;
- 
-   Encoder * makeEncoder( bool withCRLF=false ) const;
-   Decoder * makeDecoder( bool withCRLF=false ) const;
-@@ -92,11 +84,7 @@ public:
-     return 3*insize;
-   }
- 
--  int maxDecodedSizeFor( int insize, bool withCRLF=false ) const {
--    (void)withCRLF; // keep compiler happy
--    // equally simple: nothing is encoded at all, so:
--    return insize;
--  }
-+  int maxDecodedSizeFor( int insize, bool withCRLF=false ) const;
- 
-   Encoder * makeEncoder( bool withCRLF=false ) const;
-   Decoder * makeDecoder( bool withCRLF=false ) const;
-@@ -121,11 +109,7 @@ public:
-     return 3*insize;
-   }
- 
--  int maxDecodedSizeFor( int insize, bool withCRLF=false ) const {
--    (void)withCRLF; // keep compiler happy
--    // same as for "q" encoding:
--    return insize;
--  }
-+  int maxDecodedSizeFor( int insize, bool withCRLF=false ) const;
- 
-   Encoder * makeEncoder( bool withCRLF=false ) const;
-   Decoder * makeDecoder( bool withCRLF=false ) const;
diff --git a/package/kde31/kdepim31/kdepim31.cache b/package/kde31/kdepim/kdepim.cache
similarity index 81%
rename from package/kde31/kdepim31/kdepim31.cache
rename to package/kde31/kdepim/kdepim.cache
index 54851fd0f..c603e5e63 100644
--- a/package/kde31/kdepim31/kdepim31.cache
+++ b/package/kde31/kdepim/kdepim.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdepim31/kdepim31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,18 +20,18 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073233193 Sun Jan  4 17:19:53 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062282028 Sun Aug 31 00:20:28 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdepim31.log 9-kdepim31.log
 
-[BUILDTIME] 218127 (9)
-[SIZE] 8.18 MB, 546 files
+[BUILDTIME] 218446 (9)
+[SIZE] 8.22 MB, 590 files
 
 [DEP] bash binutils bison bzip2 coreutils diffutils expat fam file
 [DEP] findutils flex freetype gawk gcc3 gettext glibc23 grep kdelibs31
 [DEP] kdepim31 libart_lgpl23 libjpeg libpng linux24-header m4 make mktemp
-[DEP] ncurses net-tools numpy perl5 pilot-link python qt qt31 sed sysfiles
+[DEP] ncurses net-tools perl5 pilot-link python qt31 readline sed sysfiles
 [DEP] tar util-linux xfree86 zlib
 
diff --git a/package/kde31/kdepim31/kdepim31.conf b/package/kde31/kdepim/kdepim.conf
similarity index 91%
rename from package/kde31/kdepim31/kdepim31.conf
rename to package/kde31/kdepim/kdepim.conf
index e4c97b8ff..22da5b415 100644
--- a/package/kde31/kdepim31/kdepim31.conf
+++ b/package/kde31/kdepim/kdepim.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdepim31/kdepim31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/kdepim31/kdepim31.desc b/package/kde31/kdepim/kdepim.desc
similarity index 91%
rename from package/kde31/kdepim31/kdepim31.desc
rename to package/kde31/kdepim/kdepim.desc
index 7be362a2b..e992699ed 100644
--- a/package/kde31/kdepim31/kdepim31.desc
+++ b/package/kde31/kdepim/kdepim.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdepim31/kdepim31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 593.000
 
-[D] 2856091095 kdepim-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdepim-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdesdk31/kdesdk31.cache b/package/kde31/kdesdk/kdesdk.cache
similarity index 67%
rename from package/kde31/kdesdk31/kdesdk31.cache
rename to package/kde31/kdesdk/kdesdk.cache
index 1a65b8d52..20fc0538b 100644
--- a/package/kde31/kdesdk31/kdesdk31.cache
+++ b/package/kde31/kdesdk/kdesdk.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdesdk31/kdesdk31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,17 +20,17 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073663200 Fri Jan  9 16:46:40 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062287697 Sun Aug 31 01:54:57 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdesdk31.log 9-kdesdk31.log
 
-[BUILDTIME] 129299 (9)
-[SIZE] 7.27 MB, 632 files
+[BUILDTIME] 133142 (9)
+[SIZE] 7.25 MB, 590 files
 
-[DEP] 00-dirtree bash bdb41 binutils bzip2 coreutils diffutils expat fam
-[DEP] file findutils flex freetype gawk gcc3 gettext glibc23 grep kdelibs31
-[DEP] libart_lgpl23 libjpeg libpng linux24-header m4 make mktemp net-tools
-[DEP] pcre perl5 qt qt31 sed sysfiles tar util-linux xfree86 zlib
+[DEP] bash bdb41 binutils bzip2 coreutils diffutils expat fam file
+[DEP] findutils flex freetype gawk gcc3 gettext glibc23 grep kdelibs31
+[DEP] kdesdk31 libart_lgpl23 libjpeg libpng linux24-header make mktemp
+[DEP] net-tools pcre perl5 qt31 sed sysfiles tar util-linux xfree86 zlib
 
diff --git a/package/kde31/kdesdk/kdesdk.conf b/package/kde31/kdesdk/kdesdk.conf
new file mode 100644
index 000000000..181802189
--- /dev/null
+++ b/package/kde31/kdesdk/kdesdk.conf
@@ -0,0 +1,23 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/kde31/kdesdk31/kdesdk31.conf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/kdesdk31/kdesdk31.desc b/package/kde31/kdesdk/kdesdk.desc
similarity index 91%
rename from package/kde31/kdesdk31/kdesdk31.desc
rename to package/kde31/kdesdk/kdesdk.desc
index 880ac883d..b7b459b5a 100644
--- a/package/kde31/kdesdk31/kdesdk31.desc
+++ b/package/kde31/kdesdk/kdesdk.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdesdk31/kdesdk31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -39,8 +39,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 595.000
 
-[D] 1202588010 kdesdk-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdesdk-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdesdk31/kdesdk31.conf b/package/kde31/kdesdk31/kdesdk31.conf
deleted file mode 100644
index d5cd14d7e..000000000
--- a/package/kde31/kdesdk31/kdesdk31.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/kde31/kdesdk31/kdesdk31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-. $base/package/*/*/kde-31.conf
-
-# regenerate the broken shipped pofiles.cc
-hook_add premake 5 "flex -+ -o kbabel/common/libgettext/pofiles.{cc,ll}"
-
diff --git a/package/kde31/kdetoys31/kdetoys31.cache b/package/kde31/kdetoys/kdetoys.cache
similarity index 71%
rename from package/kde31/kdetoys31/kdetoys31.cache
rename to package/kde31/kdetoys/kdetoys.cache
index a596bbf62..568373c93 100644
--- a/package/kde31/kdetoys31/kdetoys31.cache
+++ b/package/kde31/kdetoys/kdetoys.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdetoys31/kdetoys31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,17 +20,17 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073238174 Sun Jan  4 18:42:54 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062293823 Sun Aug 31 03:37:03 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdetoys31.log 9-kdetoys31.log
 
-[BUILDTIME] 36125 (9)
-[SIZE] 3.40 MB, 604 files
+[BUILDTIME] 36074 (9)
+[SIZE] 3.43 MB, 636 files
 
 [DEP] bash binutils bzip2 coreutils diffutils expat fam file findutils
-[DEP] freetype gcc3 gettext glibc23 grep kdelibs31 kdetoys31 libart_lgpl23
-[DEP] libjpeg libpng libtiff linux24-header make mktemp net-tools pcre
-[DEP] perl5 qt qt31 sed sysfiles tar util-linux xfree86 zlib
+[DEP] freetype gawk gcc3 gettext glibc23 grep kdelibs31 kdetoys31
+[DEP] libart_lgpl23 libjpeg libpng libtiff linux24-header make mktemp
+[DEP] net-tools pcre perl5 qt31 sed sysfiles tar util-linux xfree86 zlib
 
diff --git a/package/kde31/kdetoys31/kdetoys31.conf b/package/kde31/kdetoys/kdetoys.conf
similarity index 91%
rename from package/kde31/kdetoys31/kdetoys31.conf
rename to package/kde31/kdetoys/kdetoys.conf
index 453946296..89f24f94a 100644
--- a/package/kde31/kdetoys31/kdetoys31.conf
+++ b/package/kde31/kdetoys/kdetoys.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdetoys31/kdetoys31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/kdetoys31/kdetoys31.desc b/package/kde31/kdetoys/kdetoys.desc
similarity index 91%
rename from package/kde31/kdetoys31/kdetoys31.desc
rename to package/kde31/kdetoys/kdetoys.desc
index b1e4a3f52..c57fccb6d 100644
--- a/package/kde31/kdetoys31/kdetoys31.desc
+++ b/package/kde31/kdetoys/kdetoys.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdetoys31/kdetoys31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 616.000
 
-[D] 2277104970 kdetoys-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdetoys-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/kdeutils31/kdeutils31.cache b/package/kde31/kdeutils/kdeutils.cache
similarity index 81%
rename from package/kde31/kdeutils31/kdeutils31.cache
rename to package/kde31/kdeutils/kdeutils.cache
index 4bfcf7624..18211f06f 100644
--- a/package/kde31/kdeutils31/kdeutils31.cache
+++ b/package/kde31/kdeutils/kdeutils.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdeutils31/kdeutils31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,17 +20,17 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073227255 Sun Jan  4 15:40:55 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062274767 Sat Aug 30 22:19:27 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-kdeutils31.log 9-kdeutils31.log
 
-[BUILDTIME] 111724 (9)
-[SIZE] 4.80 MB, 370 files
+[BUILDTIME] 114633 (9)
+[SIZE] 4.86 MB, 446 files
 
 [DEP] bash binutils bzip2 coreutils diffutils expat fam file findutils
 [DEP] freetype gawk gcc3 gettext glibc23 grep kdelibs31 kdeutils31
 [DEP] libart_lgpl23 libjpeg libpng linux24-header make mktemp net-tools
-[DEP] perl5 qt qt31 sed sysfiles tar util-linux xfree86 zlib
+[DEP] perl5 qt31 sed sysfiles tar util-linux xfree86 zlib
 
diff --git a/package/kde31/kdeutils31/kdeutils31.conf b/package/kde31/kdeutils/kdeutils.conf
similarity index 91%
rename from package/kde31/kdeutils31/kdeutils31.conf
rename to package/kde31/kdeutils/kdeutils.conf
index 2f9041e7d..3b457f53b 100644
--- a/package/kde31/kdeutils31/kdeutils31.conf
+++ b/package/kde31/kdeutils/kdeutils.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/kdeutils31/kdeutils31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/kdeutils31/kdeutils31.desc b/package/kde31/kdeutils/kdeutils.desc
similarity index 91%
rename from package/kde31/kdeutils31/kdeutils31.desc
rename to package/kde31/kdeutils/kdeutils.desc
index 010c95140..380051a6b 100644
--- a/package/kde31/kdeutils31/kdeutils31.desc
+++ b/package/kde31/kdeutils/kdeutils.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/kdeutils31/kdeutils31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 590.000
 
-[D] 535212939 kdeutils-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 kdeutils-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/qt/disable-tutorial-examples.patch b/package/kde31/qt/disable-tutorial-examples.patch
new file mode 100644
index 000000000..23d83f922
--- /dev/null
+++ b/package/kde31/qt/disable-tutorial-examples.patch
@@ -0,0 +1,33 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/kde31/qt31/disable-tutorial-examples.patch
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+--- ./Makefile.orig	Wed Apr  3 16:47:45 2002
++++ ./Makefile	Wed Apr  3 16:48:28 2002
+@@ -10,7 +10,7 @@
+ install: FORCE
+ 	@$(MAKE) qt.install
+ 
+-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
++all: symlinks src-qmake src-moc sub-src sub-tools
+ 	@echo
+ 	@echo "The Qt library is now built in ./lib"
+ 	@echo "The Qt examples are built in the directories in ./examples"
diff --git a/package/kde31/qt31/qt31.cache b/package/kde31/qt/qt.cache
similarity index 83%
rename from package/kde31/qt31/qt31.cache
rename to package/kde31/qt/qt.cache
index 090bcd23c..409a259e9 100644
--- a/package/kde31/qt31/qt31.cache
+++ b/package/kde31/qt/qt.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/qt31/qt31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,14 +20,14 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073155740 Sat Jan  3 19:49:00 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062169544 Fri Aug 29 17:05:44 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-qt31.log 9-qt31.log
 
-[BUILDTIME] 296803 (9)
-[SIZE] 84.84 MB, 6998 files
+[BUILDTIME] 297311 (9)
+[SIZE] 84.82 MB, 6998 files
 
 [DEP] bash binutils bzip2 coreutils cups diffutils expat findutils gawk
 [DEP] gcc3 glibc23 grep libjpeg libmng libpng linux24-header make patch
diff --git a/package/kde31/qt31/qt31.conf b/package/kde31/qt/qt.conf
similarity index 73%
rename from package/kde31/qt31/qt31.conf
rename to package/kde31/qt/qt.conf
index 1f34b26c6..5c73e99fc 100644
--- a/package/kde31/qt31/qt31.conf
+++ b/package/kde31/qt/qt.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/qt31/qt31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,12 +21,15 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 if [ $prefix_auto = 1 ] ; then
-        prefix="opt/qt31"
-        set_confopt
+	prefix="opt/qt32"
+	set_confopt
 fi
 
 qt_main() {
-	export QTDIR=$PWD
+	QTDIR=$PWD
+	var_insert LD_LIBRARY_PATH ':' "$QTDIR/lib"
+	var_insert PATH ':' "$QTDIR/bin"
+	export QTDIR LD_LIBRARY_PATH PATH
 	
 	# an optimization crashes g++ during the Makefile generator build :-(
 	echo "yes" | ( CXX_WRAPPER_BYPASS=1 ; ./configure \
@@ -35,20 +38,23 @@ qt_main() {
 
 	eval $MAKE ; eval $MAKE install
 
+	# create compatibility links ...
 	(cd $root/$prefix/lib/ ; for x in libqt-mt.so* ; do
-	ln -svf $x `echo $x | sed 's,-mt,,'` ;done)
+		ln -svf $x ${x/-mt}
+	done)
 	
-        echo "Copy some documentation:"
-	cp -r ch* doc/html tutorial examples extensions tools $docdir
+        echo "Copy some documentation ..."
+	# to be done in another package: examples extensions tutorial tools ...
+	cp -r ch* doc/html tutorial $docdir/
 	
 	find $docdir -name '*.o' | xargs rm -vf
 	find $docdir -type f -perm +111 | xargs strip -v || true
 	
-	cat > $root/etc/profile.d/qt-31 <<-EOP
-QT31DIR=/$prefix
+	cat > $root/etc/profile.d/qt32 <<-EOT
+QT32DIR=/$prefix
 QTDIR=/$prefix
-export QT31DIR QTDIR
-EOP
+export QT32DIR QTDIR
+EOT
 }
 
 createdocs=0
diff --git a/package/kde31/qt31/qt31.desc b/package/kde31/qt/qt.desc
similarity index 90%
rename from package/kde31/qt31/qt31.desc
rename to package/kde31/qt/qt.desc
index 0e75300df..1b57c2714 100644
--- a/package/kde31/qt31/qt31.desc
+++ b/package/kde31/qt/qt.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/qt31/qt31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -36,8 +36,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.2
+[V] 3.3.0
 [P] X -----5---9 303.000
 
-[D] 3637956084 qt-x11-free-3.1.2.tar.bz2 ftp://ftp.trolltech.com/qt/source/
+[D] 0 qt-x11-free-3.3.0.tar.bz2 ftp://ftp.trolltech.com/qt/source/
 
diff --git a/package/kde31/qt31/disable-tutorial-examples.patch b/package/kde31/qt31/disable-tutorial-examples.patch
deleted file mode 100644
index e3f56b8ee..000000000
--- a/package/kde31/qt31/disable-tutorial-examples.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/kde31/qt31/disable-tutorial-examples.patch
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./Makefile.orig	Wed Apr  3 16:47:45 2002
-+++ ./Makefile	Wed Apr  3 16:48:28 2002
-@@ -10,7 +10,7 @@
- install: FORCE
- 	@$(MAKE) qt.install
- 
--all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
-+all: symlinks src-qmake src-moc sub-src sub-tools
- 	@echo
- 	@echo "The Qt library is now built in ./lib"
- 	@echo "The Qt examples are built in the directories in ./examples"
diff --git a/package/kde31/quanta31/quanta31.cache b/package/kde31/quanta/quanta.cache
similarity index 80%
rename from package/kde31/quanta31/quanta31.cache
rename to package/kde31/quanta/quanta.cache
index 9667c03b4..fc1ec7230 100644
--- a/package/kde31/quanta31/quanta31.cache
+++ b/package/kde31/quanta/quanta.cache
@@ -6,7 +6,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/quanta31/quanta31.cache
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -20,17 +20,17 @@
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 
-[TIMESTAMP] 1073243866 Sun Jan  4 20:17:46 2004
-[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference
-[ROCKVER] 2.0.0-rc5
+[TIMESTAMP] 1062299708 Sun Aug 31 05:15:08 2003
+[CONFIG-ID] 2.0.0-rc2-x86-pentium-mmx-32-reference-expert
+[ROCKVER] 2.0.0-rc2
 
 [LOGS] 5-quanta31.log 9-quanta31.log
 
-[BUILDTIME] 125354 (9)
-[SIZE] 7.36 MB, 659 files
+[BUILDTIME] 126091 (9)
+[SIZE] 7.37 MB, 667 files
 
 [DEP] bash binutils bzip2 coreutils diffutils expat fam file findutils
 [DEP] freetype gawk gcc3 gettext glibc23 grep kdelibs31 libart_lgpl23
 [DEP] libjpeg libpng libtiff linux24-header make mktemp net-tools pcre
-[DEP] perl5 qt qt31 quanta31 sed sysfiles tar util-linux xfree86 zlib
+[DEP] perl5 qt31 quanta31 sed sysfiles tar util-linux xfree86 zlib
 
diff --git a/package/kde31/quanta31/quanta31.conf b/package/kde31/quanta/quanta.conf
similarity index 91%
rename from package/kde31/quanta31/quanta31.conf
rename to package/kde31/quanta/quanta.conf
index 38eef86b3..ec9c132cd 100644
--- a/package/kde31/quanta31/quanta31.conf
+++ b/package/kde31/quanta/quanta.conf
@@ -6,7 +6,7 @@
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kde31/quanta31/quanta31.conf
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,4 +20,4 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. $base/package/*/*/kde-31.conf
+. $base/package/*/*/kde-32.conf
diff --git a/package/kde31/quanta31/quanta31.desc b/package/kde31/quanta/quanta.desc
similarity index 90%
rename from package/kde31/quanta31/quanta31.desc
rename to package/kde31/quanta/quanta.desc
index eb9e001e0..4ab3eef19 100644
--- a/package/kde31/quanta31/quanta31.desc
+++ b/package/kde31/quanta/quanta.desc
@@ -7,7 +7,7 @@
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/kde31/quanta31/quanta31.desc
-[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
@@ -36,8 +36,8 @@
 
 [L] GPL
 [S] Stable
-[V] 3.1.5
+[V] 3.2.0
 [P] X -----5---9 623.000
 
-[D] 1233628881 quanta-3.1.5.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.1.5/src/
+[D] 0 quanta-3.2.0.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.2/src/
 
diff --git a/package/kde31/update-kde.sh b/package/kde31/update-kde.sh
index f5b9c9b2c..80326255b 100755
--- a/package/kde31/update-kde.sh
+++ b/package/kde31/update-kde.sh
@@ -5,10 +5,9 @@ if [ ! "$1" -o ! "$2" ] ; then
 	exit -1
 fi
 
-for x in arts* kde* quanta* ; do
+for x in kde* quanta* ; do
 	echo "Updateing $x ..."
-	sed 	-e s/$1/$2/g \
-		-e s,unstable/kde-$1,stable/kde-$2, \
+	sed 	-e s,$1,$2,g \
 		-e "s/\[D\] [0-9]* /\[D\] 0 /" $x/$x.desc > $x/$x.desc.new
 	mv $x/$x.desc.new $x/$x.desc
 done