diff options
| -rwxr-xr-x | Documentation/maintainers/regenerate-files | 12 | ||||
| -rw-r--r-- | sets/kde | 2 | ||||
| -rw-r--r-- | sets/kde-4.3 | 1 | ||||
| -rw-r--r-- | sets/kde-4.4 | 1 | ||||
| -rw-r--r-- | sets/kde-4.5 | 1 | ||||
| -rw-r--r-- | sets/kde-live | 1 | ||||
| -rw-r--r-- | sets/kdeaccessibility | 2 | ||||
| -rw-r--r-- | sets/kdeadmin | 2 | ||||
| -rw-r--r-- | sets/kdeartwork | 3 | ||||
| -rw-r--r-- | sets/kdebase | 4 | ||||
| -rw-r--r-- | sets/kdebase-4.3 | 2 | ||||
| -rw-r--r-- | sets/kdebase-4.4 | 3 | ||||
| -rw-r--r-- | sets/kdebase-4.5 | 2 | ||||
| -rw-r--r-- | sets/kdebase-apps | 1 | ||||
| -rw-r--r-- | sets/kdebase-runtime | 2 | ||||
| -rw-r--r-- | sets/kdebase-workspace | 1 | ||||
| -rw-r--r-- | sets/kdebindings | 2 | ||||
| -rw-r--r-- | sets/kdeedu | 2 | ||||
| -rw-r--r-- | sets/kdegames | 2 | ||||
| -rw-r--r-- | sets/kdegraphics | 4 | ||||
| -rw-r--r-- | sets/kdelibs | 1 | ||||
| -rw-r--r-- | sets/kdemultimedia | 2 | ||||
| -rw-r--r-- | sets/kdenetwork | 2 | ||||
| -rw-r--r-- | sets/kdeoptional | 2 | ||||
| -rw-r--r-- | sets/kdepim | 2 | ||||
| -rw-r--r-- | sets/kdesdk | 2 | ||||
| -rw-r--r-- | sets/kdetoys | 2 | ||||
| -rw-r--r-- | sets/kdeutils | 2 | ||||
| -rw-r--r-- | sets/kdewebdev | 2 |
29 files changed, 62 insertions, 5 deletions
diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files index e9270e21981..e94ffbff010 100755 --- a/Documentation/maintainers/regenerate-files +++ b/Documentation/maintainers/regenerate-files @@ -52,7 +52,6 @@ for set in kde-extras-live koffice-live; do [[ ${set} == koffice-live ]] && echo "~app-office/koffice-meta-9999 **" >> "${set}.keywords" fi done - popd > /dev/null # regenerate unmask entries (base for package mask) @@ -77,3 +76,14 @@ if [[ -d package.mask.d ]]; then done fi popd > /dev/null + +# regenerate unversioned sets +RELEASE=${RELEASE:-4.4} +pushd ../../sets/ > /dev/null +for set in *-${RELEASE}; do + newfile=${set/-${RELEASE}} + echo "newfile='${newfile}'" + echo -e "${HEADER}" > "${newfile}" + sed "s/[:-]${RELEASE}//g" "${set}" >> "${newfile}" +done +popd > /dev/null @@ -1,6 +1,8 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. # We don't include kdesdk on the global set kde-base/kate kde-base/kde-l10n +kde-base/kde-meta kde-base/kdeplasma-addons @kdeaccessibility diff --git a/sets/kde-4.3 b/sets/kde-4.3 index 9482fd098b2..0cddad2c35f 100644 --- a/sets/kde-4.3 +++ b/sets/kde-4.3 @@ -1,6 +1,7 @@ # We don't include kdesdk on the global set kde-base/kate:4.3 kde-base/kde-l10n:4.3 +kde-base/kde-meta:4.3 kde-base/kdeplasma-addons:4.3 @kdeaccessibility-4.3 diff --git a/sets/kde-4.4 b/sets/kde-4.4 index 23edfc94eb0..75baa83920d 100644 --- a/sets/kde-4.4 +++ b/sets/kde-4.4 @@ -1,6 +1,7 @@ # We don't include kdesdk on the global set kde-base/kate:4.4 kde-base/kde-l10n:4.4 +kde-base/kde-meta:4.4 kde-base/kdeplasma-addons:4.4 @kdeaccessibility-4.4 diff --git a/sets/kde-4.5 b/sets/kde-4.5 index af36f08e5d3..60755449f8c 100644 --- a/sets/kde-4.5 +++ b/sets/kde-4.5 @@ -1,6 +1,7 @@ # We don't include kdesdk on the global set kde-base/kate:4.5 kde-base/kde-l10n:4.5 +kde-base/kde-meta:4.5 kde-base/kdeplasma-addons:4.5 @kdeaccessibility-4.5 diff --git a/sets/kde-live b/sets/kde-live index 115af29bc64..5297d14b52d 100644 --- a/sets/kde-live +++ b/sets/kde-live @@ -1,6 +1,7 @@ # We don't include kdesdk on the global set kde-base/kate:live kde-base/kde-l10n:live +kde-base/kde-meta:live kde-base/kdeplasma-addons:live @kdeaccessibility-live diff --git a/sets/kdeaccessibility b/sets/kdeaccessibility index a6bb07e1fb6..3fa16c5e779 100644 --- a/sets/kdeaccessibility +++ b/sets/kdeaccessibility @@ -1,5 +1,7 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/kdeaccessibility-colorschemes kde-base/kdeaccessibility-iconthemes +kde-base/kdeaccessibility-meta kde-base/kmag kde-base/kmousetool kde-base/kmouth diff --git a/sets/kdeadmin b/sets/kdeadmin index ecf0f856875..406a700972d 100644 --- a/sets/kdeadmin +++ b/sets/kdeadmin @@ -1,4 +1,6 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/kcron +kde-base/kdeadmin-meta kde-base/knetworkconf kde-base/ksystemlog kde-base/kuser diff --git a/sets/kdeartwork b/sets/kdeartwork index a722c743a51..94926aab61f 100644 --- a/sets/kdeartwork +++ b/sets/kdeartwork @@ -1,8 +1,11 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/kdeartwork-colorschemes kde-base/kdeartwork-desktopthemes kde-base/kdeartwork-emoticons kde-base/kdeartwork-iconthemes kde-base/kdeartwork-kscreensaver +kde-base/kdeartwork-meta +# kde-base/kdeartwork-kwin-styles <--- not ready yet by upstream kde-base/kdeartwork-sounds kde-base/kdeartwork-styles kde-base/kdeartwork-wallpapers diff --git a/sets/kdebase b/sets/kdebase index 1cc06a18bf8..3499fafb47b 100644 --- a/sets/kdebase +++ b/sets/kdebase @@ -1,4 +1,6 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. +kde-base/kdebase-meta + @kdebase-apps @kdebase-runtime @kdebase-workspace - diff --git a/sets/kdebase-4.3 b/sets/kdebase-4.3 index 77e356fe560..d55802fa02a 100644 --- a/sets/kdebase-4.3 +++ b/sets/kdebase-4.3 @@ -1,3 +1,5 @@ +kde-base/kdebase-meta:4.3 + @kdebase-apps-4.3 @kdebase-runtime-4.3 @kdebase-workspace-4.3 diff --git a/sets/kdebase-4.4 b/sets/kdebase-4.4 index a93cb42a948..7e5360a7462 100644 --- a/sets/kdebase-4.4 +++ b/sets/kdebase-4.4 @@ -1,4 +1,5 @@ +kde-base/kdebase-meta:4.4 + @kdebase-apps-4.4 @kdebase-runtime-4.4 @kdebase-workspace-4.4 - diff --git a/sets/kdebase-4.5 b/sets/kdebase-4.5 index 2bf82ba8fb1..50686af667c 100644 --- a/sets/kdebase-4.5 +++ b/sets/kdebase-4.5 @@ -1,3 +1,5 @@ +kde-base/kdebase-meta:4.5 + @kdebase-apps-4.5 @kdebase-runtime-4.5 @kdebase-workspace-4.5 diff --git a/sets/kdebase-apps b/sets/kdebase-apps index 2fd438474c8..b4ad3dc0b35 100644 --- a/sets/kdebase-apps +++ b/sets/kdebase-apps @@ -1,3 +1,4 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/dolphin kde-base/kdepasswd kde-base/kdialog diff --git a/sets/kdebase-runtime b/sets/kdebase-runtime index d7c98869df8..45f9afec112 100644 --- a/sets/kdebase-runtime +++ b/sets/kdebase-runtime @@ -1,3 +1,4 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/attica kde-base/drkonqi kde-base/kcmshell @@ -7,6 +8,7 @@ kde-base/kdebase-desktoptheme kde-base/kdebase-kioslaves kde-base/kdebase-menu kde-base/kdebase-menu-icons +kde-base/kdebase-runtime-meta kde-base/kdebugdialog kde-base/kdesu kde-base/keditfiletype diff --git a/sets/kdebase-workspace b/sets/kdebase-workspace index 41d99d1fded..75441cfe4bd 100644 --- a/sets/kdebase-workspace +++ b/sets/kdebase-workspace @@ -1,3 +1,4 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/kcheckpass kde-base/kcminit kde-base/kdebase-cursors diff --git a/sets/kdebindings b/sets/kdebindings index ff60075b0c0..59a68f9aa51 100644 --- a/sets/kdebindings +++ b/sets/kdebindings @@ -1,4 +1,6 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/kdebindings-csharp +kde-base/kdebindings-meta kde-base/kdebindings-ruby kde-base/krossjava kde-base/krosspython diff --git a/sets/kdeedu b/sets/kdeedu index d6d07b5855b..49af906a266 100644 --- a/sets/kdeedu +++ b/sets/kdeedu @@ -1,9 +1,11 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/blinken kde-base/cantor kde-base/kalgebra kde-base/kalzium kde-base/kanagram kde-base/kbruch +kde-base/kdeedu-meta kde-base/kgeography kde-base/khangman kde-base/kig diff --git a/sets/kdegames b/sets/kdegames index 08872051088..7ae8dad50bf 100644 --- a/sets/kdegames +++ b/sets/kdegames @@ -1,3 +1,4 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/bomber kde-base/bovo kde-base/granatier @@ -8,6 +9,7 @@ kde-base/kblackbox kde-base/kblocks kde-base/kbounce kde-base/kbreakout +kde-base/kdegames-meta kde-base/kdiamond kde-base/kfourinline kde-base/kgoldrunner diff --git a/sets/kdegraphics b/sets/kdegraphics index f39866a645e..3dbc33c09c6 100644 --- a/sets/kdegraphics +++ b/sets/kdegraphics @@ -1,6 +1,9 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/gwenview kde-base/kamera kde-base/kcolorchooser +kde-base/kdegraphics-meta +kde-base/kdegraphics-strigi-analyzer kde-base/kgamma kde-base/kolourpaint kde-base/kruler @@ -12,5 +15,4 @@ kde-base/libksane kde-base/libkipi kde-base/okular kde-base/svgpart -kde-base/kdegraphics-strigi-analyzer kde-base/thumbnailers diff --git a/sets/kdelibs b/sets/kdelibs index c01c919e672..64baf6079fa 100644 --- a/sets/kdelibs +++ b/sets/kdelibs @@ -1,3 +1,4 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/kde-env kde-base/kdelibs kde-base/kdepimlibs diff --git a/sets/kdemultimedia b/sets/kdemultimedia index 07dc90ad4b5..55fbfa22990 100644 --- a/sets/kdemultimedia +++ b/sets/kdemultimedia @@ -1,6 +1,8 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/dragonplayer kde-base/juk kde-base/kdemultimedia-kioslaves +kde-base/kdemultimedia-meta kde-base/kmix kde-base/kscd kde-base/libkcddb diff --git a/sets/kdenetwork b/sets/kdenetwork index 630aad50f65..3202672ed86 100644 --- a/sets/kdenetwork +++ b/sets/kdenetwork @@ -1,4 +1,6 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/kdenetwork-filesharing +kde-base/kdenetwork-meta kde-base/kdnssd kde-base/kget kde-base/kopete diff --git a/sets/kdeoptional b/sets/kdeoptional index 8d1d31fb6f6..56db7b0770a 100644 --- a/sets/kdeoptional +++ b/sets/kdeoptional @@ -1,5 +1,5 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/kdelirc kde-base/kfloppy kde-base/kppp -kde-base/lilo-config kde-base/policykit-kde diff --git a/sets/kdepim b/sets/kdepim index 1e38b2e6c97..51d426c18fc 100644 --- a/sets/kdepim +++ b/sets/kdepim @@ -1,3 +1,4 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/akonadi kde-base/akregator kde-base/blogilo @@ -6,6 +7,7 @@ kde-base/kaddressbook kde-base/kalarm kde-base/kdepim-icons kde-base/kdepim-kresources +kde-base/kdepim-meta kde-base/kdepim-strigi-analyzer kde-base/kdepim-runtime kde-base/kdepim-wizards diff --git a/sets/kdesdk b/sets/kdesdk index 59cbaf42143..f19fc9abef6 100644 --- a/sets/kdesdk +++ b/sets/kdesdk @@ -1,3 +1,4 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/cervisia kde-base/kapptemplate kde-base/kate @@ -5,6 +6,7 @@ kde-base/kbugbuster kde-base/kcachegrind kde-base/kdeaccounts-plugin kde-base/kdesdk-kioslaves +kde-base/kdesdk-meta kde-base/kdesdk-misc kde-base/kdesdk-scripts kde-base/kdesdk-strigi-analyzer diff --git a/sets/kdetoys b/sets/kdetoys index 79b4b33794f..be27bef5c70 100644 --- a/sets/kdetoys +++ b/sets/kdetoys @@ -1,4 +1,6 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/amor +kde-base/kdetoys-meta kde-base/kteatime kde-base/ktux kde-base/kweather diff --git a/sets/kdeutils b/sets/kdeutils index b55f68f21e2..2daa033a2f9 100644 --- a/sets/kdeutils +++ b/sets/kdeutils @@ -1,6 +1,8 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. kde-base/ark kde-base/kcalc kde-base/kcharselect +kde-base/kdeutils-meta kde-base/kdf kde-base/kgpg kde-base/ktimer diff --git a/sets/kdewebdev b/sets/kdewebdev index 020f643a0f0..800d1afe619 100644 --- a/sets/kdewebdev +++ b/sets/kdewebdev @@ -1,3 +1,5 @@ +# Autogenerated by regenerate-files, DO NOT EDIT. +kde-base/kdewebdev-meta kde-base/kfilereplace kde-base/kimagemapeditor kde-base/klinkstatus |