Skip to content

Commit

Permalink
Release of 2.6 (Brighton)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Oct 31, 2014
1 parent 3a33dbd commit 8acae24
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "5")
SET(CPACK_PACKAGE_VERSION_MINOR "6")
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")
SET(RELEASE_NAME "Brighton")
SET(PROJECT_VERSION ${COMPLETE_VERSION})
PROJECT(qgis${PROJECT_VERSION})
IF (APPLE)
Expand Down
10 changes: 8 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
qgis (2.5.0) UNRELEASED; urgency=medium
qgis (2.6.0) UNRELEASED; urgency=medium

* Release of 2.6

-- Jürgen E. Fischer <jef@norbit.de> Fri, 31 Oct 2014 13:00:09 +0100

qgis (2.5.0) unstable; urgency=medium

* New development version 2.5 after branch of 2.4
* add libqscintilla2-dev as build dependency
Expand All @@ -8,7 +14,7 @@ qgis (2.5.0) UNRELEASED; urgency=medium
* add build dependency to pyqt4.qsci-dev
* adapt debian downstream changes

-- Jürgen E. Fischer <jef@norbit.de> Wed, 10 Sep 2014 23:27:34 +0200
-- Jürgen E. Fischer <jef@norbit.de> Fri, 31 Oct 2014 13:00:09 +0100

qgis (2.4.0) unstable; urgency=medium

Expand Down
Binary file modified images/splash/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ms-windows/Installer-Files/WelcomeFinishPage.bmp
Binary file not shown.

1 comment on commit 8acae24

@3nids
Copy link
Member

@3nids 3nids commented on 8acae24 Oct 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the splash.png file seems to be a html page...

Please sign in to comment.