summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:55:22 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:55:22 -0600
commit900df5e30c3de64b2872fcbd33b1e322a24ee672 (patch)
tree3b999742b9d38ccf28912888e98239636ed2c607
parentcbf8fcb42799f0a8ef32cc44df21fa2813fb54a4 (diff)
parentd78f33315c6d5acdb8cb801751d37058dc4137a3 (diff)
downloadtde-construct-900df5e30c3de64b2872fcbd33b1e322a24ee672.zip
tde-construct-900df5e30c3de64b2872fcbd33b1e322a24ee672.tar.gz
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-construct
-rw-r--r--apps/internet/kbear/files/fix-gcc-semicolons.diff2
-rw-r--r--apps/system/kconfigeditor/checksums1
-rw-r--r--apps/system/kio-locate/checksums2
-rw-r--r--apps/system/tdeconfigeditor/Makefile (renamed from apps/system/kconfigeditor/Makefile)2
-rw-r--r--apps/system/tdeconfigeditor/checksums1
-rw-r--r--libs/qt-x11-free/files/0049-qiconview-rubber_on_move.diff2
-rw-r--r--meta/everything/Makefile2
-rw-r--r--misc/detektive/files/mandrake-101.lst2
-rw-r--r--misc/detektive/files/mandrake-91.lst2
-rw-r--r--misc/detektive/files/mandrake-92.lst2
-rw-r--r--misc/detektive/files/suse-81.lst2
-rw-r--r--misc/detektive/files/suse-82.lst2
-rw-r--r--misc/detektive/files/suse-90.lst2
-rw-r--r--misc/detektive/files/suse-91.lst2
-rw-r--r--misc/detektive/files/suse-92.lst2
15 files changed, 14 insertions, 14 deletions
diff --git a/apps/internet/kbear/files/fix-gcc-semicolons.diff b/apps/internet/kbear/files/fix-gcc-semicolons.diff
index 168826d..68ca3f9 100644
--- a/apps/internet/kbear/files/fix-gcc-semicolons.diff
+++ b/apps/internet/kbear/files/fix-gcc-semicolons.diff
@@ -29,7 +29,7 @@
-};
+}
- void KBearCopyJob::slotEntries(KIO::Job* job, const KIO::UDSEntryList& list)
+ void KBearCopyJob::slotEntries(TDEIO::Job* job, const TDEIO::UDSEntryList& list)
{
--- ./work/kbear-2.1/kbear/kbeartransferview.h.orig 2002-11-04 18:15:17.000000000 -0500
+++ ./work/kbear-2.1/kbear/kbeartransferview.h 2004-11-17 11:47:44.494017728 -0500
diff --git a/apps/system/kconfigeditor/checksums b/apps/system/kconfigeditor/checksums
deleted file mode 100644
index d86fd92..0000000
--- a/apps/system/kconfigeditor/checksums
+++ /dev/null
@@ -1 +0,0 @@
-2a4c6ea286dd57f4ef23afb263f3d33c download/kconfigeditor-0.9.5.tar.bz2
diff --git a/apps/system/kio-locate/checksums b/apps/system/kio-locate/checksums
index dd3005d..5767eb4 100644
--- a/apps/system/kio-locate/checksums
+++ b/apps/system/kio-locate/checksums
@@ -1 +1 @@
-a102912dcce87fb562913c573d8e4e1c download/kio-locate_0.3.4.tar.gz
+a102912dcce87fb562913c573d8e4e1c download/tdeio-locate_0.3.4.tar.gz
diff --git a/apps/system/kconfigeditor/Makefile b/apps/system/tdeconfigeditor/Makefile
index 5b3484e..818998a 100644
--- a/apps/system/kconfigeditor/Makefile
+++ b/apps/system/tdeconfigeditor/Makefile
@@ -1,4 +1,4 @@
-GARNAME = kconfigeditor
+GARNAME = tdeconfigeditor
GARVERSION = 0.9.5
CATEGORIES = apps
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
diff --git a/apps/system/tdeconfigeditor/checksums b/apps/system/tdeconfigeditor/checksums
new file mode 100644
index 0000000..64c92db
--- /dev/null
+++ b/apps/system/tdeconfigeditor/checksums
@@ -0,0 +1 @@
+2a4c6ea286dd57f4ef23afb263f3d33c download/tdeconfigeditor-0.9.5.tar.bz2
diff --git a/libs/qt-x11-free/files/0049-qiconview-rubber_on_move.diff b/libs/qt-x11-free/files/0049-qiconview-rubber_on_move.diff
index a1367af..0dfcf93 100644
--- a/libs/qt-x11-free/files/0049-qiconview-rubber_on_move.diff
+++ b/libs/qt-x11-free/files/0049-qiconview-rubber_on_move.diff
@@ -5,7 +5,7 @@ author: Enrico Ros <eros.kde@email.it>
Unwanted toggling QIconViewItem focus on click.
This fixes the 'flashing' icon when clicking repeatedly on a QIconView or
-derivates (ie KIconView, KonqIconViewWidget, the KDesktop and so on..).
+derivates (ie TDEIconView, KonqIconViewWidget, the KDesktop and so on..).
The current behavior considers that if not over an icon, the user is
clicking down to perform icons selection (with the rubberband).
This is not always true, since a click might be used to give focus to a
diff --git a/meta/everything/Makefile b/meta/everything/Makefile
index 3d159f1..e3c1a02 100644
--- a/meta/everything/Makefile
+++ b/meta/everything/Makefile
@@ -2,7 +2,7 @@ GARNAME = everything
GARVERSION = 1
CATEGORIES = meta
-LIBDEPS = kde/tdebase kde/tdenetwork kde/tdepim kde/tdeaccessibility misc/ttf-bitstream-vera kde/tdeartwork kde/tdegraphics kde/tdemultimedia kde/tdeaddons kde/tdeutils kde/tdeedu kde/tdegames kde/tdesdk kde/tdewebdev kde/tdetoys kde/tdeadmin apps/office/koffice apps/development/tdevelop apps/multimedia/k3b apps/multimedia/amarok apps/graphics/digikam-plugins apps/utilities/filelight apps/multimedia/kaffeine apps/internet/kbear apps/internet/kbiff apps/system/kcpuload apps/development/kdbg apps/development/kdiff3 apps/utilities/kdirstat apps/office/kile apps/graphics/kphotoalbum apps/multimedia/kmplayer apps/system/knemo apps/system/knetload apps/games/knights apps/internet/konversation apps/utilities/krusader apps/internet/kvirc apps/office/lyx apps/multimedia/noteedit apps/office/scribus libs/gpgme libs/dirmngr libs/pinentry apps/multimedia/kdetv apps/utilities/kst apps/system/smb4k apps/system/kiosktool apps/system/kio-locate apps/office/kmymoney2 apps/graphics/gwenview apps/graphics/showimg apps/system/kconfigeditor apps/multimedia/kplayer apps/utilities/basket apps/utilities/krename apps/internet/ktorrent apps/system/ksystemlog apps/office/tellico
+LIBDEPS = kde/tdebase kde/tdenetwork kde/tdepim kde/tdeaccessibility misc/ttf-bitstream-vera kde/tdeartwork kde/tdegraphics kde/tdemultimedia kde/tdeaddons kde/tdeutils kde/tdeedu kde/tdegames kde/tdesdk kde/tdewebdev kde/tdetoys kde/tdeadmin apps/office/koffice apps/development/tdevelop apps/multimedia/k3b apps/multimedia/amarok apps/graphics/digikam-plugins apps/utilities/filelight apps/multimedia/kaffeine apps/internet/kbear apps/internet/kbiff apps/system/kcpuload apps/development/kdbg apps/development/kdiff3 apps/utilities/kdirstat apps/office/kile apps/graphics/kphotoalbum apps/multimedia/kmplayer apps/system/knemo apps/system/knetload apps/games/knights apps/internet/konversation apps/utilities/krusader apps/internet/kvirc apps/office/lyx apps/multimedia/noteedit apps/office/scribus libs/gpgme libs/dirmngr libs/pinentry apps/multimedia/kdetv apps/utilities/kst apps/system/smb4k apps/system/kiosktool apps/system/tdeio-locate apps/office/kmymoney2 apps/graphics/gwenview apps/graphics/showimg apps/system/tdeconfigeditor apps/multimedia/kplayer apps/utilities/basket apps/utilities/krename apps/internet/ktorrent apps/system/ksystemlog apps/office/tellico
DESCRIPTION = Everything except of i18n/, tdebindings and other stuff listed in the README
diff --git a/misc/detektive/files/mandrake-101.lst b/misc/detektive/files/mandrake-101.lst
index 0781c33..68968bc 100644
--- a/misc/detektive/files/mandrake-101.lst
+++ b/misc/detektive/files/mandrake-101.lst
@@ -20,4 +20,4 @@ cups RECOMMENDED
libsmbclient0 RECOMMENDED
libsmbclient0-devel RECOMMENDED
libldap2 RECOMMENDED "LDAP functionality of KAddressBook"
-xpdf OPTIONAL "Required by PDF kfile-Plugin"
+xpdf OPTIONAL "Required by PDF tdefile-Plugin"
diff --git a/misc/detektive/files/mandrake-91.lst b/misc/detektive/files/mandrake-91.lst
index d600865..ab633bd 100644
--- a/misc/detektive/files/mandrake-91.lst
+++ b/misc/detektive/files/mandrake-91.lst
@@ -14,4 +14,4 @@ libbzip2_1-devel-1.0.2-13mdk REQUIRED
libtiff3-devel-3.5.7-6mdk REQUIRED
cups RECOMMENDED
libldap2 RECOMMENDED "LDAP functionality of KAddressBook"
-xpdf OPTIONAL "Required by PDF kfile-Plugin"
+xpdf OPTIONAL "Required by PDF tdefile-Plugin"
diff --git a/misc/detektive/files/mandrake-92.lst b/misc/detektive/files/mandrake-92.lst
index bf6f48d..fb05ff0 100644
--- a/misc/detektive/files/mandrake-92.lst
+++ b/misc/detektive/files/mandrake-92.lst
@@ -19,4 +19,4 @@ cups RECOMMENDED
libsmbclient0 RECOMMENDED
libsmbclient0-devel RECOMMENDED
libldap2 RECOMMENDED "LDAP functionality of KAddressBook"
-xpdf OPTIONAL "Required by PDF kfile-Plugin"
+xpdf OPTIONAL "Required by PDF tdefile-Plugin"
diff --git a/misc/detektive/files/suse-81.lst b/misc/detektive/files/suse-81.lst
index 4362e9a..31c359e 100644
--- a/misc/detektive/files/suse-81.lst
+++ b/misc/detektive/files/suse-81.lst
@@ -85,5 +85,5 @@ python-devel OPTIONAL "Scripting in some KOffice components"
rpm OPTIONAL
rpm-devel OPTIONAL
tetex OPTIONAL
-xpdf OPTIONAL "Required by PDF kfile-Plugin"
+xpdf OPTIONAL "Required by PDF tdefile-Plugin"
xscreensaver OPTIONAL
diff --git a/misc/detektive/files/suse-82.lst b/misc/detektive/files/suse-82.lst
index e68bb85..8a2b636 100644
--- a/misc/detektive/files/suse-82.lst
+++ b/misc/detektive/files/suse-82.lst
@@ -84,5 +84,5 @@ python-devel OPTIONAL "Scripting in some KOffice components"
rpm OPTIONAL
rpm-devel OPTIONAL
tetex OPTIONAL
-xpdf OPTIONAL "Required by PDF kfile-Plugin"
+xpdf OPTIONAL "Required by PDF tdefile-Plugin"
xscreensaver OPTIONAL
diff --git a/misc/detektive/files/suse-90.lst b/misc/detektive/files/suse-90.lst
index 8cd723a..cb54325 100644
--- a/misc/detektive/files/suse-90.lst
+++ b/misc/detektive/files/suse-90.lst
@@ -80,5 +80,5 @@ python-devel OPTIONAL "Scripting in some KOffice components"
rpm OPTIONAL
rpm-devel OPTIONAL
tetex OPTIONAL
-xpdf OPTIONAL "Required by PDF kfile-Plugin"
+xpdf OPTIONAL "Required by PDF tdefile-Plugin"
xscreensaver OPTIONAL
diff --git a/misc/detektive/files/suse-91.lst b/misc/detektive/files/suse-91.lst
index 8bdb54a..6574d24 100644
--- a/misc/detektive/files/suse-91.lst
+++ b/misc/detektive/files/suse-91.lst
@@ -81,5 +81,5 @@ python-devel OPTIONAL "Scripting in some KOffice components"
rpm OPTIONAL
rpm-devel OPTIONAL
tetex OPTIONAL
-xpdf OPTIONAL "Required by PDF kfile-Plugin"
+xpdf OPTIONAL "Required by PDF tdefile-Plugin"
xscreensaver OPTIONAL
diff --git a/misc/detektive/files/suse-92.lst b/misc/detektive/files/suse-92.lst
index 4e93f1a..683aeaa 100644
--- a/misc/detektive/files/suse-92.lst
+++ b/misc/detektive/files/suse-92.lst
@@ -84,5 +84,5 @@ python-devel OPTIONAL "Scripting in some KOffice components"
rpm OPTIONAL
rpm-devel OPTIONAL
tetex OPTIONAL
-xpdf OPTIONAL "Required by PDF kfile-Plugin"
+xpdf OPTIONAL "Required by PDF tdefile-Plugin"
xscreensaver OPTIONAL