Commit f3bcd12d authored by Clint Adams's avatar Clint Adams
Browse files

xmonad-contrib: patch to build with newer X11

parent 81953711

p/xmonad-contrib/debian/changelog

+3 −2
Original line number Diff line number Diff line 
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@debian.org>  Sun, 06 May 2018 22:11:06 -0400

 -- Clint Adams <clint@debian.org>  Thu, 07 Jun 2018 19:23:24 -0400



xmonad-contrib (0.13-2) unstable; urgency=medium

p/xmonad-contrib/debian/control

+2 −2
Original line number Diff line number Diff line
@@ -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

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- 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

+1 −0
Original line number Diff line number Diff line 
use-x-www-browser.patch

newer-x11

p/xmonad-contrib/debian/patches/use-x-www-browser.patch

+3 −5
Original line number Diff line number Diff line
@@ -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