From 5b34a11765c517e44e1129c99c323926b684cdd4 Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Mon, 3 Jan 2011 14:33:03 +0000
Subject: [PATCH] More version number fiddling

---
 cmake/Version.cmake        | 4 ++--
 dist/windows/windres.rc.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 70dafd74a..7235dc978 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -10,7 +10,7 @@ set(INCLUDE_SVN_REVISION ON)
 
 # The format for version numbers is:
 # Display: $major.$minor [$prerelease] [$svn]
-# Deb:     $major.$minor[~$prerelease][~$svn]
+# Deb:     $major.$minor[~$prerelease][.$svn]
 # Rpm:     $major.$minor[$prerelease][.$svn]
 # And the rpm version is used for mac and windows
 
@@ -47,6 +47,6 @@ endif(FORCE_SVN_REVISION)
 
 if(INCLUDE_SVN_REVISION AND SVN_REVISION)
   set(CLEMENTINE_VERSION_DISPLAY "${CLEMENTINE_VERSION_DISPLAY} r${SVN_REVISION}")
-  set(CLEMENTINE_VERSION_DEB "${CLEMENTINE_VERSION_DEB}~r${SVN_REVISION}")
+  set(CLEMENTINE_VERSION_DEB "${CLEMENTINE_VERSION_DEB}.r${SVN_REVISION}")
   set(CLEMENTINE_VERSION_RPM "${CLEMENTINE_VERSION_RPM}.r${SVN_REVISION}")
 endif(INCLUDE_SVN_REVISION AND SVN_REVISION)
diff --git a/dist/windows/windres.rc.in b/dist/windows/windres.rc.in
index da707b24b..a4686e3b3 100644
--- a/dist/windows/windres.rc.in
+++ b/dist/windows/windres.rc.in
@@ -1,7 +1,7 @@
 clementine ICON "clementine.ico"
 1 VERSIONINFO
-FILEVERSION     ${CLEMENTINE_VERSION_MAJOR},${CLEMENTINE_VERSION_MINOR},0
-PRODUCTVERSION  ${CLEMENTINE_VERSION_MAJOR},${CLEMENTINE_VERSION_MINOR},0
+FILEVERSION     ${CLEMENTINE_VERSION_MAJOR},${CLEMENTINE_VERSION_MINOR},0,0
+PRODUCTVERSION  ${CLEMENTINE_VERSION_MAJOR},${CLEMENTINE_VERSION_MINOR},0,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN