[X2Go-Commits] [x2goclient] 03/06: x2goclient.spec: Copy ChangeLog (or debian/changelog) into txt/ subfolder during %setup.
git-admin at x2go.org
git-admin at x2go.org
Tue Mar 4 09:34:47 CET 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 650c4f3a3c133ffe8e887f72fb2ce3028cb4f140
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Mar 4 09:06:38 2014 +0100
x2goclient.spec: Copy ChangeLog (or debian/changelog) into txt/ subfolder during %setup.
---
debian/changelog | 3 +++
x2goclient.spec | 1 +
2 files changed, 4 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index d41ff24..f91001d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,9 @@ x2goclient (4.0.2.0-0x2go1) UNRELEASED; urgency=low
+ Bump Standards: to 3.9.5. No changes needed.
* debian/rules:
+ Copy debian/changelog into txt/ subfolder during dh_auto_configure.
+ * x2goclient.spec:
+ + Copy ChangeLog (or debian/changelog) into txt/ subfolder during
+ %setup.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 22 Jan 2014 09:20:08 +0100
diff --git a/x2goclient.spec b/x2goclient.spec
index f7a04fe..79820f4 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -95,6 +95,7 @@ the X2Go Plugin via an Apache webserver.
# Fix up install issues
sed -i -e 's/-o root -g root//' Makefile
sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile
+test -f ChangeLog && cp ChangeLog txt/changelog || test -f debian/changelog && cp debian/changelog txt/changelog || true
%if 0%{?el5}
sed -i -e '/^QMAKE_BINARY=/s at qmake-qt4@%{_libdir}/qt4/bin/qmake@' Makefile
sed -i -e '/^LRELEASE_BINARY=/s at lrelease-qt4@%{_libdir}/qt4/bin/lrelease@' Makefile
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list