mirror of
https://github.com/clementine-player/Clementine
synced 2024-12-18 20:34:39 +01:00
Add the debian distribution name to the deb filename - maybe fix dev ppa
This commit is contained in:
parent
9c273aa745
commit
79b7a3cdf2
@ -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 -d -uc -us
|
COMMAND dpkg-buildpackage -b -d -uc -us
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../clementine_${CLEMENTINE_VERSION_DEB}_${DEB_ARCH}.deb
|
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../clementine_${CLEMENTINE_VERSION_DEB}~${DEB_DIST}_${DEB_ARCH}.deb
|
||||||
${CMAKE_BINARY_DIR}/clementine_${CLEMENTINE_VERSION_DEB}_${DEB_ARCH}.deb
|
${CMAKE_BINARY_DIR}/clementine_${CLEMENTINE_VERSION_DEB}~${DEB_DIST}_${DEB_ARCH}.deb
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
)
|
)
|
||||||
|
1
debian/CMakeLists.txt
vendored
1
debian/CMakeLists.txt
vendored
@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8)
|
|||||||
execute_process(COMMAND date "+%a, %-d %b %Y %H:%M:%S %z"
|
execute_process(COMMAND date "+%a, %-d %b %Y %H:%M:%S %z"
|
||||||
OUTPUT_VARIABLE DEB_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
|
OUTPUT_VARIABLE DEB_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
|
||||||
set(DEB_DIST "unstable" CACHE STRING "Distribution to set in the .deb changelog")
|
|
||||||
set(DEB_REWRITE_RULES ON CACHE BOOL "Rewrite the debian rules file from rules.in")
|
set(DEB_REWRITE_RULES ON CACHE BOOL "Rewrite the debian rules file from rules.in")
|
||||||
|
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/changelog.in
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/changelog.in
|
||||||
|
2
debian/changelog.in
vendored
2
debian/changelog.in
vendored
@ -1,4 +1,4 @@
|
|||||||
clementine (${CLEMENTINE_VERSION_DEB}) ${DEB_DIST}; urgency=low
|
clementine (${CLEMENTINE_VERSION_DEB}~${DEB_DIST}) ${DEB_DIST}; urgency=low
|
||||||
|
|
||||||
* Version ${CLEMENTINE_VERSION_DISPLAY}
|
* Version ${CLEMENTINE_VERSION_DISPLAY}
|
||||||
|
|
||||||
|
5
dist/maketarball.sh.in
vendored
5
dist/maketarball.sh.in
vendored
@ -3,6 +3,7 @@
|
|||||||
name=clementine
|
name=clementine
|
||||||
version="@CLEMENTINE_VERSION_RPM@"
|
version="@CLEMENTINE_VERSION_RPM@"
|
||||||
deb_version="@CLEMENTINE_VERSION_DEB@"
|
deb_version="@CLEMENTINE_VERSION_DEB@"
|
||||||
|
deb_dist="@DEB_DIST@"
|
||||||
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/^\///"`
|
||||||
@ -16,6 +17,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}_$deb_version.orig.tar.gz..."
|
echo "Also creating ${name}_${deb_version}~${deb_dist}.orig.tar.gz..."
|
||||||
cp "$name-$version.tar.gz" "${name}_$deb_version.orig.tar.gz"
|
cp "$name-$version.tar.gz" "${name}_${deb_version}~${deb_dist}.orig.tar.gzz"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user