From 09cfb87c3b88ecf3a73da1635b85b3eba90e8c2b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 16 Nov 2011 13:44:16 -0600 Subject: Additional renaming of kde to tde --- generate-diffs.sh | 16 ++++++++-------- generate-xdeltas.sh | 16 ++++++++-------- makemessages | 2 +- release/KOffice-HOWTO | 4 ++-- release/RELEASE-CHECKLIST | 24 ++++++++++++------------ release/checkxml | 6 +++--- release/common | 2 +- release/compile_all | 2 +- release/koffice-l10n | 2 +- release/modules | 34 +++++++++++++++++----------------- release/pack | 2 +- release/removestuff | 4 ++-- release/snapmodules | 32 ++++++++++++++++---------------- release/taritup | 2 +- release/versions | 6 +++--- security/advisory.txt | 2 +- 16 files changed, 78 insertions(+), 78 deletions(-) diff --git a/generate-diffs.sh b/generate-diffs.sh index 4f06fcc..fee9be2 100755 --- a/generate-diffs.sh +++ b/generate-diffs.sh @@ -16,10 +16,10 @@ NEWDIR=/home/ftp/pub/kde/unstable/kde-3.1-rc6/src WRKDIR="$HOME/KDE-Diffs-work" DSTDIR="$HOME/KDE-Diffs" -PACKAGES="kdeaddons kdeadmin kdeartwork kdebase kdebindings kdeedu tdegames kdegraphics \ - kdelibs kdemultimedia kdenetwork tdepim kdesdk kdetoys kdeutils" +PACKAGES="tdeaddons tdeadmin tdeartwork tdebase tdebindings tdeedu tdegames tdegraphics \ + tdelibs tdemultimedia tdenetwork tdepim tdesdk tdetoys tdeutils" -# kde-i18n +# tde-i18n #PACKAGES="af ar bg bs ca cs da de el en_GB eo es et fa fi fr he hu it ja lt mt nb nl \ # nn nso pl pt pt_BR ro ru sk sl sr sv ta th tr uk ven vi xh zh_CN zh_TW zu" @@ -29,7 +29,7 @@ mkdir -p $DSTDIR cd $WRKDIR for package in $PACKAGES; do # i18n -# package=kde-i18n-$package +# package=tde-i18n-$package # kde sources echo -e "Unpacking $package-$OLDVER" @@ -45,14 +45,14 @@ echo -e "\n" cd $DSTDIR for package in $PACKAGES; do -# package=kde-i18n-$package; +# package=tde-i18n-$package; echo -e "Looking for diffing bins in $package" fgrep "Binary files $package-$OLDVER" $package-$OLDVER-$NEWVER.diff | awk -F' and ' '{ print $2 }' | awk -F' differ' '{ print $1 }' > $WRKDIR/$package-$OLDVER-$NEWVER.bins done cd $DSTDIR for package in $PACKAGES; do -# package=kde-i18n-$package; +# package=tde-i18n-$package; echo -e "Looking for new files in $package" fgrep "Only in $package-$NEWVER" $package-$OLDVER-$NEWVER.diff | sed s/"Only in "// | sed s/"\: "/"\/"/ > $WRKDIR/$package-$OLDVER-$NEWVER.new cd $WRKDIR @@ -61,14 +61,14 @@ done cd $DSTDIR for package in $PACKAGES; do -# package=kde-i18n-$package; +# package=tde-i18n-$package; echo -e "Looking for deleted files in $package" fgrep "Only in $package-$OLDVER" $package-$OLDVER-$NEWVER.diff | sed s/"Only in "// | sed s/"\: "/"\/"/ > $DSTDIR/$package-$OLDVER-$NEWVER.deleted done cd $WRKDIR for package in $PACKAGES; do -# package=kde-i18n-$package +# package=tde-i18n-$package echo -e "Creating bins.tar for $package" tar cf $DSTDIR/$package-$OLDVER-$NEWVER.bins.tar -T $WRKDIR/$package-$OLDVER-$NEWVER.bins done diff --git a/generate-xdeltas.sh b/generate-xdeltas.sh index d53e1f4..2353a6b 100755 --- a/generate-xdeltas.sh +++ b/generate-xdeltas.sh @@ -15,16 +15,16 @@ NEWDIR=/home/ftp/pub/kde/unstable/kde-3.1-rc6/src WRKDIR="$HOME/KDE-Delta-work" DSTDIR="$HOME/KDE-Delta" -PACKAGES="kdeaddons kdeadmin kdeartwork kdebase kdebindings kdeedu tdegames kdegraphics \ - kdelibs kdemultimedia kdenetwork tdepim kdesdk kdetoys kdeutils" +PACKAGES="tdeaddons tdeadmin tdeartwork tdebase tdebindings tdeedu tdegames tdegraphics \ + tdelibs tdemultimedia tdenetwork tdepim tdesdk tdetoys tdeutils" -# kde-i18n +# tde-i18n I18N_PACKAGES="af ar bg bs ca cs da de el en_GB eo es et fa fi fr he hu it ja lt mt nb nl \ nn nso pl pt pt_BR ro ru sk sl sr sv ta th tr uk ven vi xh zh_CN zh_TW zu" mkdir -p $WRKDIR mkdir -p $DSTDIR -mkdir -p $DSTDIR/kde-i18n +mkdir -p $DSTDIR/tde-i18n # kde sources cd $WRKDIR @@ -46,16 +46,16 @@ done # i18n cd $WRKDIR for package in $I18N_PACKAGES; do - package=kde-i18n-$package + package=tde-i18n-$package echo -e "Decompressing $package-$OLDVER" - cp $OLDDIR/kde-i18n/$package-$OLDVER.tar.bz2 . + cp $OLDDIR/tde-i18n/$package-$OLDVER.tar.bz2 . bunzip2 $package-$OLDVER.tar.bz2 echo -e "Decompressing $package-$NEWVER" - cp $NEWDIR/kde-i18n/$package-$NEWVER.tar.bz2 . + cp $NEWDIR/tde-i18n/$package-$NEWVER.tar.bz2 . bunzip2 $package-$NEWVER.tar.bz2 echo -e "Diffing $package" - xdelta delta -9 $package-$OLDVER.tar $package-$NEWVER.tar $DSTDIR/kde-i18n/patch-$package-$OLDVER-$NEWVER + xdelta delta -9 $package-$OLDVER.tar $package-$NEWVER.tar $DSTDIR/tde-i18n/patch-$package-$OLDVER-$NEWVER rm $package-$OLDVER.tar rm $package-$NEWVER.tar diff --git a/makemessages b/makemessages index 52049af..662b46d 100755 --- a/makemessages +++ b/makemessages @@ -24,7 +24,7 @@ export BASEDIR=$PWD export STARTTIME=`date +%s` -# transmod: path of the corresponding kde-i18n or l10n module +# transmod: path of the corresponding tde-i18n or l10n module export transmod="trunk/l10n" svn update -q $transmod/scripts diff --git a/release/KOffice-HOWTO b/release/KOffice-HOWTO index b805e58..b496d01 100644 --- a/release/KOffice-HOWTO +++ b/release/KOffice-HOWTO @@ -60,7 +60,7 @@ l10n tagging takes longer. kexi/kexi_version.h kplato/kptaboutdata.h -8. Run the "fixuifiles" script (from kdesdk). +8. Run the "fixuifiles" script (from tdesdk). cd clean/koffice find . -type f -name "*.ui" -exec fixuifiles {} ';' @@ -101,5 +101,5 @@ find clean/tags-koffice -type d -a ! -regex .*svn.*| \ (xargs -I{} svn info {})|grep ^URL.*anon|wc If you have problems when running ./pack, you should ensure that you -have the latest customizations directory from kdelibs/kdoctools in the +have the latest customizations directory from tdelibs/kdoctools in the current KDE branch. diff --git a/release/RELEASE-CHECKLIST b/release/RELEASE-CHECKLIST index a0064a3..2193e6e 100644 --- a/release/RELEASE-CHECKLIST +++ b/release/RELEASE-CHECKLIST @@ -16,26 +16,26 @@ Checkout branch: Update version number * */*.lsm * arts/configure.in.in - * kdewebdev/quanta/src/quanta.h - * kdevelop/configure.in.in - * kdebase/konqueror/version.h - * kdebase/startkde + * tdewebdev/quanta/src/quanta.h + * tdevelop/configure.in.in + * tdebase/konqueror/version.h + * tdebase/startkde * kde-common/admin/cvs.sh has VERSION="3.x.x" - * kdelibs/tdecore/kdeversion.h - * kdelibs/tdecore/ksycoca.h --> ksycoca version number - * kdelibs/README - * kdenetwork/kopete/libkopete/kopeteversion.h + * tdelibs/tdecore/tdeversion.h + * tdelibs/tdecore/ksycoca.h --> ksycoca version number + * tdelibs/README + * tdenetwork/kopete/libkopete/kopeteversion.h * bugs/template/wizard/report.html.tmpl * bugs/bugz/wizard_config.pl * www/areas/enterprise/bizcase/form.inc (major KDE versions only) * for koffice: configure.in.in, lib/kofficecore/kofficeversion.h, etc. * common and versions scripts -Update kdepackages in kdelibs/tdeui +Update kdepackages in tdelibs/tdeui Run "fixuifiles" Make sure the meinproc in path is a version of the correct branch Use tag_all to get clean sources into "clean" directory (e.g. /clean/koffice) -Make tarballs using "pack ". Start with kde-i18n. Do kdelibs/kdebase last. +Make tarballs using "pack ". Start with tde-i18n. Do tdelibs/tdebase last. If you have to redo a tarball because of a code change and don't want to wait for meinproc to complete, extract the old tarball inside cache/ before calling "pack". The docu script will then use the version from the cache instead of regenerating it, saving a lot of time. @@ -44,7 +44,7 @@ chmod o-rwx any new dir (so that they're not yet public) chmod g+w the new directory where packagers will put their files create contrib/ directory and make it g+w for group "packager" Test tarballs -md5sum *.tar.bz2 kde-i18n/*.tar.bz2 > MD5SUMS +md5sum *.tar.bz2 tde-i18n/*.tar.bz2 > MD5SUMS gpg --detach-sign -a MD5SUMS (if you're bored, do it for all files) (Note: for KOffice, MD5SUMS should be signed with --clearsign instead of --detach-sign.) Prepare a Changelog @@ -54,7 +54,7 @@ Ask for/write announcement (on the kde-promo mailing-list) When everything is ready: - Make directory on the FTP site readable, so that mirrors can start getting it - Update latest and/or {koffice,kdevelop}-latest symlinks on the FTP site + Update latest and/or {koffice,tdevelop}-latest symlinks on the FTP site - clean up the older releases. Make sure that kdestableftp and kdeunstableftp remain in their advertised size limits (~20 GB). Sort out older binary packages, diff --git a/release/checkxml b/release/checkxml index 50f8a9d..5d6ee7d 100755 --- a/release/checkxml +++ b/release/checkxml @@ -1,7 +1,7 @@ -cd clean/kde-i18n +cd clean/tde-i18n find . -name index.docbook | while read file; do - cdir=`dirname $file | sed -e "s,.*/kde-i18n,,"` - dir=../../cache/kde-i18n/$cdir + cdir=`dirname $file | sed -e "s,.*/tde-i18n,,"` + dir=../../cache/tde-i18n/$cdir mkdir -p $dir echo meinproc --check --cache $dir/index.cache.bz2 $file meinproc --check --cache $dir/index.cache.bz2 $file 2>/dev/null || echo "ERROR $file" diff --git a/release/common b/release/common index fe1ca4b..eea349b 100755 --- a/release/common +++ b/release/common @@ -14,7 +14,7 @@ case $package in arts) version=1.5.10 ;; - kdevelop) + tdevelop) version=3.5.3 ;; koffice) diff --git a/release/compile_all b/release/compile_all index 73a44cb..bd54e11 100755 --- a/release/compile_all +++ b/release/compile_all @@ -53,7 +53,7 @@ cd $a* else echo ERROR during $action echo ERROR during $action >> $summary - if [ $a == kdelibs ]; then + if [ $a == tdelibs ]; then echo Aborted! echo Aborted! >> $summary exit 1; diff --git a/release/koffice-l10n b/release/koffice-l10n index b899c54..3e39180 100755 --- a/release/koffice-l10n +++ b/release/koffice-l10n @@ -32,7 +32,7 @@ # Finally: # From release/, ./pack koffice-l10n -# (Pack requires kdelibs, bzip2, automake and - to avoid stupid +# (Pack requires tdelibs, bzip2, automake and - to avoid stupid # warnings - libtool :o) ) #SVNUSER=martin diff --git a/release/modules b/release/modules index 64129a8..7a9403a 100644 --- a/release/modules +++ b/release/modules @@ -1,20 +1,20 @@ arts -kdeaccessibility -kdeaddons -kdeadmin -kdeartwork -kdebindings -kdeedu +tdeaccessibility +tdeaddons +tdeadmin +tdeartwork +tdebindings +tdeedu tdegames -kdegraphics -kdemultimedia -kdenetwork -kdesdk -kdetoys -kdeutils -kdevelop -kdewebdev +tdegraphics +tdemultimedia +tdenetwork +tdesdk +tdetoys +tdeutils +tdevelop +tdewebdev tdepim -kdebase -kdelibs -kde-i18n +tdebase +tdelibs +tde-i18n diff --git a/release/pack b/release/pack index 410f13c..50d4ad5 100755 --- a/release/pack +++ b/release/pack @@ -1,6 +1,6 @@ #!/bin/bash # This is the main script. -# Call it with the package name as argument, like: ./pack kdelibs +# Call it with the package name as argument, like: ./pack tdelibs # Make sure to update the version numbers inside "common" first. # # Environment variables that can be set diff --git a/release/removestuff b/release/removestuff index 96e593b..3f6a3ba 100755 --- a/release/removestuff +++ b/release/removestuff @@ -56,7 +56,7 @@ cd_package() ) || exit 1 fi - if [ $package = "kde-l10n" -o $package = "kde-i18n" ]; then + if [ $package = "kde-l10n" -o $package = "tde-i18n" ]; then ( cd_package echo "Removing other stuff" @@ -92,7 +92,7 @@ cd_package() ) fi - if [ $package = "kde-l10n" -o $package = "koffice-l10n" -o $package = "kde-i18n" ]; then + if [ $package = "kde-l10n" -o $package = "koffice-l10n" -o $package = "tde-i18n" ]; then ( cd_package echo Removing non-released languages from package diff --git a/release/snapmodules b/release/snapmodules index 5b49dbe..30a1b59 100644 --- a/release/snapmodules +++ b/release/snapmodules @@ -1,22 +1,22 @@ qt-copy arts tdesupport -kdelibs -kdeaccessibility -kdebase -kdebindings -kdenetwork -kdegraphics -kdeadmin -kdemultimedia +tdelibs +tdeaccessibility +tdebase +tdebindings +tdenetwork +tdegraphics +tdeadmin +tdemultimedia tdegames -kdeutils -kdetoys +tdeutils +tdetoys tdepim -kdesdk -kdeaddons -kdeartwork -kdeedu +tdesdk +tdeaddons +tdeartwork +tdeedu kdekiosk kdeextragear-libs kdeextragear-addons @@ -42,5 +42,5 @@ kdeplayground-utils kdereview koffice kde-l10n -kdevelop -kdewebdev +tdevelop +tdewebdev diff --git a/release/taritup b/release/taritup index 95aed21..498b842 100755 --- a/release/taritup +++ b/release/taritup @@ -21,7 +21,7 @@ fi # Xdelta - if test "$package" = "kde-l10n" -o "$package" = "kde-i18n"; then + if test "$package" = "kde-l10n" -o "$package" = "tde-i18n"; then cd ../sources # for kde-l10n we only generate xdelta for the small files # #### double-check this code diff --git a/release/versions b/release/versions index b4f01a3..8deb9ff 100644 --- a/release/versions +++ b/release/versions @@ -5,10 +5,10 @@ case $1 in DESTURL=tags/arts/1.5.10/arts subname=$1 ;; - kde-l10n|kde-i18n) + kde-l10n|tde-i18n) HEADURL=branches/stable/l10n - DESTURL=tags/KDE/3.5.10/kde-i18n - subname=kde-i18n + DESTURL=tags/KDE/3.5.10/tde-i18n + subname=tde-i18n ;; koffice-l10n) HEADURL=branches/stable/l10n diff --git a/security/advisory.txt b/security/advisory.txt index a296eeb..e3820e3 100644 --- a/security/advisory.txt +++ b/security/advisory.txt @@ -25,7 +25,7 @@ URL: http://www.kde.org/info/security/advisory-YYYYMMDD-X.txt A patch for is available from ftp://ftp.kde.org/pub/kde/security_patches : - 0e0da738b276567e9ee36aa824e86124 post-2.2.2-kdelibs-kssl.diff + 0e0da738b276567e9ee36aa824e86124 post-2.2.2-tdelibs-kssl.diff -- cgit v1.2.3