[X2Go-Commits] [x2gokdrive] 11/28: debian/rules: drop useless use of cat.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 04ae661613335b66fdce791ec74927536f3a4d3d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Oct 24 22:47:23 2019 +0200

    debian/rules: drop useless use of cat.
---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cf6e23b..f686442 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,5 +20,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
     + Remove weird empty variable reference construct.
     + Whitespace-only fixes.
     + Move options to the front of commands.
+    + Drop useless use of cat.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 04 Jun 2019 14:10:43 +0200
diff --git a/debian/rules b/debian/rules
index 15b4174..4d0a590 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ override_dh_auto_configure:
 	cp -r $(CURDIR)/man/ BUILD/xorg-server/hw/kdrive/x2gokdrive/
 
 	# patch xorg-server build tree, so that it will build x2gokdrive
-	set -x; export XORG_UPSTREAM_VERSION=`cat $(CURDIR)/BUILD/xorg-server/configure.ac | grep AC_INIT | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/'` \
+	set -x; export XORG_UPSTREAM_VERSION=`grep AC_INIT $(CURDIR)/BUILD/xorg-server/configure.ac | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/'` \
 	        && cd $(CURDIR)/BUILD/xorg-server \
 	        && test -d ../../patches.xorg/$$XORG_UPSTREAM_VERSION && QUILT_PATCHES=../../patches.xorg/$$XORG_UPSTREAM_VERSION/ quilt push -a \
 		|| ( set +x; echo "\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version $$XORG_UPSTREAM_VERSION.\n##################################################\n"; exit 1)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git