Travis-ci: correctly detect version Changelog: add last 5 commits to changelog output...

diff --git a/.travis.yml b/.travis.yml
index f3899a2587f77854e1df771a76ff8b09f1694857..c31e5e3e3145d0074969aeb87cb84203579de5a2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ dist: trusty
 language: c
 before_install:
   - sudo apt-get -qqy update && sudo apt-get install fakeroot -qqy
+  - git fetch --unshallow
   - sudo ./Autobuild.sh -t trusty-amd64 -o deps
 script:
-  - ./Autobuild.sh -t trusty-amd64
+  - sudo ./Autobuild.sh -t trusty-amd64

diff --git a/Autobuild/debian.sh b/Autobuild/debian.sh
index e66b70349c50d6cad5580585300d1b7c6dffe51d..84307926c7c19d12f601fd824de784b97ea6062a 100755 (executable)
--- a/Autobuild/debian.sh
+++ b/Autobuild/debian.sh
@@ -25,7 +25,7 @@ END {
 }' debian/control`
 
 case "${DEBDIST}" in
-precise|trusty|jessie)
+precise|trusty|jessie|raspbianjessie)
   BUILD_DEPS=`echo ${BUILD_DEPS} | sed -e 's/libpcre2-dev/libpcre3-dev/g'` ;;
 esac
 

diff --git a/support/changelog b/support/changelog
index 84f4476387dd72379f59aebfa222429a8e93798c..fdbd67e502a427db51c5b74f74ef89526a1941d1 100755 (executable)
--- a/support/changelog
+++ b/support/changelog
@@ -8,6 +8,9 @@ CHANGELOG=$1
 DIST=$2
 VER=$3
 
+HISTORY=$(cd "$(dirname "$0")/.."; git log -5 --no-merges --pretty=format:"  * %h %<(50,trunc)%s"; 2> /dev/null)
+[ $? -ne 0 ] && HISTORY=""
+
 # Defaults
 [ -z "$CHANGELOG"     ] && CHANGELOG=$(dirname "$0")/../debian/changelog
 [ -z "$DEBEMAIL"      ] && DEBEMAIL="andreas@tvheadend.org"
@@ -15,12 +18,15 @@ VER=$3
 [ -z "$VER"           ] && VER=$("$(dirname "$0")"/version)
 [ ! -z "$DIST"        ] && VER=${VER}~${DIST}
 [ -z "$DIST"          ] && DIST=unstable
+[ -z "$HISTORY"       ] && HISTORY=""
 
 # Output
 NOW=$(date -R)
 echo >"${CHANGELOG}"  "tvheadend (${VER}) ${DIST}; urgency=low"
 echo >>"${CHANGELOG}"
-echo >>"${CHANGELOG}" "  * The full changelog can be found at "
+[ ! -z "$HISTORY" ] && echo >>"${CHANGELOG}" "${HISTORY}\n"
+echo >>"${CHANGELOG}" "  * The full changelog(s) can be found at "
 echo >>"${CHANGELOG}" "    https://tvheadend.org/projects/tvheadend/wiki/Releases"
+echo >>"${CHANGELOG}" "    https://github.com/tvheadend/tvheadend"
 echo >>"${CHANGELOG}"
 echo >>"${CHANGELOG}" " -- ${DEBFULLNAME} <${DEBEMAIL}>  ${NOW}"

diff --git a/support/version b/support/version
index 041d04fe646bd6f02d84fca4845730fa0ff17a6d..9f50a7e811f63710fd6ec9b6910aab088d7c08b0 100755 (executable)
--- a/support/version
+++ b/support/version
@@ -13,8 +13,7 @@ if [ -d ".git" ]; then
     # Git describe failed, maybe "--dirty" option is not available
     # Adding "-unknown" postfix to mark this situation
     VER=$(cd "$(dirname "$0")/.."; git describe --match "v*" 2> /dev/null)
-    [ -z "$VER" ] && VER=0.0.0
-    VER=${VER}-unknown
+    [ -z "$VER" ] && VER="0.0.0-unknown"
   fi
   VER=$(echo $VER | sed "s/^v//" | sed "s/-\([0-9]*\)-\(g[0-9a-f]*\)/-\1~\2/")
 elif [ -f "$(dirname "$0")/../debian/changelog" ]; then