r9573 - in packages/branches/xmahjongg/lenny: . debian debian/patches
Peter Pentchev
roam-guest at alioth.debian.org
Tue Apr 14 09:29:15 UTC 2009
Author: roam-guest
Date: 2009-04-14 09:29:15 +0000 (Tue, 14 Apr 2009)
New Revision: 9573
Added:
packages/branches/xmahjongg/lenny/debian/patches/02-manpage-typo.patch
packages/branches/xmahjongg/lenny/debian/patches/03-compiler-warnings.patch
packages/branches/xmahjongg/lenny/debian/xmahjongg.lintian-overrides
Modified:
packages/branches/xmahjongg/lenny/
packages/branches/xmahjongg/lenny/debian/changelog
packages/branches/xmahjongg/lenny/debian/copyright
packages/branches/xmahjongg/lenny/debian/patches/series
packages/branches/xmahjongg/lenny/debian/rules
Log:
Merge trunk rev. 9342-9357 (yes, the changelog one will be reverted later):
Override the "no-upstream-changelog" lintian warning.
........
Add a couple of to-do items for tomorrow.
........
Ah, the x-dev build dependecy was even files as a bug :)
........
Fix a typo in the manual page, thus closing #302663.
........
Convert the copyright file to the machine-parseable format and
actually list all the licenses for all relevant files there.
........
Pass -Werror to the compiler if the non-standard "werror" option is on.
........
Make the configure script work even with the -Werror flag.
........
Fix a couple of const char * warnings.
Property changes on: packages/branches/xmahjongg/lenny
___________________________________________________________________
Modified: svnmerge-integrated
- /packages/trunk/xmahjongg:1-9341
+ /packages/trunk/xmahjongg:1-9357
Modified: packages/branches/xmahjongg/lenny/debian/changelog
===================================================================
--- packages/branches/xmahjongg/lenny/debian/changelog 2009-04-14 09:20:15 UTC (rev 9572)
+++ packages/branches/xmahjongg/lenny/debian/changelog 2009-04-14 09:29:15 UTC (rev 9573)
@@ -1,6 +1,10 @@
xmahjongg (3.7-2) UNRELEASED; urgency=low
* New maintainer. Closes: #519355
+ * TODO:
+ - fix a couple of compiler warnings, build with more warning flags
+ - build with the hardening wrapper
+ - add a desktop file to fix #478955
* Use quilt for patch management.
* Regenerate the autotools-related files.
* Add a watch file.
@@ -8,6 +12,7 @@
* Add the Homepage, Vcs-Svn, and Vcs-Browser fields.
* Flesh out the long description a bit.
* Replace the obsolete x-dev dependency with x11proto-core-dev.
+ Closes: #515420
* Specify the debhelper compatibility level as 7:
- install into debian/xmahjongg instead of debian/tmp
- add misc:Depends to the xmahjongg binary package
@@ -16,6 +21,15 @@
* Bump Standards-Version to 3.8.1:
- add the README.source file mentioning the use of quilt
* Shorten the rules file using debhelper 7's dh helper.
+ * Override the "no upstream changelog" lintian warning.
+ * Fix a typo in the manual page. Closes: #302663
+ * Convert the copyright file to the machine-parseable format and
+ actually list all the relevant files' licenses there.
+ * Build with -Werror if "werror" is specified in DEB_BUILD_OPTIONS.
+ * Fix some compiler warnings:
+ - make the configure script produce the same result with or without
+ the -Werror flag at the warnings level used
+ - fix a couple of const char * warnings
-- Peter Pentchev <roam at ringlet.net> Tue, 31 Mar 2009 17:19:37 +0300
Modified: packages/branches/xmahjongg/lenny/debian/copyright
===================================================================
--- packages/branches/xmahjongg/lenny/debian/copyright 2009-04-14 09:20:15 UTC (rev 9572)
+++ packages/branches/xmahjongg/lenny/debian/copyright 2009-04-14 09:29:15 UTC (rev 9573)
@@ -1,17 +1,150 @@
-This package was debianized by Dave Swegen <dsw at debian.org>
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?recall=184
+Upstream-Name: xmahjongg
+Upstream-Source: http://www.lcdf.org/xmahjongg/
-It was downloaded from http://www.lcdf.org/xmahjongg/
+Files: *
+Author: Eddie Kohler <eddietwo at lcs.mit.edu>
+Copyright: Copyright (C) 1993-2000 Eddie Kohler.
+License: GPL-2+
+ (the following is an excerpt from the README file)
+ .
+ All source code is Copyright (C) 1993-2000 Eddie Kohler.
+ .
+ This package is distributed under the GNU General Public License, Version
+ 2, or, at your discretion, any later version. The GNU General Public License
+ is available via the Web at <http://www.gnu.org/copyleft/gpl.html>. The GPL
+ is designed to allow you to alter and redistribute the package, as long as
+ you do not remove that freedom from others.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in file "/usr/share/common-licenses/GPL-2".
-Upstream Author: Eddie Kohler <eddietwo at lcs.mit.edu>
+Files: liblcdf/clp.c include/lcdf/clp.h
+Author: Eddie Kohler <kohler at cs.ucla.edu>
+Copyright: Copyright (c) 1997-2005 Eddie Kohler, kohler at cs.ucla.edu
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, subject to the conditions
+ listed in the Click LICENSE file, which is available in full at
+ http://www.pdos.lcs.mit.edu/click/license.html. The conditions include: you
+ must preserve this copyright notice, and you cannot mention the copyright
+ holders in advertising related to the Software without their permission.
+ The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+ notice is a summary of the Click LICENSE file; the license in that file is
+ legally binding.
-Copyright:
+Files: liblcdf/giffunc.c liblcdf/gifread.c liblcdf/gifx.c
+ include/gif.h include/gifx.h
+Author: Eddie Kohler <eddietwo at lcs.mit.edu>
+Copyright: Copyright (C) 1997-9 Eddie Kohler, eddietwo at lcs.mit.edu
+Licnese: GPL-2+
+ This file is part of the GIF library.
+ .
+ The GIF library is free software*. It is distributed under the GNU General
+ Public License, version 2 or later; you can copy, distribute, or alter it
+ at will, as long as this notice is kept intact and this source code is made
+ available. There is no warranty, express or implied.
+ .
+ *There is a patent on the LZW compression method used by GIFs, and included
+ in gifwrite.c. Unisys, the patent holder, allows the compression algorithm
+ to be used without a license in software distributed at no cost to the
+ user. The decompression algorithm is not patented.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in file "/usr/share/common-licenses/GPL-2".
-All source code is Copyright (C) 1994-2000 Eddie Kohler.
+Files: liblcdf/permstr.cc include/lcdf/permstr.hh
+Author: Eddie Kohler <eddietwo at lcs.mit.edu>
+Copyright: Copyright (c) 1998-2004 Eddie Kohler
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in file "/usr/share/common-licenses/GPL-2".
-This package is distributed under the GNU General Public License, Version
-2, or, at your discretion, any later version. The GNU General Public License
-is available via the Web at <http://www.gnu.org/copyleft/gpl.html>. The GPL
-is designed to allow you to alter and redistribute the package, as long as
-you do not remove that freedom from others.
+Files: liblcdf/straccum.cc liblcdf/string.cc
+ include/lcdf/straccum.hh include/lcdf/string.hh
+Author: Eddie Kohler <eddietwo at lcs.mit.edu>
+Copyright: Copyright (c) 1999-2000 Massachusetts Institute of Technology
+ Copyright (c) 2001-2005 Eddie Kohler
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, subject to the conditions
+ listed in the Click LICENSE file. These conditions include: you must
+ preserve this copyright notice, and you cannot mention the copyright
+ holders in advertising related to the Software without their permission.
+ The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+ notice is a summary of the Click LICENSE file; the license in that file is
+ legally binding.
-On Debian systems this can be found in /usr/share/common-licenses.
+Files: liblcdf/vectorv.cc
+Author: Eddie Kohler <eddietwo at lcs.mit.edu>
+Copyright: Copyright (c) 1999-2004 Massachusetts Institute of Technology
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, subject to the conditions
+ listed in the Click LICENSE file. These conditions include: you must
+ preserve this copyright notice, and you cannot mention the copyright
+ holders in advertising related to the Software without their permission.
+ The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+ notice is a summary of the Click LICENSE file; the license in that file is
+ legally binding.
+
+Files: include/lcdf/vector.cc include/lcdf/vector.hh
+Author: Eddie Kohler <eddietwo at lcs.mit.edu>
+Copyright: Copyright (c) 1999-2000 Massachusetts Institute of Technology
+ Copyright (c) 2001-2003 International Computer Science Institute
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, subject to the conditions
+ listed in the Click LICENSE file. These conditions include: you must
+ preserve this copyright notice, and you cannot mention the copyright
+ holders in advertising related to the Software without their permission.
+ The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+ notice is a summary of the Click LICENSE file; the license in that file is
+ legally binding.
+
+Files: share/tiles/dorothys.gif
+Author: Dorothy Robinson <mokuren at teleport.com>
+Copyright: Copyright (c) 2000 Dorothy Robinson
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in file "/usr/share/common-licenses/GPL-2".
+
+Files: share/tiles/dorwhite.gif
+Author: Dorothy Robinson <mokuren at teleport.com>
+Copyright: Copyright (c) 1988 Dorothy Robinson
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in file "/usr/share/common-licenses/GPL-2".
+
+Files: debian/*
+Author: Dave Swegen <dsw at debian.org>
+ Peter Pentchev <roam at ringlet.net>
+Copyright: Copyright (C) 1998-2005 Dave Swegen
+ Copyright (C) 2009 Peter Pentchev
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in file "/usr/share/common-licenses/GPL-2".
Copied: packages/branches/xmahjongg/lenny/debian/patches/02-manpage-typo.patch (from rev 9357, packages/trunk/xmahjongg/debian/patches/02-manpage-typo.patch)
===================================================================
--- packages/branches/xmahjongg/lenny/debian/patches/02-manpage-typo.patch (rev 0)
+++ packages/branches/xmahjongg/lenny/debian/patches/02-manpage-typo.patch 2009-04-14 09:29:15 UTC (rev 9573)
@@ -0,0 +1,16 @@
+Fix a typo.
+
+Debian bug: #302663
+Submitted by: A Costa <agcosta at gis.net>
+
+--- a/xmahjongg.6
++++ b/xmahjongg.6
+@@ -311,7 +311,7 @@
+ .PP
+ The default tileset was originally created in color by Dorothy Robinson
+ <mokuren at teleport.com> with Mark A. Holm <markh at aracnet.com>. The
+-publically available version was in black-and-white. Holm copyrighted the
++publicly available version was in black-and-white. Holm copyrighted the
+ tiles in 1988, giving permission to copy and distribute for non-profit
+ purposes. The significantly altered color version that comes with
+ .B xmahjongg
Copied: packages/branches/xmahjongg/lenny/debian/patches/03-compiler-warnings.patch (from rev 9357, packages/trunk/xmahjongg/debian/patches/03-compiler-warnings.patch)
===================================================================
--- packages/branches/xmahjongg/lenny/debian/patches/03-compiler-warnings.patch (rev 0)
+++ packages/branches/xmahjongg/lenny/debian/patches/03-compiler-warnings.patch 2009-04-14 09:29:15 UTC (rev 9573)
@@ -0,0 +1,54 @@
+Make the configure script produce the same result with or without -Werror.
+Fix a couple of const char * warnings.
+
+--- a/configure
++++ b/configure
+@@ -6193,7 +6193,8 @@
+ int
+ main ()
+ {
+-gettimeofday((void *)0, (void *)0);
++struct timeval tv;
++gettimeofday(&tv, (void *)0);
+ ;
+ return 0;
+ }
+@@ -8267,6 +8268,7 @@
+
+ int a;
+ int *b = new(&a) int;
++ a = *b;
+ return 0;
+
+ ;
+--- a/liblcdf/string.cc
++++ b/liblcdf/string.cc
+@@ -37,7 +37,7 @@
+
+ inline
+ String::Memo::Memo()
+- : _refcount(0), _capacity(0), _dirty(0), _real_data("")
++ : _refcount(0), _capacity(0), _dirty(0), _real_data(new char[1])
+ {
+ }
+
+--- a/src/main.cc
++++ b/src/main.cc
+@@ -230,7 +230,7 @@
+
+
+ Button *
+-new_button(Panel *panel, char *name)
++new_button(Panel *panel, const char *name)
+ {
+ char buf[100];
+ Button *but = new Button(panel);
+@@ -708,7 +708,7 @@
+ XStringListToTextProperty(woog, 1, &window_name_prop);
+ XStringListToTextProperty(woog, 1, &icon_name_prop);
+ class_hint.res_name = (char *)(x_name ? x_name : program_name);
+- class_hint.res_class = "XMahjongg";
++ class_hint.res_class = (char *)"XMahjongg";
+
+ XResizeWindow(display, window, size_hint->width, size_hint->height);
+ XSetWMProperties(display, window, &window_name_prop, &icon_name_prop,
Modified: packages/branches/xmahjongg/lenny/debian/patches/series
===================================================================
--- packages/branches/xmahjongg/lenny/debian/patches/series 2009-04-14 09:20:15 UTC (rev 9572)
+++ packages/branches/xmahjongg/lenny/debian/patches/series 2009-04-14 09:29:15 UTC (rev 9573)
@@ -1 +1,3 @@
01-autotools.patch
+02-manpage-typo.patch
+03-compiler-warnings.patch
Modified: packages/branches/xmahjongg/lenny/debian/rules
===================================================================
--- packages/branches/xmahjongg/lenny/debian/rules 2009-04-14 09:20:15 UTC (rev 9572)
+++ packages/branches/xmahjongg/lenny/debian/rules 2009-04-14 09:29:15 UTC (rev 9573)
@@ -9,6 +9,14 @@
PACKAGE= xmahjongg
D= $(CURDIR)/debian/$(PACKAGE)
+WARNFLAGS?=
+ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
+ WARNFLAGS+= -Werror
+endif
+CFLAGS+= ${WARNFLAGS}
+CXXFLAGS+= ${WARNFLAGS}
+export CFLAGS CXXFLAGS
+
include /usr/share/quilt/quilt.make
build: build-stamp
@@ -16,7 +24,7 @@
dh build --before auto_configure
./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/games
# Avoid rebuilding config.h.in
- touch config.h.in
+ touch config.h.in && touch configure
dh build --after auto_configure
touch build-stamp
Copied: packages/branches/xmahjongg/lenny/debian/xmahjongg.lintian-overrides (from rev 9357, packages/trunk/xmahjongg/debian/xmahjongg.lintian-overrides)
===================================================================
--- packages/branches/xmahjongg/lenny/debian/xmahjongg.lintian-overrides (rev 0)
+++ packages/branches/xmahjongg/lenny/debian/xmahjongg.lintian-overrides 2009-04-14 09:29:15 UTC (rev 9573)
@@ -0,0 +1 @@
+xmahjongg: no-upstream-changelog
More information about the Pkg-games-commits
mailing list