summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-02-04 07:42:29 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-02-04 07:54:44 -0800
commit06e2dde508984b07d548b52c9790f1d3a614acdf (patch)
tree2bbac21d239d78dafed7b7126a61ac410da78d27
parent4e9b63776178d302b337f3757e5c910b02a70231 (diff)
downloadsubsurface-06e2dde508984b07d548b52c9790f1d3a614acdf.tar.gz
Get ready for Subsurface 4.4
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--Documentation/user-manual.txt6
-rw-r--r--Documentation/user-manual_es.txt2
-rw-r--r--INSTALL24
-rw-r--r--ReleaseNotes/ReleaseNotes.txt13
-rw-r--r--subsurface.pro2
5 files changed, 23 insertions, 24 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 7129f613c..e13ea098e 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1,10 +1,10 @@
-// Subsurface 4.2 User Manual
+// Subsurface 4.4 User Manual
// ==========================
// :author: Manual authors: Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
// Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Willem
// Ferguson, Salvador Cuñat, Pedro Neves
-// :revnumber: 4.2
-// :revdate: July 2014
+// :revnumber: 4.4
+// :revdate: February 2015
:icons:
:toc:
:toc-placement: manual
diff --git a/Documentation/user-manual_es.txt b/Documentation/user-manual_es.txt
index 67e92ba24..cee886ed7 100644
--- a/Documentation/user-manual_es.txt
+++ b/Documentation/user-manual_es.txt
@@ -1,4 +1,4 @@
-// _Subsurface_ 4.3 User Manual
+// _Subsurface_ 4.4 User Manual
// ==========================
// :author: Manual authors: Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
// Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Willem
diff --git a/INSTALL b/INSTALL
index 379e658d3..108b0bd3b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -13,10 +13,10 @@ package management system for Windows makes it really painful to build
Subsurface natively under Windows, we have some hints how to do so
here as well.
-As of Subsurface 4.3 all of the prebuilt binaries that we provide (right
-now Windows, Mac, Ubuntu/Debian/LinuxMint, and openSUSE/Fedora) are built
-using our own custom "flavors" of libdivecomputer and libmarblewidget. You
-can get these from
+All of the prebuilt binaries that we provide (right now Windows, Mac,
+Ubuntu/Debian/LinuxMint, and openSUSE/Fedora) are built using our own
+custom "flavors" of libdivecomputer and libmarblewidget. You can get
+these from
git://git.subsurface-divelog.org/marble (in the Subsurface-4.4 branch)
git://git.subsurface-divelog.org/libdc (in the Subsurface-4.4 branch)
@@ -109,7 +109,7 @@ First you need to compile our version of libdivecomputer:
$ mkdir ~/src # unless you have this already
$ cd ~/src
-$ git clone -b Subsurface-4.3 git://subsurface-divelog.org/libdc libdivecomputer
+$ git clone -b Subsurface-4.4 git://subsurface-divelog.org/libdc libdivecomputer
# or -b Subsurface-testing to get the testing version - careful,
# careful - this gets rebased and may be broken
# -> when not building a release version of Subsurface but the
@@ -125,7 +125,7 @@ $ sudo make install
Then you compile our custom branch of libmarblewidget
$ cd ~/src
-$ git clone -b Subsurface-4.3 git://subsurface-divelog.org/marble marble-source
+$ git clone -b Subsurface-4.4 git://subsurface-divelog.org/marble marble-source
# or -b Subsurface-testing to get the testing version - careful,
# careful - this gets rebased and may be broken
@@ -145,7 +145,7 @@ Finally you can compile Subsurface:
$ cd ~/src
$ git clone git://subsurface-divelog.org/subsurface.git
$ cd subsurface
-$ git checkout v4.3 # this get's you the last release
+$ git checkout v4.4 # this get's you the last release
# skip this step to build the latest development
# version
$ qmake SPECIAL_MARBLE_PREFIX=1
@@ -206,7 +206,7 @@ $ make install
5) Install custom subsurface Marble
$ cd ~/src
-$ git clone -b Subsurface-4.3 git://subsurface-divelog.org/marble marble-source
+$ git clone -b Subsurface-4.4 git://subsurface-divelog.org/marble marble-source
$ cd marble-source
$ mkdir marble-build
$ cd marble-build
@@ -220,7 +220,7 @@ $ make install
$ brew install automake libtool
$ cd ~/src
-$ git clone -b Subsurface-4.3 git://subsurface-divelog.org/libdc libdivecomputer
+$ git clone -b Subsurface-4.4 git://subsurface-divelog.org/libdc libdivecomputer
# -> when not building a release version of Subsurface but the
# latest master, it may be necessary to build against the
# Subsurface-testing branch
@@ -270,7 +270,7 @@ The best way to get libdivecomputer to build appears to be
$ mkdir -p ~/src
$ cd ~/src
-$ git clone -b Subsurface-4.3 git://subsurface-divelog.org/libdc libdivecomputer
+$ git clone -b Subsurface-4.4 git://subsurface-divelog.org/libdc libdivecomputer
# or -b Subsurface-testing to get the testing version - careful,
# careful - this gets rebased and may be broken
# -> when not building a release version of Subsurface but the
@@ -286,7 +286,7 @@ $ sudo mingw64-make install
To compile Marble, use:
$ cd ~/src
-$ git clone -b Subsurface-4.3 git://subsurface-divelog.org/marble marble-source
+$ git clone -b Subsurface-4.4 git://subsurface-divelog.org/marble marble-source
# or -b Subsurface-testing to get the testing version - careful,
# careful - this gets rebased and may be broken
@@ -316,7 +316,7 @@ To compile Subsurface, use:
$ cd ~/src
$ git clone git://subsurface-divelog.org/subsurface.git
$ cd subsurface
-$ cd git checkout v4.3 # this get's you the last release
+$ cd git checkout v4.4 # this get's you the last release
# skip this step to build the latest development
# version
$ packagin/windows/mingw-make.sh Qt5 SPECIAL_MARBLE_PREFIX=1
diff --git a/ReleaseNotes/ReleaseNotes.txt b/ReleaseNotes/ReleaseNotes.txt
index 8e56666fc..f7d3993b2 100644
--- a/ReleaseNotes/ReleaseNotes.txt
+++ b/ReleaseNotes/ReleaseNotes.txt
@@ -1,10 +1,10 @@
// _Subsurface_ 4.4 Release Notes
-_Subsurface_ 4.4 Beta 3 - February 2015
----------------------------------------
+_Subsurface_ 4.4 - February 2015
+--------------------------------
The _Subsurface_ development team proudly announces
-the release of version 4.4 Beta 3 (aka 4.3.970) of _Subsurface_, an open
+the release of version 4.4 of _Subsurface_, an open
source divelog and dive planning program for Windows, Mac and Linux.
License: GPLv2
@@ -44,11 +44,10 @@ For owners of the Heinrichs & Weikamp OSTC 3 and OSTC Sport _Subsurface_
now supports updating the firmware and informs users of new firmware
releases.
-Add support for importing logs from the Divesoft Freedom
+We added support for importing logs from the Divesoft Freedom
-Dropped the 64bit Windows binary and went back to a single 32bit binary
-that works on all versions of Windows, 32 or 64bit, all the way back to
-Windows XP.
+We went back to a single, Qt5 based 32bit binary that works on all
+versions of Windows, 32 or 64bit, all the way back to Windows XP.
Some of the changes since _Subsurface_ 4.2
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/subsurface.pro b/subsurface.pro
index 9f0c9877e..2cc6b0982 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -19,7 +19,7 @@ else: TARGET = subsurface
QMAKE_CLEAN += $$TARGET
-VERSION = 4.3
+VERSION = 4.4
HEADERS = \
cochran.h \