Philip Muškovac has proposed merging lp:~yofel/kdegames/4.5.95 into lp:~kubuntu-members/kdegames/ubuntu.
Requested reviews: Kubuntu Members (kubuntu-members) For more details, see: https://code.launchpad.net/~yofel/kdegames/4.5.95/+merge/45271 4.5.95 The armel patch for kolf is upstream. -- https://code.launchpad.net/~yofel/kdegames/4.5.95/+merge/45271 Your team Kubuntu Members is requested to review the proposed merge of lp:~yofel/kdegames/4.5.95 into lp:~kubuntu-members/kdegames/ubuntu.
=== modified file 'debian/changelog' --- debian/changelog 2010-12-25 23:59:10 +0000 +++ debian/changelog 2011-01-05 18:31:52 +0000 @@ -1,3 +1,10 @@ +kdegames (4:4.5.95-0ubuntu1~ppa1) natty; urgency=low + + * New upstream RC release + + Drop change to kolf/shape.cpp - applied upstream + + -- Philip Muskovac <[email protected]> Wed, 05 Jan 2011 18:41:20 +0100 + kdegames (4:4.5.90-0ubuntu2) natty; urgency=low * Fix FTBFS on armel due to qreal/double mismatch in kolf/shape.cpp === removed directory 'debian/patches' === removed file 'debian/patches/debian-changes-4:4.5.90-0ubuntu2' --- debian/patches/debian-changes-4:4.5.90-0ubuntu2 2010-12-25 23:59:10 +0000 +++ debian/patches/debian-changes-4:4.5.90-0ubuntu2 1970-01-01 00:00:00 +0000 @@ -1,38 +0,0 @@ -Description: Upstream changes introduced in version 4:4.5.90-0ubuntu2 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - kdegames (4:4.5.90-0ubuntu2) natty; urgency=low - . - * Fix FTBFS on armel due to qreal/double mismatch in kolf/shape.cpp - . - The person named in the Author field signed this changelog entry. -Author: Scott Kitterman <[email protected]> - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- kdegames-4.5.90.orig/kolf/shape.cpp -+++ kdegames-4.5.90/kolf/shape.cpp -@@ -156,8 +156,8 @@ b2Shape* Kolf::EllipseShape::createShape - const b2Vec2 c = toB2Vec2(m_rect.center() * Kolf::Box2DScaleFactor); - //ensure some minimum size because b2PolygonShape gets confused when its - //area is smaller than FLT_EPSILON (TODO: handle rx*ry == 0 differently?) -- const qreal rx = qMax(m_rect.width() * Kolf::Box2DScaleFactor / 2, 1e-5); -- const qreal ry = qMax(m_rect.height() * Kolf::Box2DScaleFactor / 2, 1e-5); -+ const qreal rx = qMax(m_rect.width() * Kolf::Box2DScaleFactor / 2, qreal(1e-5)); -+ const qreal ry = qMax(m_rect.height() * Kolf::Box2DScaleFactor / 2, qreal(1e-5)); - if (rx == ry) - { - //use circle shape when possible because it's cheaper and exact === removed file 'debian/patches/series' --- debian/patches/series 2010-12-25 23:59:10 +0000 +++ debian/patches/series 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -# Patches -debian-changes-4:4.5.90-0ubuntu2
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
