From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Oct 2011 11:53:19 +0000 (+0200)
Subject: Merge branch 'bugfixes' of git://github.com/dirkhh/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=7783387b978e5c13a415d0076ab9ff8e1c45bf4c;hp=4cf4b9ca28a7a8918bec6198c51af97f96712ba6;p=ext%2Fsubsurface.git

Merge branch 'bugfixes' of git://github.com/dirkhh/subsurface

* 'bugfixes' of git://github.com/dirkhh/subsurface:
  Updated changes file
  Create packaging directory and add spec and changes file
  Makefile fixes
---

diff --git a/Makefile b/Makefile
index 2d86d48..4be5991 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.0
+VERSION=1.1
 
 CC=gcc
 CFLAGS=-Wall -Wno-pointer-sign -g
@@ -113,7 +113,7 @@ libdivecomputer.o: libdivecomputer.c dive.h display.h display-gtk.h libdivecompu
 			$(LIBDIVECOMPUTERCFLAGS) \
 			-c libdivecomputer.c
 
-gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h
+gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h Makefile
 	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0 gconf-2.0` \
 			$(LIBDIVECOMPUTERCFLAGS) \
 			-DVERSION_STRING='"v$(VERSION)"' \