Commit cdbe94349e2a94d86cac03584345df6498f54c1d - freesweep

Import Debian changes 0.90-3 freesweep (0.90-3) unstable; urgency=medium * Team upload. * Switch to source format 3.0 (quilt). * Drop freesweep.menu. * Use compat level 9 and require debhelper >= 9. (Closes: #817462) * wrap-and-sort -sa. * Declare compliance with Debian Policy 3.9.7. * Use canonical Vcs-URI. * Add ${misc:Depends} substvar. * Remove quilt from Build-Depends because source format 3.0 uses quilt by default. * Switch to dh sequencer and simplify debian/rules. * Build with autotools_dev. * Switch to copyright format 1.0. * Add DEP-3 headers to all patches. * Add man-page.patch and fix spelling mistakes in freesweep.6. Thanks to A. Costa for the report and patch. (Closes: #659683) * Add freesweep.desktop and provide a new icon. (Closes: #538837, #726222) * Add clean file and ensure that freesweep can be built twice in a row. Markus Koschany 5 years ago

20 changed file(s) with 239 addition(s) and 155 deletion(s). Raw diff Collapse all Expand all

+23

-0

debian/changelog less more

	0	freesweep (0.90-3) unstable; urgency=medium
	1
	2	* Team upload.
	3	* Switch to source format 3.0 (quilt).
	4	* Drop freesweep.menu.
	5	* Use compat level 9 and require debhelper >= 9. (Closes: #817462)
	6	* wrap-and-sort -sa.
	7	* Declare compliance with Debian Policy 3.9.7.
	8	* Use canonical Vcs-URI.
	9	* Add ${misc:Depends} substvar.
	10	* Remove quilt from Build-Depends because source format 3.0 uses quilt by
	11	default.
	12	* Switch to dh sequencer and simplify debian/rules.
	13	* Build with autotools_dev.
	14	* Switch to copyright format 1.0.
	15	* Add DEP-3 headers to all patches.
	16	* Add man-page.patch and fix spelling mistakes in freesweep.6. Thanks to
	17	A. Costa for the report and patch. (Closes: #659683)
	18	* Add freesweep.desktop and provide a new icon. (Closes: #538837, #726222)
	19	* Add clean file and ensure that freesweep can be built twice in a row.
	20
	21	-- Markus Koschany <apo@debian.org> Thu, 24 Mar 2016 14:27:08 +0100
	22
0	23	freesweep (0.90-2) unstable; urgency=low
1	24
2	25	[ Ansgar Burchardt ]

-0

debian/clean less more

	0	Makefile
	1	config.h
	2	freesweep.6
	3	sweep.h
	4

-1

debian/compat less more

0		4
	0	9

+12

-7

debian/control less more

0	0	Source: freesweep
1	1	Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
2		Uploaders: Ansgar Burchardt <ansgar@43-1.org>
	2	Uploaders:
	3	Ansgar Burchardt <ansgar@43-1.org>
3	4	Section: games
4	5	Priority: optional
5		Standards-Version: 3.7.3
6		Build-Depends: debhelper (>= 4.0.0), libncurses5-dev, autoconf, autotools-dev, quilt
	6	Standards-Version: 3.9.7
	7	Build-Depends:
	8	autotools-dev,
	9	debhelper (>= 9),
	10	libncurses5-dev
7	11	Homepage: http://www.upl.cs.wisc.edu/~hartmann/sweep/
8		Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freesweep/
9		Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/freesweep/?op=log
10
	12	Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/freesweep/
	13	Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/freesweep/
11	14
12	15	Package: freesweep
13	16	Architecture: any
14		Depends: ${shlibs:Depends}
	17	Depends:
	18	${misc:Depends},
	19	${shlibs:Depends}
15	20	Description: text-based minesweeper
16	21	Freesweep is an implementation of the popular minesweeper game, where
17	22	one tries to find all the mines without igniting any, based on hints given

+51

-34

debian/copyright less more

0		This package has been Debianised by Antti-Juhani Kaijanaho <ajk@debian.org>
1		from sources fetched at 1999-09-05 03:30 UTC from
2		<URL:http://www.upl.cs.wisc.edu/~hartmann/sweep/freesweep.tar.gz>
	0	Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
	1	Source: http://www.upl.cs.wisc.edu/~hartmann/sweep/
	2	Comment:
	3	This package has been Debianised by Antti-Juhani Kaijanaho <ajk@debian.org>
	4	from sources fetched at 1999-09-05 03:30 UTC from
	5	<URL:http://www.upl.cs.wisc.edu/~hartmann/sweep/freesweep.tar.gz>
	6	.
	7	The sources for version 0.90 were fetched from
	8	http://www.upl.cs.wisc.edu/~hartmann/sweep/freesweep-0.90.tar.gz
	9	on Sat, 23 Feb 2008.
	10	.
	11	It was taken over by Edward Betts <edward@debian.org> on
	12	Sat, 13 Nov 1999 14:25:53 +0000
	13	.
	14	It was taken over by the Debian Games Team
	15	<pkg-games-devel@lists.alioth.debian.org> on Sat, 23 Feb 2008.
3	16
4		The sources for version 0.90 were fetched from
5		http://www.upl.cs.wisc.edu/~hartmann/sweep/freesweep-0.90.tar.gz
6		on Sat, 23 Feb 2008.
	17	Files: *
	18	Copyright: 1999, Gus Hartmann <hartmann@upl.cs.wisc.edu>
	19	1999, Pete Keller <psilord@upl.cs.wisc.edu>
	20	License: GPL-2+
7	21
8		It was taken over by Edward Betts <edward@debian.org> on
9		Sat, 13 Nov 1999 14:25:53 +0000
	22	Files: debian/*
	23	Copyright: 1999, Antti-Juhani Kaijanaho <ajk@debian.org>
	24	1999-2001, Edward Betts <edward@debian.org>
	25	2004, Romain Francoise <rfrancoise@debian.org>
	26	2006, Aurelien Jarno <aurel32@debian.org>
	27	2008, Marco Rodrigues <gothicx@sapo.pt>
	28	2008, Ansgar Burchardt <ansgar@43-1.org>
	29	2016, Markus Koschany <apo@debian.org>
	30	License: GPL-2+
10	31
11		It was taken over by the Debian Games Team
12		<pkg-games-devel@lists.alioth.debian.org> on Sat, 23 Feb 2008.
	32	Files: debian/freesweep.png
	33	Copyright: Mozilla Foundation
	34	License: GPL-2+
	35	Comment:
	36	https://commons.wikimedia.org/wiki/File:Minefield-icon.png
13	37
14		Upstream Authors: Gus Hartmann <hartmann@upl.cs.wisc.edu>
15		Pete Keller <psilord@upl.cs.wisc.edu>
16
17		Copyright:
18
19		freesweep - a curses minesweeper-style game
20		Copyright (C) 1999 Gus Hartmann & Peter Keller
21
22		This program is free software; you can redistribute it and/or modify
23		it under the terms of the GNU General Public License as published by
24		the Free Software Foundation; either version 2 of the License, or
25		(at your option) any later version.
26
27		This program is distributed in the hope that it will be useful,
28		but WITHOUT ANY WARRANTY; without even the implied warranty of
29		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
30		GNU General Public License for more details.
31
32		You should have received a copy of the GNU General Public License along
33		with this program; if not, write to the Free Software Foundation, Inc.,
34		51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
35
36		On Debian GNU/Linux systems, the complete text of the GNU General
37		Public License can be found in `/usr/share/common-licenses/GPL-2'.
	38	License: GPL-2+
	39	This program is free software; you can redistribute it and/or modify
	40	it under the terms of the GNU General Public License as published by
	41	the Free Software Foundation; either version 2 of the License, or
	42	(at your option) any later version.
	43	.
	44	This program is distributed in the hope that it will be useful,
	45	but WITHOUT ANY WARRANTY; without even the implied warranty of
	46	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	47	GNU General Public License for more details.
	48	.
	49	You should have received a copy of the GNU General Public License along
	50	with this program; if not, write to the Free Software Foundation, Inc.,
	51	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	52	.
	53	On Debian GNU/Linux systems, the complete text of the GNU General
	54	Public License can be found in `/usr/share/common-licenses/GPL-2'.

+11

-0

debian/freesweep.desktop less more

	0	[Desktop Entry]
	1	Version=1.0
	2	Type=Application
	3	Name=Freesweep
	4	Comment=text-based minesweeper game
	5	Comment[de]=textbasiertes Minesweeper-Spiel
	6	Exec=freesweep
	7	Icon=freesweep
	8	Categories=Game;LogicGame;
	9	Keywords=text-based;logic;mines;terminal;
	10	Terminal=true

-1

debian/freesweep.dirs less more

	0	etc
0	1	usr/games
1		etc
2	2	var/games

-6

~~debian/freesweep.menu~~ less more

0		?package(freesweep):\
1		needs="text"\
2		section="Games/Puzzles"\
3		title="Freesweep"\
4		command="/usr/games/freesweep"
5

debian/freesweep.png less more

Binary diff not shown

-0

debian/install less more

	0	debian/freesweep.desktop usr/share/applications
	1	debian/freesweep.png usr/share/icons/hicolor/128x128/apps

+12

-5

debian/patches/do-not-create-too-many-mines less more

	0	From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
	1	Date: Thu, 24 Mar 2016 12:43:31 +0100
	2	Subject: do-not-create-too-many-mines
	3
0	4	freesweep enters an infinite loop when placing mines if the user's
1	5	configuration has it creating more than (boardsize - 9) mines. This is
2	6	caused by game.c:510 not allowing mines to be created within a 3x3 block

7	11
8	12	Patch provided by Seneca for freesweep-0.88
9	13	see http://bugs.debian.org/249896
	14	---
	15	game.c \| 6 +++---
	16	1 file changed, 3 insertions(+), 3 deletions(-)
10	17
11		Index: freesweep-0.90/game.c
12		===================================================================
13		--- freesweep-0.90.orig/game.c
14		+++ freesweep-0.90/game.c
	18	diff --git a/game.c b/game.c
	19	index dbdf2f2..b19d8ad 100644
	20	--- a/game.c
	21	+++ b/game.c
15	22	@@ -14,12 +14,12 @@
16	23
17	24	int CheckHeight(int NewVal)

27	34	}
28	35
29	36	int CheckPercent(int NewVal)
30		@@ -53,7 +53,7 @@
	37	@@ -53,7 +53,7 @@ int CheckLineDraw(int NewVal)
31	38	*/
32	39	int CheckNumMines(int NewVal,int Height,int Width)
33	40	{

+13

-4

debian/patches/do-not-strip less more

0		Index: freesweep-0.90/Makefile.in
	0	From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
	1	Date: Thu, 24 Mar 2016 12:43:31 +0100
	2	Subject: do-not-strip
	3
1	4	===================================================================
2		--- freesweep-0.90.orig/Makefile.in
3		+++ freesweep-0.90/Makefile.in
4		@@ -60,7 +60,7 @@
	5	---
	6	Makefile.in \| 2 +-
	7	1 file changed, 1 insertion(+), 1 deletion(-)
	8
	9	diff --git a/Makefile.in b/Makefile.in
	10	index b38e541..2ceb6c3 100644
	11	--- a/Makefile.in
	12	+++ b/Makefile.in
	13	@@ -60,7 +60,7 @@ pure:
5	14
6	15	install: $(TARGET) $(TARGET).6
7	16	touch sweeptimes

+13

-4

debian/patches/fix-install less more

0		Index: freesweep-0.90/Makefile.in
	0	From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
	1	Date: Thu, 24 Mar 2016 12:43:31 +0100
	2	Subject: fix-install
	3
1	4	===================================================================
2		--- freesweep-0.90.orig/Makefile.in
3		+++ freesweep-0.90/Makefile.in
4		@@ -59,11 +59,11 @@
	5	---
	6	Makefile.in \| 10 +++++-----
	7	1 file changed, 5 insertions(+), 5 deletions(-)
	8
	9	diff --git a/Makefile.in b/Makefile.in
	10	index 2ceb6c3..53b6d8a 100644
	11	--- a/Makefile.in
	12	+++ b/Makefile.in
	13	@@ -59,11 +59,11 @@ pure:
5	14	@make "PURIFY=$(PURE_ARGS)"
6	15
7	16	install: $(TARGET) $(TARGET).6

+14

-5

debian/patches/fsf-address less more

0		Index: freesweep-0.90/gpl.c
	0	From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
	1	Date: Thu, 24 Mar 2016 12:43:31 +0100
	2	Subject: fsf-address
	3
1	4	===================================================================
2		--- freesweep-0.90.orig/gpl.c
3		+++ freesweep-0.90/gpl.c
4		@@ -22,7 +22,7 @@
	5	---
	6	gpl.c \| 5 +++--
	7	1 file changed, 3 insertions(+), 2 deletions(-)
	8
	9	diff --git a/gpl.c b/gpl.c
	10	index 7ba49c9..04e040d 100644
	11	--- a/gpl.c
	12	+++ b/gpl.c
	13	@@ -22,7 +22,7 @@ void PrintGPL()
5	14	" Version 2, June 1991",
6	15	"",
7	16	" Copyright (C) 1989, 1991 Free Software Foundation, Inc.",

10	19	" Everyone is permitted to copy and distribute verbatim copies",
11	20	" of this license document, but changing it is not allowed.",
12	21	"",
13		@@ -326,7 +326,8 @@
	22	@@ -326,7 +326,8 @@ void PrintGPL()
14	23	"",
15	24	" You should have received a copy of the GNU General Public License",
16	25	" along with this program; if not, write to the Free Software",

+41

-0

debian/patches/man-page.patch less more

	0	From: A. Costa <agcosta@gis.net>
	1	Date: Thu, 24 Mar 2016 12:45:07 +0100
	2	Subject: man page
	3
	4	Fix spelling errors in freesweep.6.in.
	5
	6	Bug: https://bugs.debian.org/659683
	7	Forwarded: no
	8	---
	9	freesweep.6.in \| 6 +++---
	10	1 file changed, 3 insertions(+), 3 deletions(-)
	11
	12	diff --git a/freesweep.6.in b/freesweep.6.in
	13	index abeb62f..8b8b511 100644
	14	--- a/freesweep.6.in
	15	+++ b/freesweep.6.in
	16	@@ -73,13 +73,13 @@ information will be placed in this manual page regarding the column format
	17	when it has been clearly established.
	18	.TP
	19	\fB\-f\fP, \fB\-\-fast\fP
	20	-This option bypasses the intercative dialog normally run initially. All values
	21	+This option bypasses the interactive dialog normally run initially. All values
	22	must either be specified on the command line or in the preferences files.
	23	.TP
	24	\fB\-g\fP, \fB\-\-show\-gpl\fP
	25	Display the GNU General Public License, in a nice curses page viewer. Currently
	26	version 2 of the license is displayed; however, freesweep is licensed under
	27	-version 2 or later of the GNU GPL, so this license may be superceded in the
	28	+version 2 or later of the GNU GPL, so this license may be superseded in the
	29	future.
	30	.TP
	31	\fB\-H\fP, \fB\-\-help\fP
	32	@@ -123,7 +123,7 @@ entered preferences should be saved. This dialog is skipped if the \-f or
	33	preference file.
	34
	35	In normal play, freesweep waits for keystrokes, and then reacts according
	36	-to the recieved value. Some keystrokes may be modified by a preceding
	37	+to the received value. Some keystrokes may be modified by a preceding
	38	integer; these are noted in the list below by a preceding \fIn\fP. The
	39	following keystroke values are valid:
	40

-0

debian/patches/series less more

2	2	do-not-strip
3	3	fix-install
4	4	do-not-create-too-many-mines
	5	man-page.patch

+21

-11

debian/patches/use-safe-string-functions less more

0		Index: freesweep-0.90/files.c
	0	From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
	1	Date: Thu, 24 Mar 2016 12:43:31 +0100
	2	Subject: use-safe-string-functions
	3
1	4	===================================================================
2		--- freesweep-0.90.orig/files.c
3		+++ freesweep-0.90/files.c
4		@@ -104,9 +104,7 @@
	5	---
	6	files.c \| 8 ++------
	7	pbests.c \| 15 ++++-----------
	8	2 files changed, 6 insertions(+), 17 deletions(-)
	9
	10	diff --git a/files.c b/files.c
	11	index b9bf110..97efaae 100644
	12	--- a/files.c
	13	+++ b/files.c
	14	@@ -104,9 +104,7 @@ int SourceHomeFile(GameStats* Game)
5	15	perror("SourceHomeFile::getenv");
6	16	return 1;
7	17	}

12	22
13	23	if ((PrefsFile=fopen(Pathname,"r"))==NULL)
14	24	{
15		@@ -167,9 +165,7 @@
	25	@@ -167,9 +165,7 @@ int WritePrefsFile(GameStats* Game)
16	26	return 1;
17	27	}
18	28

23	33
24	34	if ((PrefsFile=fopen(Pathname,"w"))==NULL)
25	35	{
26		Index: freesweep-0.90/pbests.c
27		===================================================================
28		--- freesweep-0.90.orig/pbests.c
29		+++ freesweep-0.90/pbests.c
30		@@ -382,7 +382,7 @@
	36	diff --git a/pbests.c b/pbests.c
	37	index 2fb687f..ba5c106 100644
	38	--- a/pbests.c
	39	+++ b/pbests.c
	40	@@ -382,7 +382,7 @@ struct BestEntry* NewBestEntry(GameStats *Game)
31	41	SweepError("You do not have a username!");
32	42	buf = "unknown";
33	43	}

36	46
37	47	/* get the real time it was completed */
38	48	time(&now);
39		@@ -436,16 +436,9 @@
	49	@@ -436,16 +436,9 @@ char* FPTBTF(void)
40	50	/* full path to group best times file */
41	51	char* FPTGBTF(void)
42	52	{

+16

-77

debian/rules less more

0	0	#!/usr/bin/make -f
1		# debian/rules for freesweep
2		# modifications by Edward Betts <edward@debian.org>
3		# Based on:
4		# Sample debian/rules that uses debhelper.
5		# GNU copyright 1997 to 1999 by Joey Hess.
	1	#export DH_VERBOSE=1
	2	CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
	3	CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
6	4
7		# Uncomment this to turn on verbose mode.
8		#export DH_VERBOSE=1
	5	%:
	6	dh $@ --with autotools_dev
9	7
10		include /usr/share/quilt/quilt.make
11
12		CFLAGS = -O2
13		ifeq "$(findstring debug,$(DEB_BUILD_OPTIONS))" "debug"
14		CFLAGS += -g
15		endif
16
17		configure: configure-stamp
18		configure-stamp: $(QUILT_STAMPFN)
19		dh_testdir
20
21		cp /usr/share/misc/config.sub .
22		cp /usr/share/misc/config.guess .
23		$(MAKE) config.h.in
24		CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --bindir=/usr/games \
	8	override_dh_auto_configure:
	9	CFLAGS="$(CFLAGS) $(CPPFLAGS)" dh_auto_configure -- \
	10	--prefix=/usr \
	11	--bindir=/usr/games \
25	12	--mandir='$${prefix}/share/man' \
26		--with-prefsdir=/etc --with-scoresdir=/var/games \
	13	--with-prefsdir=/etc \
	14	--with-scoresdir=/var/games \
27	15	--with-ncurses=/usr
28	16
29		touch $@
30
31		build: build-stamp
32		build-stamp: configure
33		dh_testdir
34
35		$(MAKE)
36
37		touch build-stamp
38
39		clean: clean-patched unpatch
40		clean-patched: $(QUILT_STAMPFN)
41		dh_testdir
42		dh_testroot
43		rm -f build-stamp
44		rm -f config.guess
45		rm -f config.sub
46
	17	override_dh_auto_clean:
47	18	[ ! -f Makefile ] \|\| $(MAKE) clean
48	19
49		dh_clean freesweep.6
50
51		install: build
52		dh_testdir
53		dh_testroot
54		dh_clean -k
55		dh_installdirs
56
	20	override_dh_auto_install:
57	21	$(MAKE) DESTDIR=$(CURDIR)/debian/freesweep install
58	22
59		# Build architecture-independent files here.
60		binary-indep: build install
61		# We have nothing to do by default.
	23	override_dh_installchangelogs:
	24	dh_installchangelogs CHANGES
62	25
63		# Build architecture-dependent files here.
64		binary-arch: build install
65		dh_testdir
66		dh_testroot
67		# dh_installdebconf
68		dh_installdocs
69		dh_installexamples
70		dh_installmenu
71		dh_installcron
72		dh_installinfo
73		# dh_undocumented
74		dh_installchangelogs CHANGES
75		dh_link
76		dh_strip
77		dh_compress
	26	override_dh_fixperms:
78	27	dh_fixperms
79	28	chmod 2755 $(CURDIR)/debian/freesweep/usr/games/freesweep
80	29	chown root:games $(CURDIR)/debian/freesweep/usr/games/freesweep
81		# dh_makeshlibs
82		dh_installdeb
83		# dh_perl
84		dh_shlibdeps
85		dh_gencontrol
86		dh_md5sums
87		dh_builddeb
88
89		binary: binary-indep binary-arch
90		.PHONY: build clean binary-indep binary-arch binary install

-0

debian/source/format less more

3.0 (quilt)

-0

debian/source/include-binaries less more

debian/freesweep.png