summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-11-13 14:06:37 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-11-13 14:06:37 +0000
commitd636646a59b5399cba395122858891d121fae953 (patch)
tree6dce8a5f0850a233d454ede32901c68f1515a54f
parent6d857760b43520eab67640848c586ad9b950592e (diff)
[dgit (8.1) update-gitignore-quilt-fixup]
-rw-r--r--debian/patches/auto-gitignore23
-rw-r--r--debian/patches/series1
2 files changed, 24 insertions, 0 deletions
diff --git a/debian/patches/auto-gitignore b/debian/patches/auto-gitignore
new file mode 100644
index 000000000..57bbb032e
--- /dev/null
+++ b/debian/patches/auto-gitignore
@@ -0,0 +1,23 @@
+Subject: Update .gitignore from Debian packaging branch
+
+The Debian packaging git branch contains these updates to the upstream
+.gitignore file(s). This patch is autogenerated, to provide these
+updates to users of the official Debian archive view of the package.
+
+[dgit (8.1) update-gitignore]
+---
+diff --git a/.gitignore b/.gitignore
+index 0c45e459f..41372a1e5 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -40,10 +40,6 @@ __pycache__/
+ /test-libelogind*
+
+ # Local Helper Scripts and Tools - Not for distribution
+-pwx/patches/*
+-!pwx/patches/.keep_dir
+-pwx/patches_port/*
+-!pwx/patches_port/.keep_dir
+ *.orig
+ *.rej
+ *.remote
diff --git a/debian/patches/series b/debian/patches/series
index f98eee609..6daf211dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
Disable_Dbus_activation_by_default.diff.patch
manpage-branding.diff
+auto-gitignore