summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-21 01:43:11 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-21 01:43:11 +0000
commiteb4a2bcdc03599636b17fe199beb2b8357600a2b (patch)
tree1ba67e31bcc35ee0ef20dad82edcf7c7154bda2e
parent4b0c424136a25110054ba5691ea03350cdeaa303 (diff)
downloadtdesdk-eb4a2bcdc03599636b17fe199beb2b8357600a2b.tar.gz
tdesdk-eb4a2bcdc03599636b17fe199beb2b8357600a2b.zip
Convert remaining references to kde3 (e.g. in paths) to trinity
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--cervisia/cervisia.upd32
-rw-r--r--doc/kcachegrind/index.docbook2
-rw-r--r--kbabel/common/kbabel-projectrename.upd2
-rw-r--r--kbabel/kbabel/kbabel-difftoproject.upd2
-rw-r--r--kbabel/kbabel/kbabel-project.upd2
-rwxr-xr-xscripts/kdesvn-build6
-rwxr-xr-xscripts/svn2dist6
-rw-r--r--umbrello/umbrello/docgenerators/xmi2docbook.sh4
-rw-r--r--umbrello/uml.kdevprj2
9 files changed, 29 insertions, 29 deletions
diff --git a/cervisia/cervisia.upd b/cervisia/cervisia.upd
index 9c635ea1..769c8069 100644
--- a/cervisia/cervisia.upd
+++ b/cervisia/cervisia.upd
@@ -1,5 +1,5 @@
#
-Id=kde3.2/20021228
+Id=trinity.2/20021228
File=cervisiapartrc,cvsservicerc
Group=General
Options=copy
@@ -7,22 +7,22 @@ Key=CVSPath
Options=copy
Key=Compression
#
-Id=kde3.2/20021229
+Id=trinity.2/20021229
File=cervisiapartrc,cvsservicerc
Script=move_repositories.pl,perl
#
-Id=kde3.2/20030116
+Id=trinity.2/20030116
File=cervisiapartrc
RemoveGroup=Main window
File=cervisiarc
RemoveGroup=Main window
#
-Id=kde3.2/20030117
+Id=trinity.2/20030117
File=cervisiapartrc,cervisiarc
Group=Session
Key=Current Directory
#
-Id=kde3.2/20030118
+Id=trinity.2/20030118
File=cervisiapartrc
RemoveGroup=Annotate dialog
File=cervisiapartrc
@@ -31,62 +31,62 @@ Key=Columns,ColumnOrder
Key=ColumnSizes,ColumnWidths
RemoveKey=Customized
#
-Id=kde3.2/20030205
+Id=trinity.2/20030205
File=cervisiapartrc
Group=Log dialog,LogDialog
Key=ShowListTab
RemoveGroup=Log dialog
#
-Id=kde3.2/20030210
+Id=trinity.2/20030210
File=cervisiapartrc
RemoveGroup=ChangeLog dialog
#
-Id=kde3.2/20030211
+Id=trinity.2/20030211
File=cervisiapartrc
Group=Diff dialog,DiffDialog
Key=Sync
RemoveGroup=Diff dialog
#
-Id=kde3.2/20030212
+Id=trinity.2/20030212
File=cervisiapartrc
RemoveGroup=Commit dialog
RemoveGroup=History dialog
RemoveGroup=Resolve dialog
RemoveGroup=Resolve edit dialog
#
-Id=kde3.2/20030216
+Id=trinity.2/20030216
File=cervisiapartrc
RemoveGroup=AddRepository dialog
RemoveGroup=Repository dialog
Group=Checkout dialog,CheckoutDialog
AllKeys
#
-Id=kde3.2/20030725
+Id=trinity.2/20030725
File=cervisiapartrc
Group=LogDialog
RemoveKey=ShowListTab
#
-Id=kde3.2/20030730
+Id=trinity.2/20030730
File=cervisiapartrc
Group=Colors
Script=change_colors.pl,perl
#
-Id=kde3.2/20030829
+Id=trinity.2/20030829
File=cervisiapartrc
Group=Communication
RemoveKey=Editor
#
-Id=kde3.2/20031014
+Id=trinity.2/20031014
File=cervisiapartrc
Group=General
RemoveKey=CVSPath
RemoveKey=Compression
#
-Id=kde3.4/20041112
+Id=trinity.4/20041112
File=cvsservicerc
Script=cervisia-normalize_cvsroot.pl,perl
#
-Id=kde3.4/20041207
+Id=trinity.4/20041207
File=cervisiapartrc
Group=Repositories
Script=cervisia-change_repos_list.pl,perl
diff --git a/doc/kcachegrind/index.docbook b/doc/kcachegrind/index.docbook
index 31cf322c..6a85d5eb 100644
--- a/doc/kcachegrind/index.docbook
+++ b/doc/kcachegrind/index.docbook
@@ -801,7 +801,7 @@ So, for example, for main(), you will always have a inclusive cost of almost 100
</question>
<answer>
<para>
-Obviously KCachegrind is wrongly installed on your system. It is recommended to compile it with the installation prefix to be your system wide KDE base directory like <command>configure --prefix=/opt/kde3; make install</command>.
+Obviously KCachegrind is wrongly installed on your system. It is recommended to compile it with the installation prefix to be your system wide KDE base directory like <command>configure --prefix=/opt/trinity; make install</command>.
If you choose another directory like $HOME/kde, you should set the environment variable KDEDIR to this directory before running KCachegrind.
</para>
</answer>
diff --git a/kbabel/common/kbabel-projectrename.upd b/kbabel/common/kbabel-projectrename.upd
index f2e8510b..c9bee887 100644
--- a/kbabel/common/kbabel-projectrename.upd
+++ b/kbabel/common/kbabel-projectrename.upd
@@ -1,4 +1,4 @@
-Id=kde34
+Id=trinity4
File=kbabel.defaultproject
Group=Header
Author-Email,AuthorEmail
diff --git a/kbabel/kbabel/kbabel-difftoproject.upd b/kbabel/kbabel/kbabel-difftoproject.upd
index 183f6268..8c350c05 100644
--- a/kbabel/kbabel/kbabel-difftoproject.upd
+++ b/kbabel/kbabel/kbabel-difftoproject.upd
@@ -1,4 +1,4 @@
-Id=kde34
+Id=trinity4
File=kbabelrc,kbabel.defaultproject
Group=Editor,Misc
Key=DiffBaseDir
diff --git a/kbabel/kbabel/kbabel-project.upd b/kbabel/kbabel/kbabel-project.upd
index 20fcb958..8357454a 100644
--- a/kbabel/kbabel/kbabel-project.upd
+++ b/kbabel/kbabel/kbabel-project.upd
@@ -1,4 +1,4 @@
-Id=kde33
+Id=trinity3
File=kbabelrc,kbabel.defaultproject
Group=CatalogManager
AllKeys
diff --git a/scripts/kdesvn-build b/scripts/kdesvn-build
index b0389d52..706c755a 100755
--- a/scripts/kdesvn-build
+++ b/scripts/kdesvn-build
@@ -1432,7 +1432,7 @@ sub setup_default_modules()
-dlopen-opengl),
'apply-qt-patches' => 'true',
-# See setup_kde35_hack() for why this option is here.
+# See setup_trinity5_hack() for why this option is here.
'module-base-path' => 'branches/qt/3.3',
'use-qt-builddir-hack' => 'true',
@@ -4170,7 +4170,7 @@ EOF
# This subroutine sets up or removes the default branch option for a few
# modules in order to build KDE 3.5 by default. branch options in the
# configuration file will still override these settings.
-sub setup_kde35_hack
+sub setup_trinity5_hack
{
my @branched_modules = qw/kde-common kdeaccessibility kdeaddons kdeadmin
kdeartwork kdebase kdebindings kdeedu kdegames kdegraphics kdelibs
@@ -4201,7 +4201,7 @@ eval
{
# Note to self: Quit changing the order around.
process_arguments(); # Process --help, --install, etc. first.
- setup_kde35_hack(); # Add 'branch' options as appropriate.
+ setup_trinity5_hack(); # Add 'branch' options as appropriate.
read_options(); # If we're still here, read the options
initialize_environment(); # Initialize global env vars.
diff --git a/scripts/svn2dist b/scripts/svn2dist
index 76f09b20..7680ec84 100755
--- a/scripts/svn2dist
+++ b/scripts/svn2dist
@@ -335,7 +335,7 @@ remove="$remove $modulename.lsm"
if [ $doi18n = "yes" ]; then
pushd $temp_dir
echo "Getting i18n subdirs" >> $log
- i18nlangs_tmp=`svn cat "$svnroot/l10n-kde3/subdirs"`
+ i18nlangs_tmp=`svn cat "$svnroot/l10n-trinity/subdirs"`
skiplist="`echo $noi18nlang | sed -e 's/,/ /g'`"
skiplist="$skiplist $always_skip_languages"
for lang in $i18nlangs_tmp; do
@@ -364,7 +364,7 @@ if [ -d $module/doc/$name ]; then
for lang in $i18nlangs; do
echo -n "Checking for $lang/$name... "
test -d $temp_dist/doc/$lang && rm -Rf $temp_dist/doc/$lang
- docdirname="l10n-kde3/$lang/docs/$i18nmodule/$name"
+ docdirname="l10n-trinity/$lang/docs/$i18nmodule/$name"
echo "svn export $svnroot/$docdirname $temp_dist/doc/$lang" >> $log
mkdir -p $temp_dist/doc
svn export "$svnroot/$docdirname" $temp_dist/doc/$lang >> $log 2>&1
@@ -404,7 +404,7 @@ if [ $doi18n = "yes" ]; then
echo "Getting translations for $pofile from i18n..."
for lang in $i18nlangs; do
- pofilename="l10n-kde3/$lang/messages/$i18nmodule/$pofile";
+ pofilename="l10n-trinity/$lang/messages/$i18nmodule/$pofile";
echo "Getting $pofilename" >> $log
svn cat "$svnroot/$pofilename" >$pofile 2>&1 || rm -f $pofile
if [ ! -f "$pofile" ]; then
diff --git a/umbrello/umbrello/docgenerators/xmi2docbook.sh b/umbrello/umbrello/docgenerators/xmi2docbook.sh
index 32f46928..865ebb6f 100644
--- a/umbrello/umbrello/docgenerators/xmi2docbook.sh
+++ b/umbrello/umbrello/docgenerators/xmi2docbook.sh
@@ -1,9 +1,9 @@
#! /bin/bash
echo Converting from XMI to docbook...
-java -cp /usr/share/java/xalan-j2-2.6.0.jar org.apache.xalan.xslt.Process -xml -in $1.xmi -xsl /home/gael/Logiciels/kde3.5-svn/kdesdk/umbrello.withdocgen/umbrello/docgenerators/xmi2docbook.xsl -out $1.docbook
+java -cp /usr/share/java/xalan-j2-2.6.0.jar org.apache.xalan.xslt.Process -xml -in $1.xmi -xsl /home/gael/Logiciels/trinity.5-svn/kdesdk/umbrello.withdocgen/umbrello/docgenerators/xmi2docbook.xsl -out $1.docbook
echo Converting from docbook to XHTML...
-java -cp /usr/share/java/xalan-j2-2.6.0.jar org.apache.xalan.xslt.Process -in $1.docbook -xsl /home/gael/Logiciels/kde3.5-svn/kdesdk/umbrello.withdocgen/umbrello/docgenerators/docbook2xhtml.xsl -out $1.html -html
+java -cp /usr/share/java/xalan-j2-2.6.0.jar org.apache.xalan.xslt.Process -in $1.docbook -xsl /home/gael/Logiciels/trinity.5-svn/kdesdk/umbrello.withdocgen/umbrello/docgenerators/docbook2xhtml.xsl -out $1.html -html
echo done.
diff --git a/umbrello/uml.kdevprj b/umbrello/uml.kdevprj
index 284aee44..fb5060a6 100644
--- a/umbrello/uml.kdevprj
+++ b/umbrello/uml.kdevprj
@@ -10,7 +10,7 @@ ldflags=\s -Iuml/classparser -Iuml/dialogs -Iuml/clipboard
[General]
AMChanged=true
author=Umbrello UML Modeller Authors
-configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/opt/kde3 --enable-debug\s
+configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/opt/trinity --enable-debug\s
email=uml-devel@lists.sourceforge.net
kdevprj_version=1.3
lfv_open_groups=