[Git][haskell-team/dh-haskell][master] 11 commits: Add dh_haskell addons to dh-haskell sequencer
Scott Talbert (@swt2c)
gitlab at salsa.debian.org
Tue Oct 14 00:49:50 BST 2025
Scott Talbert pushed to branch master at Debian Haskell Group / dh-haskell
Commits:
8fdc991c by Scott Talbert at 2025-09-28T17:21:23-04:00
Add dh_haskell addons to dh-haskell sequencer
- - - - -
eb4e46d7 by Scott Talbert at 2025-10-08T18:32:26-04:00
Remove call to dh_buildinfo - it has been removed from Debian
- - - - -
675b79e0 by Scott Talbert at 2025-10-08T18:32:26-04:00
Use haskell buildsystem by default
This will allow us to avoid having to specify the buildsystem in d/rules.
- - - - -
f58eff21 by Scott Talbert at 2025-10-08T18:32:26-04:00
Move envvars needed by dh_haskell_ scripts to common library
- - - - -
58b0f5c3 by Scott Talbert at 2025-10-08T18:32:26-04:00
Make dh_makeshlibs and dh_shlibdeps args match hlibrary.mk
- - - - -
70cdfb3c by Scott Talbert at 2025-10-08T18:32:26-04:00
Only build haddock when building arch-indep packages
- - - - -
d6c7175f by Scott Talbert at 2025-10-13T19:43:47-04:00
Allow and prefer haskell-devscripts-minimal as dependency
- - - - -
ad0cdbb4 by Scott Talbert at 2025-10-13T19:43:56-04:00
Disable automatic dbgsym generation (to match hlibrary.mk)
- - - - -
ac21e44a by Scott Talbert at 2025-10-13T19:43:56-04:00
Update dh_compress exclusions to match hlibrary.mk
- - - - -
1cdd3986 by Scott Talbert at 2025-10-13T19:43:56-04:00
Disable dh_missing --fail-missing in compat 13+
There are currently a few files that are being installed by
hlibrary.setup that we are not installing, namely an extra copy of the
haddock file plus possibly the LICENSE file. Ignore this for now, but
still log it.
- - - - -
b6ad61f8 by Scott Talbert at 2025-10-13T19:43:56-04:00
dh-haskell (0.6.8) unstable; urgency=medium
- - - - -
4 changed files:
- debian/changelog
- debian/control
- lib/Debian/Debhelper/Buildsystem/haskell.pm
- lib/Debian/Debhelper/Sequence/haskell.pm
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+dh-haskell (0.6.8) unstable; urgency=medium
+
+ * Add dh_haskell addons to dh-haskell sequencer
+ * Remove call to dh_buildinfo - it has been removed from Debian
+ * Use haskell buildsystem by default
+ * Move envvars needed by dh_haskell_ scripts to common library
+ * Make dh_makeshlibs and dh_shlibdeps args match hlibrary.mk
+ * Only build haddock when building arch-indep packages
+ * Allow and prefer haskell-devscripts-minimal as dependency
+ * Disable automatic dbgsym generation (to match hlibrary.mk)
+ * Update dh_compress exclusions to match hlibrary.mk
+ * Disable dh_missing --fail-missing in compat 13+
+
+ -- Scott Talbert <swt at techie.net> Mon, 13 Oct 2025 19:41:31 -0400
+
dh-haskell (0.6.7) unstable; urgency=medium
* Move package maintenance to DHG officially
=====================================
debian/control
=====================================
@@ -23,7 +23,7 @@ Depends:
${perl:Depends},
${shlibs:Depends},
debhelper (>= 9.20151220),
- haskell-devscripts (>= 0.16.10~),
+ haskell-devscripts-minimal (>= 0.16.38~) | haskell-devscripts (>= 0.16.38~),
libconst-fast-perl,
liblist-someutils-perl,
libpath-tiny-perl
=====================================
lib/Debian/Debhelper/Buildsystem/haskell.pm
=====================================
@@ -54,6 +54,7 @@ use Unicode::UTF8 qw(encode_utf8);
use Debian::Debhelper::Buildsystem::Haskell::Recipes qw(
run
+ init_hs_env
make_setup_recipe
configure_recipe
build_recipe
@@ -90,41 +91,11 @@ sub new {
$self->enforce_in_source_building;
+ init_hs_env();
+
# set a dummy HOME variable; Cabal expects one
$ENV{HOME} = '/homedoesnotexistatbuildtime';
- $ENV{DEB_DEFAULT_COMPILER} //= 'ghc';
-
- $ENV{DEB_GHC_DATABASE} = 'debian/tmp-db';
-
- my @cabal_candidates = glob('*.cabal');
-
- error('No cabal file found')
- unless @cabal_candidates;
-
- error('More than one cabal file')
- if @cabal_candidates > 1;
-
- my $cabal_path = $cabal_candidates[0];
- my $cabal_contents = path($cabal_path)->slurp_utf8;
-
- error('Cannot get package name from cabal file')
- unless $cabal_contents =~ /^ name \s* : \s* (\S*) \s* $/imx;
-
- my $package_name = lc $1;
-
- $ENV{CABAL_PACKAGE} //= $package_name;
-
- error('Cannot get package version from cabal file')
- unless $cabal_contents =~ /^ version \s* : \s* (\S*) \s* $/imx;
-
- my $package_version = $1;
-
- $ENV{CABAL_VERSION} = $package_version;
-
- $ENV{DEB_ENABLE_TESTS} //= 'no';
- $ENV{DEB_ENABLE_HOOGLE} //= 'yes';
-
$ENV{"DEB_DH_GENCONTROL_ARGS_libghc-$ENV{CABAL_PACKAGE}-dev"}
.= $SPACE . '-- -DGHC-Package=\${haskell:ghc-package}';
@@ -150,8 +121,6 @@ sub new {
# packages are empty. Disables them.
$ENV{DEB_DH_STRIP_ARGS} .= $SPACE . '--no-automatic-dbgsym';
- $ENV{DEB_SETUP_BIN_NAME} //= 'debian/hlibrary.setup';
-
# you probably do not need to touch these
$ENV{GHC6_VERSION} = qx{ghc --numeric-version};
$ENV{GHC_VERSION} = qx{ghc --numeric-version};
@@ -190,7 +159,9 @@ sub build {
my ($self) = @_;
build_recipe();
- haddock_recipe();
+ if (!$dh{DOARCH}) {
+ haddock_recipe();
+ }
check_recipe();
return;
=====================================
lib/Debian/Debhelper/Sequence/haskell.pm
=====================================
@@ -26,12 +26,8 @@ use Debian::Debhelper::Dh_Lib;
use constant USE_LEGACY => 1;
-add_command_options('dh_makeshlibs', '--noscripts', '-XlibHS');
-add_command_options('dh_shlibdeps', '-u -xlibgmp10 --ignore-missing-info');
-
-if (USE_LEGACY) {
- add_command_options('dh_shlibdeps', '-XlibHS');
-}
+add_command_options('dh_makeshlibs', '-XlibHS');
+add_command_options('dh_shlibdeps', '-u --ignore-missing-info');
if (USE_LEGACY) {
add_command_options('dh_gencontrol',
@@ -40,9 +36,42 @@ if (USE_LEGACY) {
# We must forbid debhelper compress interface description files,
# otherwise hoogle would be unhappy. FIXME: It it true?
-add_command_options('dh_compress', '-X.txt');
+add_command_options('dh_compress', '-X.haddock', '-X.hs', '-X.txt');
+
+# Starting from debhelper v9.20151219, dh_strip automatically generats debug
+# symbol packages. GHC cannot produce debugging symbols so the dbgsym
+# package ends up being empty. Disable dbgsym generation.
+add_command_options('dh_strip', '--no-automatic-dbgsym');
+
+# Build with haskell buildsystem by default
+add_command_options('dh_auto_configure', '--buildsystem=haskell');
+add_command_options('dh_auto_build', '--buildsystem=haskell');
+add_command_options('dh_auto_test', '--buildsystem=haskell');
+add_command_options('dh_auto_install', '--buildsystem=haskell');
+add_command_options('dh_auto_clean', '--buildsystem=haskell');
+
+# Disable dh_missing --fail-missing in compat 13+
+if (!compat(12)) {
+ add_command_options('dh_missing', '--list-missing');
+}
-insert_after('dh_installchangelogs', 'dh_buildinfo');
+# Insert dh_haskell_* addons (in reverse order)
+insert_after('dh_auto_install', 'dh_haskell_compiler');
+insert_after('dh_auto_install', 'dh_haskell_description');
+insert_after('dh_auto_install', 'dh_haskell_blurbs');
+insert_after('dh_auto_install', 'dh_haskell_suggests');
+insert_after('dh_auto_install', 'dh_haskell_shlibdeps');
+insert_after('dh_auto_install', 'dh_haskell_recommends_documentation_references');
+insert_after('dh_auto_install', 'dh_haskell_provides_ghc');
+insert_after('dh_auto_install', 'dh_haskell_extra_depends_ghc');
+insert_after('dh_auto_install', 'dh_haskell_depends_hugs');
+insert_after('dh_auto_install', 'dh_haskell_depends_haddock');
+insert_after('dh_auto_install', 'dh_haskell_depends_cabal');
+insert_after('dh_auto_install', 'dh_haskell_install_haddock');
+insert_after('dh_auto_install', 'dh_haskell_install_htmldocs');
+insert_after('dh_auto_install', 'dh_haskell_install_profiling_libs');
+insert_after('dh_auto_install', 'dh_haskell_install_development_libs');
+insert_after('dh_auto_install', 'dh_haskell_install_ghc_registration');
1;
View it on GitLab: https://salsa.debian.org/haskell-team/dh-haskell/-/compare/99e13252da45f5fe5f64ad9684de76412e301c16...b6ad61f8502b8006a2aecb2e0548d9a57b260ed2
--
View it on GitLab: https://salsa.debian.org/haskell-team/dh-haskell/-/compare/99e13252da45f5fe5f64ad9684de76412e301c16...b6ad61f8502b8006a2aecb2e0548d9a57b260ed2
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/20251013/29b15ca5/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list