diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-06-21 14:20:57 +0900 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-06-21 14:20:57 +0900 |
| commit | e323771765bfad159692e7be67a14782793d75c3 (patch) | |
| tree | b69e9717786c378723ccd62cb95345613a485105 /debian | |
| parent | d577a42d6c319ec9a5fe986eab17ab8f9d9f95e4 (diff) | |
| download | stylish-haskell-e323771765bfad159692e7be67a14782793d75c3.tar.gz | |
drop 0002-move-CHANGELOG-entry-from-README.patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/0002-move-CHANGELOG-entry-from-README.patch | 35 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 2 insertions, 36 deletions
diff --git a/debian/changelog b/debian/changelog index 5901b74..23505e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ stylish-haskell (0.5.17.0-1) UNRELEASED; urgency=medium * New upstream release. - Dependency change: cmdargs -> optparse-applicative + * Drop 0002-move-CHANGELOG-entry-from-README.patch + Merged upstream. -- Sean Whitton <spwhitton@spwhitton.name> Tue, 21 Jun 2016 14:17:51 +0900 diff --git a/debian/patches/0002-move-CHANGELOG-entry-from-README.patch b/debian/patches/0002-move-CHANGELOG-entry-from-README.patch deleted file mode 100644 index ca8e2ac..0000000 --- a/debian/patches/0002-move-CHANGELOG-entry-from-README.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Sean Whitton <spwhitton@spwhitton.name> -Date: Sat, 16 Apr 2016 09:44:31 -0700 -Subject: move-CHANGELOG-entry-from-README -Forwarded: https://github.com/jaspervdj/stylish-haskell/pull/101 - ---- - CHANGELOG | 3 +++ - README.markdown | 6 ------ - 2 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/CHANGELOG b/CHANGELOG -index d8f24d7..61aa915 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -51,3 +51,6 @@ - - 0.5.10.0 - * Bump `haskell-src-exts` dependency to 1.15 - * Fix test which was not run before -+ -+- `0.5.9.0` -+ * Add `compact_line` setting for Language Pragma styling -diff --git a/README.markdown b/README.markdown -index 201a294..f6925c0 100644 ---- a/README.markdown -+++ b/README.markdown -@@ -129,9 +129,3 @@ Contributors: - - Leonid Onokhov - - Michael Snoyman - - Mikhail Glushenkov -- --Changelog ----------- -- --- `0.5.9.0` -- * Add `compact_line` setting for Language Pragma styling diff --git a/debian/patches/series b/debian/patches/series index e5ef750..d8aadaf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-Debianize-README.patch -0002-move-CHANGELOG-entry-from-README.patch |