[SCM] single/multiplayer lobby for the Spring RTS engine branch, master, updated. 5f6378d1c9fca51555a630051e8e29d54957d8a7

[Marco Amadori]

The following commit has been merged in the master branch:
commit 5f6378d1c9fca51555a630051e8e29d54957d8a7
Author: Marco Amadori <marco.amadori at gmail.com>
Date:   Mon Nov 2 17:48:54 2009 +0100

    Removed libtorrent-rasterbar dependency.
    
    * This removes the GPL conflict with openssl version of
      libtorrent-rasterbar, it will be re-enabled when a openssl free
      version of libtorrent-rasterbar will be available in the archives or a
      license amendement will be added by upstream developers.

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..53e1ce7
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,7 @@
+* Mon Nov  2 17:33:45 CET 2009
+
+This release has p2p disabled due to openssl license conflicts.
+
+When a libtorrent-rasterbar package will available without openssl linked in
+or upstream will amend it's license with the openssl exception, a new release
+of SprinLobby packaging will be made available.
diff --git a/debian/changelog b/debian/changelog
index 98f91f2..2d404f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 springlobby (0.33-1) unstable; urgency=low
 
   * Initial release (Closes: #550250).
+  * This release has p2p disabled due to openssl license conflicts, look at
+    README.Debian.
 
- -- Marco Amadori <marco.amadori at gmail.com>  Tue, 27 Oct 2009 14:00:00 +0100
+ -- Marco Amadori <marco.amadori at gmail.com>  Mon, 02 Nov 2009 20:30:00 +0100
diff --git a/debian/control b/debian/control
index 5cec0fc..e0f4774 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Marco Amadori <marco.amadori at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.40), libwxgtk2.8-dev, libstdc++6-4.3-dev | libstdc++-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, libtorrent-rasterbar-dev (>= 0.14.1), asciidoc, xsltproc, docbook-xsl
+Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.40), libwxgtk2.8-dev, libstdc++6-4.3-dev | libstdc++-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, asciidoc, xsltproc, docbook-xsl
 Standards-Version: 3.8.3
 Homepage: http://springlobby.info
 Vcs-Browser: http://git.debian.org/?p=pkg-games/springlobby.git;a=summary
diff --git a/debian/copyright b/debian/copyright
index 31b7da0..7c43699 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,9 +16,6 @@ Copyright: 2006-2009, The SpringLobby Developers
 License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-Disclaimer: although SpringLobby links libtorrent-rasterbar, which could be
- built with openssl, SpringLobby uses none of its symbols (as in objdump -x
- springlobby | grep NEEDED); so no exception is needed.
 
 Files: debian/*
 Copyright: 2009, Marco Amadori
diff --git a/debian/rules b/debian/rules
index 9c3f7b2..42b20bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ PROGDIR := $(CURDIR)/debian/springlobby
 export DEB_BUILD_OPTIONS=parallel=8
 
 override_dh_auto_configure:
-	dh_auto_configure -- --bindir=/usr/games --localedir=/usr/share/locale
+	dh_auto_configure -- --bindir=/usr/games --localedir=/usr/share/locale --disable-torrent-system
 
 override_dh_auto_build:
 	+dh_auto_build
diff --git a/debian/springlobby.lintian-overrides b/debian/springlobby.lintian-overrides
deleted file mode 100644
index 1762667..0000000
--- a/debian/springlobby.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-springlobby: possible-gpl-code-linked-with-openssl

-- 
single/multiplayer lobby for the Spring RTS engine