[X2Go-Commits] [x2gokdrive] 02/03: debian/rules: Unapply patches from patches.xorg/<version>/ directory before re-applying. Also remove quilt's .pc/ patch tracking directory before applying patches.

[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 9cd696ed7a6e83febf787821e13545cf62813f7d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 29 00:23:14 2023 +0000

    debian/rules: Unapply patches from patches.xorg/<version>/ directory before re-applying. Also remove quilt's .pc/ patch tracking directory before applying patches.
---
 debian/rules | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/rules b/debian/rules
index 6dfbba4..5dd4903 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,8 @@ override_dh_auto_configure:
 		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 pop -a; \
+			rm .pc -Rfv; \
 			QUILT_PATCHES="../../patches.xorg/$${XORG_UPSTREAM_VERSION}/" quilt push -a; \
 		else \
 			( \

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