Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Only use the ~rnnnn notation for debian packages, use .rnnnn for rpms

This commit is contained in:
David Sansome 2010-09-05 11:48:56 +00:00
parent ec3ff1a822
commit 64ee9749af
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Deb.cmake
View File

@ -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}
)

3
cmake/Version.cmake
View File

@ -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")

2
debian/changelog.in vendored
View File

@ -1,4 +1,4 @@
clementine (${CLEMENTINE_VERSION}) ${DEB_DIST}; urgency=low
clementine (${CLEMENTINE_DEB_VERSION}) ${DEB_DIST}; urgency=low
* Version ${CLEMENTINE_VERSION_STRING}

5
dist/maketarball.sh.in vendored
View File

@ -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"