[X2Go-Commits] [x2gokdrive] 02/03: debian/rules: drop additional escape layer in sed expression.

[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 268ea2ca29dd94ed9890259a033d56c164baf2f3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Oct 28 03:19:34 2019 +0100

    debian/rules: drop additional escape layer in sed expression.
    
    This was previously only needed due to the weird escaping/quoting rules
    for code in backticks.
    
    The more modern and equally POSIX-compatible $() syntax makes quoting
    and escaping within subshell calls a lot easier.
---
 debian/changelog | 4 ++++
 debian/rules     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fdf3fa7..f542c10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,10 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
     + Verbosely remove *.la files.
     + Add missing single quotes - two strings were merged into one by
       accident.
+    + Drop additional escape layer in sed expression. This was previously only
+      needed due to the weird escaping/quoting rules for code in backticks.
+      The more modern and equally POSIX-compatible $() syntax makes quoting
+      and escaping within subshell calls a lot easier.
   * debian/rules.flags:
     + Define NULL variable and use it throughout the file.
 
diff --git a/debian/rules b/debian/rules
index 55d13e3..2cdde1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ override_dh_auto_configure:
 
 	# patch xorg-server build tree, so that it will build x2gokdrive
 	set -x; \
-		export XORG_UPSTREAM_VERSION="$$(grep AC_INIT '$(CURDIR)/BUILD/xorg-server/configure.ac' | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/')" && \
+		export XORG_UPSTREAM_VERSION="$$(grep AC_INIT '$(CURDIR)/BUILD/xorg-server/configure.ac' | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\1/')" && \
 		cd '$(CURDIR)/BUILD/xorg-server' && \
 		if [ -d  "../../patches.xorg/$${XORG_UPSTREAM_VERSION}" ]; then \
 			QUILT_PATCHES="../../patches.xorg/$${XORG_UPSTREAM_VERSION}/" quilt push -a; \

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