[Git][haskell-team/package-plan][master] 2 commits: Update git-annex and add gtk+2.0-dev to test requirements

Ilias Tsitsimpis (@iliastsi) gitlab at salsa.debian.org
Sun Jan 19 16:15:15 GMT 2025



Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / package-plan


Commits:
325e4eeb by Pete Ryland at 2025-01-19T16:14:44+00:00
Update git-annex and add gtk+2.0-dev to test requirements

- - - - -
97cb2b8b by Pete Ryland at 2025-01-19T16:14:44+00:00
Patch for mueval is now in hackage, removing from here

- - - - -


5 changed files:

- .gitlab-ci.yml
- README.md
- packages.txt
- − patches/mueval/0.9.4/newer-deps-non-hackage
- − patches/mueval/0.9.4/series


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -8,6 +8,6 @@ build:
   script:
     - apt-get update
     - apt-get install -y --no-install-recommends cabal-install ghc dctrl-tools patchutils libtext-patch-perl libfile-slurp-perl libipc-run-perl liblist-moreutils-perl libdpkg-perl
-    - apt-get install -y --no-install-recommends --no-install-suggests pkg-config libxft-dev libcairo-dev libatk1.0-dev libdbusmenu-glib-dev libdbusmenu-gtk3-dev libvte-2.91-dev libgsasl-dev  libgirepository1.0-dev libhdf5-serial-dev libxml2-dev libpcre3-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libzmq3-dev libyaml-dev
+    - apt-get install -y --no-install-recommends --no-install-suggests pkg-config libxft-dev libcairo-dev libatk1.0-dev libdbusmenu-glib-dev libdbusmenu-gtk3-dev libgtk+2.0-dev libvte-2.91-dev libgsasl-dev  libgirepository1.0-dev libhdf5-serial-dev libxml2-dev libpcre3-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libzmq3-dev libyaml-dev
     - HOME=/builds/haskell-team/package-plan cabal update
     - HOME=/builds/haskell-team/package-plan ./test-packages.pl


=====================================
README.md
=====================================
@@ -87,7 +87,7 @@ The script has a few dependencies, so run
       dctrl-tools patchutils libtext-patch-perl libfile-slurp-perl \
       libipc-run-perl liblist-moreutils-perl libdpkg-perl pkg-config \
       libxft-dev libcairo-dev libatk1.0-dev libdbusmenu-glib-dev \
-      libdbusmenu-gtk3-dev libvte-2.91-dev libgsasl-dev \
+      libdbusmenu-gtk3-dev libgtk+2.0-dev libvte-2.91-dev libgsasl-dev \
       libgirepository1.0-dev libhdf5-serial-dev libxml2-dev \
       libpcre3-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev \
       libsdl2-ttf-dev libzmq3-dev ca-certificates libyaml-dev
@@ -138,9 +138,9 @@ The following Dockerfile may help test in a reproducible environment
     RUN apt-get install git cabal-install ghc dctrl-tools patchutils \
      libtext-patch-perl libfile-slurp-perl libipc-run-perl \
      liblist-moreutils-perl libdpkg-perl pkg-config libxft-dev libcairo-dev \
-     libatk1.0-dev libdbusmenu-glib-dev libdbusmenu-gtk3-dev libvte-2.91-dev \
-     libgsasl-dev libgirepository1.0-dev libhdf5-serial-dev libxml2-dev \
-     libpcre3-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev \
+     libatk1.0-dev libdbusmenu-glib-dev libdbusmenu-gtk3-dev libgtk+2.0-dev \
+     libvte-2.91-dev libgsasl-dev libgirepository1.0-dev libhdf5-serial-dev \
+     libxml2-dev libpcre3-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev \
      libsdl2-ttf-dev libzmq3-dev ca-certificates libyaml-dev
 
     # Replace the following with


=====================================
packages.txt
=====================================
@@ -366,7 +366,7 @@ gi-gtk-hs 0.3.16
 gi-harfbuzz 0.0.10
 gio 0.13.11.0
 gi-pango 1.0.30
