Showing with 20 additions and 6 deletions.
  1. +1 −1 CMakeLists.txt
  2. +14 −2 debian/changelog
  3. +5 −3 scripts/release.pl
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "3")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Master")
Expand Down
16 changes: 14 additions & 2 deletions debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
qgis (2.1.0) UNRELEASED; urgency=low
qgis (2.3.0) UNRELEASED; urgency=medium

* New development version 2.3 after branch of 2.2

-- Jürgen E. Fischer <jef@norbit.de> Sat, 22 Feb 2014 09:49:29 +0100

qgis (2.2.0) unstable; urgency=medium

* Release of 2.2

-- Jürgen E. Fischer <jef@norbit.de> Sat, 22 Feb 2014 09:49:29 +0100

qgis (2.1.0) unstable; urgency=low

* new development version 2.1 after branch of 2.0
* drop qgis_icon.xpm and use "upstream" version
Expand All @@ -7,7 +19,7 @@ qgis (2.1.0) UNRELEASED; urgency=low
* add support for Ubuntu trusty
* run crssync on copy of srs.db (Closes #738117)

-- Jürgen E. Fischer <jef@norbit.de> Mon, 10 Feb 2014 20:22:57 +0100
-- Jürgen E. Fischer <jef@norbit.de> Sat, 22 Feb 2014 09:48:46 +0100

qgis (1.9.0) UNRELEASED; urgency=low

Expand Down
8 changes: 5 additions & 3 deletions scripts/release.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ sub updateCMakeLists {

my $release = "$newmajor.$newminor";
my $relbranch = "release-${newmajor}_${newminor}";
my $reltag = "final-${newmajor}_${newminor}_0";

print "Creating branch...\n";
system("git checkout -b $relbranch" ) == 0 or die "git checkout release branch failed";
Expand All @@ -85,9 +86,10 @@ sub updateCMakeLists {
system( "dch --newversion $newmajor.$newminor.0 'Release of $release'" ) == 0 or die "dch failed";
system( "cp debian/changelog /tmp" ) == 0 or die "backup changelog failed";
system( "git commit -a -m 'Release of $release ($releasename)'" ) == 0 or die "release commit failed";
system( "git tag $reltag -m 'Version $release'" ) == 0 or die "tag failed";

print "Producing archive...\n";
system( "git archive --format tar HEAD | bzip2 -c >qgis-$release.0.tar.bz2" ) == 0 or die "git archive failed";
system( "git archive --format tar --prefix=qgis-$release.0/ $reltag | bzip2 -c >qgis-$release.0.tar.bz2" ) == 0 or die "git archive failed";
system( "md5sum qgis-$newmajor.$newminor.0.tar.bz2 >qgis-$release.0.tar.bz2.md5" ) == 0 or die "md5sum failed";

$newminor++;
Expand All @@ -101,9 +103,9 @@ sub updateCMakeLists {
system( "git commit -a -m 'Bump version to $newmajor.$newminor'" ) == 0 or die "bump version failed";

print "Push dry-run...\n";
system( "git push -n origin master $relbranch" ) == 0 or die "git push -n failed";
system( "git push -n origin master $relbranch $reltag" ) == 0 or die "git push -n failed";

print "Now manually push and upload the tarballs :\n\tgit push origin master $relbranch\n\trsync qgis-$release.0.tar.bz2* qgis.org:/var/www/downloads/\n\n";
print "Now manually push and upload the tarballs :\n\tgit push origin master $relbranch $reltag\n\trsync qgis-$release.0.tar.bz2* qgis.org:/var/www/downloads/\n\n";

=head1 NAME
Expand Down