Hello community, here is the log from the commit of package kdesdk4-scripts for openSUSE:Factory checked in at 2015-02-06 10:59:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk4-scripts (Old) and /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesdk4-scripts" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk4-scripts/kdesdk4-scripts.changes 2015-01-21 22:14:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new/kdesdk4-scripts.changes 2015-02-06 10:59:15.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Feb 1 10:57:24 UTC 2015 - [email protected] + +- Update to KDE Applications 14.12.2 + * KDE Applications 14.12.2 + * See https://www.kde.org/announcements/announce-applications-14.12.2.php + +------------------------------------------------------------------- Old: ---- kde-dev-scripts-14.12.1.tar.xz New: ---- kde-dev-scripts-14.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4-scripts.spec ++++++ --- /var/tmp/diff_new_pack.F2p6Xc/_old 2015-02-06 10:59:16.000000000 +0100 +++ /var/tmp/diff_new_pack.F2p6Xc/_new 2015-02-06 10:59:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdesdk4-scripts # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: System/GUI/KDE Url: http://www.kde.org/ -Version: 14.12.1 +Version: 14.12.2 Release: 0 Source0: %{rname}-%{version}.tar.xz Patch0: %{rname}-4.14.3-fix-bashisms.patch ++++++ kde-dev-scripts-14.12.1.tar.xz -> kde-dev-scripts-14.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-14.12.1/c++-copy-class-and-file new/kde-dev-scripts-14.12.2/c++-copy-class-and-file --- old/kde-dev-scripts-14.12.1/c++-copy-class-and-file 2014-12-03 16:44:46.000000000 +0100 +++ new/kde-dev-scripts-14.12.2/c++-copy-class-and-file 2015-01-22 16:26:37.000000000 +0100 @@ -16,8 +16,14 @@ if [ ! -f $newfile.h ]; then cp $oldfile.h $newfile.h cp $oldfile.cpp $newfile.cpp - git add $newfile.h - git add $newfile.cpp + SVN_INFO=$(svn info 2>/dev/null) + if test -n "$SVN_INFO"; then + svn add $newfile.h + svn add $newfile.cpp + else + git add $newfile.h + git add $newfile.cpp + fi fi # Update build system @@ -25,13 +31,13 @@ perl -pi -e '$_ .= "$1'$newfile.h'\n" if (m/^(\s*)'$oldfile'\.h/)' CMakeLists.txt # Rename class -perl -pi -e "s/$oldname/$newname/g" $newfile.h $newfile.cpp +perl -pi -e "s/\b$oldname/$newname/g" $newfile.h $newfile.cpp oldinclguard=`echo $oldname | tr a-z A-Z` newinclguard=`echo $newname | tr a-z A-Z` # Update include guard -perl -pi -e "s/$oldinclguard/$newinclguard/g" $newfile.h +perl -pi -e "s/\b$oldinclguard/$newinclguard/g" $newfile.h # Update includes in cpp file perl -pi -e 's/\b'$oldfile'\.h/'$newfile'\.h/' $newfile.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-14.12.1/c++-rename-class-and-file new/kde-dev-scripts-14.12.2/c++-rename-class-and-file --- old/kde-dev-scripts-14.12.1/c++-rename-class-and-file 2014-12-03 16:44:46.000000000 +0100 +++ new/kde-dev-scripts-14.12.2/c++-rename-class-and-file 2015-01-22 16:26:37.000000000 +0100 @@ -12,23 +12,29 @@ newfile=`echo $newname | tr A-Z a-z` if [ ! -f $newfile.h ]; then - git mv $oldfile.h $newfile.h - git mv $oldfile.cpp $newfile.cpp + SVN_INFO=$(svn info 2>/dev/null) + if test -n "$SVN_INFO"; then + svn mv $oldfile.h $newfile.h + svn mv $oldfile.cpp $newfile.cpp + else + git mv $oldfile.h $newfile.h + git mv $oldfile.cpp $newfile.cpp + fi fi # Update buildsystem -perl -pi -e "s/$oldfile\.cpp/$newfile.cpp/" CMakeLists.txt +perl -pi -e "s/\b$oldfile\.cpp/$newfile.cpp/" CMakeLists.txt # Rename class -perl -pi -e "s/$oldname/$newname/g" $newfile.h $newfile.cpp +perl -pi -e "s/\b$oldname/$newname/g" $newfile.h $newfile.cpp oldinclguard=`echo $oldname | tr a-z A-Z` newinclguard=`echo $newname | tr a-z A-Z` # Update include guard -perl -pi -e "s/$oldinclguard/$newinclguard/g" $newfile.h +perl -pi -e "s/\b$oldinclguard/$newinclguard/g" $newfile.h -# Update include in cpp file -perl -pi -e 's/\b'$oldfile'\.h/'$newfile'\.h/' $newfile.cpp +# Update include in all relevant files +perl -pi -e 's/\b'$oldfile'\.h/'$newfile'\.h/' `grep -l $oldfile.h *.cpp *.h` -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
