r15970 - in packages/trunk/3dchess/debian: . icons patches

[Markus Koschany]

Author: apo
Date: 2017-06-29 23:21:41 +0000 (Thu, 29 Jun 2017)
New Revision: 15970

Added:
   packages/trunk/3dchess/debian/patches/wasteful-CPU-consumption.patch
Removed:
   packages/trunk/3dchess/debian/icons/3dchess.xpm
   packages/trunk/3dchess/debian/menu
Modified:
   packages/trunk/3dchess/debian/3dchess.install
   packages/trunk/3dchess/debian/changelog
   packages/trunk/3dchess/debian/compat
   packages/trunk/3dchess/debian/control
   packages/trunk/3dchess/debian/patches/series
   packages/trunk/3dchess/debian/rules
Log:
Release 0.8.1-20


Modified: packages/trunk/3dchess/debian/3dchess.install
===================================================================
--- packages/trunk/3dchess/debian/3dchess.install	2017-06-23 21:12:38 UTC (rev 15969)
+++ packages/trunk/3dchess/debian/3dchess.install	2017-06-29 23:21:41 UTC (rev 15970)
@@ -1,3 +1,2 @@
 debian/3dchess.desktop usr/share/applications
 debian/icons/3dchess.png usr/share/icons/hicolor/256x256/apps
-debian/icons/3dchess.xpm usr/share/pixmaps/3dchess

