[Debianjr-commits] r15 - in /packages/trunk/xjig: debian/changelog debian/control objects.C

[synrg at users.alioth.debian.org]

Author: synrg
Date: Sun Apr 22 22:40:39 2007
New Revision: 15

URL: http://svn.debian.org/wsvn/debianjr/?sc=1&rev=15
Log:
Start 2.4-12: nmu ack, patch for flipping

Modified:
    packages/trunk/xjig/debian/changelog
    packages/trunk/xjig/debian/control
    packages/trunk/xjig/objects.C

Modified: packages/trunk/xjig/debian/changelog
URL: http://svn.debian.org/wsvn/debianjr/packages/trunk/xjig/debian/changelog?rev=15&op=diff
==============================================================================
--- packages/trunk/xjig/debian/changelog (original)
+++ packages/trunk/xjig/debian/changelog Sun Apr 22 22:40:39 2007
@@ -1,3 +1,10 @@
+xjig (2.4-12) UNRELEASED; urgency=low
+
+  * New co-maintainer. NMU acked.
+  * Prevent accidental flipping when -side is specified. (Closes: #417902)
+
+ -- Ben Armstrong <synrg at sanctuary.nslug.ns.ca>  Sun, 22 Apr 2007 19:34:41 -0300
+
 xjig (2.4-11.1) unstable; urgency=low
 
   * NMU
@@ -6,7 +13,7 @@
   * Do menu file transition, install it in /usr/share/menu
 
  -- Marc 'HE' Brockschmidt <he at debian.org>  Thu, 15 Jun 2006 10:44:42 +0200
-i
+
 xjig (2.4-11) unstable; urgency=low
 
   * update xlibs-dev build dependency (thanks, John Wright)

Modified: packages/trunk/xjig/debian/control
URL: http://svn.debian.org/wsvn/debianjr/packages/trunk/xjig/debian/control?rev=15&op=diff
==============================================================================
--- packages/trunk/xjig/debian/control (original)
+++ packages/trunk/xjig/debian/control Sun Apr 22 22:40:39 2007
@@ -2,7 +2,8 @@
 Section: games
 Priority: optional
 Maintainer: Dave Holland <dave at debian.org>
-Standards-Version: 3.5.8.0
+Uploaders: Ben Armstrong <synrg at sanctuary.nslug.ns.ca>
+Standards-Version: 3.7.2
 Build-Depends: xutils, libx11-dev, libxext-dev, x-dev, libnetpbm10-dev, libjpeg-dev
 
 Package: xjig

Modified: packages/trunk/xjig/objects.C
URL: http://svn.debian.org/wsvn/debianjr/packages/trunk/xjig/objects.C?rev=15&op=diff
==============================================================================
--- packages/trunk/xjig/objects.C (original)
+++ packages/trunk/xjig/objects.C Sun Apr 22 22:40:39 2007
@@ -971,7 +971,7 @@
 }
 
 void MoveablePiece::DispatchPress( XButtonEvent * xbutton ) {
-	if (xbutton->state&ControlMask) {
+	if (side_lock<0 && xbutton->state&ControlMask) {
 		// printf( "doing the flip ...\n" );
 		mystack->Raise(this);
 		FlipOver( Vec2(xbutton->x,xbutton->y) );
@@ -1072,7 +1072,7 @@
 			}
 			turnflag=0;
 	}
-	else if (xbutton->time-start_time<300&&xbutton->button==Button2&&!(xbutton->state&~Button2Mask)) {
+	else if (side_lock<0 && xbutton->time-start_time<300&&xbutton->button==Button2&&!(xbutton->state&~Button2Mask)) {
 				FlipOver(Vec2(xbutton->x,xbutton->y));
 	}
 	else if (xbutton->state&Button1Mask)