Commit Debian 3.0 (quilt) metadata

[dgit (8.1~bpo9+1) quilt-fixup]

2 files changed, 85 insertions, 0 deletions

diff --git a/debian/patches/libghc-stm-dev-package-wont-be-in-new-ve.patch b/debian/patches/libghc-stm-dev-package-wont-be-in-new-ve.patch
new file mode 100644
index 00000000..2ad5ea45
--- /dev/null
+++ b/debian/patches/libghc-stm-dev-package-wont-be-in-new-ve.patch
@@ -0,0 +1,84 @@
+From: Joey Hess <joeyh@joeyh.name>
+Date: Tue, 4 Dec 2018 21:18:39 -0700
+X-Dgit-Generated: 5.5.0-2 2d5c7400a5919bd3581744b468803c18617c2837
+Subject: libghc-stm-dev package won't be in new versions of debian
+
+In Bootstrap, still try to install the package to support bootstrapping
+to old systems. If it's not available the bootstrapping will still
+succeed. The added apt-cache check is only to avoid apt complaining when
+asked to install a not available package.
+
+In debian/control, depend on ghc that includes stm, although propellor
+still supports being used with older versions of ghc
+Of course this control file is not being used for the package in debian
+any longer afaik, so something else will be done there.
+
+(cherry picked from d2a526833f7178a04b00704890cf6ee8c1187618)
+
+---
+
+--- propellor-5.5.0.orig/src/Propellor/Bootstrap.hs
++++ propellor-5.5.0/src/Propellor/Bootstrap.hs
+@@ -95,6 +95,8 @@ checkDepsCommand bs sys = go (getBuilder
+ 	go Cabal = "if ! cabal configure >/dev/null 2>&1; then " ++ depsCommand bs sys ++ "; fi"
+ 	go Stack = "if ! stack build --dry-run >/dev/null 2>&1; then " ++ depsCommand bs sys ++ "; fi"
+ 
++data Dep = Dep String | OldDep String
++
+ -- Install build dependencies of propellor, using the specified
+ -- Bootstrapper.
+ --
+@@ -128,32 +130,34 @@ depsCommand bs msys = "( " ++ intercalat
+ 
+ 	useapt builder = "apt-get update" : map aptinstall (debdeps builder)
+ 
+-	aptinstall p = "DEBIAN_FRONTEND=noninteractive apt-get -qq --no-upgrade --no-install-recommends -y install " ++ p
++	aptinstall (Dep p) = "DEBIAN_FRONTEND=noninteractive apt-get -qq --no-upgrade --no-install-recommends -y install " ++ p
++	aptinstall (OldDep p) = "if LANG=C apt-cache policy " ++ p ++ "| grep -q Candidate:; then " ++ aptinstall (Dep p) ++ "; fi"
+ 	pkginstall p = "ASSUME_ALWAYS_YES=yes pkg install " ++ p
+ 	pacmaninstall p = "pacman -S --noconfirm --needed " ++ p
+ 
+ 	debdeps Cabal =
+-		[ "gnupg"
++		[ Dep "gnupg"
+ 		-- Below are the same deps listed in debian/control.
+-		, "ghc"
+-		, "cabal-install"
+-		, "libghc-async-dev"
+-		, "libghc-split-dev"
+-		, "libghc-hslogger-dev"
+-		, "libghc-unix-compat-dev"
+-		, "libghc-ansi-terminal-dev"
+-		, "libghc-ifelse-dev"
+-		, "libghc-network-dev"
+-		, "libghc-mtl-dev"
+-		, "libghc-transformers-dev"
+-		, "libghc-exceptions-dev"
+-		, "libghc-stm-dev"
+-		, "libghc-text-dev"
+-		, "libghc-hashable-dev"
++		, Dep "ghc"
++		, Dep "cabal-install"
++		, Dep "libghc-async-dev"
++		, Dep "libghc-split-dev"
++		, Dep "libghc-hslogger-dev"
++		, Dep "libghc-unix-compat-dev"
++		, Dep "libghc-ansi-terminal-dev"
++		, Dep "libghc-ifelse-dev"
++		, Dep "libghc-network-dev"
++		, Dep "libghc-mtl-dev"
++		, Dep "libghc-transformers-dev"
++		, Dep "libghc-exceptions-dev"
++		, Dep "libghc-text-dev"
++		, Dep "libghc-hashable-dev"
++		-- Deps that are only needed on old systems.
++		, OldDep "libghc-stm-dev"
+ 		]
+ 	debdeps Stack =
+-		[ "gnupg"
+-		, "haskell-stack"
++		[ Dep "gnupg"
++		, Dep "haskell-stack"
+ 		]
+ 
+ 	fbsddeps Cabal =
diff --git a/debian/patches/series b/debian/patches/series
index 7d0cb20f..97c6a30a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0002-dpkg-mergechangelogs.patch
+libghc-stm-dev-package-wont-be-in-new-ve.patch