[SCM] single/multiplayer lobby for the Spring RTS engine branch, master, updated. debian/0.34-2-3-g3a1930a
Marco Amadori
marco.amadori at gmail.com
Tue Dec 1 16:14:51 UTC 2009
The following commit has been merged in the master branch:
commit 3a1930aed3695077f6f011eab5e654d7b2d8f931
Author: Marco Amadori <marco.amadori at gmail.com>
Date: Tue Dec 1 16:50:46 2009 +0100
New upstream release 0.40.
* Adapted packaging for cmake buildsystem.
* Refined copyright informations.
diff --git a/debian/changelog b/debian/changelog
index ac7b415..6779c11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-springlobby (0.34-2) unstable; urgency=low
+springlobby (0.40-1) unstable; urgency=low
+
+ [ Marco Amadori ]
+ * New upstream release.
+ * Migrated packaging to the new upstream build system (cmake).
+ * Revised authors list.
[ Bruno "Fuddl" Kleinert]
* Don't hardwire parallel instances of make to 8 in debian/rules. Use
DEB_BUILD_OPTIONS instead. (Closes: #558759)
- -- Bruno "Fuddl" Kleinert <fuddl at debian.org> Mon, 30 Nov 2009 22:51:14 +0100
+ -- Marco Amadori <marco.amadori at gmail.com> Tue, 01 Dec 2009 19:15:06 +0100
springlobby (0.34-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 46c1485..e2f1eee 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~), 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
+Build-Depends: debhelper (>= 7.0.50~), cmake, libwxgtk2.8-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 9685ca7..5c03a8c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,22 @@
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=59
Name: SpringLobby
Maintainer: The SpringLobby Team:
+ Andrea Piras <braindamage at springlobby.info>
+ Arvid Norberg <arvid at arvid.local>
+ Collin J. Sutton <collin.sutton at gmail.com>
+ Dmytry Lavrov <dmytryl at gmail.com>
+ Jan Holthusen <JHolthusen at web.de>
+ Jon Morton <jonanin at gmail.com>
+ Jonanin <jonanin at gmail.com>
+ Kaot <Kaot at Springlobby.info>
+ Lasse Karkkainen <unknown>
+ Leo Moisio <semi at springlobby.info>
+ Ole Martin Solaas <omsolaas at gmail.com>
René Milk <koshi at springlobby.info>
- tc
- olemars <omsolaas at gmail.com>
- semi at springlobby.info
- braindamage
- -jk-
+ Tiziano <tiziano at tizbac.dyndns.org>
+ Tobi Vollebregt <tobivollebregt at gmail.com>
+ Tommy Carlsson <tc at springlobby.info>
+ Vincenzo Di Massa <vincenzo.dimassa at itsme.it>
Packaged-By: Marco Amadori <marco.amadori at gmail.com>
Packaged-Date: Tue, 20 Oct 2009 13:00:00 +0200
Source: http://springlobby.info
@@ -17,25 +27,15 @@ 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'.
-Files: src/libtorrent/include/*, src/libtorrent/src/*
-Copyright: 2003-2007 Arvid Norberg
- 2003-2006, Magnus Jonsson
- 2006, Un Shyam
- 2006, MassaRoddel
- 2003, Daniel Wallin
- 2004-2005, Cory Nelson
-License: BSD
- On Debian systems, the complete text of the BSD License
- can be found in `/usr/share/common-licenses/BSD'.
-
-Files: src/libtorrent/zlib/*
-Copyright: 1995-2005 Jean-loup Gailly, Mark Adler
-License: zlib/libpng
-
-Files: src/libtorrent/include/libtorrent/utf8.hpp
-Copyright: 2004-2005, Cory Nelson
-License: zlib/libpng
+Files: src/settings++/*
+Copyright: 2007, Kloot
+ 2009, René Milk <koshi at springlobby.info>
+License: GPL-3+
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+Files: src/utils/md5.*
+Copyright: 1999, 2000, 2002 Aladdin Enterprises
License: zlib/libpng
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -53,42 +53,6 @@ License: zlib/libpng
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
-Files: src/libtorrent/include/libtorrent/*variant*.hpp
-Copyright: 2004, Daniel Wallin
-License: BSL-1.0
-
-Files: src/libtorrent/asio/*
-Copyright: 2003,2008, Christopher M. Kohlhoff <chris at kohlhoff dot com>
- 2005, Voipster <Indrek dot Juhani at voipster do>
-License: BSL-1.0
-
-License: BSL-1.0
- from http://www.boost.org/LICENSE_1_0.txt:
- .
- Boost Software License - Version 1.0 - August 17th, 2003
- .
- Permission is hereby granted, free of charge, to any person or organization
- obtaining a copy of the software and accompanying documentation covered by
- this license (the "Software") to use, reproduce, display, distribute,
- execute, and transmit the Software, and to prepare derivative works of the
- Software, and to permit third-parties to whom the Software is furnished to
- do so, all subject to the following:
- .
- The copyright notices in the Software and this entire statement, including
- the above license grant, this restriction and the following disclaimer,
- must be included in all copies of the Software, in whole or in part, and
- all derivative works of the Software, unless such copies or derivative
- works are solely in the form of machine-executable object code generated by
- a source language processor.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
Files: debian/*
Copyright: 2009, Marco Amadori
License: GPL-3
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..b4fc787
--- /dev/null
+++ b/debian/links
@@ -0,0 +1 @@
+/usr/share/man/man6/springlobby.6.gz /usr/share/man/man6/springlobby.real.6.gz
diff --git a/debian/rules b/debian/rules
index 741a9fe..eedf266 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,20 +16,28 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
override_dh_auto_configure:
- dh_auto_configure -- --bindir=/usr/games --localedir=/usr/share/locale --disable-torrent-system
+ dh_auto_configure -- -DOPTION_TORRENT_SYSTEM=OFF
override_dh_auto_build:
+dh_auto_build
$(MAKE) -C debian/manpages
+override_dh_installchangelogs:
+ dh_installchangelogs ChangeLog
+
override_dh_auto_install:
+dh_auto_install
cd $(PROGDIR)/usr/share/doc/springlobby && \
- rm COPYING INSTALL AUTHORS && \
- gzip -9 ChangeLog README THANKS
+ rm -fv COPYING AUTHORS && \
+ gzip -9 README THANKS NEWS
+
# install launcher
- mv $(PROGDIR)/usr/games/springlobby $(PROGDIR)/usr/games/springlobby.real
+ mkdir -p $(PROGDIR)/usr/games
+ mv $(PROGDIR)/usr/bin/springsettings $(PROGDIR)/usr/games/
+ mv $(PROGDIR)/usr/bin/springlobby $(PROGDIR)/usr/games/springlobby.real
install debian/springlobby.launcher $(PROGDIR)/usr/games/springlobby
+ # remove empty dirs (/usr/bin expected until an CMake bindir is provided)
+ find $(PROGDIR) -type d -empty -delete
override_dh_auto_clean:
+dh_auto_clean
diff --git a/debian/springlobby.launcher b/debian/springlobby.launcher
old mode 100755
new mode 100644
--
single/multiplayer lobby for the Spring RTS engine
More information about the Pkg-games-commits
mailing list