Update ChangeLog and bump version for v1.2.2 release.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

.travis.yml

@@ -1,7 +1,9 @@
 # Travis CI integration -- https://travis-ci.org/troglobit/libuev
+# Defaults to GNU GCC and autotools: ./configure && make && make test
 language: c
-compiler:
+
-  - gcc
+# We don't need to install packages, use dockerized build, quicker
+sudo: false
 
 env:
   global:

CHANGELOG.md

@@ -3,6 +3,22 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
+[v1.2.2] - 2015-08-30
+---------------------
+
+Minor bugfix release.
+
+### Changes
+- The `ifdef STATIC` in the Makefile has been removed.  Now both the
+  .a and .so libraries are built.  The user may then select what to
+  install.  This is a change for convenience when using libuEv from
+  a GNU Configure & Build based project.
+
+### Fixes
+- Fix odd data ordering issue on Debian Jessie in new `uev_private_t`
+- Fix issue #6: Segfault when stopping timer before calling `uev_exit()`
+
+
 [v1.2.1] - 2015-07-02
 ---------------------
 
@@ -141,7 +157,7 @@ v0.0.1 - 2012-03-17
 users mailing list.
 
 [UNRELEASED]: https://github.com/troglobit/libuev/compare/v1.2.1...HEAD
-[v1.2.0]: https://github.com/troglobit/libuev/compare/v1.2.0...v1.2.1
+[v1.2.1]: https://github.com/troglobit/libuev/compare/v1.2.0...v1.2.1
 [v1.2.0]: https://github.com/troglobit/libuev/compare/v1.1.0...v1.2.0
 [v1.1.0]: https://github.com/troglobit/libuev/compare/v1.0.5...v1.1.0
 [v1.0.5]: https://github.com/troglobit/libuev/compare/v1.0.4...v1.0.5

Makefile

@@ -27,7 +27,7 @@
 ROOTDIR    ?= $(shell pwd)
 
 #VERSION    = $(shell git tag -l | tail -1)
-VERSION    ?= 1.2.1
+VERSION    ?= 1.2.2
 NAME        = libuev
 PKG         = $(NAME)-$(VERSION)
 ARCHIVE     = $(PKG).tar.xz
@@ -50,18 +50,14 @@ HEADERS     = uev.h private.h queue.h
 OBJS       := uev.o io.o timer.o signal.o
 SRCS       := $(OBJS:.o=.c)
 DEPS       := $(SRCS:.c=.d)
-JUNK        = *~ *.bak *.map .*.d DEADJOE *.gdb *.elf core core.* *.html
+JUNK        = *~ *.bak *.map .*.d *.so* *.a DEADJOE *.gdb *.elf core core.* *.html
 
 VER         = 1
 LIBNAME     = $(NAME)
 SOLIB       = $(LIBNAME).so.$(VER)
 SYMLIB      = $(LIBNAME).so
 STATICLIB   = $(LIBNAME).a
-ifdef STATIC
+TARGET      = $(STATICLIB) $(SOLIB)
-TARGET      = $(STATICLIB)
-else
-TARGET      = $(SOLIB)
-endif
 
 # Default install paths
 prefix     ?= /usr/local
@@ -89,12 +85,10 @@ $(STATICLIB): Makefile $(OBJS)
 	@$(AR) $(ARFLAGS) $@ $(OBJS)
 
 install-exec: all
-ifndef STATIC
 	@printf "  INSTALL $(DESTDIR)$(libdir)/$(SOLIB)\n"
 	@install -d $(DESTDIR)$(libdir)
 	@install $(SOLIB) $(DESTDIR)$(libdir)/$(SOLIB)
 	@ln -sf $(SOLIB) $(DESTDIR)$(libdir)/$(SYMLIB)
-endif
 
 install-dev:
 	@install -d $(DESTDIR)$(incdir)/$(LIBNAME)
@@ -102,11 +96,9 @@ install-dev:
 		printf "  INSTALL $(DESTDIR)$(incdir)/$(LIBNAME)/$$file\n";	\
 		install -m 0644 $$file $(DESTDIR)$(incdir)/$(LIBNAME)/$$file;	\
 	done
-ifdef STATIC
 	@printf "  INSTALL $(DESTDIR)$(libdir)/$(STATICLIB)\n"
 	@install -d $(DESTDIR)$(libdir)
 	@install $(STATICLIB) $(DESTDIR)$(libdir)/$(STATICLIB)
-endif
 	@install -d $(DESTDIR)$(datadir)
 	@for file in $(DISTFILES); do					\
 		printf "  INSTALL $(DESTDIR)$(datadir)/$$file\n";	\

README.md

@@ -293,7 +293,7 @@ used for inspiration is the very small [Picoev][9] by [Oku Kazuho].
 [Flemming Madsen]: http://www.madsensoft.dk
 [Dave Zarzycki, Apple]: http://www.youtube.com/watch?v=cD_s6Fjdri8
 
-[libuEv] is developed and maintained by [Joachim Nilsson]
+[libuEv] is developed and maintained by [Joachim Nilsson].
 
 <!--
   -- Local Variables:

timer.c

@@ -154,12 +154,12 @@ int uev_timer_start(uev_t *w)
  */
 int uev_timer_stop(uev_t *w)
 {
-	if (uev_watcher_stop(w))
-		return -1;
-
 	/* Stop kernel timer */
 	uev_timer_set(w, 0, 0);
 
+	if (uev_watcher_stop(w))
+		return -1;
+
 	/* Close timerfd, will have to be reopened again on reset */
 	close(w->fd);
 	w->fd = -1;

uev.h

@@ -41,10 +41,12 @@
 
 /* Event watcher */
 typedef struct uev {
+	/* Private data for libuEv internal engine */
+	uev_private_t   type;
+
+	/* Public data for users to reference  */
 	int             fd;
 	uev_ctx_t      *ctx;
-
-	uev_private_t   type;
 } uev_t;
 
 /* Generic callback for watchers */