[Git][haskell-team/DHG_packages][master] newer haskell-yi-language, plus fix haskell-yi-frontend-vty (patches no longer...
Marcel Fourné (@mfourne)
gitlab at salsa.debian.org
Fri Oct 25 13:48:16 BST 2024
Marcel Fourné pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
7621a1e9 by Marcel Fourné at 2024-10-25T14:47:58+02:00
newer haskell-yi-language, plus fix haskell-yi-frontend-vty (patches no longer necessary due to upstream release)
- - - - -
7 changed files:
- − p/haskell-yi-frontend-vty/debian/patches/series
- − p/haskell-yi-frontend-vty/debian/patches/vty-events-fix.diff
- p/haskell-yi-language/debian/changelog
- − p/haskell-yi-language/debian/patches/Hspec-cabal
- − p/haskell-yi-language/debian/patches/Hspec-imports
- − p/haskell-yi-language/debian/patches/newer-deps
- − p/haskell-yi-language/debian/patches/series
Changes:
=====================================
p/haskell-yi-frontend-vty/debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-vty-events-fix.diff
=====================================
p/haskell-yi-frontend-vty/debian/patches/vty-events-fix.diff deleted
=====================================
@@ -1,58 +0,0 @@
-Description: fixes type mismatch in Debian
-Author: Marcel Fourné <debian at marcelfourne.de>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout https://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>)
-Bug: <upstream-bugtracker-url>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: (no|not-needed|<patch-forwarded-url>)
-Applied-Upstream: <version>, (<commit-url>|commit:<commid-id>)
-Reviewed-By: <name and email of someone who approved/reviewed the patch>
-Last-Update: 2023-11-12
-
---- haskell-yi-frontend-vty-0.19.0.orig/src/Yi/Frontend/Vty.hs
-+++ haskell-yi-frontend-vty-0.19.0/src/Yi/Frontend/Vty.hs
-@@ -62,6 +62,7 @@ import qualified Graphics.Vty
- vertCat, withBackColor,
- withForeColor,
- withStyle, (<|>))
-+import qualified Graphics.Vty.Input.Events as Vty (InternalEvent(InputEvent))
- import System.Exit (ExitCode, exitWith)
- import Yi.Buffer
- import Yi.Config
-@@ -143,10 +144,10 @@ start config submitEvents submitActions
- getEvent = do
- event <- atomically (readTChan inputChan)
- case event of
-- (Vty.EvResize _ _) -> do
-+ (Vty.InputEvent (Vty.EvResize _ _)) -> do
- submitActions []
- getEvent
-- _ -> return (fromVtyEvent event)
-+ Vty.InputEvent ievent -> return (fromVtyEvent ievent)
-
- renderLoop :: IO ()
- renderLoop = do
---- haskell-yi-frontend-vty-0.19.0.orig/src/Yi/Frontend/Vty/Conversions.hs
-+++ haskell-yi-frontend-vty-0.19.0/src/Yi/Frontend/Vty/Conversions.hs
-@@ -6,12 +6,14 @@ module Yi.Frontend.Vty.Conversions
- ) where
-
- import Data.List (nub, sort)
--import qualified Graphics.Vty as Vty (Attr, Color, Event (EvKey), Key (KBS, KBackTab, KBegin, KCenter, KChar, KDel, KDown, KEnd, KEnter, KEsc, KFun, KHome, KIns, KLeft, KMenu, KPageDown, KPageUp, KPause, KPrtScr, KRight, KUp),
-- Modifier (..), black, blue, brightBlack,
-+import qualified Graphics.Vty as Vty (Attr, Color, black, blue, brightBlack,
- brightBlue, brightCyan, brightGreen,
- brightMagenta, brightRed, brightWhite,
- brightYellow, cyan, green, magenta, red,
- rgbColor, white, yellow)
-+import qualified Graphics.Vty.Input.Events as Vty (Event (EvKey),
-+ Key (KBS, KBackTab, KBegin, KCenter, KChar, KDel, KDown, KEnd, KEnter, KEsc, KFun, KHome, KIns, KLeft, KMenu, KPageDown, KPageUp, KPause, KPrtScr, KRight, KUp),
-+ Modifier (..))
- import qualified Yi.Event (Event (..), Key (..), Modifier (MCtrl, MMeta, MShift))
- import qualified Yi.Style (Color (..))
=====================================
p/haskell-yi-language/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-yi-language (0.19.2-1) unstable; urgency=medium
+
+ * New upstream release, incorporating Debian patches, fixing test-suite
+
+ -- Marcel Fourné <email at marcelfourne.de> Fri, 25 Oct 2024 14:29:03 +0200
+
haskell-yi-language (0.19.1-1) unstable; urgency=medium
* New upstream version for GHC 9.6
=====================================
p/haskell-yi-language/debian/patches/Hspec-cabal deleted
=====================================
@@ -1,15 +0,0 @@
-Description: added direct Hspec deps in cabal file
-Forwarded: no
-Last-Update: 2022-08-11
-
---- haskell-yi-language-0.19.0.orig/yi-language.cabal
-+++ haskell-yi-language-0.19.0/yi-language.cabal
-@@ -75,6 +75,8 @@ test-suite tasty
- , microlens-platform
- , tasty
- , tasty-hspec
-+ , hspec
-+ , hspec-expectations
- , tasty-quickcheck
- , yi-language
- default-language: Haskell2010
=====================================
p/haskell-yi-language/debian/patches/Hspec-imports deleted
=====================================
@@ -1,16 +0,0 @@
-Description: include some lost Hspec imports
-Forwarded: no
-Last-Update: 2022-08-11
-
---- haskell-yi-language-0.19.0.orig/test/Spec.hs
-+++ haskell-yi-language-0.19.0/test/Spec.hs
-@@ -5,6 +5,9 @@ import Test.Tasty
- import Test.Tasty.Hspec
- import Test.Tasty.QuickCheck
-
-+import Test.Hspec
-+import Test.Hspec.Expectations
-+
- import Yi.Regex
- import Text.Regex.TDFA.ReadRegex (parseRegex)
- import Text.Regex.TDFA.Pattern
=====================================
p/haskell-yi-language/debian/patches/newer-deps deleted
=====================================
@@ -1,15 +0,0 @@
-Index: b/yi-language.cabal
-===================================================================
---- a/yi-language.cabal
-+++ b/yi-language.cabal
-@@ -68,8 +68,8 @@ test-suite tasty
- , containers
- , hashable >=1.1.2.5
- , pointedlist >= 0.5
-- , regex-base ==0.93.*
-- , regex-tdfa >= 1.1 && <1.3
-+ , regex-base >=0.93 && <0.95
-+ , regex-tdfa >= 1.1 && <1.4
- , transformers-base
- , unordered-containers >= 0.1.3 && < 0.3
- , microlens-platform
=====================================
p/haskell-yi-language/debian/patches/series deleted
=====================================
@@ -1,3 +0,0 @@
-newer-deps
-Hspec-imports
-Hspec-cabal
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/7621a1e9b1403e1f845782f2786efd0def79d4dc
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/7621a1e9b1403e1f845782f2786efd0def79d4dc
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/20241025/6b5837f2/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list