All pastes #505186 Raw Edit

persia

public text v1 · immutable
·published 2007-05-23 13:31 UTC
rendered paste body
persia@frigga:~/src/scratch/gnome-hearts$ debdiff gnome-hearts_0.1.3-3.dsc gnome-hearts_0.1.3-3ubuntu1.dsc
diff -u gnome-hearts-0.1.3/debian/control.in gnome-hearts-0.1.3/debian/control.in
--- gnome-hearts-0.1.3/debian/control.in
+++ gnome-hearts-0.1.3/debian/control.in
@@ -1,7 +1,8 @@
 Source: gnome-hearts
 Section: games
 Priority: optional
-Maintainer: Sander Marechal <s.marechal@jejik.com>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sander Marechal <s.marechal@jejik.com>
 Build-Depends: cdbs,
                debhelper (>= 5.0),
                libgtk2.0-dev (>= 2.8.0),
diff -u gnome-hearts-0.1.3/debian/control gnome-hearts-0.1.3/debian/control
--- gnome-hearts-0.1.3/debian/control
+++ gnome-hearts-0.1.3/debian/control
@@ -1,7 +1,8 @@
 Source: gnome-hearts
 Section: games
 Priority: optional
-Maintainer: Sander Marechal <s.marechal@jejik.com>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sander Marechal <s.marechal@jejik.com>
 Build-Depends: cdbs,
                debhelper (>= 5.0),
                libgtk2.0-dev (>= 2.8.0),
diff -u gnome-hearts-0.1.3/debian/changelog gnome-hearts-0.1.3/debian/changelog
--- gnome-hearts-0.1.3/debian/changelog
+++ gnome-hearts-0.1.3/debian/changelog
@@ -1,3 +1,9 @@
+gnome-hearts (0.1.3-3ubuntu1) feisty; urgency=low
+
+  * Corrected the score calculation for Omnibus and Omnibus alternative ruleset (LP: 114893)
+  * Changed Maintainer field, added XSBC-Original-Maintainer field
+ -- Stijn Polfliet <stijn.polfliet@gmail.com>  Tue, 22 May 2007 21:19:07 +0200
+
 gnome-hearts (0.1.3-3) unstable; urgency=high
 
   * Add a get-orig-source target to retrieve the upstream tarball.
only in patch2:
unchanged:
--- gnome-hearts-0.1.3.orig/debian/patches/02_correct_score.patch
+++ gnome-hearts-0.1.3/debian/patches/02_correct_score.patch
@@ -0,0 +1,17 @@
+diff -Nur gnome-hearts-0.1.3/src/hearts.c gnome-hearts-0.1.3.new/src/hearts.c
+--- gnome-hearts-0.1.3/src/hearts.c    2007-05-23 10:39:47.000000000 +0200
++++ gnome-hearts-0.1.3.new/src/hearts.c        2007-05-23 10:39:47.000000000 +0200
+@@ -260,9 +260,11 @@
+               for (i = 0; i < 4; i++)
+               {
+                       /* update the scores */
+-                      if (player[i]->point_cards == 14) /* shot the moon? */
++                      if (player[i]->point_cards == 14 && player[i]->score_round == 26) /* shot the moon? */
+                               player[i]->score_total -= player[i]->score_round;
+-                      else
++                      else if (player[i]->point_cards == 14 && player[i]->score_round == 16) /* shot the moon with bonus? */
++                              player[i]->score_total -= 36;
++                      else
+                               player[i]->score_total += player[i]->score_round;
+ 
+                       player[i]->score_round = 0;
persia@frigga:~/src/scratch/gnome-hearts$