diff --git a/debian/copyright b/debian/copyright index 828b372dbad..ec04bd8fc88 100644 --- a/debian/copyright +++ b/debian/copyright @@ -166,9 +166,7 @@ Comment: Voronoi diagram calculator/ Delaunay triangulator Steve Fortune's homepage: http://netlib.bell-labs.com/cm/cs/who/sjf/index.html License: GPL-2+ -Files: external//qwtpolar-0.1/* - external//qwtpolar-1.0/* - external//qwtpolar-1.1.1/* +Files: external/qwtpolar-1.1.1/* Copyright: 2008, Uwe Rathmann Comment: This library is free software; you can redistribute it and/or modify it under the terms of the Qwt License, Version 1.0 @@ -304,10 +302,10 @@ License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 Files: src/providers/oracle/ocispatial/qsql_ocispatial.h src/providers/oracle/ocispatial/qsqlcachedresult_p.h - src/providers/spatialite/qspatialite/qsql_spatialite.cpp - src/providers/spatialite/qspatialite/qsql_spatialite.h - src/providers/spatialite/qspatialite/qsqlcachedresult_p.h - src/providers/spatialite/qspatialite/smain.cpp + external/qspatialite/qsql_spatialite.cpp + external/qspatialite/qsql_spatialite.h + external/qspatialite/qsqlcachedresult_p.h + external/qspatialite/smain.cpp Copyright: 2012, Digia Plc and/or its subsidiary(-ies) License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 diff --git a/scripts/addcopyright.sh b/scripts/addcopyright.sh index e5edb937996..c9a2a28394c 100755 --- a/scripts/addcopyright.sh +++ b/scripts/addcopyright.sh @@ -43,7 +43,7 @@ for i in $FILES; do author=volayaf ;; - src/app/gps/qwtpolar-*|src/app/qtmain_android.cpp|src/core/gps/qextserialport/*|lib/astyle/*) + src/app/qtmain_android.cpp) # Skip third party files echo "${i} skipped" continue diff --git a/scripts/astyle.sh b/scripts/astyle.sh index 2d7b5c8699c..819c87a1ae9 100755 --- a/scripts/astyle.sh +++ b/scripts/astyle.sh @@ -85,7 +85,7 @@ astyleit() { for f in "$@"; do case "$f" in - src/app/gps/qwtpolar-*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|external/o2/*|external/astyle/*|python/ext-libs/*|src/providers/spatialite/qspatialite/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|*/ui_*.py|*.astyle|tests/testdata/*|editors/*) + src/plugins/grass/qtermwidget/*|external/o2/*|external/astyle/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*) echo -ne "$f skipped $elcr" continue ;; diff --git a/scripts/prepare-commit.sh b/scripts/prepare-commit.sh index 2ee7b24251f..4418f64496e 100755 --- a/scripts/prepare-commit.sh +++ b/scripts/prepare-commit.sh @@ -74,11 +74,6 @@ for f in $MODIFIED; do (( i++ )) || true case "$f" in - src/core/gps/qextserialport/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|src/3d/poly2tri/*) - echo "$f" skipped - continue - ;; - *.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.sip|*.py) ;; diff --git a/scripts/sort_include.sh b/scripts/sort_include.sh index b48e8f1b2c7..7d33cae05d9 100755 --- a/scripts/sort_include.sh +++ b/scripts/sort_include.sh @@ -30,14 +30,11 @@ FILE3="sort_include_3.tmp" DoNotSort="(sqlite3.h)|(spatialite.h)" for file in $(find . \ - ! -path "./src/app/gps/qwtpolar-*" \ - ! -path "./src/core/gps/qextserialport/*" \ ! -path "./src/plugins/grass/qtermwidget/*" \ - ! -path "./src/astyle/*" \ ! -path "./python/ext-libs/*" \ - ! -path "./src/providers/spatialite/qspatialite/*" \ - ! -path "./src/plugins/globe/osgEarthQt/*" \ - ! -path "./src/plugins/globe/osgEarthUtil/*" \ + ! -path "./external/astyle/*" \ + ! -path "./external/qwtpolar-*" \ + ! -path "./external/qspatialite/*" \ -regex "./src/\(.+/\)*.*\.\(h\|cpp\)" -type f \ -or -regex "./tests/\(.+/\)*.*\.\(h\|cpp\)" -type f ) do diff --git a/scripts/spell_check/.agignore b/scripts/spell_check/.agignore index d4e9bb52e25..09ce5d9829b 100644 --- a/scripts/spell_check/.agignore +++ b/scripts/spell_check/.agignore @@ -14,7 +14,6 @@ src/app/gps/qwtpolar-1.0/ src/app/gps/qwtpolar-1.1.1/ src/core/pal src/plugins/grass/qtermwidget/ -src/3d/poly2tri/ #Extensions diff --git a/scripts/update-indent.sh b/scripts/update-indent.sh index a395af3c5fe..8e24a7f44a9 100644 --- a/scripts/update-indent.sh +++ b/scripts/update-indent.sh @@ -57,7 +57,7 @@ true > $ASTYLEDIFF # reformat for f in $MODIFIED; do case "$f" in - src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|external/astyle/*) + src/plugins/grass/qtermwidget/*|external/astyle/*) echo $f skipped continue ;; diff --git a/scripts/verify-indentation.sh b/scripts/verify-indentation.sh index f599176addf..92b07bc55eb 100755 --- a/scripts/verify-indentation.sh +++ b/scripts/verify-indentation.sh @@ -36,11 +36,6 @@ for f in $FILES; do echo "Checking $f" >>/tmp/ctest-important.log case "$f" in - src/core/gps/qextserialport/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|src/3d/poly2tri/*|scripts/customwidget_template*) - echo "$f skipped" - continue - ;; - *.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.sip|*.py) ;;