fix installation and some other followup cleanups to dcd017a

qgis · Jun 10, 2020 · b304e38 · b304e38
1 parent dc6d34b
commit b304e38
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 11 deletions.
diff --git a/.docker/qgis3-build-deps-focal.dockerfile b/.docker/qgis3-build-deps-focal.dockerfile
@@ -97,7 +97,6 @@ RUN  apt-get update \
     qtbase5-private-dev \
     saga \
     spawn-fcgi \
-    txt2tags \
     unzip \
     xauth \
     xfonts-100dpi \

diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -101,7 +101,6 @@ RUN  apt-get update \
     qtbase5-private-dev \
     saga \
     spawn-fcgi \
-    txt2tags \
     unzip \
     xauth \
     xfonts-100dpi \

diff --git a/debian/control b/debian/control
@@ -72,7 +72,6 @@ Build-Depends:
  git,
  doxygen,
  graphviz,
- txt2tags,
  xvfb,
  xauth,
  xfonts-base,

diff --git a/debian/control.in b/debian/control.in
@@ -77,7 +77,6 @@ Build-Depends:
  git,
  doxygen,
  graphviz,
- txt2tags,
  xvfb,
  xauth,
  xfonts-base,

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -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

diff --git a/scripts/astyle.sh b/scripts/astyle.sh
@@ -117,7 +117,7 @@ for f in "$@"; do
 			cmd=astyleit
 			;;
 
-		*.ui|*.qgm|*.txt|*.t2t|resources/context_help/*)
+		*.ui|*.qgm|*.txt|resources/context_help/*)
 			cmd=:
 			;;
 

diff --git a/scripts/release.pl b/scripts/release.pl
@@ -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" );

diff --git a/scripts/spell_check/check_spelling.sh b/scripts/spell_check/check_spelling.sh
@@ -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
 

diff --git a/scripts/update_indent.sh b/scripts/update_indent.sh
@@ -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"
 		;;