diff options
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/debian-changes | 19 | ||||
| -rwxr-xr-x | debian/rules | 11 | ||||
| -rw-r--r-- | debug-me.cabal | 6 | ||||
| -rw-r--r-- | doc/news/version_1.20170520.mdwn | 13 | ||||
| -rw-r--r-- | doc/news/version_1.20220324.mdwn | 6 |
8 files changed, 58 insertions, 24 deletions
@@ -1,3 +1,10 @@ +debug-me (1.20221231) unstable; urgency=medium + + * Support ghc 9.2. + Thanks, Tony Zorman + + -- Joey Hess <id@joeyh.name> Sat, 31 Dec 2022 14:23:22 -0400 + debug-me (1.20220324) unstable; urgency=medium * Support ghc 8.8. diff --git a/debian/changelog b/debian/changelog index 30555e4..2c08b91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,23 @@ -debug-me (1.20220324-1) UNRELEASED; urgency=medium +debug-me (1.20221231-2) unstable; urgency=medium + + * Disable link time optimisation on ppc64el (Closes: #1052313). + Thanks to Heinrich Schuchardt for the patch. + * Bump Aeson dependency bounds to allow 2.1 (Closes: #1054930). + + -- Sean Whitton <spwhitton@spwhitton.name> Fri, 03 Nov 2023 10:21:15 +0000 + +debug-me (1.20221231-1) unstable; urgency=medium + + * New upstream release. + + -- Sean Whitton <spwhitton@spwhitton.name> Tue, 04 Jul 2023 16:38:00 +0100 + +debug-me (1.20220324-1) unstable; urgency=medium * New upstream release. * Update build-dep bounds for libghc-aeson-dev and libghc-websockets-dev. - -- Sean Whitton <spwhitton@spwhitton.name> Sun, 22 May 2022 14:52:27 -0700 + -- Sean Whitton <spwhitton@spwhitton.name> Sun, 22 May 2022 14:58:59 -0700 debug-me (1.20200820-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index f2a3385..78d92cb 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 10), dh-exec, ghc (>= 8.4.3), libghc-aeson-dev (>= 0.11), - libghc-aeson-dev (<< 2.1), + libghc-aeson-dev (<< 2.2), libghc-async-dev (>= 2.1), libghc-cereal-dev (>= 0.5), libghc-cryptonite-dev (>= 0.20), diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 7a639c7..4f17f2a 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -15,8 +15,19 @@ upload of upstream version 1.2.3, you could use: clone`.) A single combined diff, containing all the changes, follows. ---- debug-me-1.20220324.orig/debug-me.init -+++ debug-me-1.20220324/debug-me.init +--- debug-me-1.20221231.orig/debug-me.cabal ++++ debug-me-1.20221231/debug-me.cabal +@@ -64,7 +64,7 @@ Executable debug-me + , stm-chans (>= 3.0) + , posix-pty (>= 0.2.1) + , terminal-size (>= 0.3) +- , aeson (>= 0.11 && < 2.1) ++ , aeson (>= 0.11 && < 2.2) + , sandi (>= 0.4) + , text (>= 1.2.2) + , optparse-applicative (>= 0.12) +--- debug-me-1.20221231.orig/debug-me.init ++++ debug-me-1.20221231/debug-me.init @@ -33,7 +33,7 @@ case "$1" in start-stop-daemon --start --quiet --oknodo \ --background --no-close \ @@ -26,8 +37,8 @@ A single combined diff, containing all the changes, follows. --exec "$DAEMON" -- $DAEMON_PARAMS \ > /var/log/debug-me.log log_end_msg $? ---- debug-me-1.20220324.orig/debug-me.service -+++ debug-me-1.20220324/debug-me.service +--- debug-me-1.20221231.orig/debug-me.service ++++ debug-me-1.20221231/debug-me.service @@ -8,8 +8,8 @@ EnvironmentFile=-/etc/default/debug-me ExecStart=/usr/bin/debug-me $DAEMON_PARAMS InaccessiblePaths=/home diff --git a/debian/rules b/debian/rules index 191cb01..b017b3c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,18 @@ #!/usr/bin/make -f +DPKG_EXPORT_BUILDFLAGS := 1 +include /usr/share/dpkg/architecture.mk + # Debian's ghc cannot compile anything with -fPIC at present, so we # have to disable PIE hardening to avoid build failures on archs like # amd64. See discussion on debian-haskell@lists.debian.org -export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie +DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie + +# Building with LTO failed on ppc64el (LP: #2033639) +ifeq ("$(DEB_BUILD_ARCH)", "ppc64el") + DEB_BUILD_MAINT_OPTIONS += optimize=-lto +endif +export DEB_BUILD_MAINT_OPTIONS # cabal likes to write to $HOME, so use Setup.hs directly export BUILDER = ./Setup diff --git a/debug-me.cabal b/debug-me.cabal index d5a44e9..befaf98 100644 --- a/debug-me.cabal +++ b/debug-me.cabal @@ -1,5 +1,5 @@ Name: debug-me -Version: 1.20220324 +Version: 1.20221231 Cabal-Version: >= 1.10 Maintainer: Joey Hess <joey@kitenet.net> Author: Joey Hess @@ -55,7 +55,7 @@ Executable debug-me Build-Depends: base (>= 4.9 && < 5.0) , network (>= 2.6) - , bytestring == 0.10.* + , bytestring < 0.12 , cryptonite (>= 0.20) , unix (>= 2.7) , process (>= 1.4) @@ -64,7 +64,7 @@ Executable debug-me , stm-chans (>= 3.0) , posix-pty (>= 0.2.1) , terminal-size (>= 0.3) - , aeson (>= 0.11 && < 2.1) + , aeson (>= 0.11 && < 2.2) , sandi (>= 0.4) , text (>= 1.2.2) , optparse-applicative (>= 0.12) diff --git a/doc/news/version_1.20170520.mdwn b/doc/news/version_1.20170520.mdwn deleted file mode 100644 index 094f328..0000000 --- a/doc/news/version_1.20170520.mdwn +++ /dev/null @@ -1,13 +0,0 @@ -debug-me 1.20170520 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * debug-me is available in Debian unstable. - * gpg keyrings in /usr/share/debug-me/ will be checked - to see if a connecting person is a known developer of software - installed on the system, and so implicitly trusted already. - Software packages/projects can install keyrings to that location. - (Thanks to Sean Whitton for the idea.) - * make install installs /usr/share/debug-me/a\_debug-me\_developer.gpg, - which contains the key of Joey Hess. (stack and cabal installs don't - include this file because they typically don't install system-wide) - * debug-me.cabal: Added dependency on time. - * stack.yaml: Update to new posix-pty version."""]]
\ No newline at end of file diff --git a/doc/news/version_1.20220324.mdwn b/doc/news/version_1.20220324.mdwn new file mode 100644 index 0000000..8056232 --- /dev/null +++ b/doc/news/version_1.20220324.mdwn @@ -0,0 +1,6 @@ +debug-me 1.20220324 released with [[!toggle text="these changes"]] +[[!toggleable text=""" * Support ghc 8.8. + Thanks, Tony Zorman + * Support aeson 2.0. + Thanks, Tony Zorman + * Update to lts-19.0."""]]
\ No newline at end of file |