[Git][haskell-team/DHG_packages][master] xmonad-contrib: patch to build with newer X11
Clint Adams
gitlab at salsa.debian.org
Fri Jun 8 00:24:11 BST 2018
Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
f3bcd12d by Clint Adams at 2018-06-07T19:23:43-04:00
xmonad-contrib: patch to build with newer X11
- - - - -
5 changed files:
- p/xmonad-contrib/debian/changelog
- p/xmonad-contrib/debian/control
- + p/xmonad-contrib/debian/patches/newer-x11
- p/xmonad-contrib/debian/patches/series
- p/xmonad-contrib/debian/patches/use-x-www-browser.patch
Changes:
=====================================
p/xmonad-contrib/debian/changelog
=====================================
--- a/p/xmonad-contrib/debian/changelog
+++ b/p/xmonad-contrib/debian/changelog
@@ -1,8 +1,9 @@
-xmonad-contrib (0.13-3) UNRELEASED; urgency=medium
+xmonad-contrib (0.13-3) unstable; urgency=medium
* Set Rules-Requires-Root to no.
+ * Patch to build with newer X11.
- -- Clint Adams <clint at debian.org> Sun, 06 May 2018 22:11:06 -0400
+ -- Clint Adams <clint at debian.org> Thu, 07 Jun 2018 19:23:24 -0400
xmonad-contrib (0.13-2) unstable; urgency=medium
=====================================
p/xmonad-contrib/debian/control
=====================================
--- a/p/xmonad-contrib/debian/control
+++ b/p/xmonad-contrib/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
ghc-prof,
haskell-devscripts (>= 0.13),
libghc-x11-dev (>= 1.6.1),
- libghc-x11-dev (<< 1.9),
+ libghc-x11-dev (<< 1.10),
libghc-x11-prof,
libghc-x11-xft-dev (>= 0.2),
libghc-x11-xft-prof,
@@ -45,7 +45,7 @@ Build-Depends-Indep:
libghc-x11-xft-doc,
libghc-xmonad-doc,
Standards-Version: 4.1.4
-Homepage: http://xmonad.org/
+Homepage: https://xmonad.org/
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/xmonad-contrib
Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git
=====================================
p/xmonad-contrib/debian/patches/newer-x11
=====================================
--- /dev/null
+++ b/p/xmonad-contrib/debian/patches/newer-x11
@@ -0,0 +1,11 @@
+--- a/xmonad-contrib.cabal
++++ b/xmonad-contrib.cabal
+@@ -63,7 +63,7 @@
+ random,
+ mtl >= 1 && < 3,
+ unix,
+- X11>=1.6.1 && < 1.9,
++ X11>=1.6.1 && < 1.10,
+ xmonad>=0.13 && < 0.14,
+ utf8-string
+
=====================================
p/xmonad-contrib/debian/patches/series
=====================================
--- a/p/xmonad-contrib/debian/patches/series
+++ b/p/xmonad-contrib/debian/patches/series
@@ -1 +1,2 @@
use-x-www-browser.patch
+newer-x11
=====================================
p/xmonad-contrib/debian/patches/use-x-www-browser.patch
=====================================
--- a/p/xmonad-contrib/debian/patches/use-x-www-browser.patch
+++ b/p/xmonad-contrib/debian/patches/use-x-www-browser.patch
@@ -6,11 +6,9 @@ Forwarded: not-needed
Last-Update: 2012-07-07
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: xmonad-contrib/XMonad/Prompt/Shell.hs
-===================================================================
---- xmonad-contrib.orig/XMonad/Prompt/Shell.hs 2015-08-15 11:07:17.965480351 +0200
-+++ xmonad-contrib/XMonad/Prompt/Shell.hs 2015-08-15 11:07:17.961480259 +0200
-@@ -151,7 +151,7 @@
+--- a/XMonad/Prompt/Shell.hs
++++ b/XMonad/Prompt/Shell.hs
+@@ -155,7 +155,7 @@
or pass it to a shell; so in that case, define $BROWSER as something like \"xterm -e elinks\"
or as the name of a shell script doing much the same thing. -}
getBrowser :: IO String
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/f3bcd12d8cd4f8719b57f7a5a402c991a8bd8137
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/f3bcd12d8cd4f8719b57f7a5a402c991a8bd8137
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180607/50c7cc96/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list