r14367 - in packages/trunk/performous/debian: . patches

Markus Koschany apo-guest at alioth.debian.org
Sun Jun 30 11:21:43 UTC 2013 

Author: apo-guest
Date: 2013-06-30 11:21:43 +0000 (Sun, 30 Jun 2013)
New Revision: 14367

Added:
   packages/trunk/performous/debian/patches/use-Boost-TIME_UTC_-constant-unconditionally.patch
Removed:
   packages/trunk/performous/debian/patches/boost_filesystem_v2.patch
Modified:
   packages/trunk/performous/debian/changelog
   packages/trunk/performous/debian/control
   packages/trunk/performous/debian/copyright
   packages/trunk/performous/debian/patches/series
Log:
Fix #710625. Release 0.7.0-2.


Modified: packages/trunk/performous/debian/changelog
===================================================================
--- packages/trunk/performous/debian/changelog	2013-06-30 11:10:23 UTC (rev 14366)
+++ packages/trunk/performous/debian/changelog	2013-06-30 11:21:43 UTC (rev 14367)
@@ -1,3 +1,21 @@
+performous (0.7.0-2) unstable; urgency=low
+
+  * Team upload.
+  * debian/control:
+    - Use canonical VCS-URI.
+    - Remove versioned dependencies on boost libraries because they are
+      trivially satisfied now.
+    - Remove superfluous ${shlibs:Depends} substvar from performous-dbg
+      package.
+    - Bump Standards-Version to 3.9.4, no changes.
+  * debian/copyright: Fix lintian issue copyright-refers-to-symlink-license and
+    point to GPL-2 license.
+  * Add use-Boost-TIME_UTC_-constant-unconditionally.patch. Use always the new
+    Boost constant TIME_UTC_ and fix FTBFS with libboost1.49. (Closes: #710625)
+  * Drop boost_filesystem_v2.patch. Not necessary for newer boost versions.
+
+ -- Markus Koschany <apo at gambaru.de>  Sun, 30 Jun 2013 11:59:10 +0200
+
 performous (0.7.0-1) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/performous/debian/control
===================================================================
--- packages/trunk/performous/debian/control	2013-06-30 11:10:23 UTC (rev 14366)
+++ packages/trunk/performous/debian/control	2013-06-30 11:21:43 UTC (rev 14367)
@@ -6,15 +6,15 @@
 Build-Depends: debhelper (>= 9),
  cmake (>= 2.6), pkg-config, help2man, gettext,
  libgl1-mesa-dev, libsdl1.2-dev, libcairo2-dev, librsvg2-dev,
- libboost-thread-dev (>= 1.36), libboost-serialization-dev (>= 1.36),
- libboost-program-options-dev (>= 1.36), libboost-regex-dev (>= 1.36),
- libboost-filesystem-dev (>= 1.36),
+ libboost-thread-dev, libboost-serialization-dev,
+ libboost-program-options-dev, libboost-regex-dev,
+ libboost-filesystem-dev,
  libavcodec-dev, libavformat-dev, libswscale-dev,
  libmagick++-dev, libsamplerate0-dev, libxml++2.6-dev,
  libasound2-dev, libjack-dev, libpulse-dev, portaudio19-dev,
  libgstreamer0.10-dev, libglew1.5-dev, libpango1.0-dev
-Standards-Version: 3.9.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/performous/
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/performous/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/performous/
 Homepage: http://performous.org/
 
@@ -54,7 +54,7 @@
 Priority: extra
 Architecture: any
 Depends: performous (= ${binary:Version}) | performous-tools (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
+ ${misc:Depends}
 Pre-Depends: dpkg (>= 1.15.6)
 Description: karaoke game that allows user supplied songs - debug
  A karaoke, band and dancing game where one or more players perform a song

Modified: packages/trunk/performous/debian/copyright
===================================================================
--- packages/trunk/performous/debian/copyright	2013-06-30 11:10:23 UTC (rev 14366)
+++ packages/trunk/performous/debian/copyright	2013-06-30 11:21:43 UTC (rev 14367)
@@ -42,7 +42,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 The Debian packaging is (c) 2007-2008, Miriam Ruiz <little_miry at yahoo.es>
 and is licensed under the same license as the program, see above.

Deleted: packages/trunk/performous/debian/patches/boost_filesystem_v2.patch
===================================================================
--- packages/trunk/performous/debian/patches/boost_filesystem_v2.patch	2013-06-30 11:10:23 UTC (rev 14366)
+++ packages/trunk/performous/debian/patches/boost_filesystem_v2.patch	2013-06-30 11:21:43 UTC (rev 14367)
@@ -1,19 +0,0 @@
-Description: Set BOOST_FILESYSTEM_VERSION=2
- This prevents FTBFS with boost >= 1.46, which sets
- BOOST_FILESYSTEM_VERSION=3 by default.
-Author: Evgeni Golov <evgeni at debian.org>
-Bug-Debian: http://bugs.debian.org/625109
-
-Index: performous-0.7.0/CMakeLists.txt
-===================================================================
---- performous-0.7.0.orig/CMakeLists.txt	2012-11-12 23:14:08.000000000 +0100
-+++ performous-0.7.0/CMakeLists.txt	2012-11-20 23:57:00.000000000 +0100
-@@ -15,6 +15,8 @@
- 
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
- 
-+add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
-+
- # Add a sensible build type default and warning because empty means no optimization and no debug info.
- if(NOT CMAKE_BUILD_TYPE)
- 	message("WARNING: CMAKE_BUILD_TYPE is not defined!\n         Defaulting to CMAKE_BUILD_TYPE=RelWithDebInfo. Use ccmake to set a proper value.")

Modified: packages/trunk/performous/debian/patches/series
===================================================================
--- packages/trunk/performous/debian/patches/series	2013-06-30 11:10:23 UTC (rev 14366)
+++ packages/trunk/performous/debian/patches/series	2013-06-30 11:21:43 UTC (rev 14367)
@@ -1,4 +1,3 @@
 desktop.patch
-boost_filesystem_v2.patch
 libav0.8.patch
-
+use-Boost-TIME_UTC_-constant-unconditionally.patch

Added: packages/trunk/performous/debian/patches/use-Boost-TIME_UTC_-constant-unconditionally.patch
===================================================================
--- packages/trunk/performous/debian/patches/use-Boost-TIME_UTC_-constant-unconditionally.patch	                        (rev 0)
+++ packages/trunk/performous/debian/patches/use-Boost-TIME_UTC_-constant-unconditionally.patch	2013-06-30 11:21:43 UTC (rev 14367)
@@ -0,0 +1,27 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sun, 30 Jun 2013 11:43:12 +0200
+Subject: use Boost TIME_UTC_ constant unconditionally
+
+Use always the new Boost TIME_UTC_ constant. This patch can be dropped as soon
+as libboost1.53 is the new default in Debian.
+
+Bug: http://bugs.debian.org/710625
+Forwarded: not-needed
+
+---
+ game/xtime.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/game/xtime.hh b/game/xtime.hh
+index 8f5463d..ab53e23 100644
+--- a/game/xtime.hh
++++ b/game/xtime.hh
+@@ -24,7 +24,7 @@ namespace {
+ #if (BOOST_VERSION / 100 % 1000 >= 50)
+ 		boost::xtime_get(&time, boost::TIME_UTC_);
+ #else
+-		boost::xtime_get(&time, boost::TIME_UTC);
++		boost::xtime_get(&time, boost::TIME_UTC_);
+ #endif
+ 		return time;
+ 	}

More information about the Pkg-games-commits mailing list