diff options
| -rw-r--r-- | README.markdown | 14 | ||||
| -rw-r--r-- | debian/changelog | 120 | ||||
| -rw-r--r-- | debian/clean | 1 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 64 | ||||
| -rw-r--r-- | debian/copyright | 50 | ||||
| -rw-r--r-- | debian/docs | 1 | ||||
| -rw-r--r-- | debian/lintian-overrides | 4 | ||||
| -rw-r--r-- | debian/manpages | 1 | ||||
| -rw-r--r-- | debian/patches/debian-changes | 45 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 28 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/source/lintian-overrides | 2 | ||||
| -rw-r--r-- | debian/source/options | 2 | ||||
| -rw-r--r-- | debian/source/patch-header | 17 | ||||
| -rw-r--r-- | debian/stylish-haskell.install | 1 | ||||
| -rw-r--r-- | debian/watch | 3 |
18 files changed, 342 insertions, 14 deletions
diff --git a/README.markdown b/README.markdown index 199b95d..02ca635 100644 --- a/README.markdown +++ b/README.markdown @@ -1,9 +1,5 @@ ## stylish-haskell -<img src="./assets/Logo/SVG/RoundedLogo.svg" width="100px"> - - - ## Introduction A simple Haskell code prettifier. The goal is not to format all of the code in @@ -12,16 +8,6 @@ manually cleaning up import statements etc. gets tedious very quickly. This tool tries to help where necessary without getting in the way. -## Installation - -You can install it using `stack install stylish-haskell` or `cabal install stylish-haskell`. - -You can also install it using your package manager: - -- Debian 9 or later: `apt-get install stylish-haskell` -- Ubuntu 16.10 or later: `apt-get install stylish-haskell` -- Arch Linux: `pacman -S stylish-haskell` - ## Features - Aligns and sorts `import` statements diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..02cc129 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,120 @@ +stylish-haskell (0.11.0.0-1) unstable; urgency=medium + + * New upstream release. + * Updates now that stylish-haskell.1.adoc has been merged upstream: + - add self to Files: * d/copyright stanza + - update debian/{clean,manpages,rules} + - drop debian/ copy of the manpage. + + -- Sean Whitton <spwhitton@spwhitton.name> Sun, 26 Jul 2020 20:11:16 -0700 + +stylish-haskell (0.9.4.4-1) unstable; urgency=medium + + * New upstream release. + + -- Sean Whitton <spwhitton@spwhitton.name> Wed, 15 Jan 2020 06:59:45 -0700 + +stylish-haskell (0.9.4.3-1) unstable; urgency=medium + + * New upstream version. + + -- Sean Whitton <spwhitton@spwhitton.name> Fri, 01 Nov 2019 20:19:27 -0700 + +stylish-haskell (0.9.2.2-3) unstable; urgency=medium + + * Add new changelog entry, source upload to unstable + + -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 09 Sep 2019 10:31:15 +0200 + +stylish-haskell (0.9.2.2-2) unstable; urgency=medium + + * Update semigroup dependency + + -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 09 Sep 2019 10:19:47 +0200 + +stylish-haskell (0.9.2.2-1) unstable; urgency=medium + + * New upstream release. + * Update build-dep bounds. + + -- Sean Whitton <spwhitton@spwhitton.name> Sun, 14 Jul 2019 15:35:52 +0100 + +stylish-haskell (0.9.2.1-1) unstable; urgency=medium + + * New upstream release. + * Update build-dep bounds. + + -- Sean Whitton <spwhitton@spwhitton.name> Sat, 12 Jan 2019 09:53:02 -0700 + +stylish-haskell (0.9.2.0-1) unstable; urgency=medium + + * New upstream release (Closes: #898524). + - New build-deps on libghc-file-embed-{dev,prof} + * Stop installing default config to /usr/share/stylish-haskell + Now embedded in the executable. + - Drop FILES section from manpage. + * Update d/copyright: + - Bump years + - Add stanza for scripts/* + (Not installed in our binary packages.) + - Replace 'BSD3' with 'BSD-3-clause'. + + -- Sean Whitton <spwhitton@spwhitton.name> Sun, 13 May 2018 11:06:57 -0700 + +stylish-haskell (0.8.1.0-1) unstable; urgency=medium + + * New upstream release (Closes: #881821). + * Declare compliance with Debian Policy version 4.1.1. + - Update Priority: 'extra' -> 'optional' + + -- Sean Whitton <spwhitton@spwhitton.name> Fri, 17 Nov 2017 13:56:04 -0700 + +stylish-haskell (0.7.1.0-1) unstable; urgency=medium + + * New upstream release (Closes: #867193). + - Bump build-deps for aeson, src-exts, optparse-applicative and hunit. + * Drop override_dh_compress stanza. + Policy does not actually require us to compress a file that small. + * Update Vcs-Browser. + * Switch to dgit-maint-merge(7) workflow. + - Add d/source/options + - Add d/source/patch-header + * Bump debhelper compat to 10. + * Bump standards version to 4.0.0 (no changes required). + + -- Sean Whitton <spwhitton@spwhitton.name> Wed, 05 Jul 2017 08:19:33 +0100 + +stylish-haskell (0.6.1.0-1) unstable; urgency=medium + + * New upstream release. + * Refresh patch to README. + * Add new options to manpage: + - --no-utf8 + - --version + + -- Sean Whitton <spwhitton@spwhitton.name> Sat, 30 Jul 2016 21:14:51 -0700 + +stylish-haskell (0.5.17.0-2) unstable; urgency=low + + * General manpage with asciidoctor instead of ronn. + Second attempt at making it reproducible. + * Remove non-existent -V & --version options from manpage. + + -- Sean Whitton <spwhitton@spwhitton.name> Fri, 24 Jun 2016 15:34:29 +0900 + +stylish-haskell (0.5.17.0-1) unstable; urgency=medium + + * New upstream release. + - Dependency change: cmdargs -> optparse-applicative + * Drop 0002-move-CHANGELOG-entry-from-README.patch + Merged upstream. + * Pass changelog timestamp to ronn so manpage builds reproducibly. + * Add debian/stylish-haskell.1 to d/clean. + + -- Sean Whitton <spwhitton@spwhitton.name> Tue, 21 Jun 2016 14:56:59 +0900 + +stylish-haskell (0.5.16.0-1) unstable; urgency=medium + + * Initial release (Closes: #821196) + + -- Sean Whitton <spwhitton@spwhitton.name> Sat, 16 Apr 2016 15:00:39 -0700 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..419e5e1 --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +doc/stylish-haskell.1 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..8234e63 --- /dev/null +++ b/debian/control @@ -0,0 +1,64 @@ +Source: stylish-haskell +Maintainer: Sean Whitton <spwhitton@spwhitton.name> +Priority: optional +Section: haskell +Build-Depends: debhelper (>= 10), + ghc, + libghc-aeson-dev (>= 0.6), + libghc-aeson-dev (<< 1.5), + libghc-aeson-prof (>= 0.6), + libghc-aeson-prof (<< 1.5), + libghc-file-embed-dev (>= 0.0.10), + libghc-file-embed-dev (<< 0.1), + libghc-file-embed-prof (>= 0.0.10), + libghc-file-embed-prof (<< 0.1), + libghc-src-exts-dev (>= 1.18), + libghc-src-exts-dev (<< 1.24), + libghc-src-exts-prof (>= 1.18), + libghc-src-exts-prof (<< 1.24), + libghc-mtl-dev (>= 2.0), + libghc-mtl-dev (<< 2.3), + libghc-mtl-prof (>= 2.0), + libghc-mtl-prof (<< 2.3), + libghc-semigroups-dev (>= 0.18), + libghc-semigroups-dev (<< 0.20), + libghc-semigroups-prof (>= 0.18), + libghc-semigroups-prof (<< 0.20), + libghc-syb-dev (>= 0.3), + libghc-syb-dev (<< 0.8), + libghc-syb-prof (>= 0.3), + libghc-syb-prof (<< 0.8), + libghc-hsyaml-dev (>= 0.2.0), + libghc-hsyaml-dev (<< 0.3), + libghc-hsyaml-prof (>= 0.2.0), + libghc-hsyaml-prof (<< 0.3), + libghc-hsyaml-aeson-dev (>= 0.2.0), + libghc-hsyaml-aeson-dev (<< 0.3), + libghc-hsyaml-aeson-prof (>= 0.2.0), + libghc-hsyaml-aeson-prof (<< 0.3), + libghc-optparse-applicative-dev (>= 0.12), + libghc-optparse-applicative-dev (<< 0.16), + libghc-strict-dev (>= 0.3), + libghc-strict-dev (<< 0.4), + libghc-hunit-dev (>= 1.2), + libghc-hunit-dev (<< 1.7), + libghc-test-framework-dev (>= 0.4), + libghc-test-framework-dev (<< 0.9), + libghc-test-framework-hunit-dev (>= 0.2), + libghc-test-framework-hunit-dev (<< 0.4), + asciidoctor, +Standards-Version: 4.1.1 +Homepage: https://github.com/jaspervdj/stylish-haskell +Vcs-Git: https://git.spwhitton.name/stylish-haskell +Vcs-Browser: https://git.spwhitton.name/stylish-haskell + +Package: stylish-haskell +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, +Suggests: haskell-mode +Description: Haskell code prettifier + stylish-haskell prettifies Haskell code. A design goal is not + getting in the user's way, so it restricts itself to formatting only + some parts of the Haskell code piped to it, such as import + statements. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..72ba46c --- /dev/null +++ b/debian/copyright @@ -0,0 +1,50 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: stylish-haskell +Upstream-Contact: Jasper Van der Jeugt <m@jaspervdj.be> +Source: https://github.com/jaspervdj/stylish-haskell + +Files: * +Copyright: (C) 2012-2018 Jasper Van der Jeugt <m@jaspervdj.be> + (C) 2016, 2018 Sean Whitton <spwhitton@spwhitton.name> +License: BSD-3-clause + +Files: scripts/* +Copyright: (C) 2018 Jasper Van der Jeugt <m@jaspervdj.be> + (C) Neil Mitchell 2010-2018 +License: BSD-3-clause +Comment: see https://github.com/ndmitchell/neil/blob/master/LICENSE + +Files: debian/* +Copyright: (C) 2016-2018 Sean Whitton <spwhitton@spwhitton.name> +License: BSD-3-clause + +License: BSD-3-clause + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + . + * Neither the name of Jasper Van der Jeugt <m@jaspervdj.be> nor + the names of other contributors may be used to endorse or + promote products derived from this software without specific + prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..8d526b9 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.markdown diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 0000000..58bf513 --- /dev/null +++ b/debian/lintian-overrides @@ -0,0 +1,4 @@ +# standard override for Haskell binary packages +binary-or-shlib-defines-rpath +# standard override for Haskell binary packages +hardening-no-relro diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 0000000..419e5e1 --- /dev/null +++ b/debian/manpages @@ -0,0 +1 @@ +doc/stylish-haskell.1 diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes new file mode 100644 index 0000000..18313ff --- /dev/null +++ b/debian/patches/debian-changes @@ -0,0 +1,45 @@ +The Debian packaging of stylish-haskell is maintained in git, using +the merging workflow described in dgit-maint-merge(7). There isn't a +patch queue that can be represented as a quilt series. + +A detailed breakdown of the changes is available from their canonical +representation - git commits in the packaging repository. For +example, to see the changes made by the Debian maintainer in the first +upload of upstream version 1.2.3, you could use: + + % git clone https://git.dgit.debian.org/stylish-haskell + % cd stylish-haskell + % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian' + +(If you have dgit, use `dgit clone stylish-haskell`, rather than plain +`git clone`.) + +A single combined diff, containing all the changes, follows. +--- stylish-haskell-0.11.0.0.orig/README.markdown ++++ stylish-haskell-0.11.0.0/README.markdown +@@ -2,8 +2,6 @@ + + <img src="./assets/Logo/SVG/RoundedLogo.svg" width="100px"> + +-[](https://circleci.com/gh/jaspervdj/stylish-haskell) +- + ## Introduction + + A simple Haskell code prettifier. The goal is not to format all of the code in +@@ -12,16 +10,6 @@ manually cleaning up import statements e + + This tool tries to help where necessary without getting in the way. + +-## Installation +- +-You can install it using `stack install stylish-haskell` or `cabal install stylish-haskell`. +- +-You can also install it using your package manager: +- +-- Debian 9 or later: `apt-get install stylish-haskell` +-- Ubuntu 16.10 or later: `apt-get install stylish-haskell` +-- Arch Linux: `pacman -S stylish-haskell` +- + ## Features + + - Aligns and sorts `import` statements diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7bb8252 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +debian-changes diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..222bc56 --- /dev/null +++ b/debian/rules @@ -0,0 +1,28 @@ +#!/usr/bin/make -f + +# these rules originally written by Joey Hess for hothasktags package + +%: + dh $@ + +override_dh_auto_configure: + ghc --make Setup + ./Setup configure \ + --datadir=/usr/share/stylish-haskell --datasubdir="" \ + --enable-tests + +override_dh_auto_build: + asciidoctor -d manpage -b manpage doc/stylish-haskell.1.adoc + ./Setup build + +override_dh_auto_clean: + if [ -x Setup ]; then ./Setup clean; fi + rm -f Setup Setup.o Setup.hi debian/stylish-haskell.1 + +override_dh_auto_test: + ./Setup test + +override_dh_strip: + # GHC cannot produce debugging symbols so the -dbgsym package + # ends up empty, so disable generating it + dh_strip --no-automatic-dbgsym diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..12bfc41 --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,2 @@ +# signatures not provided & watch file just for notification of existence of new versions +debian-watch-may-check-gpg-signature diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..ce071fb --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +single-debian-patch +auto-commit diff --git a/debian/source/patch-header b/debian/source/patch-header new file mode 100644 index 0000000..ba4e463 --- /dev/null +++ b/debian/source/patch-header @@ -0,0 +1,17 @@ +The Debian packaging of stylish-haskell is maintained in git, using +the merging workflow described in dgit-maint-merge(7). There isn't a +patch queue that can be represented as a quilt series. + +A detailed breakdown of the changes is available from their canonical +representation - git commits in the packaging repository. For +example, to see the changes made by the Debian maintainer in the first +upload of upstream version 1.2.3, you could use: + + % git clone https://git.dgit.debian.org/stylish-haskell + % cd stylish-haskell + % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian' + +(If you have dgit, use `dgit clone stylish-haskell`, rather than plain +`git clone`.) + +A single combined diff, containing all the changes, follows. diff --git a/debian/stylish-haskell.install b/debian/stylish-haskell.install new file mode 100644 index 0000000..1a4bd8f --- /dev/null +++ b/debian/stylish-haskell.install @@ -0,0 +1 @@ +dist/build/stylish-haskell/stylish-haskell usr/bin diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..9e0591f --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/stylish-haskell-$1\.tar\.gz/ \ + https://github.com/jaspervdj/stylish-haskell/tags .*/v?(\d\S*)\.tar\.gz |