This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from f9c56f2 x2gokdrive.spec: add description for x2gokdrive (source) package. new 23b2a66 x2gokdrive.spec: fix typo pkgconfig(Xau) => pkgconfig(xau). new 268ea2c debian/rules: drop additional escape layer in sed expression. new a14f2a1 x2gokdrive.spec: backport escaping layer change from debian/rules. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++++++ debian/rules | 2 +- x2gokdrive.spec | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 23b2a66add83b858bfb9876025a8d9f1ee67d7a7 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 28 03:12:16 2019 +0100 x2gokdrive.spec: fix typo pkgconfig(Xau) => pkgconfig(xau). --- debian/changelog | 1 + x2gokdrive.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1b98497..fdf3fa7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Add/copy Summary tag to xorg-x11-server-x2gokdrive binary package. + Add description for x2gokdrive (source) package. It's a slightly modified version of the binary package description. + + Fix typo pkgconfig(Xau) => pkgconfig(xau). * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index d39a9dc..6b66512 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -83,7 +83,7 @@ BuildRequires: pkgconfig(presentproto) BuildRequires: pkgconfig(bigreqsproto) BuildRequires: pkgconfig(compositeproto) BuildRequires: pkgconfig(xtrans) -BuildRequires: pkgconfig(Xau) +BuildRequires: pkgconfig(xau) BuildRequires: pkgconfig(xdmcp) %if 0%{?fedora} > 24 || 0%{?rhel} >= 7 || 0%{?sle_version} >= 120300 BuildRequires: pkgconfig(xfont2) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
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@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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit a14f2a11d7245f8bc5bc8231c26f93a56cfbdd41 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 28 03:20:44 2019 +0100 x2gokdrive.spec: backport escaping layer change from debian/rules. --- debian/changelog | 1 + x2gokdrive.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f542c10..d38f5d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium + Add description for x2gokdrive (source) package. It's a slightly modified version of the binary package description. + Fix typo pkgconfig(Xau) => pkgconfig(xau). + + Backport escaping layer change from debian/rules. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 6b66512..85f5130 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -203,7 +203,7 @@ cp -r 'man/' 'BUILD/hw/kdrive/x2gokdrive/' # patch xorg-server build tree, so that it will build x2gokdrive set -x -export XORG_UPSTREAM_VERSION="$(grep 'AC_INIT' 'BUILD/configure.ac' | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/')" +export XORG_UPSTREAM_VERSION="$(grep 'AC_INIT' 'BUILD/configure.ac' | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\1/')" cd 'BUILD' 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