prepare for 0.2.0.0 and give plain cabal a chance

diff --git a/Makefile b/Makefile
index 40bdfde211ecb34ee78352f8a3cb975573441568..caaf2af7cb5dd5468003f43b78a0280fd2ad181e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 DESTDIR=
 pfx=/usr/local
 
+default: build-cabal
+
 build-stack:
        stack setup
        stack build --pedantic
@@ -14,17 +16,17 @@ install-common:
        install -m755 callback $(DESTDIR)$(pfx)/lib/haskell-amqp-utils/
        install -m644 callback.config.sh $(DESTDIR)$(pfx)/lib/haskell-amqp-utils/
 
-install: install-stack install-common
+install: install-cabal install-common
 
 build-cabal:
-       cabal update
-       cabal install --only-dependencies --enable-tests
-       cabal configure --enable-tests
-       cabal build
-       cabal test
+       LANG=C.UTF-8 cabal update
+       LANG=C.UTF-8 cabal install --only-dependencies --enable-tests
+       LANG=C.UTF-8 cabal configure --enable-tests
+       LANG=C.UTF-8 cabal build
+       LANG=C.UTF-8 cabal test
 
 install-cabal: build-cabal
-       cabal install --prefix=$(DESTDIR)$(pfx)
+       LANG=C.UTF-8 cabal install --prefix=$(DESTDIR)$(pfx)
 
 all:   $(subst .hs,,$(wildcard *.hs))
 

diff --git a/amqp-utils.cabal b/amqp-utils.cabal
index 02d4193ff13fbd583c28ace988c4ab9d45a58369..8703b1019a7998189d771c2e0b6672080d0cecc1 100644 (file)
--- a/amqp-utils.cabal
+++ b/amqp-utils.cabal
@@ -6,7 +6,7 @@ name:                amqp-utils
 -- PVP summary:      +-+------- breaking API changes
 --                   | | +----- non-breaking API additions
 --                   | | | +--- code changes with no API change
-version:             0.1.3.0
+version:             0.2.0.0
 
 -- A short (one-line) description of the package.
 synopsis:            Generic Haskell AMQP Consumer

diff --git a/debian/changelog b/debian/changelog
index a145b30c4c418a1a27377bfef3699b31a2f17be4..eb949cc1df67ef4ed61a42e9db8b139e4cd7b355 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+haskell-amqp-utils (0.2.0.0) unstable; urgency=medium
+
+  * Version
+  * indent
+  * english
+  * options --user and --pass
+  * add plain auth and make TLS optional
+  * default guest / guest
+  * remove custom shortcuts
+  * update .gitignore
+  * update examples, make -T toggle TLS
+  * Create README.md
+  * update Makefile with install-cabal
+
+ -- Frank Doepper <[email protected]>  Thu, 16 Feb 2017 19:07:42 +0100
+
 haskell-amqp-utils (0.1.2.8) unstable; urgency=medium
 
   * indentation

diff --git a/debian/control b/debian/control
index d24b76bdc37cc002fd30453db4b1cfe3b43a4dac..20a4ffb624ade4bcc0eaddacc8ff5a306fdcf75c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Maintainer: Frank Doepper <[email protected]>
 Priority: optional
 Section: haskell
 Build-Depends: debhelper (>= 7.0)
-               , stack
+               , ghc
+               , cabal-install
 
 Package: haskell-amqp-utils
 Architecture: any