From 64ee9749af8e7bdb4101c79a83c49bfa1568993d Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Sun, 5 Sep 2010 11:48:56 +0000
Subject: [PATCH] Only use the ~rnnnn notation for debian packages, use .rnnnn
 for rpms

---
 cmake/Deb.cmake        | 2 +-
 cmake/Version.cmake    | 3 ++-
 debian/changelog.in    | 2 +-
 dist/maketarball.sh.in | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cmake/Deb.cmake b/cmake/Deb.cmake
index a0daf98a3..62c62b7d1 100644
--- a/cmake/Deb.cmake
+++ b/cmake/Deb.cmake
@@ -2,7 +2,7 @@ set(DEB_ARCH amd64 CACHE STRING "Architecture of the deb file")
 
 add_custom_target(deb
   COMMAND dpkg-buildpackage -b -uc -us
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../clementine_${CLEMENTINE_VERSION}_${DEB_ARCH}.deb
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../clementine_${CLEMENTINE_DEB_VERSION}_${DEB_ARCH}.deb
                                    ${CMAKE_BINARY_DIR}/clementine.deb
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 )
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 79cc3a3c6..962c32c93 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -9,7 +9,8 @@ set(BUILDBOT_REVISION $ENV{BUILDBOT_REVISION})
 if(BUILDBOT_REVISION)
   set(CLEMENTINE_VERSION_STRING "0.4 - buildbot r${BUILDBOT_REVISION}") # Displayed in GUIs
   set(CLEMENTINE_VERSION_SHORT_STRING "0.4r${BUILDBOT_REVISION}")       # Used in filenames
-  set(CLEMENTINE_VERSION ${CLEMENTINE_VERSION_MAJOR}.${CLEMENTINE_VERSION_MINOR}.90~r${BUILDBOT_REVISION})
+  set(CLEMENTINE_VERSION ${CLEMENTINE_VERSION_MAJOR}.${CLEMENTINE_VERSION_MINOR}.90.r${BUILDBOT_REVISION})
+  set(CLEMENTINE_DEB_VERSION ${CLEMENTINE_VERSION_MAJOR}.${CLEMENTINE_VERSION_MINOR}.90~r${BUILDBOT_REVISION})
 else(BUILDBOT_REVISION)
   set(CLEMENTINE_VERSION_STRING "0.4")
   set(CLEMENTINE_VERSION_SHORT_STRING "0.4")
diff --git a/debian/changelog.in b/debian/changelog.in
index 3e1c31bb9..178c6554c 100644
--- a/debian/changelog.in
+++ b/debian/changelog.in
@@ -1,4 +1,4 @@
-clementine (${CLEMENTINE_VERSION}) ${DEB_DIST}; urgency=low
+clementine (${CLEMENTINE_DEB_VERSION}) ${DEB_DIST}; urgency=low
 
   * Version ${CLEMENTINE_VERSION_STRING}
 
diff --git a/dist/maketarball.sh.in b/dist/maketarball.sh.in
index dd8ce393d..dbcf716a2 100755
--- a/dist/maketarball.sh.in
+++ b/dist/maketarball.sh.in
@@ -2,6 +2,7 @@
 
 name=clementine
 version="@CLEMENTINE_VERSION@"
+deb_version="@CLEMENTINE_VERSION@"
 root=$(cd "${0%/*}/.." && echo $PWD/${0##*/})
 root=`dirname "$root"`
 rootnoslash=`echo $root | sed "s/^\///"`
@@ -15,6 +16,6 @@ tar -czf $name-$version.tar.gz "$root" \
     --exclude "$root/debian" \
     --exclude "$root/dist/*.tar.gz"
 
-echo "Also creating ${name}_$version.orig.tar.gz..."
-cp "$name-$version.tar.gz" "${name}_$version.orig.tar.gz"
+echo "Also creating ${name}_$deb_version.orig.tar.gz..."
+cp "$name-$version.tar.gz" "${name}_$deb_version.orig.tar.gz"