summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-08-11 08:56:17 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-08-11 08:56:17 +0000
commit33c56f96021d6cbd39ad2cf2b722b591650202e0 (patch)
tree997135ed3b374eb26574810620ad4e28ee5b384d
parentMerging upstream version 20190811. (diff)
downloadopen-infrastructure-compute-tools-33c56f96021d6cbd39ad2cf2b722b591650202e0.tar.xz
open-infrastructure-compute-tools-33c56f96021d6cbd39ad2cf2b722b591650202e0.zip
Removing debconf-includes.patch, included upstream.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/upstream/0001-debconf-includes.patch15
2 files changed, 0 insertions, 16 deletions
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c5e165c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream/0001-debconf-includes.patch
diff --git a/debian/patches/upstream/0001-debconf-includes.patch b/debian/patches/upstream/0001-debconf-includes.patch
deleted file mode 100644
index 1b5df4a..0000000
--- a/debian/patches/upstream/0001-debconf-includes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Daniel Baumann <daniel.baumann@progress-linux.org>
-Description: Correcting whitespace error in include handling that broke debconf container create script.
-
-diff -Naurp open-infrastructure-compute-tools.orig/share/scripts/debconf open-infrastructure-compute-tools/share/scripts/debconf
---- open-infrastructure-compute-tools.orig/share/scripts/debconf
-+++ open-infrastructure-compute-tools/share/scripts/debconf
-@@ -359,7 +359,7 @@ Debootstrap ()
- INCLUDE="dbus"
-
- # apt repositories
-- INCLUDE="${INCLUDE} gnupg"
-+ INCLUDE="${INCLUDE},gnupg"
-
- if ( echo "${MIRROR}" | grep -qs '^https' ) || \
- ( echo "${PARENT_MIRROR}" | grep -qs '^https' )