Modified: packages/trunk/3dchess/debian/changelog
===================================================================
--- packages/trunk/3dchess/debian/changelog	2017-06-23 21:12:38 UTC (rev 15969)
+++ packages/trunk/3dchess/debian/changelog	2017-06-29 23:21:41 UTC (rev 15970)
@@ -1,3 +1,19 @@
+3dchess (0.8.1-20) unstable; urgency=medium
+
+  * Team upload.
+  * Declare compliance with Debian Policy 4.0.0.
+  * Switch to compat level 10.
+  * Drop deprecated menu file and xpm icon.
+  * Fix FTCBFS.
+    - Pass --sourcedirectory to dh.
+    - Remove redundant overrides such as override_dh_auto_build thus letting
+      dh_auto_build pass cross compilers.
+    Thanks to Helmut Grohne for the report and patch. (Closes: #864623)
+  * Add wasteful-CPU-consumption.patch. The game always consumed 100 % CPU
+    resources due to a missing sleep call in its main loop. (Closes: #866378)
+
+ -- Markus Koschany <apo at debian.org>  Fri, 30 Jun 2017 01:09:34 +0200
+
 3dchess (0.8.1-19) unstable; urgency=medium
 
   * Team upload.

Modified: packages/trunk/3dchess/debian/compat
===================================================================
--- packages/trunk/3dchess/debian/compat	2017-06-23 21:12:38 UTC (rev 15969)
+++ packages/trunk/3dchess/debian/compat	2017-06-29 23:21:41 UTC (rev 15970)
@@ -1 +1 @@
-9
+10

Modified: packages/trunk/3dchess/debian/control
===================================================================
--- packages/trunk/3dchess/debian/control	2017-06-23 21:12:38 UTC (rev 15969)
+++ packages/trunk/3dchess/debian/control	2017-06-29 23:21:41 UTC (rev 15970)
@@ -4,9 +4,9 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders:
  Barry deFreese <bdefreese at debian.org>
-Standards-Version: 3.9.6
+Standards-Version: 4.0.0
 Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 10),
  libx11-dev,
  libxaw7-dev,
  libxpm-dev,

Deleted: packages/trunk/3dchess/debian/icons/3dchess.xpm
===================================================================
--- packages/trunk/3dchess/debian/icons/3dchess.xpm	2017-06-23 21:12:38 UTC (rev 15969)
+++ packages/trunk/3dchess/debian/icons/3dchess.xpm	2017-06-29 23:21:41 UTC (rev 15970)
@@ -1,89 +0,0 @@
-/* XPM */
-static char *_dchess[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 51 1 ",
-"  c #1D1D1D",
-". c #303030",
-"X c #353535",
-"o c #3D3D3D",
-"O c #434343",
-"+ c #474747",
-"@ c #484848",
-"# c #525252",
-"$ c #575757",
-"% c #595959",
-"& c #5E5E5E",
-"* c #636363",
-"= c #676767",
-"- c #686868",
-"; c #6D6D6D",
-": c #737373",
-"> c #777777",
-", c #787878",
-"< c #7B7B7B",
-"1 c #808080",
-"2 c #878787",
-"3 c #898989",
-"4 c #8F8F8F",
-"5 c #929292",
-"6 c #959595",
-"7 c #999999",
-"8 c #9E9E9E",
-"9 c #A3A3A3",
-"0 c #A7A7A7",
-"q c #A8A8A8",
-"w c #ADADAD",
-"e c #B2B2B2",
-"r c #B7B7B7",
-"t c #B8B8B8",
-"y c #BDBDBD",
-"u c #C2C2C2",
-"i c #C5C5C5",
-"p c #C8C8C8",
-"a c #CCCCCC",
-"s c #D2D2D2",
-"d c #D6D6D6",
-"f c #D9D9D9",
-"g c #DDDDDD",
-"h c #E1E1E1",
-"j c #E5E5E5",
-"k c #EAEAEA",
-"l c #ECECEC",
-"z c #F2F2F2",
-"x c #F4F4F4",
-"c c #FAFAFA",
-"v c #FFFFFF",
-/* pixels */
-"cljzapiacklxsiydxkjlsiidcxjfsiup",
-"vhplypiyxhjltyrulffzyaiihjdsuw0t",
-"fsiatlapjhgjtpiikffztfsyslhkuyre",
-"ghgftjaikffjyiuuhffhtaiihjhjugfr",
-"syydhhghsuufggfgpuishgghpyudhfgg",
-"tytacjlzuttpvjlzuttacjlzuttacjlc",
-"titpxdgzyutpxdgzyutpxdgzyitpxdgx",
-"riypzdgzyiypzdgzyiypxdgzyiypxdgx",
-"hggjdyifjggjdyifhgghduifhgghdyis",
-"vvvzuyypcvvzuyypvvvzuyypcvvzuyut",
-"vvvzuyyacvvzuyyacvvzuyyavvvzuyyy",
-"vvvziyypcvvziyypcvvzuyypcvvzuyut",
-"dfffjjjhffffjjjhfddfjjjjfdfgjjjh",
-"yyypcvvzuyypcvvzuyypcvvzuyypcvvc",
-"yyyavvvzuyyavvvzuyyacvvzuyyacvvx",
-"yyyacvvzuyypcvvzuuypcvvzuyypcvvc",
-"jjjhfdfgjjjhffffjjjjfddfjkjhffdd",
-"vvvzuyypvvvzuyypcvvzuyypcvvzuyyt",
-"vvvzuyyacvvzuyyacvvzuyyacvvzuyyy",
-"vvvzuyypcvvzuyypcvvziyypcvvzuyyy",
-"dfdfjjjhffdfjjjjffffjjjhfdfgjjjh",
-"yyypcvvzutypcvvzuyypcvvzuyypvvvx",
-"yyyavvvzuyyacvvzuyyavvvzuyypcvvc",
-"yuypcvvzuyyacvvzuyypcvvzuyyacvvx",
-"jkkhffffhkjhffffjjjjdfffjjkhfffs",
-"vufxu60avufxu60avufxu60avufxu60y",
-"v,qxi-2pc,qxi-2ac,qxu-2pc,qxu-2y",
-"v,0xu=2ac,0xu-2pv,0xu-2ac,0xu=2y",
-"dryfjsuafwrgjurjd0wfjiajfresjpah",
-"ypaps2>dy;>pl45ky=2ax26zq-*yvxlc",
-",138e.,xt+$pz>3ly%,aj#*k7.-p857q",
-",Xo9a %lt#&px:3z0o#uk%-k0 @i0XOw"
-};

Deleted: packages/trunk/3dchess/debian/menu
===================================================================
--- packages/trunk/3dchess/debian/menu	2017-06-23 21:12:38 UTC (rev 15969)
+++ packages/trunk/3dchess/debian/menu	2017-06-29 23:21:41 UTC (rev 15970)
@@ -1,6 +0,0 @@
-?package(3dchess):needs="X11" \
-  section="Games/Board" \
-  title="3D Chess" \
-  longtitle="3D Chess - play chess across 3 boards!" \
-  command="/usr/games/3Dc" \
-  icon="/usr/share/pixmaps/3dchess/3dchess.xpm"

Modified: packages/trunk/3dchess/debian/patches/series
===================================================================
--- packages/trunk/3dchess/debian/patches/series	2017-06-23 21:12:38 UTC (rev 15969)
+++ packages/trunk/3dchess/debian/patches/series	2017-06-29 23:21:41 UTC (rev 15970)
@@ -3,3 +3,4 @@
 12_3Dc-rules.html.patch
 13_machine.h.patch
 hardening.patch
+wasteful-CPU-consumption.patch

Added: packages/trunk/3dchess/debian/patches/wasteful-CPU-consumption.patch
===================================================================
--- packages/trunk/3dchess/debian/patches/wasteful-CPU-consumption.patch	                        (rev 0)
+++ packages/trunk/3dchess/debian/patches/wasteful-CPU-consumption.patch	2017-06-29 23:21:41 UTC (rev 15970)
@@ -0,0 +1,26 @@
+From: Fabian Greffrath <fabian at debian.org>
+Date: Fri, 30 Jun 2017 01:04:52 +0200
+Subject: wasteful CPU consumption
+
+The game always consumed 100 % CPU resources due to a missing sleep call in its
+main loop.
+
+Bug-Debian: https://bugs.debian.org/866378
+Forwarded: no
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index 84979ca..d1db23a 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -200,7 +200,7 @@ DoMain3DcLoop(void)
+                          &event);
+           XtDispatchEvent(&event);
+         }
+-
++    usleep(10);
+     } /* End game loop */
+ 
+   return;

Modified: packages/trunk/3dchess/debian/rules
===================================================================
--- packages/trunk/3dchess/debian/rules	2017-06-23 21:12:38 UTC (rev 15969)
+++ packages/trunk/3dchess/debian/rules	2017-06-29 23:21:41 UTC (rev 15970)
@@ -3,16 +3,10 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=-stackprotectorstrong
 
 %:
-	dh $@ --parallel
+	dh $@ --sourcedirectory=src
 
-override_dh_auto_build:
-	$(MAKE) -C `pwd`/src
-
-override_dh_auto_clean:
-	[ ! -f "`pwd`/src/Makefile" ] || $(MAKE) -C `pwd`/src clean
-
 override_dh_auto_install:
-	$(MAKE) -C `pwd`/src install BINDIR=`pwd`/debian/3dchess/usr/games
+	dh_auto_install -- BINDIR=`pwd`/debian/3dchess/usr/games
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES