[Git][haskell-team/DHG_packages][master] xmonad: Upgrading from 0.15 to 0.17.0

[Clint Adams (@clint)]

Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
ff5cfd3c by Clint Adams at 2022-07-21T21:08:42-04:00
xmonad: Upgrading from 0.15 to 0.17.0

- - - - -


4 changed files:

- p/xmonad/debian/changelog
- p/xmonad/debian/control
- − p/xmonad/debian/patches/newer-pandoc
- p/xmonad/debian/patches/series


Changes:

=====================================
p/xmonad/debian/changelog
=====================================
@@ -1,9 +1,13 @@
-xmonad (0.15-5) UNRELEASED; urgency=medium
+xmonad (0.17.0-1) unstable; urgency=medium
 
+  [ Ilias Tsitsimpis ]
   * Declare compliance with Debian policy 4.6.1
   * Remove retired developer, Joachim Breitner, from Uploaders.
 
- -- Ilias Tsitsimpis <iliastsi at debian.org>  Tue, 28 Jun 2022 15:33:30 +0300
+  [ Clint Adams ]
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Thu, 21 Jul 2022 21:05:58 -0400
 
 xmonad (0.15-4) unstable; urgency=medium
 


=====================================
p/xmonad/debian/control
=====================================
@@ -9,35 +9,25 @@ Priority: optional
 Section: haskell
 Rules-Requires-Root: no
 Build-Depends:
+ haskell-devscripts (>= 0.13),
  cdbs,
  debhelper (>= 10),
  ghc (>= 8.4.3),
  ghc-prof,
- haskell-devscripts (>= 0.13),
- libghc-x11-dev (>= 1.8),
- libghc-x11-dev (<< 1.10),
+ libghc-x11-dev (>= 1.10),
+ libghc-x11-dev (<< 1.11),
  libghc-x11-prof,
- libghc-data-default-dev,
- libghc-data-default-prof,
- libghc-extensible-exceptions-dev,
- libghc-extensible-exceptions-prof,
- libghc-pandoc-dev (>= 2.9),
- libghc-regex-posix-dev,
+ libghc-data-default-class-dev,
+ libghc-data-default-class-prof,
  libghc-setlocale-dev,
  libghc-setlocale-prof,
- libghc-utf8-string-dev (<< 1.1),
- libghc-utf8-string-dev (>= 0.3),
- libghc-utf8-string-prof,
  libx11-dev,
  libxinerama-dev,
  pandoc-data,
-Build-Depends-Indep:
- ghc-doc,
- libghc-data-default-doc,
- libghc-extensible-exceptions-doc,
- libghc-setlocale-doc,
- libghc-utf8-string-doc,
+Build-Depends-Indep: ghc-doc,
  libghc-x11-doc,
+ libghc-data-default-class-doc,
+ libghc-setlocale-doc,
 Standards-Version: 4.6.1
 Homepage: https://xmonad.org
 Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/xmonad


=====================================
p/xmonad/debian/patches/newer-pandoc deleted
=====================================
@@ -1,70 +0,0 @@
-Clint writes:
-
-> On Sun, Jul 05, 2020 at 05:58:57PM +0200, Adam Sjøgren wrote:
-
->> Maybe I should try to get rid of the dependency on Text.Pandoc in
->> xmonad, it is only used to generate the man-page from a markdown file
->> with some keybindings inserted.
-
-> Or now that we have a newer version of pandoc, you could port
-> util/GenerateManpage.hs to build with the changed API.
-
-Ok, I will give it a shot.
-
-I have sent a patch upstream:
-
- · https://mail.haskell.org/pipermail/xmonad/2020-July/015392.html
-
-And here is a patch for the current xmonad package in unstable:
-
-Description: update GenerateManPage to new Pandoc API
-
----
-Last-Update: 2020-07-14
-
-Index: b/util/GenerateManpage.hs
-===================================================================
---- a/util/GenerateManpage.hs
-+++ b/util/GenerateManpage.hs
-@@ -9,6 +9,7 @@
- -- Public License version 2 or later.
- 
- import Control.Monad.IO.Class (liftIO)
-+import Control.Error.Util (hush)
- import Data.Char
- import Data.List
- import qualified Data.Text as T
-@@ -30,14 +31,16 @@ main = do
-             . lines
-             $ markdownSource
- 
--        manTemplate <- getDefaultTemplate "man"
--        manBody <- writeMan def { writerTemplate = Just manTemplate } parsed
-+        manTemplate <- getDefaultTemplate (T.pack "man")
-+        compiledManTemplate <- runWithPartials $ compileTemplate "" manTemplate
-+        manBody <- writeMan def { writerTemplate = hush compiledManTemplate } parsed
-         liftIO $ TIO.writeFile "./man/xmonad.1" $ manBody
-         liftIO $ putStrLn "Documentation created: man/xmonad.1"
- 
--        htmltemplate <- getDefaultTemplate "html"
-+        htmltemplate <- getDefaultTemplate (T.pack "html")
-+        compiledHtmlTemplate <- runWithPartials $ compileTemplate "" htmltemplate
-         htmlBody <- writeHtml5String def
--                                     { writerTemplate = Just htmltemplate
-+                                     { writerTemplate = hush compiledHtmlTemplate
-                                      , writerTableOfContents = True }
-                                      parsed
-         liftIO $ TIO.writeFile "./man/xmonad.1.html" htmlBody
-Index: b/xmonad.cabal
-===================================================================
---- a/xmonad.cabal
-+++ b/xmonad.cabal
-@@ -99,7 +99,7 @@ executable generatemanpage
-   hs-source-dirs: util
- 
-   if flag(generatemanpage)
--    build-depends: base, pandoc >= 2, regex-posix, text
-+    build-depends: base, pandoc >= 2.9, regex-posix, text
-   else
-     buildable: False
- 


=====================================
p/xmonad/debian/patches/series
=====================================
@@ -1,2 +1 @@
 use_x-terminal-emulator.patch
-newer-pandoc



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/ff5cfd3ce631a9a8bb7fb762b8cc5abc26706805

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/ff5cfd3ce631a9a8bb7fb762b8cc5abc26706805
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/20220722/a38d2faf/attachment-0001.htm>