From 2601f1490b55efe6c08e9ead499582dbcafeb4c3 Mon Sep 17 00:00:00 2001 From: velnias75 Date: Fri, 22 May 2015 11:20:35 +0200 Subject: [PATCH] bumped version to 0.19.0 --- .gitignore | 6 +++--- Makefile.am | 2 +- THANKS | 5 +++++ configure.ac | 2 +- debian/changelog | 4 ++-- debian/control | 3 +-- debian/netmaumau-server-common.docs | 2 ++ debian/source/options | 10 ++++++++++ src/server/netmaumau.rc.in | 4 ++-- 9 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 THANKS create mode 100644 debian/netmaumau-server-common.docs diff --git a/.gitignore b/.gitignore index 5656675..fc3d155 100644 --- a/.gitignore +++ b/.gitignore @@ -48,8 +48,11 @@ netmaumau.h2m netmaumau.kdev4 netmaumau.pc netmaumau-*.tar.xz +nmm-ai.flw *.o release +src/ai/.deps/ +src/ai/.libs/ src/client/.deps/ src/client/.libs src/client/Makefile @@ -103,6 +106,3 @@ start-server.sh test-driver V*.xml win32 -src/ai/.deps/ -src/ai/.libs/ -nmm-ai.flw diff --git a/Makefile.am b/Makefile.am index 0d35ec9..e06f560 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ noinst_SCRIPTS = start-server.sh ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = COPYING netmaumau.ico netmaumau.xinetd.in netmaumau.pc.in start-server.sh.in +EXTRA_DIST = COPYING THANKS netmaumau.ico netmaumau.xinetd.in netmaumau.pc.in start-server.sh.in if XINETD CLEANFILES = netmaumau diff --git a/THANKS b/THANKS new file mode 100644 index 0000000..fc9603a --- /dev/null +++ b/THANKS @@ -0,0 +1,5 @@ +Thanks are going to: + +Catherine Maria Touhami +Christoph Korn +Julian Ospald diff --git a/configure.ac b/configure.ac index 877b479..a44ebd8 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.61]) -AC_INIT([NetMauMau], [0.18.2], [heiko@rangun.de], [netmaumau], [https://github.com/velnias75/NetMauMau]) +AC_INIT([NetMauMau], [0.19.0], [heiko@rangun.de], [netmaumau], [https://github.com/velnias75/NetMauMau]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip tar-pax no-installinfo no-texinfo.tex]) AM_MAINTAINER_MODE diff --git a/debian/changelog b/debian/changelog index 10abb24..4736fec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -netmaumau (0.18.2) UNRELEASED; urgency=low +netmaumau (0.19.0) UNRELEASED; urgency=low * improved ace/king/queen rounds * fixed endless loop of AI under some circumstances - -- Heiko Schäfer Mon, 18 May 2015 20:46:31 +0200 + -- Heiko Schäfer Fri, 22 May 2015 08:06:37 +0200 netmaumau (0.18.0) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index 98aedbe..94e3916 100644 --- a/debian/control +++ b/debian/control @@ -24,8 +24,7 @@ Homepage: http://sourceforge.net/projects/netmaumau/ Package: netmaumau-client Architecture: any Pre-Depends: dpkg (>= 1.15.6~) -Depends: netmaumau-client-api-15, - ${misc:Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends} Suggests: nmm-qt-client Description: Server for the popular card game Mau Mau - console client diff --git a/debian/netmaumau-server-common.docs b/debian/netmaumau-server-common.docs new file mode 100644 index 0000000..45b68aa --- /dev/null +++ b/debian/netmaumau-server-common.docs @@ -0,0 +1,2 @@ +COPYING +THANKS diff --git a/debian/source/options b/debian/source/options index 74a452b..f197f75 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,2 +1,12 @@ compression = "xz" compression-level = 9 +tar-ignore = .svn +tar-ignore = .git +tar-ignore = .gitignore +tar-ignore = V*.xml +tar-ignore = netmaumau.ico +tar-ignore = "DIE\ OFFIZIELLEN\ MAUMAU\ SPIELREGELN.pdf" +tar-ignore = *.patch +tar-ignore = config.log +tar-ignore = nmm-ai.flw + diff --git a/src/server/netmaumau.rc.in b/src/server/netmaumau.rc.in index 092cb2b..7155c81 100755 --- a/src/server/netmaumau.rc.in +++ b/src/server/netmaumau.rc.in @@ -20,8 +20,8 @@ IDI_ICON1 ICON DISCARDABLE "@top_srcdir@/netmaumau.ico" 1 VERSIONINFO - FILEVERSION 0,0,18,2 - PRODUCTVERSION 0,0,18,2 + FILEVERSION 0,0,19,0 + PRODUCTVERSION 0,0,19,0 FILEFLAGSMASK 0x17L #ifndef NDEBUG FILEFLAGS 0x1L