diff -Nru xball-3.0.1/debian/changelog xball-3.0.1/debian/changelog --- xball-3.0.1/debian/changelog 2013-09-14 16:57:27.000000000 +0000 +++ xball-3.0.1/debian/changelog 2017-09-13 03:24:18.000000000 +0000 @@ -1,3 +1,28 @@ +xball (3.0.1-2) unstable; urgency=medium + + * QA upload. + * Change maintainer to Debian QA Group because the package has been orphaned. + * Acknowledge NMU by Luk Claes. Thanks! (Closes: #722945) + * Switch to compat level 10. + * wrap-and-sort -sa. + * Declare compliance with Debian Policy 4.1.0. + * Drop deprecated menu file. Convert xpm icon to png and install it into the + hicolor icon directory. + * Drop debian/README. No longer useful. + * Simplify debian/rules and use dh sequencer. + * Provide a desktop file. (Closes: #738054) + * Fix FTBFS with the clang compiler. + Thanks to Piotr Sokołowski for the patch. (Closes: #742972) + * Homepage field: Point to tracker.debian.org. + * Add man-page-spelling.patch and fix a minor spelling mistake in xball.man. + * export DEB_CFLAGS_MAINT_APPEND = -std=gnu89 otherwise the game will + segfault with newer versions of the C standard. + * Install data files into /usr/share/games/xball. + * Add implicit-declaration.patch and fix various compiler warnings about + implicit declarations. + + -- Markus Koschany Wed, 13 Sep 2017 05:24:18 +0200 + xball (3.0.1-1.2) unstable; urgency=low * Non-maintainer upload. diff -Nru xball-3.0.1/debian/compat xball-3.0.1/debian/compat --- xball-3.0.1/debian/compat 2010-05-04 11:49:18.000000000 +0000 +++ xball-3.0.1/debian/compat 2017-09-13 03:24:18.000000000 +0000 @@ -1 +1 @@ -7 +10 diff -Nru xball-3.0.1/debian/control xball-3.0.1/debian/control --- xball-3.0.1/debian/control 2013-09-14 16:55:58.000000000 +0000 +++ xball-3.0.1/debian/control 2017-09-13 03:24:18.000000000 +0000 @@ -1,13 +1,21 @@ Source: xball Section: games Priority: optional -Maintainer: Stephen Birch -Build-Depends: debhelper (>= 7.1), libmotif-dev, xutils-dev, libxmu-dev, libxt-dev, autotools-dev -Standards-Version: 3.8.4 +Maintainer: Debian QA Group +Build-Depends: + debhelper (>= 10), + libmotif-dev, + libxmu-dev, + libxt-dev, + xutils-dev +Standards-Version: 4.1.0 +Homepage: https://tracker.debian.org/pkg/xball Package: xball Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends} Description: Simulate bouncing balls in a window A simple educational game that simulates bouncing balls in a window. Gravity, elasticity, and ability to collide can all be adjusted. diff -Nru xball-3.0.1/debian/copyright xball-3.0.1/debian/copyright --- xball-3.0.1/debian/copyright 2007-12-10 23:32:34.000000000 +0000 +++ xball-3.0.1/debian/copyright 2017-09-13 03:24:18.000000000 +0000 @@ -20,19 +20,19 @@ Author: Po Cheung Copyright 1989 The University of Texas at Austin Copyright 1990 Microelectronics and Computer Technology Corporation - + Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of The University of Texas - and Microelectronics and Computer Technology Corporation (MCC) not be + and Microelectronics and Computer Technology Corporation (MCC) not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. The - University of Texas and MCC makes no representations about the - suitability of this software for any purpose. It is provided "as is" + University of Texas and MCC makes no representations about the + suitability of this software for any purpose. It is provided "as is" without express or implied warranty. - + THE UNIVERSITY OF TEXAS AND MCC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THE UNIVERSITY OF TEXAS OR MCC BE LIABLE FOR @@ -40,6 +40,6 @@ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - + Author: Po Cheung Created: March 10, 1989 diff -Nru xball-3.0.1/debian/install xball-3.0.1/debian/install --- xball-3.0.1/debian/install 2007-12-10 23:32:34.000000000 +0000 +++ xball-3.0.1/debian/install 2017-09-13 03:24:18.000000000 +0000 @@ -1,3 +1,3 @@ -demo[0-9]* *.xbm run_demos /usr/share/xball/ -debian/xball.xpm /usr/share/pixmaps/ - +debian/xball.desktop usr/share/applications +debian/xball.png /usr/share/icons/hicolor/32x32/apps +demo[0-9]* *.xbm run_demos /usr/share/games/xball/ diff -Nru xball-3.0.1/debian/manpages xball-3.0.1/debian/manpages --- xball-3.0.1/debian/manpages 1970-01-01 00:00:00.000000000 +0000 +++ xball-3.0.1/debian/manpages 2017-09-13 03:24:18.000000000 +0000 @@ -0,0 +1 @@ +xball.man diff -Nru xball-3.0.1/debian/patches/clang-ftbfs.patch xball-3.0.1/debian/patches/clang-ftbfs.patch --- xball-3.0.1/debian/patches/clang-ftbfs.patch 1970-01-01 00:00:00.000000000 +0000 +++ xball-3.0.1/debian/patches/clang-ftbfs.patch 2017-09-13 03:24:18.000000000 +0000 @@ -0,0 +1,24 @@ +From: Piotr Sokołowski +Date: Wed, 13 Sep 2017 05:22:19 +0200 +Subject: clang ftbfs + +Bug-Debian: https://bugs.debian.org/742972 +--- + xball.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/xball.c b/xball.c +index 4df72e4..40d0aca 100644 +--- a/xball.c ++++ b/xball.c +@@ -25,8 +25,9 @@ + #include "patchlevel.h" + + /*** Start of main program ***/ ++int + main(argc,argv) +-unsigned argc; ++int argc; + char **argv; + { + /* Use the app-defaults file as a set of strings for the fallback */ diff -Nru xball-3.0.1/debian/patches/implicit-declaration.patch xball-3.0.1/debian/patches/implicit-declaration.patch --- xball-3.0.1/debian/patches/implicit-declaration.patch 1970-01-01 00:00:00.000000000 +0000 +++ xball-3.0.1/debian/patches/implicit-declaration.patch 2017-09-13 03:24:18.000000000 +0000 @@ -0,0 +1,82 @@ +From: Markus Koschany +Date: Wed, 13 Sep 2017 06:53:50 +0200 +Subject: implicit declaration + +Fix various compiler warnings. +--- + demo.c | 1 + + misc.c | 1 + + room.c | 1 + + xball.c | 3 ++- + xball_sys.c | 1 + + 5 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/demo.c b/demo.c +index 0091a05..cf6dd73 100644 +--- a/demo.c ++++ b/demo.c +@@ -23,6 +23,7 @@ + #include "names.h" + #include "intf.h" + #include "miscx.h" ++#include + + /* Structures */ + typedef struct { +diff --git a/misc.c b/misc.c +index 996f15e..c979377 100644 +--- a/misc.c ++++ b/misc.c +@@ -12,6 +12,7 @@ + /* System Headers */ + #include + #include ++#include + + + /* Given a string 'text\nmore text', allocates and returns the +diff --git a/room.c b/room.c +index bd007c6..92aed64 100644 +--- a/room.c ++++ b/room.c +@@ -27,6 +27,7 @@ + /* Local headers */ + #include "room.h" + #include "misc.h" ++#include "miscx.h" + #include "scrollbar.h" + + /* Macros */ +diff --git a/xball.c b/xball.c +index 40d0aca..24cd1b7 100644 +--- a/xball.c ++++ b/xball.c +@@ -23,6 +23,7 @@ + #include "xball_sys.h" + #include "miscx.h" + #include "patchlevel.h" ++#include + + /*** Start of main program ***/ + int +@@ -56,7 +57,7 @@ char **argv; + + if (argc > 1 && strncmp(argv[1],"-help", strlen(argv[1])) == 0) + { +- printf("XBall - version %d, patchlevel %d.\n\n", VERSION, PATCHLEVEL); ++ printf("XBall - version %s, patchlevel %d.\n\n", VERSION, PATCHLEVEL); + puts("Usage:\n\txball [-options ...]\n\nWhere options include:"); + puts(" Option Default Resource Meaning"); + puts(" -help Print out this message"); +diff --git a/xball_sys.c b/xball_sys.c +index ee2e4a4..d14ba66 100644 +--- a/xball_sys.c ++++ b/xball_sys.c +@@ -26,6 +26,7 @@ + #include "xball_sys.h" + #include "names.h" + #include "misc.h" ++#include + + + /* Creates the xball system. This object holds together the other diff -Nru xball-3.0.1/debian/patches/man-page-spelling.patch xball-3.0.1/debian/patches/man-page-spelling.patch --- xball-3.0.1/debian/patches/man-page-spelling.patch 1970-01-01 00:00:00.000000000 +0000 +++ xball-3.0.1/debian/patches/man-page-spelling.patch 2017-09-13 03:24:18.000000000 +0000 @@ -0,0 +1,22 @@ +From: Markus Koschany +Date: Wed, 13 Sep 2017 05:39:26 +0200 +Subject: man page spelling + +Fix a minor spelling mistake in xball.man. +--- + xball.man | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xball.man b/xball.man +index 866c4b6..9bf8607 100644 +--- a/xball.man ++++ b/xball.man +@@ -28,7 +28,7 @@ run demo which create and manipulate the balls in various ways. + Documentation is included on-line via the Help menu and is not + reproduced here. + .SH OPTIONS +-Run xball \-help for a decription of the command line options ++Run xball \-help for a description of the command line options + .SH DEMOS + Several demo files are included with the distribution. To run all the + demos, run 'run_demos'. diff -Nru xball-3.0.1/debian/patches/series xball-3.0.1/debian/patches/series --- xball-3.0.1/debian/patches/series 2010-05-08 20:02:44.000000000 +0000 +++ xball-3.0.1/debian/patches/series 2017-09-13 03:24:18.000000000 +0000 @@ -1,2 +1,5 @@ 10-fix-spelling.patch 20-xball.man.patch +clang-ftbfs.patch +man-page-spelling.patch +implicit-declaration.patch diff -Nru xball-3.0.1/debian/README xball-3.0.1/debian/README --- xball-3.0.1/debian/README 2007-12-10 23:32:34.000000000 +0000 +++ xball-3.0.1/debian/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -xball for DEBIAN and Ubuntu ---------------------------- - -Per Debian policy recommendations the program is installed in -/usr/games (not /usr/bin). That means it is not in the normal -PATH. The program can be started either from the window manager menu -structure or with the following command: - -$ /usr/games/xball - -Stephen Birch - diff -Nru xball-3.0.1/debian/rules xball-3.0.1/debian/rules --- xball-3.0.1/debian/rules 2010-05-04 11:50:29.000000000 +0000 +++ xball-3.0.1/debian/rules 2017-09-13 03:24:18.000000000 +0000 @@ -1,69 +1,19 @@ #!/usr/bin/make -f -# Get xball version number from changelog -VERSION = $(shell head -1 debian/changelog | sed -e 's/.*(//' | sed -e 's/).*//') +# Don't remove this line otherwise the game will segfault with newer C +# standards. This issue surfaced with the switch to GCC 7. Please fix the code. +export DEB_CFLAGS_MAINT_APPEND = -std=gnu89 + +include /usr/share/dpkg/pkg-info.mk + +%: + dh $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + --prefix=/usr \ + --bindir=/usr/games \ + --datadir=/usr/share/games/xball -CFLAGS = -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -CFLAGS += -O0 -else -CFLAGS += -O2 -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - chmod +x configure - chmod +x missing - ./configure \ - --prefix=$(CURDIR)/debian/xball \ - --exec-prefix=$(CURDIR)/debian/xball/usr - touch configure-stamp - -build: configure-stamp build-stamp -build-stamp: - dh_testdir - $(MAKE) VERSION=$(VERSION) - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - dh_clean - [ ! -f Makefile ] || $(MAKE) distclean - rm -rf .deps - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) install - cd debian && mv xball/usr/bin xball/usr/games - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_install - dh_installdocs - dh_installmenu - dh_installman xball.man - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_auto_build: + dh_auto_build -- VERSION=$(DEB_VERSION_UPSTREAM) diff -Nru xball-3.0.1/debian/source/include-binaries xball-3.0.1/debian/source/include-binaries --- xball-3.0.1/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ xball-3.0.1/debian/source/include-binaries 2017-09-13 03:24:18.000000000 +0000 @@ -0,0 +1 @@ +debian/xball.png diff -Nru xball-3.0.1/debian/xball.desktop xball-3.0.1/debian/xball.desktop --- xball-3.0.1/debian/xball.desktop 1970-01-01 00:00:00.000000000 +0000 +++ xball-3.0.1/debian/xball.desktop 2017-09-13 03:24:18.000000000 +0000 @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=XBall +Comment=simulate bouncing balls in a window +Comment[de]=simuliere springende Bälle in einem Fenster +Exec=xball +Icon=xball +Terminal=false +Type=Application +Categories=Game;Simulation; +Keywords=balls;X;window;bouncing; diff -Nru xball-3.0.1/debian/xball.menu xball-3.0.1/debian/xball.menu --- xball-3.0.1/debian/xball.menu 2007-12-10 23:32:34.000000000 +0000 +++ xball-3.0.1/debian/xball.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -?package(xball):needs="X11" \ - section="Games/Toys" \ - title="Xball simulation" \ - command="/usr/games/xball" \ - icon="/usr/share/pixmaps/xball.xpm" Binary files /tmp/tmp5v8vWE/qgiKJ0dwUa/xball-3.0.1/debian/xball.png and /tmp/tmp5v8vWE/Of73Xff8qf/xball-3.0.1/debian/xball.png differ diff -Nru xball-3.0.1/debian/xball.xpm xball-3.0.1/debian/xball.xpm --- xball-3.0.1/debian/xball.xpm 2007-12-10 23:32:34.000000000 +0000 +++ xball-3.0.1/debian/xball.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ -/* XPM */ -static char * xball_xpm[] = { -"32 32 129 2", -" c None", -". c #000000", -"+ c #565658", -"@ c #DBDBDB", -"# c #D5D5D5", -"$ c #CDCDCD", -"% c #C4C4C4", -"& c #C9C9C9", -"* c #EFEFEF", -"= c #FAFAFA", -"- c #F6F6F6", -"; c #E1E1E1", -"> c #D4D4D4", -", c #D8D8D8", -"' c #BFBFBF", -") c #727474", -"! c #131313", -"~ c #080808", -"{ c #FFFFFF", -"] c #ABABAB", -"^ c #9B9B9B", -"/ c #E6E6E6", -"( c #C0C0C0", -"_ c #F2F2F2", -": c #CBCBCB", -"< c #B3B3B3", -"[ c #C8C8C8", -"} c #F0F0F0", -"| c #A0A09F", -"1 c #7F7F7F", -"2 c #A0A0A0", -"3 c #707070", -"4 c #777777", -"5 c #FDFDFD", -"6 c #F1F1F1", -"7 c #A7A7A7", -"8 c #656565", -"9 c #525252", -"0 c #5D5D5D", -"a c #A2A2A2", -"b c #E5E5E5", -"c c #9E9E9E", -"d c #333333", -"e c #343434", -"f c #797979", -"g c #E3E3E3", -"h c #8C8F90", -"i c #EDEDED", -"j c #868686", -"k c #2E2E2E", -"l c #232323", -"m c #404040", -"n c #8B8B8C", -"o c #DEDEDE", -"p c #717171", -"q c #3E3E3E", -"r c #595959", -"s c #AEAEAE", -"t c #939393", -"u c #AFAFAF", -"v c #DDDDDD", -"w c #939798", -"x c #CFCFCF", -"y c #E8E8E8", -"z c #8D9192", -"A c #EAEAEA", -"B c #969696", -"C c #7A7A7A", -"D c #A9A9A9", -"E c #F7F7F7", -"F c #E7E7E7", -"G c #6C6C6C", -"H c #515151", -"I c #767676", -"J c #F9F9F9", -"K c #D1D1D1", -"L c #555555", -"M c #A1A1A1", -"N c #434343", -"O c #DADADA", -"P c #B0B0B0", -"Q c #1F1F1F", -"R c #494949", -"S c #5C5C5C", -"T c #141414", -"U c #191919", -"V c #757575", -"W c #C5C5C5", -"X c #292929", -"Y c #161616", -"Z c #3B3B3B", -"` c #F8F8F8", -" . c #373737", -".. c #3C3C3C", -"+. c #545454", -"@. c #101010", -"#. c #0F0F0F", -"$. c #585858", -"%. c #C6C6C6", -"&. c #696969", -"*. c #BABABA", -"=. c #919191", -"-. c #4D4D4D", -";. c #BCBCBC", -">. c #6E6E6E", -",. c #6F6F6F", -"'. c #929292", -"). c #414141", -"!. c #3F3F3F", -"~. c #7E7E7E", -"{. c #9F9F9F", -"]. c #B2B2B2", -"^. c #505050", -"/. c #B1B1B1", -"(. c #616161", -"_. c #646464", -":. c #AAAAAA", -"<. c #CECECE", -"[. c #EBEBEB", -"}. c #D6D6D6", -"|. c #8B8B8B", -"1. c #F5F5F5", -"2. c #D2D2D2", -"3. c #B4B4B4", -"4. c #CCCCCC", -"5. c #898989", -"6. c #E2E2E2", -"7. c #535353", -"8. c #070808", -" . . . . . . . . . . . . . . . . . . . . . . . . ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" . . + @ @ # $ % & @ * = - ; > , , , , , > & ' ) ! ~ . . ", -" . . ' { { { { { { { { { { { { { { { { { { { { { { { . . . ", -" . . ] { { { { { { { { { { { { { { { { { { { { { { { . . . ", -" . . ^ { { { { { / ( ( / { { { { { { _ : < [ } { { { . . . ", -" . . | { { { { { ( 1 1 ( { { { { { { / 2 3 4 ( 5 { { . . . ", -" . . | { { { { { ( 1 1 ( { { { { { { 6 7 8 9 0 a b { . . . ", -" . . ^ { { { { { / ( ( / { { { { { { { / c 9 d e f g . . . ", -" . . h { { { { { { { { { { { { { { { { { i j k l m < . . . ", -" . . n { { { { { { { { { { { { { { { { { { o p q r s . . . ", -" . . t { { { { { { { { { { { { { { { { { { { g < u v . . . ", -" . . ^ { { { { { { { { { { { { { { { { { { { { { { { . . . ", -" . . w { { { { { { { { { { { { { { { = o x y { { { { . . . ", -" . . z { { { { { { { { { { { { { { { A B C D { { { { . . . ", -" . . z { { { { { { { { E F F E { { { F G H I J { { { . . . ", -" . . z { { { { { { { { K 3 L M { { { - p N 0 O { { { . . . ", -" . . z { { { { { { { { P k Q R { { { { S T U V { { { . . . ", -" . . z { { { { { { { { W X Y Z ` { { { .~ ~ ..{ { { . . . ", -" . . z { { { { { { { { 6 r d H ; { { { +.@.#.$.{ { { . . . ", -" . . h { { { %.3 &.*.{ { =.-.&.$ { { { ;.>.,.' { { { . . . ", -" . . h { { { '.).!.~.{ { {.0 0 *.{ { { { { { { { { { . . . ", -" . . h { { { ].L ^.a { { /.(._.:.{ { { { { { { { { { . . . ", -" . . h { { { * <.: [.{ { }.=.|.' { { { { { { { { { { . . . ", -" . . n { { { { { { { { { 1.O 2.[.{ { { { { O 3.4.1.{ . . . ", -" . . n { { { { { { { { { { { { { { { { { { {.4 5.6.{ . . . ", -" . . ) { { { { { { { { { { { { { { { { { { {.4 5.6.{ . . . ", -" . . 7.{ { { { { { { { { { { { { { { { { { O 3.4.1.{ . . . ", -" . . . . . . . . . . . . . . . . . . . . . . . . ! 8.. . . ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" . . . . . . . . . . . . . . . . . . . . . . . . . "};