[Git][haskell-team/DHG_packages][master] Fix additional cdbs -> dh-haskell porting issues

[Scott Talbert (@swt2c)]

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


Commits:
fa8b6778 by Scott Talbert at 2026-01-08T19:04:30-05:00
Fix additional cdbs -> dh-haskell porting issues

- - - - -


13 changed files:

- p/allure/debian/rules
- p/gitit/debian/rules
- p/haskell-ansi-terminal/debian/rules
- + p/haskell-clientsession/debian/clean
- p/haskell-clientsession/debian/rules
- p/haskell-irc/debian/rules
- + p/haskell-yaml/debian/clean
- p/haskell-yaml/debian/rules
- + p/haskell-yesod-core/debian/clean
- p/haskell-yesod-core/debian/rules
- + p/haskell-yesod-test/debian/clean
- p/haskell-yesod-test/debian/rules
- p/shelltestrunner/debian/rules


Changes:

=====================================
p/allure/debian/rules
=====================================
@@ -6,7 +6,5 @@ ifneq (,$(filter $(DEB_BUILD_ARCH),armel armhf mips mipsel sparc64 mips64el hppa
     export DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-O0"
 endif
 
-common-binary-arch:: check-ghc-stamp
-
 %:
 	dh $@


=====================================
p/gitit/debian/rules
=====================================
@@ -7,9 +7,6 @@ execute_after_dh_auto_build:
 	$(XP) $(DB2MAN) debian/gitit.xml
 	$(XP) $(DB2MAN) debian/expireGititCache.xml
 
-install/libghc-gitit-data::
-	dh_haskell_depends -plibghc-gitit-data # for haskell:Extra-Depends substvar
-
 execute_after_dh_install-indep:
 	chmod +x debian/libghc-gitit-data/usr/share/gitit/data/post-update
 


=====================================
p/haskell-ansi-terminal/debian/rules
=====================================
@@ -1,8 +1,4 @@
 #!/usr/bin/make -f
 
-# How to install an extra file into the documentation package
-#binary-fixup/libghc-ansi-terminal-doc::
-#	echo "Some informative text" > debian/libghc-ansi-terminal-doc/usr/share/doc/libghc-ansi-terminal-doc/AnExtraDocFile
-
 %:
 	dh $@


=====================================
p/haskell-clientsession/debian/clean
=====================================
@@ -0,0 +1 @@
+client_session_key.aes


=====================================
p/haskell-clientsession/debian/rules
=====================================
@@ -2,8 +2,5 @@
 
 export DEB_ENABLE_TESTS = yes
 
-cleanbuilddir/libghc-clientsession-dev::
-	rm -f client_session_key.aes
-
 %:
 	dh $@


=====================================
p/haskell-irc/debian/rules
=====================================
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-install/libghc-irc-doc::
+execute_after_dh_install-indep:
 	find debian/libghc-irc-doc -type d -empty -delete
 
 %:


=====================================
p/haskell-yaml/debian/clean
=====================================
@@ -0,0 +1,2 @@
+tmp.yaml
+tmp2.yaml


=====================================
p/haskell-yaml/debian/rules
=====================================
@@ -9,8 +9,5 @@ export LC_ALL=C.UTF-8
 else
 export DEB_ENABLE_TESTS = no
 
-cleanbuilddir/libghc-yaml-dev::
-	rm -f tmp.yaml tmp2.yaml
-
 %:
 	dh $@


=====================================
p/haskell-yesod-core/debian/clean
=====================================
@@ -0,0 +1 @@
+client_session_key.aes


=====================================
p/haskell-yesod-core/debian/rules
=====================================
@@ -2,8 +2,5 @@
 
 export DEB_ENABLE_TESTS = yes
 
-cleanbuilddir/libghc-yesod-core-dev::
-	rm -f client_session_key.aes
-
 %:
 	dh $@


=====================================
p/haskell-yesod-test/debian/clean
=====================================
@@ -0,0 +1 @@
+client_session_key.aes


=====================================
p/haskell-yesod-test/debian/rules
=====================================
@@ -2,11 +2,5 @@
 
 export DEB_ENABLE_TESTS = yes
 
-# unicode problems
-check-ghc-stamp: export LANG := en_US.UTF-8
-
-cleanbuilddir/libghc-yesod-test-dev::
-	rm -f client_session_key.aes
-
 %:
 	dh $@


=====================================
p/shelltestrunner/debian/rules
=====================================
@@ -6,8 +6,5 @@ debian/shelltest.1: debian/shelltest.md
 # Note: for now, the built man page is distributed, so that we don't
 # need to build-depend on pandoc.
 
-#clean::
-#	rm -f debian/shelltest.1
-
 %:
 	dh $@



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

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/fa8b67788107237343a630beb9eb5039fc537400
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/20260109/4d40b07e/attachment-0001.htm>