[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [sysadmin/release-tools] /: make trunk be for 4.11 as it is on the other SC modules
From: Albert Astals Cid <aacid () kde ! org>
Date: 2013-01-23 21:38:42
Message-ID: 20130123213842.0AE59A6091 () git ! kde ! org
[Download RAW message or body]
Git commit 0b273f10c484b79849ed17fe39bc6b34b6d326a6 by Albert Astals Cid.
Committed on 23/01/2013 at 22:38.
Pushed by aacid into branch 'master'.
make trunk be for 4.11 as it is on the other SC modules
M +1 -1 common
D +0 -55 kdesdk410cmakelists.txt
M +132 -132 modules.git
D +0 -47 pack_kdesdk
M +3 -3 versions
http://commits.kde.org/sysadmin/release-tools/0b273f10c484b79849ed17fe39bc6b34b6d326a6
diff --git a/common b/common
index 25e5fb4..19c582e 100755
--- a/common
+++ b/common
@@ -9,7 +9,7 @@ if test -z "$version"; then
case $package in
*)
- version=4.9.98
+ version=4.10.60
;;
esac
diff --git a/kdesdk410cmakelists.txt b/kdesdk410cmakelists.txt
deleted file mode 100644
index 060ee90..0000000
--- a/kdesdk410cmakelists.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-# SELF-CONTAINED SUBMODULES, FOR PREPARATION OF MIGRATION TO GIT
-
-# Using macro_optional_add_subdirectory(...) does not work, because that
-# needs at least "include(MacroLibrary)" before. But that would defeat the goal
-# to only include the submodules here and do nothing else.
-# So we create our own clone of macro_optional_add_subdirectory here,
-
-# to continue support for everybody who does not have a complete checkout of
-# the KDESDK module
-
-# clone of macro_optional_add_subdirectory(...)
-# Copyright (c) 2007, Alexander Neundorf, <neundorf@kde.org>
-MACRO (KDESDK_OPTIONAL_ADD_SUBDIRECTORY _dir )
- GET_FILENAME_COMPONENT(_fullPath ${_dir} ABSOLUTE)
- IF(EXISTS ${_fullPath}/CMakeLists.txt)
- IF(DISABLE_ALL_OPTIONAL_SUBDIRECTORIES)
- SET(_DEFAULT_OPTION_VALUE FALSE)
- ELSE(DISABLE_ALL_OPTIONAL_SUBDIRECTORIES)
- SET(_DEFAULT_OPTION_VALUE TRUE)
- ENDIF(DISABLE_ALL_OPTIONAL_SUBDIRECTORIES)
-
- IF(DISABLE_ALL_OPTIONAL_SUBDIRS AND NOT DEFINED BUILD_${_dir})
- SET(_DEFAULT_OPTION_VALUE FALSE)
- ENDIF(DISABLE_ALL_OPTIONAL_SUBDIRS AND NOT DEFINED BUILD_${_dir})
-
- OPTION(BUILD_${_dir} "Build directory ${_dir}" ${_DEFAULT_OPTION_VALUE})
- IF(BUILD_${_dir})
- ADD_SUBDIRECTORY(${_dir})
- ENDIF(BUILD_${_dir})
- ENDIF(EXISTS ${_fullPath}/CMakeLists.txt)
-ENDMACRO (KDESDK_OPTIONAL_ADD_SUBDIRECTORY)
-
-
-cmake_minimum_required(VERSION 2.6)
-project(kdesdk)
-
-# list of self-contained submodules
-kdesdk_optional_add_subdirectory(cervisia)
-kdesdk_optional_add_subdirectory(dolphin-plugins)
-kdesdk_optional_add_subdirectory(kapptemplate)
-kdesdk_optional_add_subdirectory(kcachegrind)
-kdesdk_optional_add_subdirectory(kioslave)
-kdesdk_optional_add_subdirectory(kmtrace)
-kdesdk_optional_add_subdirectory(kompare)
-kdesdk_optional_add_subdirectory(kpartloader)
-kdesdk_optional_add_subdirectory(kprofilemethod)
-kdesdk_optional_add_subdirectory(kstartperf)
-kdesdk_optional_add_subdirectory(kuiviewer)
-kdesdk_optional_add_subdirectory(lokalize)
-kdesdk_optional_add_subdirectory(okteta)
-kdesdk_optional_add_subdirectory(poxml)
-kdesdk_optional_add_subdirectory(scripts)
-kdesdk_optional_add_subdirectory(strigi-analyzer)
-kdesdk_optional_add_subdirectory(thumbnailers)
-kdesdk_optional_add_subdirectory(umbrello)
diff --git a/modules.git b/modules.git
index 15861c4..b1c1778 100644
--- a/modules.git
+++ b/modules.git
@@ -1,132 +1,132 @@
-kdelibs KDE/4.10
-kactivities KDE/4.10
-nepomuk-core KDE/4.10
-nepomuk-widgets KDE/4.10
-kde-workspace KDE/4.10
-kde-runtime KDE/4.10
-kde-baseapps KDE/4.10
-kate KDE/4.10
-konsole KDE/4.10
-smokegen KDE/4.10
-smokeqt KDE/4.10
-smokekde KDE/4.10
-qyoto KDE/4.10
-kimono KDE/4.10
-pykde4 KDE/4.10
-qtruby KDE/4.10
-korundum KDE/4.10
-perlqt KDE/4.10
-perlkde KDE/4.10
-analitza KDE/4.10
-blinken KDE/4.10
-cantor KDE/4.10
-kalgebra KDE/4.10
-kalzium KDE/4.10
-kanagram KDE/4.10
-kbruch KDE/4.10
-kgeography KDE/4.10
-khangman KDE/4.10
-kig KDE/4.10
-kiten KDE/4.10
-klettres KDE/4.10
-kmplot KDE/4.10
-kstars KDE/4.10
-ktouch KDE/4.10
-kturtle KDE/4.10
-kwordquiz KDE/4.10
-libkdeedu KDE/4.10
-marble KDE/4.10
-pairs KDE/4.10
-parley KDE/4.10
-rocs KDE/4.10
-step KDE/4.10
-kdepim KDE/4.10
-kdepimlibs KDE/4.10
-kdepim-runtime KDE/4.10
-gwenview KDE/4.10
-kamera KDE/4.10
-kcolorchooser KDE/4.10
-kdegraphics-mobipocket KDE/4.10
-kdegraphics-strigi-analyzer KDE/4.10
-kdegraphics-thumbnailers KDE/4.10
-kgamma KDE/4.10
-kolourpaint KDE/4.10
-kruler KDE/4.10
-ksaneplugin KDE/4.10
-ksnapshot KDE/4.10
-libkdcraw KDE/4.10
-libkexiv2 KDE/4.10
-libkipi KDE/4.10
-libksane KDE/4.10
-okular KDE/4.10
-svgpart KDE/4.10
-kdeplasma-addons KDE/4.10
-kross-interpreters KDE/4.10
-ark KDE/4.10
-filelight KDE/4.10
-kcalc KDE/4.10
-kcharselect KDE/4.10
-kdf KDE/4.10
-kfloppy KDE/4.10
-kgpg KDE/4.10
-kremotecontrol KDE/4.10
-ktimer KDE/4.10
-kwallet KDE/4.10
-print-manager KDE/4.10
-superkaramba KDE/4.10
-sweeper KDE/4.10
-jovie KDE/4.10
-kaccessible KDE/4.10
-kmag KDE/4.10
-kmousetool KDE/4.10
-kmouth KDE/4.10
-audiocd-kio KDE/4.10
-dragon KDE/4.10
-ffmpegthumbs KDE/4.10
-juk KDE/4.10
-kmix KDE/4.10
-kscd KDE/4.10
-libkcddb KDE/4.10
-libkcompactdisc KDE/4.10
-mplayerthumbs KDE/4.10
-bomber KDE/4.10
-bovo KDE/4.10
-granatier KDE/4.10
-kajongg KDE/4.10
-kapman KDE/4.10
-katomic KDE/4.10
-kblackbox KDE/4.10
-kblocks KDE/4.10
-kbounce KDE/4.10
-kbreakout KDE/4.10
-kdiamond KDE/4.10
-kfourinline KDE/4.10
-kgoldrunner KDE/4.10
-kigo KDE/4.10
-killbots KDE/4.10
-kiriki KDE/4.10
-kjumpingcube KDE/4.10
-klickety KDE/4.10
-klines KDE/4.10
-kmahjongg KDE/4.10
-kmines KDE/4.10
-knavalbattle KDE/4.10
-knetwalk KDE/4.10
-kolf KDE/4.10
-kollision KDE/4.10
-konquest KDE/4.10
-kpat KDE/4.10
-kreversi KDE/4.10
-kshisen KDE/4.10
-ksirk KDE/4.10
-ksnakeduel KDE/4.10
-kspaceduel KDE/4.10
-ksquares KDE/4.10
-ksudoku KDE/4.10
-ktuberling KDE/4.10
-kubrick KDE/4.10
-libkdegames KDE/4.10
-libkmahjongg KDE/4.10
-lskat KDE/4.10
-palapeli KDE/4.10
-picmi KDE/4.10
+kdelibs master
+kactivities master
+nepomuk-core master
+nepomuk-widgets master
+kde-workspace master
+kde-runtime master
+kde-baseapps master
+kate master
+konsole master
+smokegen master
+smokeqt master
+smokekde master
+qyoto master
+kimono master
+pykde4 master
+qtruby master
+korundum master
+perlqt master
+perlkde master
+analitza master
+blinken master
+cantor master
+kalgebra master
+kalzium master
+kanagram master
+kbruch master
+kgeography master
+khangman master
+kig master
+kiten master
+klettres master
+kmplot master
+kstars master
+ktouch master
+kturtle master
+kwordquiz master
+libkdeedu master
+marble master
+pairs master
+parley master
+rocs master
+step master
+kdepim master
+kdepimlibs master
+kdepim-runtime master
+gwenview master
+kamera master
+kcolorchooser master
+kdegraphics-mobipocket master
+kdegraphics-strigi-analyzer master
+kdegraphics-thumbnailers master
+kgamma master
+kolourpaint master
+kruler master
+ksaneplugin master
+ksnapshot master
+libkdcraw master
+libkexiv2 master
+libkipi master
+libksane master
+okular master
+svgpart master
+kdeplasma-addons master
+kross-interpreters master
+ark master
+filelight master
+kcalc master
+kcharselect master
+kdf master
+kfloppy master
+kgpg master
+kremotecontrol master
+ktimer master
+kwallet master
+print-manager master
+superkaramba master
+sweeper master
+jovie master
+kaccessible master
+kmag master
+kmousetool master
+kmouth master
+audiocd-kio master
+dragon master
+ffmpegthumbs master
+juk master
+kmix master
+kscd master
+libkcddb master
+libkcompactdisc master
+mplayerthumbs master
+bomber master
+bovo master
+granatier master
+kajongg master
+kapman master
+katomic master
+kblackbox master
+kblocks master
+kbounce master
+kbreakout master
+kdiamond master
+kfourinline master
+kgoldrunner master
+kigo master
+killbots master
+kiriki master
+kjumpingcube master
+klickety master
+klines master
+kmahjongg master
+kmines master
+knavalbattle master
+knetwalk master
+kolf master
+kollision master
+konquest master
+kpat master
+kreversi master
+kshisen master
+ksirk master
+ksnakeduel master
+kspaceduel master
+ksquares master
+ksudoku master
+ktuberling master
+kubrick master
+libkdegames master
+libkmahjongg master
+lskat master
+palapeli master
+picmi master
diff --git a/pack_kdesdk b/pack_kdesdk
deleted file mode 100755
index aa3c586..0000000
--- a/pack_kdesdk
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-# Special for KDE 4.10 lifefime, pack kdegames monolithic
-package=kdesdk
-source `dirname $0`/common $package $2
-
-MEINPROCPATH=`type -p meinproc`
-if test -f "$MEINPROCPATH"; then
- MEINPROCPATH=`dirname $MEINPROCPATH`
-fi
-if test -n "$MEINPROCPATH"; then
- export PATH=$MEINPROCPATH:/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin
- echo "PATH changed to $PATH"
-fi
-test -n "$package" || { echo "requires modulename as parameter"; exit 1; }
-test -d clean || { echo "create clean subdir with svn checkout"; exit 1; }
-test -d dirty || mkdir dirty || { echo "create empty subdir dirty"; exit 1; }
-test -d sources || mkdir sources || { echo "create empty subdir sources"; exit 1; }
-
-test -d dirty/$package-$version && { echo "rm -rf dirty/$package-$version"; rm -rf \
dirty/$package-$version; }
-test -d dirty/$package && { echo "rm -rf dirty/$package"; rm -rf dirty/$package; }
-
-mkdir dirty/kdesdk
-cp kdesdk410cmakelists.txt dirty/kdesdk/CMakeLists.txt
-repos="cervisia dolphin-plugins kapptemplate kcachegrind kde-dev-scripts \
kde-dev-utils kdesdk-strigi-analyzers kdesdk-thumbnailers kioslave kompare lokalize \
okteta poxml umbrello"
-for repo in $repos; do
- echo "cp -pr clean/$repo/ dirty/kdesdk"
- cp -pr clean/$repo/ dirty/kdesdk || exit 1
-done
-
-echo "cd dirty"
-cd dirty || exit 1
-
-# Anonymize checkout by removing the SVN information from it.
-echo "anon $package"
-$scriptpath/anon $package || exit 1
-
-# Generate docu
-echo "docu $package"
-$scriptpath/docu $package
-
-# Prepare for distribution
-echo "dist $package"
-$scriptpath/dist $package $version || exit 1
-
-# Final packaging
-echo "taritup $package"
-$scriptpath/taritup $package $version || exit 1
diff --git a/versions b/versions
index c002467..edea7e3 100644
--- a/versions
+++ b/versions
@@ -5,12 +5,12 @@ case $1 in
subname=kde-l10n
;;
oxygen-icons)
- HEADURL=branches/KDE/4.10/$1
- DESTURL=tags/KDE/4.9.98/$1
+ HEADURL=trunk/kdesupport/$1
+ DESTURL=tags/KDE/4.10.60/$1
subname=$1
;;
*)
- HEADURL=branches/KDE/4.10/$1
+ HEADURL=trunk/KDE/$1
subname=$1
;;
esac
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic