[Git][haskell-team/DHG_packages][master] 3 commits: happy: Remove unused utils.mk include from d/rules

[Scott Talbert (@swt2c)]

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


Commits:
7952bacf by Scott Talbert at 2025-12-17T18:37:00-05:00
happy: Remove unused utils.mk include from d/rules

- - - - -
6334e7a3 by Scott Talbert at 2025-12-17T19:05:38-05:00
happy: fix additional dh-haskell porting issues

- - - - -
75dd2f8e by Scott Talbert at 2025-12-17T19:06:15-05:00
happy (1.20.1.1-2) unstable; urgency=medium

- - - - -


3 changed files:

- p/happy/debian/changelog
- p/happy/debian/happy.install
- p/happy/debian/rules


Changes:

=====================================
p/happy/debian/changelog
=====================================
@@ -1,12 +1,13 @@
-happy (1.20.1.1-2) UNRELEASED; urgency=medium
+happy (1.20.1.1-2) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]
   * Declare compliance with Debian policy 4.7.0
 
   [ Scott Talbert ]
   * Build using dh-haskell
+  * Remove unused utils.mk include from d/rules (Closes: #1110564)
 
- -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 11 Sep 2024 15:16:54 +0300
+ -- Scott Talbert <swt at techie.net>  Wed, 17 Dec 2025 19:05:55 -0500
 
 happy (1.20.1.1-1) unstable; urgency=medium
 


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


=====================================
p/happy/debian/rules
=====================================
@@ -5,17 +5,13 @@
 # Largely rewritten for the Cabalised happy by Ian Lynagh in 2006.
 # Largely rewritten for cdbs and hlibrary.mk by Iain Lane in 2009.
 
-DEB_BUILD_DEPENDENCIES = build-arch
-
 export DEB_SETUP_GHC_CONFIGURE_ARGS := --datasubdir=/usr/share/happy --docdir=/usr/share/doc/happy
 
-include /usr/share/cdbs/1/rules/utils.mk
-
 ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
 export DEB_SETUP_GHC_CONFIGURE_ARGS += --with-happy=/bin/true
 endif
 
-clean::
+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
@@ -24,7 +20,7 @@ clean::
 	# Hacks:
 	rm -f doc/config.log doc/config.status doc/config.mk doc/configure
 
-configure/happy::
+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
@@ -36,10 +32,5 @@ configure/happy::
 	    -e "s#@VERSION@#`debian/get_version`#g" \
 	  doc/happy.1.in > doc/happy.1
 
-# install templates to appropriate directory
-binary-post-install/happy::
-	$(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc --destdir=debian/happy
-	rm -f debian/happy/usr/share/doc/happy/LICENSE
-
 %:
 	dh $@



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/41149b4120c83a1bfb3b430600a0496d14479ffc...75dd2f8e8ec6a99a1fbe9d2e3f776e028cd6cbc7

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/41149b4120c83a1bfb3b430600a0496d14479ffc...75dd2f8e8ec6a99a1fbe9d2e3f776e028cd6cbc7
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/20251218/0525bc51/attachment-0001.htm>