[SCM] transportation simulator branch, master, updated. debian/102.2.2.ds1-1-21-g99a3ce9

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 37c4a3ae6467d05f505679b4bd460f4730689aef
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Wed Feb 16 23:04:07 2011 +0100

    Link less libraries into makeobj.

diff --git a/debian/patches/link-less-libraries.diff b/debian/patches/link-less-libraries.diff
new file mode 100644
index 0000000..b0edf7a
--- /dev/null
+++ b/debian/patches/link-less-libraries.diff
@@ -0,0 +1,19 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Date: Wed, 16 Feb 2011 23:01:47 +0100
+Subject: Link less libraries into makeobj
+
+This fixes the following warnings from dpkg-shlibdeps:
+
+  dpkg-shlibdeps: warning: dependency on libz.so.1 could be avoided if "debian/simutrans-makeobj/usr/games/makeobj" were not uselessly linked against it (they use none of its symbols).
+  dpkg-shlibdeps: warning: dependency on libbz2.so.1.0 could be avoided if "debian/simutrans-makeobj/usr/games/makeobj" were not uselessly linked against it (they use none of its symbols).
+--- simutrans.orig/makeobj/Makefile
++++ simutrans/makeobj/Makefile
+@@ -21,7 +21,7 @@
+ CFLAGS += -DMAKEOBJ
+ CXXFLAGS += -DMAKEOBJ
+ 
+-STD_LIBS += -lz -lbz2 -lpng -lm
++STD_LIBS += -lpng -lm
+ 
+ ifeq ($(OSTYPE),cygwin)
+   OS_INC   ?= -I/usr/include/mingw
diff --git a/debian/patches/series b/debian/patches/series
index bcfc336..6681fb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ revert-svn-1937.diff
 path-for-game-data.diff
 config.diff
 sha1-replacement.diff
+link-less-libraries.diff

-- 
transportation simulator