This is a multi-part message in MIME format. --------------090105020000050003000201 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Albert Astals Cid ha scritto: > El dimarts, 14 de juny de 2016, a les 23:53:11 CEST, Luigi Toscano va > escriure: >> Albert Astals Cid ha scritto: >>> El dissabte, 11 de juny de 2016, a les 16:14:45 CEST, Alexander Potashev >>> va >>> >>> escriure: >>>> Hi, >>>> >>>> I guess branches/stable/l10n-kde4/*/messages/kde-workspace should go >>>> from SVN because Plasma 4 is discontinued. If so, please remove these >>>> po/pot/documentation files. >>> >>> We ship them because since we have never shipped them anywhere else if we >>> stop shipping them distros that still use a Plasma 4 desktop suddenly >>> lose their translations if they update their KDE Applications. >>> >>> Yes, it sucks, but since it doesn't hurt it's safer to do that. >> >> Couldn't we release a set of tarballs with last version of Plasma 4 >> translations, so that people interested can use them, and remove them from >> SVN and stop shipping them? > > That is an option yes, would anyone be interested in working on making that > happen? The attached patch can be applied on top of the current Applications/16.08 branch of sysadmin/release-tools (maybe saved in its own branch) and should be able to create a set of tarballs with only content kde-workspace 4.11.22. Up for review :) Ciao -- Luigi --------------090105020000050003000201 Content-Type: text/x-diff; name="0001-Special-release-branch-for-kde-workspace-alone.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Special-release-branch-for-kde-workspace-alone.patch" From 79d6cba55a5e4748a3f75d4ea664a117f3658d42 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Sat, 30 Jul 2016 00:30:34 +0200 Subject: [PATCH] Special release branch for kde-workspace alone Release the last version of translations for KDE Workspaces 4.11.22. --- pack_l10n.sh | 84 +++++++++++++++++++++--------------------------------------- version | 6 +---- 2 files changed, 30 insertions(+), 60 deletions(-) diff --git a/pack_l10n.sh b/pack_l10n.sh index ffa390b..a943ab2 100755 --- a/pack_l10n.sh +++ b/pack_l10n.sh @@ -12,9 +12,7 @@ mkdir -p sources/kde-l10n mkdir -p versions svn cat $l10n_repo4/scripts/autogen.sh > /tmp/kde-l10n-autogen4.sh -svn cat $l10n_repo5/scripts/autogen.sh > /tmp/kde-l10n-autogen5.sh chmod +x /tmp/kde-l10n-autogen4.sh -chmod +x /tmp/kde-l10n-autogen5.sh remove_stuff() { @@ -51,12 +49,12 @@ remove_stuff() rm -rf no-auto-merge rm -rf */no-auto-merge rm -rf */frameworks -} - -remove_stuff_kf5() -{ - remove_stuff - rm -rf */kde-workspace + rm -rf */kde[a-z]* + rm -rf */kde-runtime + rm -rf */applications + rm -rf messages/qt + rm -rf lokalize-files + rm -rf scripts } pack_variants4() @@ -73,32 +71,18 @@ pack_variants4() fi } -pack_variants5() -{ - if test -f pack-with-variants; then - cat pack-with-variants | while read vdir; do - echo $vdir - svn export $l10n_repo5/$vdir@ $vdir@ &> /dev/null - cd $vdir - remove_stuff_kf5 - cd .. - done - rm -f pack-with-variants - fi -} - pack_lang() { lang=$1 rootLang=$2 checkout=1 + workLangVersionDir="kde-workspace-l10n-$lang-$version" while [ $checkout -eq 1 ]; do umask 000 MANIFEST="`mktemp -t`" rev=`get_svn_rev` svn export $l10n_repo4/$lang@ ${lang}4@ &> /dev/null - svn export $l10n_repo5/$lang@ ${lang}5@ &> /dev/null rev2=`get_svn_rev` if [ "$rev" = "$rev2" ]; then if [ $rootLang -eq 1 ]; then @@ -108,59 +92,50 @@ pack_lang() cd ${lang}4 remove_stuff pack_variants4 - cd ../${lang}5 - remove_stuff_kf5 - pack_variants5 cd .. rev3=`get_svn_rev` # Check again after pack_variants just in case # something happened in between if [ "$rev" = "$rev3" ]; then if [ $rootLang -eq 1 ]; then - mkdir kde-l10n-$lang-$version - mkdir kde-l10n-$lang-$version/4 - mkdir kde-l10n-$lang-$version/5 - mv ${lang}4 kde-l10n-$lang-$version/4/$lang - mv ${lang}5 kde-l10n-$lang-$version/5/$lang + mkdir $workLangVersionDir + mkdir $workLangVersionDir/4 + mv ${lang}4 $workLangVersionDir/4/$lang # Delete empty folders, we do it a few times # in case there is empty dirs inside empty dirs - find kde-l10n-$lang-$version -type d -empty -delete - find kde-l10n-$lang-$version -type d -empty -delete - find kde-l10n-$lang-$version -type d -empty -delete - find kde-l10n-$lang-$version -type d -empty -delete - find kde-l10n-$lang-$version -type d -empty -delete - find kde-l10n-$lang-$version -type d -empty -delete - cd kde-l10n-$lang-$version/4 + find $workLangVersionDir -type d -empty -delete + find $workLangVersionDir -type d -empty -delete + find $workLangVersionDir -type d -empty -delete + find $workLangVersionDir -type d -empty -delete + find $workLangVersionDir -type d -empty -delete + find $workLangVersionDir -type d -empty -delete + cd $workLangVersionDir/4 /tmp/kde-l10n-autogen4.sh $lang - cd ../5 - /tmp/kde-l10n-autogen5.sh $lang cd ../.. - echo "project($lang)" > kde-l10n-$lang-$version/CMakeLists.txt - echo "cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)" > kde-l10n-$lang-$version/CMakeLists.txt - echo "cmake_policy(SET CMP0002 OLD)" >> kde-l10n-$lang-$version/CMakeLists.txt - echo "cmake_policy(SET CMP0014 OLD)" >> kde-l10n-$lang-$version/CMakeLists.txt - echo "add_subdirectory(4)" >> kde-l10n-$lang-$version/CMakeLists.txt - echo "add_subdirectory(5)" >> kde-l10n-$lang-$version/CMakeLists.txt - echo "add_subdirectory($lang)" >> kde-l10n-$lang-$version/4/CMakeLists.txt - echo "add_subdirectory($lang)" >> kde-l10n-$lang-$version/5/CMakeLists.txt - find kde-l10n-$lang-$version -type f |sed 's/^\.*\/*//'|sort > MANIFEST - tar cf kde-l10n-$lang-$version.tar --owner 0 --group 0 --numeric-owner --no-recursion --files-from MANIFEST - xz -9 kde-l10n-$lang-$version.tar - mv kde-l10n-$lang-$version.tar.xz sources/kde-l10n + echo "project($lang)" > $workLangVersionDir/CMakeLists.txt + echo "cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)" > $workLangVersionDir/CMakeLists.txt + echo "cmake_policy(SET CMP0002 OLD)" >> $workLangVersionDir/CMakeLists.txt + echo "cmake_policy(SET CMP0014 OLD)" >> $workLangVersionDir/CMakeLists.txt + echo "add_subdirectory(4)" >> $workLangVersionDir/CMakeLists.txt + echo "add_subdirectory($lang)" >> $workLangVersionDir/4/CMakeLists.txt + find $workLangVersionDir -type f |sed 's/^\.*\/*//'|sort > MANIFEST + tar cf $workLangVersionDir.tar --owner 0 --group 0 --numeric-owner --no-recursion --files-from MANIFEST + xz -9 $workLangVersionDir.tar + mv $workLangVersionDir.tar.xz sources/kde-l10n rm -f MANIFEST fi checkout=0 fi fi if [ $rootLang -eq 1 ]; then - rm -rf ${lang}4 ${lang}5 kde-l10n-$lang-$version + rm -rf ${lang}4 $workLangVersionDir fi done } cat language_list | while read lang; do - finalDestination=sources/kde-l10n/kde-l10n-$lang-$version.tar.xz + finalDestination=sources/kde-l10n/kde-workspace-l10n-$lang-$version.tar.xz versionFilePath=versions/kde-l10n-$lang repoLine="$l10n_repo4/$lang" # Passing a very "up" root since we are shipping kde4 and kf5 translations @@ -180,4 +155,3 @@ cat language_list | while read lang; do done rm -f /tmp/kde-l10n-autogen4.sh -rm -f /tmp/kde-l10n-autogen5.sh diff --git a/version b/version index 1121869..612f72b 100644 --- a/version +++ b/version @@ -1,5 +1 @@ -if [ "$repo" = "kdelibs" ]; then - version=4.14.23 -else - version=16.07.80 -fi +version=4.11.22 -- 2.8.1 --------------090105020000050003000201--