[Git][haskell-team/DHG_packages][experimental] 9 commits: README: Link to salsa project and fix formatting
Ilias Tsitsimpis (@iliastsi)
gitlab at salsa.debian.org
Fri Aug 11 19:01:34 BST 2023
Ilias Tsitsimpis pushed to branch experimental at Debian Haskell Group / DHG_packages
Commits:
2449e9dc by Gioele Barabucci at 2023-07-07T13:25:39+00:00
README: Link to salsa project and fix formatting
- - - - -
22ac1677 by Gioele Barabucci at 2023-07-07T13:25:39+00:00
README: Format commands and paths
- - - - -
36d4745a by Clint Adams at 2023-07-16T08:00:54-04:00
add git-mediate
- - - - -
d3d5aac4 by Scott Talbert at 2023-07-31T18:48:16-04:00
ghc: Fix FTBFS with sphinx 7.1 (Closes: #1042658)
- - - - -
2a1343ae by Scott Talbert at 2023-08-02T13:10:10-04:00
haskell-gi-base: Upgrading from 0.26.2 to 0.26.4
- - - - -
2f5d74dd by Scott Talbert at 2023-08-02T13:19:45-04:00
haskell-gi: Upgrading from 0.26.1 to 0.26.7
- - - - -
ddf57113 by Scott Talbert at 2023-08-05T09:46:08-04:00
haskell-haskell-gi-base: Correct definition of gTypeError / fix reproducibility (Closes: #969958)
- - - - -
ef3fc329 by Ilias Tsitsimpis at 2023-08-11T19:46:06+03:00
Merge branch 'master' into experimental
- - - - -
b9f61783 by Ilias Tsitsimpis at 2023-08-11T20:16:23+03:00
ghc: New upstream release (9.4.6)
- - - - -
22 changed files:
- README.md
- p/ghc/debian/changelog
- p/ghc/debian/control
- + p/ghc/debian/patches/fix-bytestring-9.4.6
- − p/ghc/debian/patches/ghc-prim-libatomic
- p/ghc/debian/patches/series
- + p/ghc/debian/patches/use-unbundled-sphinx-rtd-theme
- p/ghc/debian/patches/x32-use-native-x86_64-insn.patch
- p/ghc/debian/rules
- + p/haskell-git-mediate/debian/changelog
- + p/haskell-git-mediate/debian/compat
- + p/haskell-git-mediate/debian/control
- + p/haskell-git-mediate/debian/copyright
- + p/haskell-git-mediate/debian/git-mediate.install
- + p/haskell-git-mediate/debian/rules
- + p/haskell-git-mediate/debian/source/format
- + p/haskell-git-mediate/debian/watch
- p/haskell-haskell-gi-base/debian/changelog
- + p/haskell-haskell-gi-base/debian/patches/fix-gtypeerror.patch
- + p/haskell-haskell-gi-base/debian/patches/series
- p/haskell-haskell-gi/debian/changelog
- p/haskell-haskell-gi/debian/control
Changes:
=====================================
README.md
=====================================
@@ -13,7 +13,7 @@ feature of our work, hence the choice to put all our packaging into one
repository.
-Also, our work is maintaining the debian/ directory, so we decided to track
+Also, our work is maintaining the `debian/` directory, so we decided to track
only that, and _not_ upstream sources. Therefore, the directory structure for a
Haskell package foo is as follows:
@@ -23,15 +23,15 @@ Haskell package foo is as follows:
/p/haskell-foo/debian/control -- the usual files
...
-In particular, /p/haskell-foo/ contains no files besides debian/. So what is
-the point of having the files under the debian/ subdirectory? This way, you can
-extract the upstream sources in there and run your usual
-uscan/debchange/quilt/sbuild/debrelease-commands as usual. The `.gitignore`
-file is set up so that git will not bother you about the extracted upstream
-sources.
+In particular, `/p/haskell-foo/` contains no files besides `debian/`.
+So what is the point of having the files under the `debian/` subdirectory?
+This way, you can extract the upstream sources in there and run your usual
+`uscan`/`debchange`/`quilt`/`sbuild`/`debrelease-commands` as usual.
+The `.gitignore` file is set up so that git will not bother you about the
+extracted upstream sources.
-As running uscan or dpkg-buildpackage in that directory will dump files into
-the parent, we introduced the /p/ directory. Again, a `.gitignore` file is set
+As running `uscan` or `dpkg-buildpackage` in that directory will dump files into
+the parent, we introduced the `/p/` directory. Again, a `.gitignore` file is set
up so that git will not bother you about the tarballs, `deb`-files or
`changes`-files therein.
@@ -71,11 +71,12 @@ Debian Haskell Tools
We provide tools for a number of repeated tasks, such as tagging, upgrading,
knowing what to build and what to upgrade, etc. They are provided in the
`pkg-haskell-tools` package, available in sid, or at
-git at salsa.debian.org:haskell-team/pkg-haskell-tools.git
-(git://salsa.debian.org/haskell-team/pkg-haskell-tools.git for
+<https://salsa.debian.org/haskell-team/pkg-haskell-tools>
+(Git repository: `git at salsa.debian.org:haskell-team/pkg-haskell-tools.git`,
+or `git://salsa.debian.org/haskell-team/pkg-haskell-tools.git` for
read-only access).
-All tools are under the `dht` prefix, and it has a manpage (man dht) or at
+All tools are under the `dht` prefix, and it has a manpage (`man dht`) or at
<file:///usr/share/doc/pkg-haskell-tools/dht.html>.
=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,12 @@
+ghc (9.4.6-1~exp1) experimental; urgency=medium
+
+ * New upstream release
+ * Do not reduce parallelism on mipsel, as this doesn't fix OOM issues
+ * Drop 'ghc-prim-libatomic' patch, doesn't work
+ * Do not run inplace/bin/ghc-stage2 for cross-builds (Closes: #1042078)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Fri, 11 Aug 2023 19:52:02 +0300
+
ghc (9.4.5-1~exp3) experimental; urgency=medium
* Try to reduce parallel builds on mipsel
@@ -60,6 +69,13 @@ ghc (9.2.5-1~exp1) experimental; urgency=medium
-- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 29 Nov 2022 10:29:14 +0100
+ghc (9.0.2-5) unstable; urgency=medium
+
+ * Team upload.
+ * Fix FTBFS with sphinx 7.1 (Closes: #1042658)
+
+ -- Scott Talbert <swt at techie.net> Mon, 31 Jul 2023 18:47:27 -0400
+
ghc (9.0.2-4) unstable; urgency=medium
* Backport patch to fix ABI reproducibility (Closes: #1015733)
=====================================
p/ghc/debian/control
=====================================
@@ -19,6 +19,7 @@ Build-Depends:
libffi-dev,
libncurses-dev,
python3-sphinx <!cross>,
+ python3-sphinx-rtd-theme <!cross>,
dpkg-dev (>= 1.16.1.1)
Build-Depends-Indep:
hscolour,
=====================================
p/ghc/debian/patches/fix-bytestring-9.4.6
=====================================
@@ -0,0 +1,28 @@
+From 2bdeb7b0e7dd100fce9e1f4d1ecf1cd6b5b9702c Mon Sep 17 00:00:00 2001
+From: Matthew Craven <clyring at gmail.com>
+Date: Tue, 8 Aug 2023 14:25:03 -0400
+Subject: [PATCH] Use a more specific include than Rts.h (#607)
+
+The Rts.h include seems to cause build problems.
+See also:
+ https://gitlab.haskell.org/ghc/ghc/-/issues/23789
+ https://github.com/haskell/bytestring/issues/606
+
+(cherry picked from commit e8a9b522063a203424eac3357873e4a8f2a09965)
+---
+ cbits/is-valid-utf8.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/libraries/bytestring/cbits/is-valid-utf8.c
+===================================================================
+--- a/libraries/bytestring/cbits/is-valid-utf8.c
++++ b/libraries/bytestring/cbits/is-valid-utf8.c
+@@ -50,7 +50,7 @@ SUCH DAMAGE.
+ #endif
+
+ #include <MachDeps.h>
+-#include "Rts.h"
++#include "ghcplatform.h"
+
+ #ifdef WORDS_BIGENDIAN
+ #define to_little_endian(x) __builtin_bswap64(x)
=====================================
p/ghc/debian/patches/ghc-prim-libatomic deleted
=====================================
@@ -1,217 +0,0 @@
-Description: Use libatomic in ghc-prim
- Configure the libraries/ghc-prim/ghc-prim.cabal file to use
- libatomic if needed, same way as rts/rts.cabal does.
-Author: Ilias Tsitsimpis <iliastsi at debian.org>
-
-Index: b/libraries/ghc-prim/ghc-prim.cabal
-===================================================================
---- a/libraries/ghc-prim/ghc-prim.cabal
-+++ /dev/null
-@@ -1,92 +0,0 @@
--cabal-version: 2.2
--name: ghc-prim
--version: 0.9.0
---- NOTE: Don't forget to update ./changelog.md
--license: BSD-3-Clause
--license-file: LICENSE
--category: GHC
--maintainer: libraries at haskell.org
--bug-reports: https://gitlab.haskell.org/ghc/ghc/issues/new
--synopsis: GHC primitives
--build-type: Custom
--description:
-- This package contains the primitive types and operations supplied by GHC.
--
--extra-source-files: changelog.md
--
--source-repository head
-- type: git
-- location: https://gitlab.haskell.org/ghc/ghc.git
-- subdir: libraries/ghc-prim
--
--custom-setup
-- setup-depends: base >= 4 && < 5, process, filepath, directory, Cabal >= 1.23 && < 3.9
--
--Library
-- default-language: Haskell2010
-- other-extensions:
-- BangPatterns
-- CPP
-- DeriveGeneric
-- MagicHash
-- MultiParamTypeClasses
-- NoImplicitPrelude
-- StandaloneDeriving
-- Trustworthy
-- TypeFamilies
-- UnboxedTuples
-- UnliftedFFITypes
--
-- build-depends: rts == 1.0.*
--
-- exposed-modules:
-- GHC.CString
-- GHC.Classes
-- GHC.Debug
-- GHC.Magic
-- GHC.Magic.Dict
-- GHC.Prim.Ext
-- GHC.Prim.Panic
-- GHC.Prim.Exception
-- GHC.Prim.PtrEq
-- GHC.PrimopWrappers
-- GHC.Tuple
-- GHC.Types
--
-- virtual-modules:
-- GHC.Prim
--
-- -- OS Specific
-- if os(windows)
-- -- Windows requires some extra libraries for linking because the RTS
-- -- is no longer re-exporting them (see #11223)
-- -- ucrt: standard C library. The RTS will automatically include this,
-- -- but is added for completeness.
-- -- mingw32: Unfortunately required because of a resource leak between
-- -- mingwex and mingw32. the __math_err symbol is defined in
-- -- mingw32 which is required by mingwex.
-- -- user32: provides access to apis to modify user components (UI etc)
-- -- on Windows. Required because of mingw32.
-- extra-libraries: user32, mingw32, ucrt
--
-- if os(linux)
-- -- we need libm, but for musl and other's we might need libc, as libm
-- -- is just an empty shell.
-- extra-libraries: c, m
--
-- c-sources:
-- cbits/atomic.c
-- cbits/bswap.c
-- cbits/bitrev.c
-- cbits/clz.c
-- cbits/ctz.c
-- cbits/debug.c
-- cbits/longlong.c
-- cbits/pdep.c
-- cbits/pext.c
-- cbits/popcnt.c
-- cbits/word2float.c
--
-- -- We need to set the unit ID to ghc-prim (without a version number)
-- -- as it's magic.
-- ghc-options: -this-unit-id ghc-prim
-Index: b/libraries/ghc-prim/ghc-prim.cabal.in
-===================================================================
---- /dev/null
-+++ b/libraries/ghc-prim/ghc-prim.cabal.in
-@@ -0,0 +1,98 @@
-+cabal-version: 2.2
-+name: ghc-prim
-+version: 0.9.0
-+-- NOTE: Don't forget to update ./changelog.md
-+license: BSD-3-Clause
-+license-file: LICENSE
-+category: GHC
-+maintainer: libraries at haskell.org
-+bug-reports: https://gitlab.haskell.org/ghc/ghc/issues/new
-+synopsis: GHC primitives
-+build-type: Custom
-+description:
-+ This package contains the primitive types and operations supplied by GHC.
-+
-+extra-source-files: changelog.md
-+
-+source-repository head
-+ type: git
-+ location: https://gitlab.haskell.org/ghc/ghc.git
-+ subdir: libraries/ghc-prim
-+
-+flag need-atomic
-+ default: @CabalNeedLibatomic@
-+
-+custom-setup
-+ setup-depends: base >= 4 && < 5, process, filepath, directory, Cabal >= 1.23 && < 3.9
-+
-+Library
-+ default-language: Haskell2010
-+ other-extensions:
-+ BangPatterns
-+ CPP
-+ DeriveGeneric
-+ MagicHash
-+ MultiParamTypeClasses
-+ NoImplicitPrelude
-+ StandaloneDeriving
-+ Trustworthy
-+ TypeFamilies
-+ UnboxedTuples
-+ UnliftedFFITypes
-+
-+ build-depends: rts == 1.0.*
-+
-+ exposed-modules:
-+ GHC.CString
-+ GHC.Classes
-+ GHC.Debug
-+ GHC.Magic
-+ GHC.Magic.Dict
-+ GHC.Prim.Ext
-+ GHC.Prim.Panic
-+ GHC.Prim.Exception
-+ GHC.Prim.PtrEq
-+ GHC.PrimopWrappers
-+ GHC.Tuple
-+ GHC.Types
-+
-+ virtual-modules:
-+ GHC.Prim
-+
-+ -- OS Specific
-+ if os(windows)
-+ -- Windows requires some extra libraries for linking because the RTS
-+ -- is no longer re-exporting them (see #11223)
-+ -- ucrt: standard C library. The RTS will automatically include this,
-+ -- but is added for completeness.
-+ -- mingw32: Unfortunately required because of a resource leak between
-+ -- mingwex and mingw32. the __math_err symbol is defined in
-+ -- mingw32 which is required by mingwex.
-+ -- user32: provides access to apis to modify user components (UI etc)
-+ -- on Windows. Required because of mingw32.
-+ extra-libraries: user32, mingw32, ucrt
-+
-+ if os(linux)
-+ -- we need libm, but for musl and other's we might need libc, as libm
-+ -- is just an empty shell.
-+ extra-libraries: c, m
-+
-+ if flag(need-atomic)
-+ extra-libraries: atomic
-+
-+ c-sources:
-+ cbits/atomic.c
-+ cbits/bswap.c
-+ cbits/bitrev.c
-+ cbits/clz.c
-+ cbits/ctz.c
-+ cbits/debug.c
-+ cbits/longlong.c
-+ cbits/pdep.c
-+ cbits/pext.c
-+ cbits/popcnt.c
-+ cbits/word2float.c
-+
-+ -- We need to set the unit ID to ghc-prim (without a version number)
-+ -- as it's magic.
-+ ghc-options: -this-unit-id ghc-prim
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -1236,6 +1236,7 @@ dnl When adding things to this list be s
- dnl Rules.Configure.configureResults list.
- AC_CONFIG_FILES(
- [ rts/rts.cabal
-+ libraries/ghc-prim/ghc-prim.cabal
- compiler/ghc.cabal
- ghc/ghc-bin.cabal
- utils/runghc/runghc.cabal
=====================================
p/ghc/debian/patches/series
=====================================
@@ -11,4 +11,5 @@ separate-docs
build-fix-hs-constants.patch
fix-index-html-removal
fix-llvm-armel
-ghc-prim-libatomic
+use-unbundled-sphinx-rtd-theme
+fix-bytestring-9.4.6
=====================================
p/ghc/debian/patches/use-unbundled-sphinx-rtd-theme
=====================================
@@ -0,0 +1,13 @@
+Index: b/docs/users_guide/conf.py
+===================================================================
+--- a/docs/users_guide/conf.py
++++ b/docs/users_guide/conf.py
+@@ -66,7 +66,7 @@ exclude_patterns = ['.build']
+ html_title = "Glasgow Haskell Compiler %s User's Guide" % release
+ html_short_title = "GHC %s User's Guide" % release
+ html_theme_path = ['.']
+-html_theme = 'rtd-theme'
++html_theme = 'sphinx_rtd_theme'
+ html_logo = None
+ html_static_path = ['images']
+ # Convert quotes and dashes to typographically correct entities
=====================================
p/ghc/debian/patches/x32-use-native-x86_64-insn.patch
=====================================
@@ -16,7 +16,7 @@ Index: b/rts/RtsSymbols.c
===================================================================
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
-@@ -914,7 +914,7 @@ extern char **environ;
+@@ -935,7 +935,7 @@ extern char **environ;
// 64-bit support functions in libgcc.a
=====================================
p/ghc/debian/rules
=====================================
@@ -59,11 +59,7 @@ ifneq (,$(filter mips mipsel powerpc powerpcspe sparc64, $(DEB_HOST_ARCH)))
endif
%:
-ifneq (,$(filter mipsel, $(DEB_HOST_ARCH)))
- dh $@ --max-parallel=2
-else
dh $@
-endif
override_dh_autoreconf:
dh_autoreconf ./boot.source
@@ -210,9 +206,11 @@ override_dh_auto_install-arch:
sed -ri 's,/usr/share/doc/ghc-doc/html/libraries/(.*)\.haddock,/usr/lib/ghc-doc/haddock/ghc/\1.haddock,' debian/tmp/var/lib/ghc/package.conf.d/*.conf
# Sort out the binaries
+ifeq (NO,$(BUILD_CROSS))
if inplace/bin/ghc-stage2 --info | grep '"Have interpreter","NO"'; then \
cd debian/tmp/usr/bin ;rm -f ghci* runghc* runhaskell*; \
fi
+endif
# manpages
echo ".so man1/ghc.1" > debian/tmp/usr/share/man/man1/ghc-$(ProjectVersion).1
=====================================
p/haskell-git-mediate/debian/changelog
=====================================
@@ -0,0 +1,5 @@
+haskell-git-mediate (1.0.8.1-1) unstable; urgency=low
+
+ * Initial release. closes: #1041232.
+
+ -- Clint Adams <clint at debian.org> Sun, 16 Jul 2023 07:38:19 -0400
=====================================
p/haskell-git-mediate/debian/compat
=====================================
@@ -0,0 +1 @@
+10
=====================================
p/haskell-git-mediate/debian/control
=====================================
@@ -0,0 +1,66 @@
+Source: haskell-git-mediate
+Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
+Uploaders: Clint Adams <clint at debian.org>
+Priority: optional
+Section: haskell
+Rules-Requires-Root: no
+Build-Depends: debhelper (>= 10),
+ haskell-devscripts-minimal | haskell-devscripts (>= 0.13),
+ cdbs,
+ ghc,
+ ghc-prof,
+ libghc-diff-dev (>= 0.4),
+ libghc-diff-prof (>= 0.4),
+ libghc-ansi-terminal-dev (>= 0.6.2),
+ libghc-ansi-terminal-prof (>= 0.6.2),
+ libghc-base-compat-dev (>= 0.8.2),
+ libghc-base-compat-prof (>= 0.8.2),
+ libghc-optparse-applicative-dev (>= 0.11),
+ libghc-optparse-applicative-prof (>= 0.11),
+ libghc-unix-compat-dev (>= 0.4.2.0),
+ libghc-unix-compat-prof (>= 0.4.2.0),
+Standards-Version: 4.6.2
+Homepage: https://github.com/Peaker/git-mediate
+X-Description: tool to help resolving git conflicts
+ In any conflicted state - git-mediate shows you
+ the 2 diffs involved. By applying these diffs to
+ the base version and the other version, you
+ emulate the situation where the patch had already
+ existed when the other had been applied.
+ .
+ Reapply git-mediate, it will validate that you've
+ indeed applied it correctly, and bam: conflict
+ disappeared!
+ .
+ Git-mediate also lets you handle modify/delete
+ conflicts (there's no sane way in git to show
+ what the modification actually was)
+ .
+ Git-mediate also streamlines jumping to the
+ conflicts with your editor, either with the `-e`
+ option to invoke your editor, or via the standard
+ line number format, which is parsed by all major
+ editors, to allow use of "jump to next error"
+ keys.
+ .
+ Git-mediate especially shines with automatic
+ source transformation tools such as renamers.
+ .
+ In a conflicted state, re-apply a rename that
+ caused the conflict, run git-mediate without
+ opening any files, and the conflicts are gone!
+
+Package: git-mediate
+Architecture: any
+Section: vcs
+Depends: ${haskell:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends: ${haskell:Recommends},
+Suggests: ${haskell:Suggests},
+Conflicts: ${haskell:Conflicts},
+Provides: ${haskell:Provides},
+Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+ ${haskell:LongDescription}
+ .
+ ${haskell:Blurb}
=====================================
p/haskell-git-mediate/debian/copyright
=====================================
@@ -0,0 +1,18 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: git-mediate
+Upstream-Contact: Eyal Lotem <eyal.lotem at gmail.com>
+Source: https://hackage.haskell.org/package/git-mediate
+
+Files: *
+Copyright: Eyal Lotem
+License: GPL-2
+
+Files: debian/*
+Copyright: held by the contributors mentioned in debian/changelog
+License: GPL-2+
+
+License: GPL-2
+ See /usr/share/common-licenses/GPL-2 on your Debian-based system.
+
+License: GPL-2+
+ See /usr/share/common-licenses/GPL-2 on your Debian-based system.
=====================================
p/haskell-git-mediate/debian/git-mediate.install
=====================================
@@ -0,0 +1 @@
+dist-ghc/build/git-mediate/git-mediate usr/bin
=====================================
p/haskell-git-mediate/debian/rules
=====================================
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+DEB_SETUP_BIN_NAME = debian/hlibrary.setup
+DEB_CABAL_PACKAGE = git-mediate
+DEB_DEFAULT_COMPILER = ghc
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/hlibrary.mk
+
+build/git-mediate:: build-ghc-stamp
=====================================
p/haskell-git-mediate/debian/source/format
=====================================
@@ -0,0 +1 @@
+3.0 (quilt)
=====================================
p/haskell-git-mediate/debian/watch
=====================================
@@ -0,0 +1,2 @@
+version=3
+https://hackage.haskell.org/package/git-mediate/distro-monitor .*-([0-9\.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
=====================================
p/haskell-haskell-gi-base/debian/changelog
=====================================
@@ -1,3 +1,16 @@
+haskell-haskell-gi-base (0.26.4-2) unstable; urgency=medium
+
+ * Team upload.
+ * Correct definition of gTypeError / fix reproducibility (Closes: #969958)
+
+ -- Scott Talbert <swt at techie.net> Sat, 05 Aug 2023 09:45:58 -0400
+
+haskell-haskell-gi-base (0.26.4-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Scott Talbert <swt at techie.net> Wed, 02 Aug 2023 13:10:10 -0400
+
haskell-haskell-gi-base (0.26.2-1) unstable; urgency=medium
* New upstream release
=====================================
p/haskell-haskell-gi-base/debian/patches/fix-gtypeerror.patch
=====================================
@@ -0,0 +1,38 @@
+From ba4154155f6ebf3d56b60a64db0f4fdbb1bcad6f Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt at techie.net>
+Date: Sat, 5 Aug 2023 01:51:26 -0400
+Subject: [PATCH] Correct definition of gTypeError to a run-time type (#414)
+
+Fixes #413
+---
+ base/Data/GI/Base/GType.hsc | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/base/Data/GI/Base/GType.hsc b/base/Data/GI/Base/GType.hsc
+index 027147b..30d265e 100644
+--- a/Data/GI/Base/GType.hsc
++++ b/Data/GI/Base/GType.hsc
+@@ -107,10 +107,6 @@ gtypeInvalid = GType #const G_TYPE_INVALID
+ gtypeVariant :: GType
+ gtypeVariant = GType #const G_TYPE_VARIANT
+
+--- | The `GType` corresponding to 'Data.GI.Base.GError.GError'.
+-gtypeError :: GType
+-gtypeError = GType #const G_TYPE_ERROR
+-
+ -- | The `GType` corresponding to 'Data.GI.Base.BasicTypes.GParamSpec'.
+ gtypeParam :: GType
+ gtypeParam = GType #const G_TYPE_PARAM
+@@ -140,3 +136,9 @@ foreign import ccall haskell_gi_StablePtr_get_type :: CGType
+ -- | The `GType` for boxed `StablePtr`s.
+ gtypeStablePtr :: GType
+ gtypeStablePtr = GType haskell_gi_StablePtr_get_type
++
++foreign import ccall "g_error_get_type" g_error_get_type :: CGType
++
++-- | The `GType` corresponding to 'Data.GI.Base.GError.GError'.
++gtypeError :: GType
++gtypeError = GType g_error_get_type
+--
+2.40.1
+
=====================================
p/haskell-haskell-gi-base/debian/patches/series
=====================================
@@ -0,0 +1 @@
+fix-gtypeerror.patch
=====================================
p/haskell-haskell-gi/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-haskell-gi (0.26.7-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+
+ -- Scott Talbert <swt at techie.net> Wed, 02 Aug 2023 13:17:39 -0400
+
haskell-haskell-gi (0.26.1-1) unstable; urgency=medium
[ Ilias Tsitsimpis ]
=====================================
p/haskell-haskell-gi/debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 10),
libghc-ansi-terminal-prof,
libghc-attoparsec-dev (>= 0.13),
libghc-attoparsec-prof,
- libghc-haskell-gi-base-dev (>= 0.26.1),
+ libghc-haskell-gi-base-dev (>= 0.26.4),
libghc-haskell-gi-base-dev (<< 0.27),
libghc-haskell-gi-base-prof,
libghc-pretty-show-dev,
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/3a3d0f289e4c07362957a2fed4f8b50814dad147...b9f6178365252e3ae2f467d82d53fc52c7f10d2a
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/3a3d0f289e4c07362957a2fed4f8b50814dad147...b9f6178365252e3ae2f467d82d53fc52c7f10d2a
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/20230811/b095556a/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list