Skip to content
Permalink
Browse files

fix installation and some other followup cleanups to dcd017a

  • Loading branch information
jef-n committed Jun 10, 2020
1 parent dc6d34b commit b304e3843a98ba679455345245757d0a9e82edb5
@@ -97,7 +97,6 @@ RUN apt-get update \
qtbase5-private-dev \
saga \
spawn-fcgi \
txt2tags \
unzip \
xauth \
xfonts-100dpi \
@@ -101,7 +101,6 @@ RUN apt-get update \
qtbase5-private-dev \
saga \
spawn-fcgi \
txt2tags \
unzip \
xauth \
xfonts-100dpi \
@@ -72,7 +72,6 @@ Build-Depends:
git,
doxygen,
graphviz,
txt2tags,
xvfb,
xauth,
xfonts-base,
@@ -77,7 +77,6 @@ Build-Depends:
git,
doxygen,
graphviz,
txt2tags,
xvfb,
xauth,
xfonts-base,
@@ -5,8 +5,6 @@ SET (WITH_APIDOC FALSE CACHE BOOL "Determines whether the QGIS API doxygen docum
SET (QT_DOC_URL "https://doc.qt.io/qt-5/" CACHE STRING "URL for Qt docs")

SET(QGIS_DOC_FILES
../INSTALL
../NEWS
index.html
developersmap.html
nohelp.html
@@ -117,7 +117,7 @@ for f in "$@"; do
cmd=astyleit
;;

*.ui|*.qgm|*.txt|*.t2t|resources/context_help/*)
*.ui|*.qgm|*.txt|resources/context_help/*)
cmd=:
;;

@@ -181,8 +181,8 @@ ($$)
run( "cp debian/changelog /tmp", "backup changelog failed" );

unless( defined $dopoint ) {
run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) if $doltr;
run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) unless $doltr;
run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' INSTALL.md", "could not update osgeo4w deps package" ) if $doltr;
run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' INSTALL.md", "could not update osgeo4w deps package" ) unless $doltr;
run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" );
run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" );
run( "git commit -n -a -m 'Release of $release ($newreleasename)'", "release commit failed" );
@@ -23,7 +23,7 @@
# fi

# extensions or files that should be excluded from file list if :% is appended in the spelling.dat file
EXCLUDE_SCRIPT_LIST='(\.(xml|svg|sip|t2t|pl|sh|qgs|badquote|cmake(\.in)?)|^(debian/copyright|cmake_templates/.*|INSTALL|NEWS|tests/testdata/labeling/README.rst|tests/testdata/font/QGIS-Vera/COPYRIGHT.TXT|doc/(news|INSTALL)\.html|debian/build/))$'
EXCLUDE_SCRIPT_LIST='(\.(xml|svg|sip|pl|sh|qgs|badquote|cmake(\.in)?)|^(debian/copyright|cmake_templates/.*|tests/testdata/labeling/README.rst|tests/testdata/font/QGIS-Vera/COPYRIGHT.TXT|doc/NEWS\.html|debian/build/))$'

DIR=$(git rev-parse --show-toplevel)/scripts/spell_check

@@ -66,7 +66,7 @@ for f in $MODIFIED; do
cmd=astyle.sh
;;

*.ui|*.qgm|*.txt|*.t2t|*.py|*.sip|resources/context_help/*)
*.ui|*.qgm|*.txt|*.py|*.sip|resources/context_help/*)
cmd="flip -ub"
;;

0 comments on commit b304e38

Please sign in to comment.
You can’t perform that action at this time.