Add the debian distribution name to the deb filename - maybe fix dev ppa

This commit is contained in:
David Sansome 2011-01-08 16:47:29 +00:00
parent 9c273aa745
commit 79b7a3cdf2
4 changed files with 6 additions and 6 deletions

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 -d -uc -us
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../clementine_${CLEMENTINE_VERSION_DEB}_${DEB_ARCH}.deb
${CMAKE_BINARY_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_DIST}_${DEB_ARCH}.deb
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)

View File

@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 2.8)
execute_process(COMMAND date "+%a, %-d %b %Y %H:%M:%S %z"
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")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/changelog.in

2
debian/changelog.in vendored
View File

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

View File

@ -3,6 +3,7 @@
name=clementine
version="@CLEMENTINE_VERSION_RPM@"
deb_version="@CLEMENTINE_VERSION_DEB@"
deb_dist="@DEB_DIST@"
root=$(cd "${0%/*}/.." && echo $PWD/${0##*/})
root=`dirname "$root"`
rootnoslash=`echo $root | sed "s/^\///"`
@ -16,6 +17,6 @@ tar -czf $name-$version.tar.gz "$root" \
--exclude "$root/debian" \
--exclude "$root/dist/*.tar.gz"
echo "Also creating ${name}_$deb_version.orig.tar.gz..."
cp "$name-$version.tar.gz" "${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}~${deb_dist}.orig.tar.gzz"