[X2Go-Commits] [x2goserver] 06/09: debian/rules: Detect Git-created ChangeLog file if present (created by X2Go upstream's build scripts during package build).

git-admin at x2go.org git-admin at x2go.org
Tue Apr 1 10:42:26 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit b943e07a31db18f488c6a0cd03f9c6846eac5836
Author: Mike Gabriel <mike.gabriel at 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).
---
 debian/changelog |    3 +++
 debian/rules     |    2 ++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cdce0ba..064face 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -132,6 +132,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 acdd782..7e71d57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,12 @@ override_dh_auto_build:
 	PREFIX=/usr PERL_INSTALLDIRS=vendor dh_auto_build
 
 override_dh_auto_install:
+	if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog ChangeLog; fi
 	$(MAKE) -f Makefile build-arch
 	PREFIX=/usr dh_auto_install
 
 override_dh_auto_clean:
+	rm -f ChangeLog
 	rm -Rfv x2goserver/.build_html
 	rm -Rfv x2goserver-extensions/.build_html
 	PREFIX=/usr dh_auto_clean

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git



More information about the x2go-commits mailing list