[Git][haskell-team/DHG_packages][master] xmonad: Update patch to build with newer pandoc
Ilias Tsitsimpis
gitlab at salsa.debian.org
Sun Aug 2 10:11:43 BST 2020
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
f1ac8cc3 by Ilias Tsitsimpis at 2020-08-02T12:03:45+03:00
xmonad: Update patch to build with newer pandoc
- - - - -
8 changed files:
- p/xmonad/debian/changelog
- p/xmonad/debian/control
- p/xmonad/debian/gnome-flashback-xmonad.session
- + p/xmonad/debian/gnome-session-x11 at gnome-flashback-xmonad.target
- − p/xmonad/debian/libghc6-xmonad-doc.docs
- − p/xmonad/debian/libghc6-xmonad-doc.examples
- p/xmonad/debian/patches/newer-pandoc
- p/xmonad/debian/xmonad.install
Changes:
=====================================
p/xmonad/debian/changelog
=====================================
@@ -1,3 +1,13 @@
+xmonad (0.15-4) unstable; urgency=medium
+
+ * Update patch to build with newer pandoc (>= 2.9) (Closes: #961829)
+ * Update gnome-flashback-xmonad to work with newer gnome.
+ Thanks Tollef Fog Heen for the suggestion.
+ * Install systemd user target unit file for gnome-session.
+ Thanks Tollef Fog Heen for the suggestion (Closes: #948823).
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Sun, 02 Aug 2020 11:35:54 +0300
+
xmonad (0.15-3) unstable; urgency=medium
* Patch from Adam Sjøgren to build man page with newer pandoc API..
=====================================
p/xmonad/debian/control
=====================================
@@ -22,7 +22,7 @@ Build-Depends:
libghc-data-default-prof,
libghc-extensible-exceptions-dev,
libghc-extensible-exceptions-prof,
- libghc-pandoc-dev (>= 1.10),
+ libghc-pandoc-dev (>= 2.9),
libghc-regex-posix-dev,
libghc-setlocale-dev,
libghc-setlocale-prof,
@@ -57,7 +57,7 @@ Recommends:
xfonts-base,
Suggests:
dmenu,
- gnome-session-flashback,
+ gnome-session-flashback (>= 3.34),
Conflicts:
xmonad-rebuild,
Provides:
=====================================
p/xmonad/debian/gnome-flashback-xmonad.session
=====================================
@@ -1,3 +1,3 @@
[GNOME Session]
Name=GNOME Flashback (Xmonad)
-RequiredComponents=gnome-flashback-init;gnome-flashback;gnome-panel;xmonad;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
+RequiredComponents=gnome-flashback;gnome-panel;xmonad;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
=====================================
p/xmonad/debian/gnome-session-x11 at gnome-flashback-xmonad.target
=====================================
@@ -0,0 +1,21 @@
+[Unit]
+Description=GNOME XMonad Session
+OnFailure=gnome-session-failed.target
+OnFailureJobMode=replace
+DefaultDependencies=no
+RefuseManualStart=no
+
+Conflicts=shutdown.target gnome-session-shutdown.target
+PartOf=graphical-session.target
+
+# Pull in all X11-specific services the session might depend on
+Requires=gnome-session-x11-services.target
+
+BindsTo=gnome-session at .target
+After=gnome-session at .target
+
+BindsTo=gnome-flashback.target
+After=gnome-flashback.target
+
+BindsTo=gnome-session.target
+After=gnome-session.target
=====================================
p/xmonad/debian/libghc6-xmonad-doc.docs deleted
=====================================
@@ -1,2 +0,0 @@
-CONFIG
-TODO
=====================================
p/xmonad/debian/libghc6-xmonad-doc.examples deleted
=====================================
@@ -1 +0,0 @@
-man/xmonad.hs
=====================================
p/xmonad/debian/patches/newer-pandoc
=====================================
@@ -22,6 +22,8 @@ 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 @@
@@ -32,24 +34,37 @@ Last-Update: 2020-07-14
import Data.Char
import Data.List
import qualified Data.Text as T
-@@ -30,14 +31,16 @@
+@@ -30,14 +31,16 @@ main = do
. lines
$ markdownSource
- manTemplate <- getDefaultTemplate "man"
- manBody <- writeMan def { writerTemplate = Just manTemplate } parsed
+ manTemplate <- getDefaultTemplate (T.pack "man")
-+ compiledManTemplate <- compileTemplate "" manTemplate
++ 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 <- compileTemplate "" htmltemplate
++ 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/xmonad.install
=====================================
@@ -1,6 +1,7 @@
debian/gnome-flashback-xmonad /usr/bin
debian/gnome-flashback-xmonad.session /usr/share/gnome-session/sessions
debian/xmonad-session /usr/bin
+debian/gnome-session-x11 at gnome-flashback-xmonad.target /usr/lib/systemd/user
debian/xmonad.desktop /usr/share/applications
debian/xmonad.png /usr/share/icons
debian/xsessions/gnome-flashback-xmonad.desktop /usr/share/xsessions
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f1ac8cc3736f1f53a4bb2c581c05a2ccc1ea2f0f
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/f1ac8cc3736f1f53a4bb2c581c05a2ccc1ea2f0f
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/20200802/0536f05d/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list