Updates now that stylish-haskell.1.adoc has been merged upstream

6 files changed, 14 insertions, 57 deletions

diff --git a/debian/changelog b/debian/changelog
index e70216f..174c480 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+stylish-haskell (0.11.0.0-1) UNRELEASED; 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 18:41:38 -0700
+
 stylish-haskell (0.9.4.4-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/clean b/debian/clean
index 2af444d..419e5e1 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1 @@
-debian/stylish-haskell.1
+doc/stylish-haskell.1
diff --git a/debian/copyright b/debian/copyright
index 2e91d43..72ba46c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,7 @@ 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/*
diff --git a/debian/manpages b/debian/manpages
index 2af444d..419e5e1 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1 @@
-debian/stylish-haskell.1
+doc/stylish-haskell.1
diff --git a/debian/rules b/debian/rules
index 5ea127f..222bc56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ override_dh_auto_configure:
 		--enable-tests
 
 override_dh_auto_build:
-	asciidoctor -d manpage -b manpage debian/stylish-haskell.1.adoc
+	asciidoctor -d manpage -b manpage doc/stylish-haskell.1.adoc
 	./Setup build
 
 override_dh_auto_clean:
diff --git a/debian/stylish-haskell.1.adoc b/debian/stylish-haskell.1.adoc
deleted file mode 100644
index 65c2b6c..0000000
--- a/debian/stylish-haskell.1.adoc
+++ /dev/null
@@ -1,54 +0,0 @@
-= stylish-haskell(1)
-
-== NAME
-
-stylish-haskell - simple Haskell code prettifier
-
-== SYNOPSIS
-
-*stylish-haskell* [_-c_|_--config=FILE_] [_-v|--verbose_]
-[_-i_|_--inplace_] [--no-utf8] [_FILES_]...
-
-*stylish-haskell* _-d_|_--defaults_
-
-*stylish-haskell* _-?_|_--help_
-
-*stylish-haskell* _--version_
-
-== DESCRIPTION
-
-*stylish-haskell* performs automatic formatting on the Haskell code in
-the files passed on the command line or piped via STDIN. It outputs to
-STDOUT unless *-i* is specified.
-
-STDIN is assumed to be encoded UTF-8, unless the *--no-utf8* option is
-used.
-
-=== OPTIONS
-
-*-c*, *--config=FILE*::
-  Override the default configuration file.
-
-*-v*, *--verbose*::
-  Turn on verbose output.
-
-*-i*, *--inplace*::
-  Prettify and overwrite the given files in place.
-
-*-d*, *--defaults*::
-  Dump default config and exit.
-
-*-?*, *--help*::
-  Output help text and exit.
-
-*--version*::
-  Output version information and exit.
-
-*--no-utf8*::
-  Don't assume that STDIN is encoded UTF-8, and don't force UTF-8 output.
-
-== AUTHOR
-
-This manual page was originally written by Sean Whitton
-<\spwhitton@spwhitton.name> for the Debian GNU/Linux system (but may be
-used by others).