From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 19 Mar 2026 12:39:43 +0000 (+0000)
Subject: Manual merge of version 0.1.5-1+rpi1 and 0.3.1-3 to produce 0.3.1-3+rpi1
X-Git-Tag: archive/raspbian/0.3.1-3+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=26e89f59da45d9222ebcbff7ae2b8804b2924e03;p=haskell-nothunks.git

Manual merge of version 0.1.5-1+rpi1 and 0.3.1-3 to produce 0.3.1-3+rpi1
---

26e89f59da45d9222ebcbff7ae2b8804b2924e03
diff --cc debian/changelog
index e1c8944,31a66c5..cd95a84
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,24 +1,31 @@@
- haskell-nothunks (0.1.5-1+rpi1) trixie-staging; urgency=medium
++haskell-nothunks (0.3.1-3+rpi1) forky-staging; urgency=medium
 +
++  [changes brought forward from 0.1.5-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Nov 2024 16:33:05 +0000]
 +  * Force C.UTF-8 locale for build.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 07 Nov 2024 16:33:05 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 19 Mar 2026 12:39:12 +0000
++
+ haskell-nothunks (0.3.1-3) unstable; urgency=medium
+ 
+   * Fix typo in patch.
+ 
+  -- Clint Adams <clint@debian.org>  Mon, 19 Jan 2026 17:00:23 -0500
+ 
+ haskell-nothunks (0.3.1-2) unstable; urgency=medium
+ 
+   * Patch for newer and older dependencies.
+ 
+  -- Clint Adams <clint@debian.org>  Mon, 19 Jan 2026 16:27:06 -0500
+ 
+ haskell-nothunks (0.3.1-1) unstable; urgency=medium
+ 
+   [ Scott Talbert ]
+   * Build using dh-haskell
+ 
+   [ Clint Adams ]
+   * New upstream version.
+ 
+  -- Clint Adams <clint@debian.org>  Mon, 19 Jan 2026 12:07:21 -0500
  
  haskell-nothunks (0.1.5-1) unstable; urgency=medium
  
diff --cc debian/rules
index 53a71ef,7a9e76c..4090d8b
--- a/debian/rules
+++ b/debian/rules
@@@ -1,8 -1,6 +1,6 @@@
  #!/usr/bin/make -f
  
 -export DEB_ENABLE_TESTS = yes
 +export LC_ALL=C.UTF-8
  
- DEB_ENABLE_TESTS = yes
- 
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/hlibrary.mk
+ %:
+ 	dh $@