Manaserv disabled in compilation scripts as deprecated.

7 files changed, 12 insertions, 10 deletions

diff --git a/bmake b/bmake
index 1eebfb5db..d62f4a23c 100755
--- a/bmake
+++ b/bmake
@@ -38,8 +38,7 @@ autoreconf -i
 ./configure --prefix=$dir/run \
             --datadir=$dir/run/share/games \
             --bindir=$dir/run/bin \
-            --mandir=$dir/run/share/man \
-            --enable-manaserv=yes
+            --mandir=$dir/run/share/man
 
 cd po
 #make -j5 update-po 2>../make1.log
diff --git a/bmake44 b/bmake44
index acd11e99e..af2422028 100755
--- a/bmake44
+++ b/bmake44
@@ -38,8 +38,7 @@ autoreconf -i
 ./configure --prefix=$dir/run \
             --datadir=$dir/run/share/games \
             --bindir=$dir/run/bin \
-            --mandir=$dir/run/share/man \
-            --enable-manaserv=yes
+            --mandir=$dir/run/share/man
 
 cd po
 #make -j5 update-po 2>../make1.log
diff --git a/bmake46 b/bmake46
index 28dd9e3d3..4afc100ac 100755
--- a/bmake46
+++ b/bmake46
@@ -53,8 +53,7 @@ autoreconf -i
 ./configure --prefix=$dir/run \
             --datadir=$dir/run/share/games \
             --bindir=$dir/run/bin \
-            --mandir=$dir/run/share/man \
-            --enable-manaserv=yes
+            --mandir=$dir/run/share/man
 
 cd po
 #make -j5 update-po 2>../make1.log
diff --git a/packaging/debian/changelog.in b/packaging/debian/changelog.in
index 4e1a85704..d9411de1d 100644
--- a/packaging/debian/changelog.in
+++ b/packaging/debian/changelog.in
@@ -1,3 +1,9 @@
+manaplus (1:1.1.4.3-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 02 Apr 2011 19:38:18 +0300
+
 manaplus (1:1.1.3.30-1%DIST%) unstable; urgency=low
 
   * New upstream release.
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 1a88b6f52..2a5ad6150 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -12,8 +12,7 @@ config.status:
 	dh_testdir
 	CFLAGS="$(CFLAGS) -Wall" ./configure --host=$(DEB_HOST_GNU_TYPE) \
 	--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
-	--datadir=/usr/share/games --bindir=/usr/games --mandir=/usr/share/man \
-	--enable-manaserv=yes
+	--datadir=/usr/share/games --bindir=/usr/games --mandir=/usr/share/man
 
 build: build-stamp
 build-stamp: config.status
diff --git a/toolchain.cmake b/toolchain.cmake
index 31d4bc6ba..341a267db 100644
--- a/toolchain.cmake
+++ b/toolchain.cmake
@@ -19,7 +19,7 @@ SET(SDLMIXER_INCLUDE_DIR ../mana_win/libs/include/SDL)
 SET(SDLNET_INCLUDE_DIR ../mana_win/libs/include/SDL)
 SET(SDLTTF_INCLUDE_DIR ../mana_win/libs/include/SDL)
 SET(SDL_INCLUDE_DIR ../mana_win/libs/include/SDL)
-SET(ENABLE_MANASERV ON)
+# SET(ENABLE_MANASERV ON)
 
 # here is the target environment located
 SET(CMAKE_FIND_ROOT_PATH  /usr/i586-mingw32msvc /../mana_win/libs )
diff --git a/toolchain.nightly b/toolchain.nightly
index c83d9b0c7..d92a292ba 100644
--- a/toolchain.nightly
+++ b/toolchain.nightly
@@ -19,7 +19,7 @@ SET(SDLMIXER_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
 SET(SDLNET_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
 SET(SDLTTF_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
 SET(SDL_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
-SET(ENABLE_MANASERV ON)
+# SET(ENABLE_MANASERV ON)
 
 # here is the target environment located
 SET(CMAKE_FIND_ROOT_PATH  /usr/i586-mingw32msvc ./packaging/windows/ )