[commit: packages/xhtml] master: Finalize for 3000.2.2 release (6358594)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/xhtml

On branch  : master
Link       : http://git.haskell.org/packages/xhtml.git/commitdiff/6358594eb5139f6760e2ada72718d69fed5a1015

>---------------------------------------------------------------

commit 6358594eb5139f6760e2ada72718d69fed5a1015
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Jun 17 22:53:25 2017 +0200

    Finalize for 3000.2.2 release


>---------------------------------------------------------------

6358594eb5139f6760e2ada72718d69fed5a1015
 .gitignore   | 4 +++-
 ChangeLog.md | 5 +++++
 xhtml.cabal  | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 468db0f..c487581 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 .project
-dist
+dist/
+dist-newstyle/
 GNUmakefile
 dist-install/
 ghc.mk
 test.hs
 .hub
+.ghc.environment.*
diff --git a/ChangeLog.md b/ChangeLog.md
new file mode 100644
index 0000000..2030f31
--- /dev/null
+++ b/ChangeLog.md
@@ -0,0 +1,5 @@
+## 3000.2.2
+
+- Add `Semigroup Html` instance
+- Update to `cabal-version:>=1.10`
+- Clean-up compiler warnings
diff --git a/xhtml.cabal b/xhtml.cabal
index 104bc64..fba4bbc 100644
--- a/xhtml.cabal
+++ b/xhtml.cabal
@@ -16,6 +16,7 @@ Homepage:           https://github.com/haskell/xhtml
 Bug-Reports:        https://github.com/haskell/xhtml/issues
 Build-type:         Simple
 Cabal-version:      >= 1.10
+extra-source-files: ChangeLog.md
 
 Source-repository head
     type:           git