summaryrefslogtreecommitdiffhomepage
path: root/debian
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2017-07-05 08:10:39 +0100
committerSean Whitton <spwhitton@spwhitton.name>2017-07-05 08:10:39 +0100
commit627d6555da3e474e4736f410872941651cba4928 (patch)
tree3e4e246b6fc6936180a423a07c8de8e6e45cf3db /debian
parentf9517b093e310e663f0ed6c17de40b5493b6f6d5 (diff)
downloadstylish-haskell-627d6555da3e474e4736f410872941651cba4928.tar.gz
Commit Debian 3.0 (quilt) metadata
[dgit (4.0) quilt-fixup]
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/0001-Debianize-README.patch39
-rw-r--r--debian/patches/debian-changes45
-rw-r--r--debian/patches/series2
3 files changed, 46 insertions, 40 deletions
diff --git a/debian/patches/0001-Debianize-README.patch b/debian/patches/0001-Debianize-README.patch
deleted file mode 100644
index 60fc6ea..0000000
--- a/debian/patches/0001-Debianize-README.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Sean Whitton <spwhitton@spwhitton.name>
-Date: Sat, 16 Apr 2016 09:43:35 -0700
-Subject: Debianize-README
-Forwarded: not-needed
-
----
- README.markdown | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/README.markdown b/README.markdown
-index 209f2d7..01f20d9 100644
---- a/README.markdown
-+++ b/README.markdown
-@@ -1,8 +1,6 @@
- stylish-haskell
- ===============
-
--[![Build Status](https://secure.travis-ci.org/jaspervdj/stylish-haskell.svg?branch=master)](http://travis-ci.org/jaspervdj/stylish-haskell)
--
- Introduction
- ------------
-
-@@ -12,16 +10,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 `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
- --------
-
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
new file mode 100644
index 0000000..68351a9
--- /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.7.1.0.orig/README.markdown
++++ stylish-haskell-0.7.1.0/README.markdown
+@@ -1,8 +1,6 @@
+ stylish-haskell
+ ===============
+
+-[![Build Status](https://secure.travis-ci.org/jaspervdj/stylish-haskell.svg?branch=master)](http://travis-ci.org/jaspervdj/stylish-haskell)
+-
+ Introduction
+ ------------
+
+@@ -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
+ --------
+
diff --git a/debian/patches/series b/debian/patches/series
index d8aadaf..7bb8252 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-Debianize-README.patch
+debian-changes