[X2Go-Commits] [x2gokdrive] 03/08: {./, patches.xorg/{common, 1.18.4, 1.19.{2, 6}, 1.20.{1, 4, 5}}/}quilt.env: add new quilt environment helper mechanism.

git-admin at x2go.org git-admin at x2go.org
Mon Oct 28 06:47:20 CET 2019


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

x2go pushed a commit to branch master
in repository x2gokdrive.

commit eb50333f9a702e68b2b929aaec21f7d1d6c05957
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Oct 28 04:53:09 2019 +0100

    {./,patches.xorg/{common,1.18.4,1.19.{2,6},1.20.{1,4,5}}/}quilt.env: add new quilt environment helper mechanism.
    
    Should make using quilt a lot easier on the developer's machine.
    
    Requires SOURCING(!) the quilt.env file within a specific versioned
    sub-directory OR SOURCING(!) the top-level quilt.env file and exporting
    QUILT_PATCHES manually.
---
 debian/changelog              |  5 +++++
 patches.xorg/1.18.4/quilt.env |  1 +
 patches.xorg/1.19.2/quilt.env |  1 +
 patches.xorg/1.19.6/quilt.env |  1 +
 patches.xorg/1.20.1/quilt.env |  1 +
 patches.xorg/1.20.4/quilt.env |  1 +
 patches.xorg/1.20.5/quilt.env |  1 +
 patches.xorg/common/quilt.env | 22 ++++++++++++++++++++++
 quilt.env                     |  9 +++++++++
 9 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b0c146c..12668a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,11 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
   * Initial release:
     - patches.legacy/README.legacy-patches.md: whitespace-only fix.
     - patches.legacy/README.legacy-patches.md: fix markdown syntax.
+    - {./,patches.xorg/{common,1.18.4,1.19.{2,6},1.20.{1,4,5}}/}quilt.env: add
+      new quilt environment helper mechanism. Should make using quilt a lot
+      easier on the developer's machine. Requires SOURCING(!) the quilt.env
+      file within a specific versioned sub-directory OR SOURCING(!) the
+      top-level quilt.env file and exporting QUILT_PATCHES manually.
   * debian/control:
     + Grammar fix.
     + Remove dependencies that refer to disabled features.
diff --git a/patches.xorg/1.18.4/quilt.env b/patches.xorg/1.18.4/quilt.env
new file mode 120000
index 0000000..543e930
--- /dev/null
+++ b/patches.xorg/1.18.4/quilt.env
@@ -0,0 +1 @@
+../common/quilt.env
\ No newline at end of file
diff --git a/patches.xorg/1.19.2/quilt.env b/patches.xorg/1.19.2/quilt.env
new file mode 120000
index 0000000..543e930
--- /dev/null
+++ b/patches.xorg/1.19.2/quilt.env
@@ -0,0 +1 @@
+../common/quilt.env
\ No newline at end of file
diff --git a/patches.xorg/1.19.6/quilt.env b/patches.xorg/1.19.6/quilt.env
new file mode 120000
index 0000000..543e930
--- /dev/null
+++ b/patches.xorg/1.19.6/quilt.env
@@ -0,0 +1 @@
+../common/quilt.env
\ No newline at end of file
diff --git a/patches.xorg/1.20.1/quilt.env b/patches.xorg/1.20.1/quilt.env
new file mode 120000
index 0000000..543e930
--- /dev/null
+++ b/patches.xorg/1.20.1/quilt.env
@@ -0,0 +1 @@
+../common/quilt.env
\ No newline at end of file
diff --git a/patches.xorg/1.20.4/quilt.env b/patches.xorg/1.20.4/quilt.env
new file mode 120000
index 0000000..543e930
--- /dev/null
+++ b/patches.xorg/1.20.4/quilt.env
@@ -0,0 +1 @@
+../common/quilt.env
\ No newline at end of file
diff --git a/patches.xorg/1.20.5/quilt.env b/patches.xorg/1.20.5/quilt.env
new file mode 120000
index 0000000..543e930
--- /dev/null
+++ b/patches.xorg/1.20.5/quilt.env
@@ -0,0 +1 @@
+../common/quilt.env
\ No newline at end of file
diff --git a/patches.xorg/common/quilt.env b/patches.xorg/common/quilt.env
new file mode 100644
index 0000000..949568a
--- /dev/null
+++ b/patches.xorg/common/quilt.env
@@ -0,0 +1,22 @@
+typeset this_fake=''
+typeset -i cont='1'
+if [[ -n "${ZSH_VERSION}" ]]; then
+  this_fake="${(%):-%x}"
+elif [[ -n "${BASH_VERSION}" ]]; then
+  this_fake="${BASH_SOURCE[0]}"
+else
+  printf 'Sorry, unsupported shell.\nThis helper will not work for you.\n' >&2
+  cont='0'
+fi
+
+if [[ '0' -ne "${cont}" ]]; then
+  typeset this_real="$(readlink -ne "${this_fake}")"
+  typeset this_dir="$(dirname "${this_fake}")"
+  typeset this_version="$(basename "${this_dir}")"
+  typeset this_patchesdir="$(basename "$(dirname "${this_dir}")")"
+  this_dir="${this_patchesdir}/${this_version}"
+  typeset top="$(dirname "$(dirname "$(dirname "${this_real}")")")"
+
+  export QUILT_PATCHES="${top}/${this_dir}"
+  . "${top}/quilt.env"
+fi
diff --git a/quilt.env b/quilt.env
new file mode 100644
index 0000000..8bfef15
--- /dev/null
+++ b/quilt.env
@@ -0,0 +1,9 @@
+# Maintainer helper for working with quilt.
+# If needed, adjust to your needs.
+# This file will not export QUILT_PATCHES directly.
+# If you use this, do it manually.
+# Alternatively, SOURCE(!) the quilt.env files within the versioned
+# sub-directories and everything should be set up automagically.
+export QUILT_DIFF_ARGS='--no-index -pab --color=auto'
+export QUILT_DIFF_OPTS='-p'
+export QUILT_REFRESH_ARGS='-p ab --no-index'

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


More information about the x2go-commits mailing list