[Git][haskell-team/package-plan][master] patches for darcs, gitit, and glirc
Clint Adams (@clint)
gitlab at salsa.debian.org
Wed Feb 18 14:25:04 GMT 2026
Clint Adams pushed to branch master at Debian Haskell Group / package-plan
Commits:
6e7b418d by Clint Adams at 2026-02-18T09:24:53-05:00
patches for darcs, gitit, and glirc
- - - - -
9 changed files:
- packages.txt
- + patches/darcs/2.18.5/newer-deps
- + patches/darcs/2.18.5/series
- + patches/gitit/0.15.1.2/clean-cabal-file.patch
- + patches/gitit/0.15.1.2/jquery.patch
- + patches/gitit/0.15.1.2/newer-deps
- + patches/gitit/0.15.1.2/series
- + patches/glirc/2.41/newer-deps
- + patches/glirc/2.41/series
Changes:
=====================================
packages.txt
=====================================
@@ -201,7 +201,7 @@ css-text 0.1.3.0
csv 0.1.2
curl 1.3.8
curve25519 0.2.8
-darcs 2.18.5 key binary=darcs notest obsolete # https://bugs.debian.org/1127981
+darcs 2.18.5 key binary=darcs notest
data-accessor 0.2.3.1
data-accessor-mtl 0.2.0.5
data-binary-ieee754 0.4.4 # obsolete
@@ -371,14 +371,14 @@ gio 0.13.12.0
gi-pango 1.0.30
git-annex 10.20251029 binary key -f-ConcurrentOutput ahead
githash 0.1.7.0
-gitit 0.15.1.2 key obsolete # https://bugs.debian.org/1127956
+gitit 0.15.1.2 key
git-lfs 1.2.5
git-mediate 1.1.0 binary
gitrev 1.3.1
gi-vte 2.91.35
gi-xlib 2.0.14
glib 0.13.12.0
-glirc 2.41 binary key obsolete # https://bugs.debian.org/1127982
+glirc 2.41 binary key
Glob 0.10.2
gloss 1.13.2.2 key
gloss-rendering 1.13.2.1
=====================================
patches/darcs/2.18.5/newer-deps
=====================================
@@ -0,0 +1,49 @@
+--- a/darcs.cabal
++++ b/darcs.cabal
+@@ -123,7 +123,7 @@ flag warn-as-error
+ -- ----------------------------------------------------------------------
+
+ custom-setup
+- setup-depends: base >= 4.10 && < 4.20,
++ setup-depends: base >= 4.10,
+ Cabal >= 2.4 && < 3.11,
+ process >= 1.2.3.0 && < 1.7,
+ filepath >= 1.4.1 && < 1.5.0.0,
+@@ -416,7 +416,7 @@ Library
+ build-depends: unix >= 2.7.1.0 && < 2.9,
+ directory >= 1.2.7 && < 1.4
+
+- build-depends: base >= 4.10 && < 4.20,
++ build-depends: base >= 4.10,
+ safe >= 0.3.20 && < 0.4,
+ stm >= 2.1 && < 2.6,
+ binary >= 0.5 && < 0.11,
+@@ -455,7 +455,7 @@ Library
+ temporary >= 1.2.1 && < 1.4,
+ process >= 1.2.3.0 && < 1.7,
+ array >= 0.5.1.0 && < 0.6,
+- hashable >= 1.2.3.3 && < 1.5,
++ hashable >= 1.2.3.3 && < 1.6,
+ mmap >= 0.5.9 && < 0.6,
+ zlib >= 0.6.1.2 && < 0.8,
+ network-uri >= 2.6 && < 2.8,
+@@ -471,7 +471,7 @@ Library
+ build-depends: crypton-connection >= 0.4 && < 0.5,
+ data-default >= 0.7.1.3 && < 0.9,
+ http-client-tls >= 0.3.5 && < 0.4,
+- tls >= 2.0.6 && < 2.2
++ tls >= 2.0.6 && < 2.3
+ else
+ -- cannot use crypton-connection >= 0.4, so
+ -- constraining indirect dependency to work around problems
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -8,7 +8,7 @@ import Distribution.PackageDescription (
+ import Distribution.Package ( packageVersion )
+ import Distribution.Version( Version )
+ import Distribution.Simple.LocalBuildInfo
+- ( LocalBuildInfo(..), absoluteInstallDirs )
++ ( LocalBuildInfo(..), absoluteInstallDirs, buildDir )
+ import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
+ import Distribution.Simple.Setup
+ (buildVerbosity, copyDest, copyVerbosity, fromFlag,
=====================================
patches/darcs/2.18.5/series
=====================================
@@ -0,0 +1 @@
+newer-deps
=====================================
patches/gitit/0.15.1.2/clean-cabal-file.patch
=====================================
@@ -0,0 +1,33 @@
+Description: Remove from .cabal data files, missing in tarball
+Author: Dmitry Bogatov
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: b/gitit.cabal
+===================================================================
+--- a/gitit.cabal
++++ b/gitit.cabal
+@@ -37,12 +37,6 @@ author: John MacFarlane
+ maintainer: jgm at berkeley.edu
+ bug-reports: http://github.com/jgm/gitit/issues
+ stability: experimental
+-extra-source-files: data/static/js/jquery-1.2.6.js
+- data/static/js/jquery.hotkeys-0.7.9.js
+- data/static/js/jquery-ui.core-1.6rc2.js
+- data/static/js/jquery-ui.droppable-1.6rc2.js
+- data/static/js/jquery-ui.draggable-1.6rc2.js
+- data/static/js/jquery-ui.tabs-1.6rc2.js
+ extra-doc-files: CHANGES, YUI-LICENSE, BLUETRIP-LICENSE, TANGOICONS
+ data-files: data/static/css/screen.css, data/static/css/print.css,
+ data/static/css/ie.css, data/static/css/highlighting.css,
+@@ -50,9 +44,8 @@ data-files: data/static/css/scr
+ data/static/css/custom.css,
+ data/static/img/logo.png, data/static/img/icons/feed.png,
+ data/static/img/icons/folder.png, data/static/img/icons/page.png,
+- data/static/js/dragdiff.js, data/static/js/jquery-1.2.6.min.js,
+- data/static/js/uploadForm.js, data/static/js/jquery-ui-combined-1.6rc2.min.js,
+- data/static/js/jquery.hotkeys-0.7.9.min.js,
++ data/static/js/dragdiff.js,
++ data/static/js/uploadForm.js,
+ data/static/js/preview.js, data/static/js/search.js,
+ data/static/js/MathMLinHTML.js, data/static/js/footnotes.js,
+ data/static/robots.txt,
=====================================
patches/gitit/0.15.1.2/jquery.patch
=====================================
@@ -0,0 +1,40 @@
+Description: Use libjs-jquery instead of embedded code
+ Patch gitit to use the javascript linked from the libjs-jquery package,
+ instead of the embedded one.
+Author: Giovanni Mascellani <gio at debian.org>
+Index: b/data/templates/expire.st
+===================================================================
+--- a/data/templates/expire.st
++++ b/data/templates/expire.st
+@@ -1,5 +1,5 @@
+ $if(usecache)$
+-<script type="text/javascript" src="$base$/js/jquery.hotkeys-0.7.9.min.js"></script>
++<script type="text/javascript" src="$base$/js/jquery.hotkeys.js"></script>
+ <script type="text/javascript">
+ /* <![CDATA[ */
+ \$(document).bind("keydown", "ctrl+r", function() {
+Index: b/src/Network/Gitit/Layout.hs
+===================================================================
+--- a/src/Network/Gitit/Layout.hs
++++ b/src/Network/Gitit/Layout.hs
+@@ -77,7 +77,7 @@ filledPageTemplate base' cfg layout html
+ 'h':'t':'t':'p':_ -> x
+ _ -> base' ++ "/js/" ++ x
+
+- scripts = ["jquery-1.2.6.min.js", "jquery-ui-combined-1.6rc2.min.js", "footnotes.js"] ++ pgScripts layout
++ scripts = ["jquery.min.js", "jquery-ui.min.js", "footnotes.js"] ++ pgScripts layout
+ scriptLink x = script ! [src (prefixedScript x),
+ thetype "text/javascript"] << noHtml
+ javascriptlinks = renderHtmlFragment $ concatHtml $ map scriptLink scripts
+Index: b/data/templates/page.st
+===================================================================
+--- a/data/templates/page.st
++++ b/data/templates/page.st
+@@ -9,6 +9,7 @@
+ <link href="$base$/_feed$pageUrl$" type="application/atom+xml" rel="alternate" title="$wikititle$ - $pagetitle$" />
+ $endif$
+ <title>$wikititle$ - $pagetitle$</title>
++ <link href="$base$/css/jquery-ui.min.css" rel="stylesheet" media="print" type= "text/css" />
+ $if(printable)$
+ <link href="$base$/css/print.css" rel="stylesheet" media="all" type= "text/css" />
+ $else$
=====================================
patches/gitit/0.15.1.2/newer-deps
=====================================
@@ -0,0 +1,38 @@
+--- a/gitit.cabal
++++ b/gitit.cabal
+@@ -127,7 +127,7 @@ Library
+ mtl,
+ old-time,
+ temporary,
+- pandoc >= 2.9 && < 2.20 || >= 3.0 && < 3.2,
++ pandoc >= 2.9 && < 2.20 || >= 3.0 && < 3.8,
+ pandoc-types >= 1.20 && < 1.24,
+ skylighting >= 0.8.2.3 && < 0.15,
+ bytestring,
+@@ -141,7 +141,7 @@ Library
+ time,
+ recaptcha >= 0.1,
+ filestore >= 0.6.5 && < 0.7,
+- zlib >= 0.5 && < 0.7,
++ zlib >= 0.5 && < 0.8,
+ url >= 2.1,
+ happstack-server >= 7.5 && < 7.10,
+ base64-bytestring >= 0.1,
+@@ -155,14 +155,14 @@ Library
+ json >= 0.4 && < 0.12,
+ uri-bytestring >= 0.2.3.3,
+ split,
+- hoauth2 >= 2.3.0 && < 2.11,
+- xml-conduit >= 1.5 && < 1.10,
++ hoauth2 >= 2.3.0 && < 2.15,
++ xml-conduit >= 1.5 && < 1.11,
+ http-conduit >= 2.1.6 && < 2.4,
+ http-client-tls >= 0.2.2 && < 0.4,
+ aeson >= 0.7 && < 2.3,
+ uuid >= 1.3 && < 1.4,
+ network-uri >= 2.6,
+- network >= 2.6 && < 3.2,
++ network >= 2.6 && < 3.3,
+ network-bsd >= 2.8.1 && < 2.9,
+ doctemplates >= 0.7.1
+ if flag(plugins)
=====================================
patches/gitit/0.15.1.2/series
=====================================
@@ -0,0 +1,3 @@
+clean-cabal-file.patch
+jquery.patch
+newer-deps
=====================================
patches/glirc/2.41/newer-deps
=====================================
@@ -0,0 +1,11 @@
+--- a/glirc.cabal
++++ b/glirc.cabal
+@@ -203,7 +203,7 @@ library
+ unix >=2.7 && <2.9,
+ unordered-containers >=0.2.11 && <0.3,
+ vector >=0.11 && <0.14,
+- vty ^>=6.2,
++ vty >=6.2,
+
+ test-suite test
+ type: exitcode-stdio-1.0
=====================================
patches/glirc/2.41/series
=====================================
@@ -0,0 +1 @@
+newer-deps
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/commit/6e7b418d4fcf4d6af13cf796cf2d582d0f615e97
--
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/commit/6e7b418d4fcf4d6af13cf796cf2d582d0f615e97
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/20260218/59051d6a/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list