Package: springlobby Version: 0.63-1 Severity: wishlist Tags: patch please update springlobby to the latest upstream version and enable bittorrent support. The attached patch series against the git repository linked at the PTS page performs the necessary modifications. You just need to do these steps
uscan --destdir=../tarballs
git-import-org ../tarballs/springlobby-0.63.tar.gz
cat dirwithpatches/*.patch | git am
.. usual build preparations (dch -r, git commit, git-buildpackage)
I built the package in a sid pbuilder root without problems.
Regards
Jan Dittberner
--
Jan Dittberner - Debian Developer
GPG-key: 4096R/558FB8DD 2009-05-10
B2FF 1D95 CE8F 7A22 DF4C F09B A73E 0055 558F B8DD
http://ddportfolio.debian.net/ - http://people.debian.org/~jandd/
From 1e135433b9103d12623e1e7fe0e2b7713e2350f1 Mon Sep 17 00:00:00 2001 From: Jan Dittberner <[email protected]> Date: Thu, 11 Feb 2010 13:10:16 +0100 Subject: [PATCH 1/5] update to upstream version 0.63 --- debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/debian/changelog b/debian/changelog index f0a4888..d20eb9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +springlobby (0.63-1) UNRELEASED; urgency=low + + * new upstream version 0.63. + + -- Jan Dittberner <[email protected]> Thu, 11 Feb 2010 13:10:05 +0100 + springlobby (0.44-2) unstable; urgency=low * Added the -dbg debug package. -- 1.6.6.1
From ece9ac8ab7ba571530212f0055f9fad88c4ba079 Mon Sep 17 00:00:00 2001 From: Jan Dittberner <[email protected]> Date: Thu, 11 Feb 2010 13:13:31 +0100 Subject: [PATCH 2/5] remove /debian export-ignore from .git-attributes --- .gitattributes | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 51fb73f..1ff26a2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,4 @@ /buildbot export-ignore -/debian export-ignore -/debian export-ignore /gentoo export-ignore /images export-ignore /rpm export-ignore -- 1.6.6.1
From 8ea13b1d86a7fac503b705a8dad906e439328df1 Mon Sep 17 00:00:00 2001 From: Jan Dittberner <[email protected]> Date: Thu, 11 Feb 2010 13:25:53 +0100 Subject: [PATCH 3/5] remove debian/patches/0001-properly-define-LOCALE_INSTALL_DIR.patch --- debian/changelog | 5 ++ debian/control | 4 +- .../0001-properly-define-LOCALE_INSTALL_DIR.patch | 41 -------------------- debian/patches/series | 1 - debian/rules | 4 +- 5 files changed, 10 insertions(+), 45 deletions(-) delete mode 100644 debian/patches/0001-properly-define-LOCALE_INSTALL_DIR.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index d20eb9e..2a9445c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ springlobby (0.63-1) UNRELEASED; urgency=low * new upstream version 0.63. + * remove debian/patches/0001-properly-define-LOCALE_INSTALL_DIR.patch + which has been applied upstream + - remove debian/patches/series + - debian/control: remove quilt from Build-Depends + - debian/rules: remove --with quilt -- Jan Dittberner <[email protected]> Thu, 11 Feb 2010 13:10:05 +0100 diff --git a/debian/control b/debian/control index 9ad430a..f6b5762 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,9 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Marco Amadori <[email protected]> -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, quilt +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/patches/0001-properly-define-LOCALE_INSTALL_DIR.patch b/debian/patches/0001-properly-define-LOCALE_INSTALL_DIR.patch deleted file mode 100644 index a97ec4f..0000000 --- a/debian/patches/0001-properly-define-LOCALE_INSTALL_DIR.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 574ba70663a8dd71bb2447c8fc6ad5a0f4ec9287 Mon Sep 17 00:00:00 2001 -From: Rene Milk <[email protected]> -Date: Tue, 15 Dec 2009 22:50:02 +0100 -Subject: [PATCH] properly define LOCALE_INSTALL_DIR - ---- - CMakeLists.txt | 2 +- - src/springlobbyapp.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6b86d6d..89db64d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -209,7 +209,7 @@ ENDIF(WIN32) - if( OPTION_TRANSLATION_SUPPORT ) - include ( ${CMAKE_SOURCE_DIR}/po/CMakeLists.txt ) - endif( OPTION_TRANSLATION_SUPPORT ) -- -+ADD_DEFINITIONS( -DLOCALE_INSTALL_DIR="${LOCALE_INSTALL_DIR}" ) - #---------------------------------------------------------------------------------------------------- - # Build target defintions - #---------------------------------------------------------------------------------------------------- -diff --git a/src/springlobbyapp.cpp b/src/springlobbyapp.cpp -index 8144ff0..4443374 100644 ---- a/src/springlobbyapp.cpp -+++ b/src/springlobbyapp.cpp -@@ -112,8 +112,8 @@ bool SpringLobbyApp::OnInit() - #ifdef __WXMSW__ - wxString path = wxPathOnly( wxStandardPaths::Get().GetExecutablePath() ) + wxFileName::GetPathSeparator() + _T("locale"); - #else -- #if defined(LOCALEDIR) -- wxString path ( _T(LOCALEDIR) ); -+ #if defined(LOCALE_INSTALL_DIR) -+ wxString path ( _T(LOCALE_INSTALL_DIR) ); - #else - // use a dummy name here, we're only interested in the base path - wxString path = wxStandardPaths::Get().GetLocalizedResourcesDir(_T("noneWH"),wxStandardPaths::ResourceCat_Messages); --- -1.6.5.4 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index a228202..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-properly-define-LOCALE_INSTALL_DIR.patch diff --git a/debian/rules b/debian/rules index fadfdaf..6fede39 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,7 @@ override_dh_auto_install: cd $(PROGDIR)/usr/share/doc/springlobby && \ rm -fv COPYING AUTHORS && \ gzip -9 README THANKS NEWS - + # install launcher mkdir -p $(PROGDIR)/usr/games mv $(PROGDIR)/usr/bin/springsettings $(PROGDIR)/usr/games/ @@ -50,4 +50,4 @@ override_dh_auto_clean: $(MAKE) -C debian/manpages clean %: - +dh --buildsystem=cmake --with quilt $@ + +dh --buildsystem=cmake $@ -- 1.6.6.1
From 1c6429ce3d25e2c45ff47faf69486bc7f2e927ad Mon Sep 17 00:00:00 2001 From: Jan Dittberner <[email protected]> Date: Thu, 11 Feb 2010 13:35:54 +0100 Subject: [PATCH 4/5] fix Build-Depends --- debian/changelog | 2 ++ debian/control | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2a9445c..e4c1afa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ springlobby (0.63-1) UNRELEASED; urgency=low - remove debian/patches/series - debian/control: remove quilt from Build-Depends - debian/rules: remove --with quilt + * debian/control: fix Build-Depends, remove libsdl*, add libopenal-dev, + libcurl4-gnutls-dev, libtorrent-rasterbar-dev -- Jan Dittberner <[email protected]> Thu, 11 Feb 2010 13:10:05 +0100 diff --git a/debian/control b/debian/control index f6b5762..4a22068 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Marco Amadori <[email protected]> -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 +Build-Depends: debhelper (>= 7.0.50~), cmake, libwxgtk2.8-dev, asciidoc, + xsltproc, docbook-xsl, libopenal-dev, libcurl4-gnutls-dev, + libtorrent-rasterbar-dev Standards-Version: 3.8.3 Homepage: http://springlobby.info Vcs-Browser: http://git.debian.org/?p=pkg-games/springlobby.git;a=summary -- 1.6.6.1
From c006243e89501d5d7a8651c4815b43c3e58df335 Mon Sep 17 00:00:00 2001 From: Jan Dittberner <[email protected]> Date: Thu, 11 Feb 2010 13:48:22 +0100 Subject: [PATCH 5/5] enable torrent system --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4c1afa..a75ce36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ springlobby (0.63-1) UNRELEASED; urgency=low - debian/rules: remove --with quilt * debian/control: fix Build-Depends, remove libsdl*, add libopenal-dev, libcurl4-gnutls-dev, libtorrent-rasterbar-dev + * debian/rules: enable torrent system -- Jan Dittberner <[email protected]> Thu, 11 Feb 2010 13:10:05 +0100 diff --git a/debian/rules b/debian/rules index 6fede39..d3a84ee 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif override_dh_auto_configure: - dh_auto_configure -- -DOPTION_TORRENT_SYSTEM=OFF -DSPRINGLOBBY_REV:STRING=$(SLVERSION) -DCMAKE_BUILD_TYPE=RELWITHDEBINFO + dh_auto_configure -- -DSPRINGLOBBY_REV:STRING=$(SLVERSION) -DCMAKE_BUILD_TYPE=RELWITHDEBINFO override_dh_auto_build: +dh_auto_build -- 1.6.6.1
signature.asc
Description: Digital signature