-git-annex 10.20241031 binary key -f-ConcurrentOutput
+git-annex 10.20241202 binary key -f-ConcurrentOutput
 githash 0.1.7.0
 github 0.29
 gitit 0.15.1.2 key


=====================================
patches/mueval/0.9.4/newer-deps-non-hackage deleted
=====================================
@@ -1,72 +0,0 @@
-Index: b/mueval.cabal
-===================================================================
---- a/mueval.cabal
-+++ b/mueval.cabal
-@@ -41,7 +41,7 @@ library
-         -static
- 
-     build-depends:
--        Cabal >=3.8.1.0 && <3.9,
-+        Cabal >=3.8.1.0,
-         QuickCheck >=2.14.3 && <2.16,
-         base >=4.5 && <5,
-         containers >=0.6.7 && <0.7,
-@@ -49,11 +49,11 @@ library
-         extensible-exceptions >=0.1.1.4 && <0.2,
-         filepath >=1.4.2.2 && <1.5,
-         hint >=0.9.0.7 && <0.10,
--        mtl >=2.2.2 && <2.3,
-+        mtl >=2.2.2,
-         process >=1.6.16.0 && <1.7,
-         show >=0.6 && <0.7,
-         simple-reflect >=0.3.3 && <0.4,
--        unix >=2.7.3 && <2.8
-+        unix >=2.7.3
- 
- executable mueval
-     main-is:          Main.hs
-@@ -67,7 +67,7 @@ executable mueval
-         -static -threaded -rtsopts -with-rtsopts=-N
- 
-     build-depends:
--        Cabal >=3.8.1.0 && <3.9,
-+        Cabal >=3.8.1.0,
-         QuickCheck >=2.14.3 && <2.16,
-         base >=4.5 && <5,
-         containers >=0.6.7 && <0.7,
-@@ -75,12 +75,12 @@ executable mueval
-         extensible-exceptions >=0.1.1.4 && <0.2,
-         filepath >=1.4.2.2 && <1.5,
-         hint >=0.9.0.7 && <0.10,
--        mtl >=2.2.2 && <2.3,
-+        mtl >=2.2.2,
-         mueval,
-         process >=1.6.16.0 && <1.7,
-         show >=0.6 && <0.7,
-         simple-reflect >=0.3.3 && <0.4,
--        unix >=2.7.3 && <2.8
-+        unix >=2.7.3
- 
- test-suite mueval-test
-     type:             exitcode-stdio-1.0
-@@ -95,7 +95,7 @@ test-suite mueval-test
-         -static -threaded -rtsopts -with-rtsopts=-N
- 
-     build-depends:
--        Cabal >=3.8.1.0 && <3.9,
-+        Cabal >=3.8.1.0,
-         QuickCheck >=2.14.3 && <2.16,
-         base >=4.5 && <5,
-         containers >=0.6.7 && <0.7,
-@@ -103,9 +103,9 @@ test-suite mueval-test
-         extensible-exceptions >=0.1.1.4 && <0.2,
-         filepath >=1.4.2.2 && <1.5,
-         hint >=0.9.0.7 && <0.10,
--        mtl >=2.2.2 && <2.3,
-+        mtl >=2.2.2,
-         mueval,
-         process >=1.6.16.0 && <1.7,
-         show >=0.6 && <0.7,
-         simple-reflect >=0.3.3 && <0.4,
--        unix >=2.7.3 && <2.8
-+        unix >=2.7.3


=====================================
patches/mueval/0.9.4/series deleted
=====================================
@@ -1 +0,0 @@
-newer-deps-non-hackage



View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/compare/49d2ea4743da6632b19fafb13d05f192e58bdb12...97cb2b8b8b20797f5a7d6eea3f506d75dc619201

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/compare/49d2ea4743da6632b19fafb13d05f192e58bdb12...97cb2b8b8b20797f5a7d6eea3f506d75dc619201
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/20250119/2cc987b3/attachment-0001.htm>


More information about the Pkg-haskell-commits mailing list