This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 48a358dfc3cd61475ebb153faafad6ac0dea9308 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 1 10:36:38 2014 +0200 debian/rules: Detect Git-created ChangeLog file if present (created by X2Go upstream's build scripts during package build). Conflicts (resolved by Mike Gabriel): debian/rules --- debian/changelog | 3 +++ debian/rules | 2 ++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7aaa8c7..9bb991c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,9 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low + Add Description key to LSB header. * debian/config: + Explicitly call set -e. Makes lintian happier. + * debian/rules: + + Detect Git-created ChangeLog file if present (created by X2Go + upstream's build scripts during package build). [ Harald Nordgard-Hansen ] * New upstream release (4.0.1.14): diff --git a/debian/rules b/debian/rules index f71ab24..259ead8 100755 --- a/debian/rules +++ b/debian/rules @@ -4,9 +4,11 @@ PREFIX=/usr dh $@ override_dh_auto_install: + if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog ChangeLog; fi PREFIX=/usr make -f Makefile build-arch override_dh_auto_clean: + rm -f ChangeLog rm -fv x2gosqlitewrapper rm -Rfv x2goserver/.build_html rm -Rfv x2goserver-extensions/.build_html -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git