update OSGeo4W deps in INSTALL only in release branch

jef-n · jef-n · commit 42aea6c97cd8 · 2018-09-04T15:04:15.000+02:00
diff --git a/doc/msvc.t2t b/doc/msvc.t2t
@@ -31,7 +31,7 @@ For the QGIS build you need to install following packages from cygwin:
 
 and from OSGeo4W (select //Advanced Installation//):
 
-- qgis-rel-deps
+- qgis-dev-deps
 -
 
 This will also select packages the above packages depend on.
diff --git a/scripts/release.pl b/scripts/release.pl
@@ -168,11 +168,6 @@ ($$)
 unless( $dopoint ) {
 	run( "scripts/update-news.pl $newmajor $newminor '$newreleasename'", "could not update news" ) if $major>2 || ($major==2 && $minor>14);
 
-	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( "txt2tags --encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" );
-	run( "txt2tags --encoding=utf-8 -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" );
-
 	run( "git commit -n -a -m \"changelog and news update for $release\"", "could not commit changelog and news update" );
 
 	print "Creating and checking out branch...\n";
@@ -187,6 +182,11 @@ ($$)
 run( "cp debian/changelog /tmp", "backup changelog failed" );
 
 unless( $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( "txt2tags --encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" );
+	run( "txt2tags --encoding=utf-8 -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" );
+
 	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" );

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ For the QGIS build you need to install following packages from cygwin:`
`31`	`31`
`32`	`32`	`and from OSGeo4W (select //Advanced Installation//):`
`33`	`33`
`34`		`-- qgis-rel-deps`
	`34`	`+- qgis-dev-deps`
`35`	`35`	`-`
`36`	`36`
`37`	`37`	`This will also select packages the above packages depend on.`