Skip to content

Commit 9eb8e79

Browse files
committed
* update appdata on release
* remove unused splash & banner templates
1 parent 7b751cb commit 9eb8e79

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

images/splash/splash.xcf.bz2

-22.7 MB
Binary file not shown.

images/splash/web_banner.xcf.bz2

-152 KB
Binary file not shown.

linux/org.qgis.qgis.appdata.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<project_group>QGIS</project_group>
1919
<releases>
20-
<release version="3.2" date="2018-06-22" />
20+
<release version="3.2.0" date="2018-06-22" />
2121
</releases>
2222
<launchable type="desktop-id">org.qgis.qgis.desktop</launchable>
2323
<provides>

scripts/release.pl

+2-7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use warnings;
1313
use Getopt::Long;
1414
use Pod::Usage;
15+
use POSIX;
1516

1617
my $dryrun;
1718

@@ -162,6 +163,7 @@ ($$)
162163

163164
print "Updating changelog...\n";
164165
run( "scripts/create_changelog.sh", "create_changelog.sh failed" );
166+
run( "perl -i -pe 's#<releases>#<releases>\n <release version=\"$newmajor.$newminor.$newpatch\" date=\"" . strftime("%Y-%m-%d", localtime) . "\" />#' linux/org.qgis.qgis.appdata.xml", "appdata update failed" );
165167

166168
unless( $dopoint ) {
167169
run( "scripts/update-news.pl $newmajor $newminor '$newreleasename'", "could not update news" ) if $major>2 || ($major==2 && $minor>14);
@@ -187,13 +189,6 @@ ($$)
187189
unless( $dopoint ) {
188190
run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" );
189191
run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" );
190-
191-
if( -f "images/splash/splash-release.xcf.bz2" ) {
192-
run( "cp -v images/splash/splash-$newmajor.$newminor.xcf.bz2 images/splash/splash.xcf.bz2", "splash xcf switch failed" );
193-
} else {
194-
print "WARNING: NO images/splash/splash-release.xcf.bz2\n";
195-
}
196-
197192
run( "git commit -n -a -m 'Release of $release ($newreleasename)'", "release commit failed" );
198193
run( "git tag $reltag -m 'Version $release'", "release tag failed" );
199194
} else {

0 commit comments

Comments
 (0)