From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 29 May 2017 08:56:58 +0000 (+0200)
Subject: committing changes in /etc after emerge run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=141ec80dcbe778779a5d47261668db7be4f0931b;p=config%2Fberta%2Fetc.git

committing changes in /etc after emerge run

Package changes:
+dev-util/quilt-0.65
---

diff --git a/.etckeeper b/.etckeeper
index 194b9b1..7912456 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1896,6 +1896,7 @@ maybe chgrp 'puppet' 'puppetlabs/puppet/ssl/public_keys/berta.pixelpark.com.pem'
 maybe chmod 0644 'puppetlabs/puppet/ssl/public_keys/berta.pixelpark.com.pem'
 maybe chmod 0755 'python-exec'
 maybe chmod 0644 'python-exec/python-exec.conf'
+maybe chmod 0644 'quilt.quiltrc'
 maybe chmod 0644 'rc.conf'
 maybe chmod 0644 'request-key.conf'
 maybe chmod 0755 'request-key.d'
diff --git a/quilt.quiltrc b/quilt.quiltrc
new file mode 100644
index 0000000..58f665e
--- /dev/null
+++ b/quilt.quiltrc
@@ -0,0 +1,37 @@
+# Example /etc/quilt.quiltrc
+
+# Options passed to GNU diff when generating patches
+QUILT_DIFF_OPTS="--show-c-function"
+
+# Options passed to GNU patch when applying patches.
+# (For appling patches which are not in unified format, remove the "--unified".)
+#QUILT_PATCH_OPTS="--ignore-whitespace"
+QUILT_PATCH_OPTS="--unified"
+
+# Options passed to diffstat when generating patch statistics
+#QUILT_DIFFSTAT_OPTS="-f0"
+
+# Options to pass to commands (QUILT_${COMMAND}_ARGS)
+QUILT_PUSH_ARGS="--color=auto"
+QUILT_DIFF_ARGS="--no-timestamps --color=auto"
+QUILT_REFRESH_ARGS="--no-timestamps --backup"
+QUILT_SERIES_ARGS="--color=auto"
+QUILT_PATCHES_ARGS="--color=auto"
+
+# When non-default less options are used, add the -R option so that less outputs
+# ANSI color escape codes "raw".
+[ -n "$LESS" -a -z "${QUILT_PAGER+x}" ] && QUILT_PAGER="less -FRX"
+
+# (Add "-p ab" to QUILT_DIFF_ARGS and QUILT_REFRESH_ARGS to get
+#  -p1 style diffs with a/file and b/file filenams in headers
+#  instead of dir.orig/file and dir/file.)
+
+# The directory in which patches are found (defaults to "patches").
+#QUILT_PATCHES=patches
+
+# Prefix all patch names with the relative path to the patch?
+QUILT_PATCHES_PREFIX=yes
+
+# Use a specific editor for quilt (defaults to the value of $EDITOR before
+# sourcing this configuration file, or vi if $EDITOR wasn't set).
+#EDITOR=nedit