mirror of
https://github.com/clementine-player/Clementine
synced 2024-12-18 12:28:31 +01:00
Only use the ~rnnnn notation for debian packages, use .rnnnn for rpms
This commit is contained in:
parent
ec3ff1a822
commit
64ee9749af
@ -2,7 +2,7 @@ set(DEB_ARCH amd64 CACHE STRING "Architecture of the deb file")
|
|||||||
|
|
||||||
add_custom_target(deb
|
add_custom_target(deb
|
||||||
COMMAND dpkg-buildpackage -b -uc -us
|
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
|
${CMAKE_BINARY_DIR}/clementine.deb
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
)
|
)
|
||||||
|
@ -9,7 +9,8 @@ set(BUILDBOT_REVISION $ENV{BUILDBOT_REVISION})
|
|||||||
if(BUILDBOT_REVISION)
|
if(BUILDBOT_REVISION)
|
||||||
set(CLEMENTINE_VERSION_STRING "0.4 - buildbot r${BUILDBOT_REVISION}") # Displayed in GUIs
|
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_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)
|
else(BUILDBOT_REVISION)
|
||||||
set(CLEMENTINE_VERSION_STRING "0.4")
|
set(CLEMENTINE_VERSION_STRING "0.4")
|
||||||
set(CLEMENTINE_VERSION_SHORT_STRING "0.4")
|
set(CLEMENTINE_VERSION_SHORT_STRING "0.4")
|
||||||
|
2
debian/changelog.in
vendored
2
debian/changelog.in
vendored
@ -1,4 +1,4 @@
|
|||||||
clementine (${CLEMENTINE_VERSION}) ${DEB_DIST}; urgency=low
|
clementine (${CLEMENTINE_DEB_VERSION}) ${DEB_DIST}; urgency=low
|
||||||
|
|
||||||
* Version ${CLEMENTINE_VERSION_STRING}
|
* Version ${CLEMENTINE_VERSION_STRING}
|
||||||
|
|
||||||
|
5
dist/maketarball.sh.in
vendored
5
dist/maketarball.sh.in
vendored
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
name=clementine
|
name=clementine
|
||||||
version="@CLEMENTINE_VERSION@"
|
version="@CLEMENTINE_VERSION@"
|
||||||
|
deb_version="@CLEMENTINE_VERSION@"
|
||||||
root=$(cd "${0%/*}/.." && echo $PWD/${0##*/})
|
root=$(cd "${0%/*}/.." && echo $PWD/${0##*/})
|
||||||
root=`dirname "$root"`
|
root=`dirname "$root"`
|
||||||
rootnoslash=`echo $root | sed "s/^\///"`
|
rootnoslash=`echo $root | sed "s/^\///"`
|
||||||
@ -15,6 +16,6 @@ tar -czf $name-$version.tar.gz "$root" \
|
|||||||
--exclude "$root/debian" \
|
--exclude "$root/debian" \
|
||||||
--exclude "$root/dist/*.tar.gz"
|
--exclude "$root/dist/*.tar.gz"
|
||||||
|
|
||||||
echo "Also creating ${name}_$version.orig.tar.gz..."
|
echo "Also creating ${name}_$deb_version.orig.tar.gz..."
|
||||||
cp "$name-$version.tar.gz" "${name}_$version.orig.tar.gz"
|
cp "$name-$version.tar.gz" "${name}_$deb_version.orig.tar.gz"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user