Hello community, here is the log from the commit of package kdesdk-scripts for openSUSE:Factory checked in at 2020-04-29 20:48:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk-scripts (Old) and /work/SRC/openSUSE:Factory/.kdesdk-scripts.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdesdk-scripts" Wed Apr 29 20:48:08 2020 rev:29 rq:796920 version:20.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk-scripts/kdesdk-scripts.changes 2020-03-12 23:03:29.367114687 +0100 +++ /work/SRC/openSUSE:Factory/.kdesdk-scripts.new.2738/kdesdk-scripts.changes 2020-04-29 20:48:47.092503440 +0200 @@ -1,0 +2,36 @@ +Thu Apr 23 12:22:14 UTC 2020 - Luca Beltrame <lbeltrame@kde.org> + +- Update to 20.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- No code change since 20.03.90 + +------------------------------------------------------------------- +Sun Apr 5 20:29:55 UTC 2020 - Luca Beltrame <lbeltrame@kde.org> + +- Update to 20.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-rc +- No code change since 20.03.80 + +------------------------------------------------------------------- +Sun Mar 22 09:16:51 UTC 2020 - Luca Beltrame <lbeltrame@kde.org> + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Changes since 19.12.3: + * c++-*-class-and-file: add support for camelcase filenames + * Not necessary now + * Fix string + * Add my relicensing agreements (mjansen) + * add tfella to relicense check + * Updating my relicensing agreements + * Fix minor EBN issues and typo + * Add myself (arichardson) to relicensecheck.pl + * Add vladz to relicensecheck.pl + +------------------------------------------------------------------- Old: ---- kde-dev-scripts-19.12.3.tar.xz kde-dev-scripts-19.12.3.tar.xz.sig New: ---- kde-dev-scripts-20.04.0.tar.xz kde-dev-scripts-20.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk-scripts.spec ++++++ --- /var/tmp/diff_new_pack.RjpdIW/_old 2020-04-29 20:48:48.736507206 +0200 +++ /var/tmp/diff_new_pack.RjpdIW/_new 2020-04-29 20:48:48.740507215 +0200 @@ -22,17 +22,13 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kdesdk-scripts -Version: 19.12.3 +Version: 20.04.0 Release: 0 Summary: Scripts for KDE software development License: GPL-2.0-only AND GFDL-1.2-only Group: System/GUI/KDE -URL: http://www.kde.org/ +URL: https://www.kde.org/ Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif Patch0: kde-dev-scripts-4.14.3-fix-bashisms.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem @@ -42,8 +38,10 @@ Obsoletes: kde-dev-scripts < %{_kapp_version} Provides: kde-dev-scripts = %{_kapp_version} %if %{with lang} -Recommends: %{name}-lang +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig +Source2: applications.keyring %endif +Recommends: %{name}-lang %description This package contains scripts useful for development of KDE software. @@ -58,9 +56,7 @@ This package contains the scripts to make the porting KDE software from kdelibs and Qt4 to Qt5 and KDE Frameworks 5. -%if %{with lang} %lang_package -%endif %prep %setup -q -n %{rname}-%{version} ++++++ kde-dev-scripts-19.12.3.tar.xz -> kde-dev-scripts-20.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-19.12.3/c++-copy-class-and-file new/kde-dev-scripts-20.04.0/c++-copy-class-and-file --- old/kde-dev-scripts-19.12.3/c++-copy-class-and-file 2020-01-23 12:31:17.000000000 +0100 +++ new/kde-dev-scripts-20.04.0/c++-copy-class-and-file 2020-02-28 15:41:42.000000000 +0100 @@ -8,8 +8,13 @@ oldname=$1 newname=$2 -oldfile=`echo $oldname | tr A-Z a-z` -newfile=`echo $newname | tr A-Z a-z` +if [ -f $oldname.cpp ]; then + oldfile=$oldname + newfile=$newname +else + oldfile=`echo $oldname | tr A-Z a-z` + newfile=`echo $newname | tr A-Z a-z` +fi echo "Copying $oldfile.{cpp,h} to $newfile.{cpp,h}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-19.12.3/c++-rename-class-and-file new/kde-dev-scripts-20.04.0/c++-rename-class-and-file --- old/kde-dev-scripts-19.12.3/c++-rename-class-and-file 2020-01-23 12:31:17.000000000 +0100 +++ new/kde-dev-scripts-20.04.0/c++-rename-class-and-file 2020-02-28 15:41:42.000000000 +0100 @@ -8,8 +8,13 @@ exit 1 fi -oldfile=`echo $oldname | tr A-Z a-z` -newfile=`echo $newname | tr A-Z a-z` +if [ -f $oldname.cpp ]; then + oldfile=$oldname + newfile=$newname +else + oldfile=`echo $oldname | tr A-Z a-z` + newfile=`echo $newname | tr A-Z a-z` +fi findup() { parg="$1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-19.12.3/gdb/qt5printers/core.py new/kde-dev-scripts-20.04.0/gdb/qt5printers/core.py --- old/kde-dev-scripts-19.12.3/gdb/qt5printers/core.py 2020-01-23 12:31:17.000000000 +0100 +++ new/kde-dev-scripts-20.04.0/gdb/qt5printers/core.py 2020-02-28 15:41:42.000000000 +0100 @@ -33,7 +33,7 @@ def _format_jd(jd): """Format a Julian Day in YYYY-MM-DD format.""" - # maths from http://www.tondering.dk/claus/cal/julperiod.php + # maths from https://www.tondering.dk/claus/cal/julperiod.php a = jd + 32044 b = (4 * a + 3) // 146097 c = a - ( (146097 * b) // 4 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-19.12.3/grantlee_strings_extractor.py new/kde-dev-scripts-20.04.0/grantlee_strings_extractor.py --- old/kde-dev-scripts-19.12.3/grantlee_strings_extractor.py 2020-01-23 12:31:17.000000000 +0100 +++ new/kde-dev-scripts-20.04.0/grantlee_strings_extractor.py 2020-02-28 15:41:42.000000000 +0100 @@ -26,7 +26,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -## Parts of this file are reproduced from the Django framework. The Django licence appears below. +## Parts of this file are reproduced from the Django framework. The Django license appears below. ## # Copyright (c) Django Software Foundation and individual contributors. @@ -129,7 +129,7 @@ # The original context of much of this script is in the django template system: -# http://code.djangoproject.com/browser/django/trunk/django/template/base.py +# https://github.com/django/django/blob/master/django/template/base.py TOKEN_TEXT = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-19.12.3/kf5/convert-kcmdlineargs.pl new/kde-dev-scripts-20.04.0/kf5/convert-kcmdlineargs.pl --- old/kde-dev-scripts-19.12.3/kf5/convert-kcmdlineargs.pl 2020-01-23 12:31:17.000000000 +0100 +++ new/kde-dev-scripts-20.04.0/kf5/convert-kcmdlineargs.pl 2020-02-28 15:41:42.000000000 +0100 @@ -84,8 +84,6 @@ $_ .= " QApplication app(argc, argv); // PORTING SCRIPT: move this to before the KAboutData initialization\n"; $_ .= " KAboutData::setApplicationData(aboutData);\n"; } - $_ .= " parser.addVersionOption();\n"; - $_ .= " parser.addHelpOption();\n"; if ( defined $use_aboutdata) { $_ .= " //PORTING SCRIPT: adapt aboutdata variable if necessary\n"; $_ .= " aboutData.setupCommandLine(&parser);\n"; @@ -157,8 +155,6 @@ $_ .= " QCommandLineParser parser;\n"; $_ .= " KAboutData::setApplicationData(aboutData);\n"; } - $_ .= " parser.addVersionOption();\n"; - $_ .= " parser.addHelpOption();\n"; if ( defined $use_aboutdata) { $_ .= " //PORTING SCRIPT: adapt aboutdata variable if necessary\n"; $_ .= " aboutData.setupCommandLine(&parser);\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-19.12.3/kf5/convert-kmimetype.pl new/kde-dev-scripts-20.04.0/kf5/convert-kmimetype.pl --- old/kde-dev-scripts-19.12.3/kf5/convert-kmimetype.pl 2020-01-23 12:31:17.000000000 +0100 +++ new/kde-dev-scripts-20.04.0/kf5/convert-kmimetype.pl 2020-02-28 15:41:42.000000000 +0100 @@ -19,7 +19,7 @@ my @l = map { my $orig = $_; - # see http://community.kde.org/Frameworks/Porting_Notes#KDECore_Changes + # see https://community.kde.org/Frameworks/Porting_Notes#KDECore_Changes if (/KMimeType::Ptr\s+(\w+)/) { my $var = $1; $varname{$var} = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-19.12.3/kf5/convert-qkdebug-to-qcdebug.sh new/kde-dev-scripts-20.04.0/kf5/convert-qkdebug-to-qcdebug.sh --- old/kde-dev-scripts-19.12.3/kf5/convert-qkdebug-to-qcdebug.sh 2020-01-23 12:31:17.000000000 +0100 +++ new/kde-dev-scripts-20.04.0/kf5/convert-qkdebug-to-qcdebug.sh 2020-02-28 15:41:42.000000000 +0100 @@ -39,7 +39,7 @@ echo "2) Add #include \"$debugnamefile.h\" to each file which was changed if it is not there yet" echo "3) Add include(ECMQtDeclareLoggingCategory) to CMakeLists.txt" echo "4) Add '$newlogname <description> IDENTIFIER [$newcategoryname]' to <name>.categories" -echo "4) install( FILES <name>.categories DESTINATION \${KDE_INSTALL_CONFDIR} ) to CMakeLists.txt" +echo "4) install( FILES <name>.categories DESTINATION \${KDE_INSTALL_LOGGINGCATEGORIESDIR} ) to CMakeLists.txt" echo "5) Verify that it compiles :)" echo "6) If you find bugs fix them please me" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-19.12.3/kf5/convert-to-cmake-automoc.pl new/kde-dev-scripts-20.04.0/kf5/convert-to-cmake-automoc.pl --- old/kde-dev-scripts-19.12.3/kf5/convert-to-cmake-automoc.pl 2020-01-23 12:31:17.000000000 +0100 +++ new/kde-dev-scripts-20.04.0/kf5/convert-to-cmake-automoc.pl 2020-02-28 15:41:42.000000000 +0100 @@ -15,7 +15,7 @@ # "foo.cpp:0: Note: No relevant classes found. No output generated." # => Remove the include in this case # -# More info: http://www.cmake.org/cmake/help/v3.0/manual/cmake-qt.7.html#automoc +# More info: https://cmake.org/cmake/help/v3.0/manual/cmake-qt.7.html#automoc # # Usual invocation: # find -iname "*.cpp" | xargs kde-dev-scripts/kf5/convert-to-cmake-automoc.pl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-19.12.3/kf5/resolve_kuit.py new/kde-dev-scripts-20.04.0/kf5/resolve_kuit.py --- old/kde-dev-scripts-19.12.3/kf5/resolve_kuit.py 2020-01-23 12:31:17.000000000 +0100 +++ new/kde-dev-scripts-20.04.0/kf5/resolve_kuit.py 2020-02-28 15:41:42.000000000 +0100 @@ -50,7 +50,7 @@ # are looked up in its kdelibs4.po. The pattern path to kdelibs4.po files, # which contains @lang@ placeholder, is given with -t PATTERN option. # This can be a local path or a HTTP URL (e.g. -# http://websvn.kde.org/*checkout*/trunk/l10n-kde4/@lang@/messages/kdelibs/kde... ). +# https://websvn.kde.org/*checkout*/trunk/l10n-kde4/@lang@/messages/kdelibs/kd... ). # Language of processed PO file is determined from its Language: header field. # If only PO files of one language are processed and they do not reliably # contain this field, the language can be forced with -l LANG option. @@ -66,7 +66,7 @@ # For a given i18n string, the decision of whether to resolve KUIT markup # into plain or Qt rich text is made based on the context marker, # as described in KUIT documentation at -# http://techbase.kde.org/Development/Tutorials/Localization/i18n_Semantics . +# https://techbase.kde.org/Development/Tutorials/Localization/i18n_Semantics . # Target formats can also be manually specified for certain context markers # by repeating the -f option. E.g. -f @info:progress=rich would override # the default resolution into plain text for @info:progress i18n strings. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-19.12.3/relicensecheck.pl new/kde-dev-scripts-20.04.0/relicensecheck.pl --- old/kde-dev-scripts-19.12.3/relicensecheck.pl 2020-01-23 12:31:17.000000000 +0100 +++ new/kde-dev-scripts-20.04.0/relicensecheck.pl 2020-02-28 15:41:42.000000000 +0100 @@ -27,13 +27,14 @@ ### ### 5. Include 'CCBYSA4+' if you are okay with contributions you've made under ### "GNU FDL" being relicensed as "Creative Commons Attribution-ShareAlike 4.0 International". -### For more information, see http://techbase.kde.org/Projects/KDE_Relicensing +### For more information, see https://community.kde.org/Guidelines_and_HOWTOs/Relicensing/KDE_Relicensing my %license_table = ( 'acrouthamel' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'aheinecke' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'arichardson' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'athurhfree' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], + 'cfeck' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'cgerloff' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'davidedmundson'=> ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'davidre' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], @@ -61,6 +62,7 @@ 'sitter' => ['CCBYSA4'], 'sredman' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'sstjames' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], + 'tfella' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'thomassc' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'vladz' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'wbauer' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ] @@ -101,7 +103,6 @@ 'bshah' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'capel' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'carewolf' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], - 'cfeck' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'cgiboudeaux' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'chani' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'chehrlic' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],