[Git][haskell-team/DHG_packages][master] happy: Fix a few dh-haskell porting issues and depend on happy-lib >= 2.1.7-3

[Scott Talbert (@swt2c)]

Scott Talbert pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
5a552707 by Scott Talbert at 2026-01-30T21:27:02-05:00
happy: Fix a few dh-haskell porting issues and depend on happy-lib >= 2.1.7-3

- - - - -


6 changed files:

- p/happy/debian/changelog
- p/happy/debian/control
- − p/happy/debian/doc-base
- p/happy/debian/happy.install
- − p/happy/debian/happy.manpages
- p/happy/debian/rules


Changes:

=====================================
p/happy/debian/changelog
=====================================
@@ -1,8 +1,12 @@
-happy (2.1.7-1) UNRELEASED; urgency=medium
+happy (2.1.7-1) unstable; urgency=medium
 
+  [ Clint Adams ]
   * New upstream version.
 
- -- Clint Adams <clint at debian.org>  Tue, 20 Jan 2026 09:30:02 -0500
+  [ Scott Talbert ]
+  * Fix a few dh-haskell porting issues and depend on happy-lib >= 2.1.7-3
+
+ -- Scott Talbert <swt at techie.net>  Fri, 30 Jan 2026 21:10:02 -0500
 
 happy (1.20.1.1-2) unstable; urgency=medium
 


=====================================
p/happy/debian/control
=====================================
@@ -3,21 +3,17 @@ Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.or
 Uploaders: Iain Lane <laney at ubuntu.com>
 Priority: optional
 Section: haskell
+Standards-Version: 4.7.3
 Rules-Requires-Root: no
 Build-Depends:
  dh-sequence-haskell,
  haskell-devscripts (>= 0.16.45),
  debhelper-compat (= 13),
  dpkg-dev (>= 1.17.14),
- autoconf,
- docbook-utils,
  ghc (>= 9.4),
  ghc-prof,
- libghc-happy-lib-dev (>= 2.1.7),
+ libghc-happy-lib-dev (>= 2.1.7-3),
  libghc-happy-lib-dev (<< 2.1.8),
- docbook-xsl,
- docbook-xml,
- xsltproc,
  happy <!stage1>,
 Homepage: https://www.haskell.org/happy/
 Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/happy]


=====================================
p/happy/debian/doc-base deleted
=====================================
@@ -1,12 +0,0 @@
-Document: happy
-Title: Happy User's manual
-Author: Simon Marlow (simonm at microsoft.com)
-Abstract: Happy is a parser generator system for Haskell, similar to the
- tool yacc for C. Like yacc, it takes a file containing an annotated BNF
- specification of a grammar and produces a Haskell module containing a
- parser for the grammar.
-Section: Programming/Haskell
-
-Format: HTML
-Index: /usr/share/doc/happy/html/index.html
-Files: /usr/share/doc/happy/html/*.html


=====================================
p/happy/debian/happy.install
=====================================
@@ -1,3 +1 @@
-doc/happy/* usr/share/doc/happy/html
 usr/bin/happy
-usr/share/happy


=====================================
p/happy/debian/happy.manpages deleted
=====================================
@@ -1 +0,0 @@
-doc/happy.1


=====================================
p/happy/debian/rules
=====================================
@@ -11,26 +11,5 @@ ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
 export DEB_SETUP_GHC_CONFIGURE_ARGS += --with-happy=/bin/true
 endif
 
-execute_after_dh_auto_clean:
-	[ ! -f doc/config.mk ] || $(MAKE) -C doc clean
-
-	rm -f debian/get_version.o debian/get_version.hi debian/get_version
-	rm -f doc/happy.1
-
-	# Hacks:
-	rm -f doc/config.log doc/config.status doc/config.mk doc/configure
-
-execute_after_dh_auto_build:
-	# doc/configure is not shipped, generate it
-	cd doc && autoconf && rm -r autom4te.cache &&  ./configure --prefix=/usr
-	# used in build to stick version into man page
-	ghc --make debian/get_version.hs -o debian/get_version
-
-	$(MAKE) -C doc html
-	sed -e "s#@LIBDIR@#/usr/share/happy-`debian/get_version`#g" \
-	    -e "s#@DOCDIR@#/usr/share/doc/happy#g" \
-	    -e "s#@VERSION@#`debian/get_version`#g" \
-	  doc/happy.1.in > doc/happy.1
-
 %:
 	dh $@



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/5a552707ca67617f817cf18c132336d52b375824

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/5a552707ca67617f817cf18c132336d52b375824
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/20260131/a3ea08b1/attachment-0001.htm>