r13548 - in packages/trunk/slashem/debian: . patches
Vincent Cheng
vincentc-guest at alioth.debian.org
Sun May 13 00:30:57 UTC 2012
Author: vincentc-guest
Date: 2012-05-13 00:30:57 +0000 (Sun, 13 May 2012)
New Revision: 13548
Added:
packages/trunk/slashem/debian/patches/fix-libpng15-ftbfs.patch
Modified:
packages/trunk/slashem/debian/changelog
packages/trunk/slashem/debian/compat
packages/trunk/slashem/debian/control
packages/trunk/slashem/debian/copyright
packages/trunk/slashem/debian/patches/series
packages/trunk/slashem/debian/slashem-common.install
packages/trunk/slashem/debian/slashem-gtk.install
packages/trunk/slashem/debian/slashem-sdl.install
packages/trunk/slashem/debian/slashem-x11.install
packages/trunk/slashem/debian/slashem.install
Log:
slashem: Update to version 0.0.7E7F3-4
Modified: packages/trunk/slashem/debian/changelog
===================================================================
--- packages/trunk/slashem/debian/changelog 2012-05-08 22:00:00 UTC (rev 13547)
+++ packages/trunk/slashem/debian/changelog 2012-05-13 00:30:57 UTC (rev 13548)
@@ -1,3 +1,16 @@
+slashem (0.0.7E7F3-4) unstable; urgency=low
+
+ * Add debian/patches/fix-libpng15-ftbfs.patch to fix FTBFS with libpng 1.5.
+ (Closes: #649807)
+ * Replace build-depends on libpng12-dev with libpng-dev. (Closes: #662505)
+ * Add build-depends on zlib1g-dev.
+ * Update Format header in debian/copyright to latest DEP-5 revision.
+ * Fix syntax errors caught by lintian in debian/copyright.
+ * Update Standards version from 3.9.2 to 3.9.3, no changes required.
+ * Update debhelper compatiblity level from 8 to 9.
+
+ -- Vincent Cheng <Vincentc1208 at gmail.com> Thu, 10 May 2012 17:05:05 -0700
+
slashem (0.0.7E7F3-3) unstable; urgency=low
* Adopt package; change maintainer field in debian/control to:
Modified: packages/trunk/slashem/debian/compat
===================================================================
--- packages/trunk/slashem/debian/compat 2012-05-08 22:00:00 UTC (rev 13547)
+++ packages/trunk/slashem/debian/compat 2012-05-13 00:30:57 UTC (rev 13548)
@@ -1 +1 @@
-8
+9
Modified: packages/trunk/slashem/debian/control
===================================================================
--- packages/trunk/slashem/debian/control 2012-05-08 22:00:00 UTC (rev 13547)
+++ packages/trunk/slashem/debian/control 2012-05-13 00:30:57 UTC (rev 13548)
@@ -3,18 +3,35 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Vincent Cheng <Vincentc1208 at gmail.com>
-Build-Depends: debhelper (>= 8), libx11-dev, libxext-dev, libxpm-dev,
- libxt-dev, x11proto-core-dev, libgtk2.0-dev, libsdl1.2-dev, libxaw7-dev,
- libncurses5-dev, bison, flex, bsdmainutils, groff-base, libpng12-dev,
- po-debconf (>= 1.0)
-Standards-Version: 3.9.2
+Build-Depends:
+ bison,
+ bsdmainutils,
+ debhelper (>= 9),
+ flex,
+ groff-base,
+ libgtk2.0-dev,
+ libncurses5-dev,
+ libpng-dev,
+ libsdl1.2-dev,
+ libx11-dev,
+ libxaw7-dev,
+ libxext-dev,
+ libxpm-dev,
+ libxt-dev,
+ po-debconf (>= 1.0),
+ x11proto-core-dev,
+ zlib1g-dev
+Standards-Version: 3.9.3
Homepage: http://www.slashem.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/slashem/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/slashem/
Package: slashem
Architecture: any
-Depends: slashem-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ slashem-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Suggests: slashem-x11 | slashem-sdl | slashem-gtk
Description: variant of Nethack
Super Lotsa Added Stuff Hack - Extended Magic (SLASH'EM)
@@ -36,14 +53,14 @@
Package: slashem-common
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: debconf | debconf-2.0
Recommends: slashem | slashem-x11 | slashem-sdl | slashem-gtk
Replaces: slashem (<< 0.0.7E6F1-1)
Conflicts: slashem (<< 0.0.7E6F1-1)
Description: files common to all slashem-packages
This package contains the files comme to all the window ports of
- Slash'EM. You need to install at least one package containing a
+ Slash'EM. You need to install at least one package containing a
window port to use this package:
.
slashem - The basic ASCII interface
@@ -53,7 +70,10 @@
Package: slashem-sdl
Architecture: any
-Depends: slashem-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ slashem-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: variant of Nethack (SDL window port)
Super Lotsa Added Stuff Hack - Extended Magic (SLASH'EM)
is a role-playing game where you control a single character. The
@@ -70,7 +90,10 @@
Package: slashem-x11
Architecture: any
-Depends: slashem-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ slashem-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: variant of Nethack (X11 window port)
Super Lotsa Added Stuff Hack - Extended Magic (SLASH'EM)
is a role-playing game where you control a single character. The
@@ -87,7 +110,10 @@
Package: slashem-gtk
Architecture: any
-Depends: slashem-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ slashem-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: variant of Nethack (Gtk window port)
Super Lotsa Added Stuff Hack - Extended Magic (SLASH'EM)
is a role-playing game where you control a single character. The
Modified: packages/trunk/slashem/debian/copyright
===================================================================
--- packages/trunk/slashem/debian/copyright 2012-05-08 22:00:00 UTC (rev 13547)
+++ packages/trunk/slashem/debian/copyright 2012-05-13 00:30:57 UTC (rev 13548)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: slashem
Source: http://www.slashem.org/
@@ -6,7 +6,7 @@
Copyright: 1997-2006 Warren 'WACko' Cheung <wac at intergate.bc.ca>
1997-2006 J. Ali Harlow <j_ali at users.sourceforge.net>
1985-2003 Stichting Mathematisch Centrum, M. Stephenson (Nethack)
-License: Nethack General Public License
+License: Nethack-General-Public-License
Files: debian/*
Copyright: 2003-2007 Peter Makholm <peter at makholm.net>
@@ -31,100 +31,99 @@
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-License: Nethack General Public License
+License: Nethack-General-Public-License
NETHACK GENERAL PUBLIC LICENSE
(Copyright 1989 M. Stephenson)
-
+ .
(Based on the BISON general public license,
copyright 1988 Richard M. Stallman)
-
+ .
Everyone is permitted to copy and distribute verbatim copies of this
license, but changing it is not allowed. You can also use this wording to
make the terms for other programs.
-
- The license agreements of most software companies keep you at the mercy of
-those companies. By contrast, our general public license is intended to give
-everyone the right to share NetHack. To make sure that you get the rights we
-want you to have, we need to make restrictions that forbid anyone to deny you
-these rights or to ask you to surrender the rights. Hence this license
-agreement.
-
- Specifically, we want to make sure that you have the right to give away
-copies of NetHack, that you receive source code or else can get it if you
-want it, that you can change NetHack or use pieces of it in new free
-programs, and that you know you can do these things.
-
- To make sure that everyone has such rights, we have to forbid you to
-deprive anyone else of these rights. For example, if you distribute copies
-of NetHack, you must give the recipients all the rights that you have. You
-must make sure that they, too, receive or can get the source code. And you
-must tell them their rights.
-
- Also, for our own protection, we must make certain that everyone finds out
-that there is no warranty for NetHack. If NetHack is modified by someone
-else and passed on, we want its recipients to know that what they have is
-not what we distributed.
-
- Therefore we (Mike Stephenson and other holders of NetHack copyrights) make
-the following terms which say what you must do to be allowed to distribute or
-change NetHack.
-
-
+ .
+ The license agreements of most software companies keep you at the mercy of
+ those companies. By contrast, our general public license is intended to give
+ everyone the right to share NetHack. To make sure that you get the rights we
+ want you to have, we need to make restrictions that forbid anyone to deny you
+ these rights or to ask you to surrender the rights. Hence this license
+ agreement.
+ .
+ Specifically, we want to make sure that you have the right to give away
+ copies of NetHack, that you receive source code or else can get it if you
+ want it, that you can change NetHack or use pieces of it in new free
+ programs, and that you know you can do these things.
+ .
+ To make sure that everyone has such rights, we have to forbid you to
+ deprive anyone else of these rights. For example, if you distribute copies
+ of NetHack, you must give the recipients all the rights that you have. You
+ must make sure that they, too, receive or can get the source code. And you
+ must tell them their rights.
+ .
+ Also, for our own protection, we must make certain that everyone finds out
+ that there is no warranty for NetHack. If NetHack is modified by someone
+ else and passed on, we want its recipients to know that what they have is
+ not what we distributed.
+ .
+ Therefore we (Mike Stephenson and other holders of NetHack copyrights) make
+ the following terms which say what you must do to be allowed to distribute or
+ change NetHack.
+ .
+ .
COPYING POLICIES
-
- 1. You may copy and distribute verbatim copies of NetHack source code as
-you receive it, in any medium, provided that you keep intact the notices on
-all files that refer to copyrights, to this License Agreement, and to the
-absence of any warranty; and give any other recipients of the NetHack
-program a copy of this License Agreement along with the program.
-
- 2. You may modify your copy or copies of NetHack or any portion of it, and
-copy and distribute such modifications under the terms of Paragraph 1 above
-(including distributing this License Agreement), provided that you also do the
-following:
-
+ .
+ 1. You may copy and distribute verbatim copies of NetHack source code as
+ you receive it, in any medium, provided that you keep intact the notices on
+ all files that refer to copyrights, to this License Agreement, and to the
+ absence of any warranty; and give any other recipients of the NetHack
+ program a copy of this License Agreement along with the program.
+ .
+ 2. You may modify your copy or copies of NetHack or any portion of it, and
+ copy and distribute such modifications under the terms of Paragraph 1 above
+ (including distributing this License Agreement), provided that you also do the
+ following:
+ .
a) cause the modified files to carry prominent notices stating that you
changed the files and the date of any change; and
-
+ .
b) cause the whole of any work that you distribute or publish, that in
whole or in part contains or is a derivative of NetHack or any part
thereof, to be licensed at no charge to all third parties on terms
identical to those contained in this License Agreement (except that you
may choose to grant more extensive warranty protection to some or all
third parties, at your option)
-
+ .
c) You may charge a distribution fee for the physical act of
transferring a copy, and you may at your option offer warranty protection
in exchange for a fee.
-
- 3. You may copy and distribute NetHack (or a portion or derivative of it,
-under Paragraph 2) in object code or executable form under the terms of
-Paragraphs 1 and 2 above provided that you also do one of the following:
-
+ .
+ 3. You may copy and distribute NetHack (or a portion or derivative of it,
+ under Paragraph 2) in object code or executable form under the terms of
+ Paragraphs 1 and 2 above provided that you also do one of the following:
+ .
a) accompany it with the complete machine-readable source code, which
must be distributed under the terms of Paragraphs 1 and 2 above; or,
-
+ .
b) accompany it with full information as to how to obtain the complete
machine-readable source code from an appropriate archive site. (This
alternative is allowed only for noncommercial distribution.)
-
-For these purposes, complete source code means either the full source
-distribution as originally released over Usenet or updated copies of the
-files in this distribution used to create the object code or executable.
-
- 4. You may not copy, sublicense, distribute or transfer NetHack except as
-expressly provided under this License Agreement. Any attempt otherwise to
-copy, sublicense, distribute or transfer NetHack is void and your rights to
-use the program under this License agreement shall be automatically
-terminated. However, parties who have received computer software programs
-from you with this License Agreement will not have their licenses terminated
-so long as such parties remain in full compliance.
-
-
-Stated plainly: You are prohibited by the terms of this License Agreement
-from using NetHack for gainful purposes. You are permitted to modify
-NetHack, or otherwise use parts of NetHack, provided that you comply with
-the conditions specified above; in particular, your modified NetHack or
-program containing parts of NetHack must remain freely available as provided
-in this License Agreement. In other words, go ahead and share NetHack, but
-don't try to stop anyone else from sharing it farther.
+ .
+ For these purposes, complete source code means either the full source
+ distribution as originally released over Usenet or updated copies of the
+ files in this distribution used to create the object code or executable.
+ .
+ 4. You may not copy, sublicense, distribute or transfer NetHack except as
+ expressly provided under this License Agreement. Any attempt otherwise to
+ copy, sublicense, distribute or transfer NetHack is void and your rights to
+ use the program under this License agreement shall be automatically
+ terminated. However, parties who have received computer software programs
+ from you with this License Agreement will not have their licenses terminated
+ so long as such parties remain in full compliance.
+ .
+ Stated plainly: You are prohibited by the terms of this License Agreement
+ from using NetHack for gainful purposes. You are permitted to modify
+ NetHack, or otherwise use parts of NetHack, provided that you comply with
+ the conditions specified above; in particular, your modified NetHack or
+ program containing parts of NetHack must remain freely available as provided
+ in this License Agreement. In other words, go ahead and share NetHack, but
+ don't try to stop anyone else from sharing it farther.
Added: packages/trunk/slashem/debian/patches/fix-libpng15-ftbfs.patch
===================================================================
--- packages/trunk/slashem/debian/patches/fix-libpng15-ftbfs.patch (rev 0)
+++ packages/trunk/slashem/debian/patches/fix-libpng15-ftbfs.patch 2012-05-13 00:30:57 UTC (rev 13548)
@@ -0,0 +1,36 @@
+Description: Fix FTBFS with libpng 1.5.
+Origin: http://lists.fedoraproject.org/pipermail/scm-commits/2012-January/719482.html
+Author: Iain Arnell <iarnell at gmail.com>
+Bug-Debian: http://bugs.debian.org/649807
+Last-Update: 05-10-2012
+
+--- a/win/gl/gl_image.c
++++ b/win/gl/gl_image.c
+@@ -495,7 +495,7 @@
+ /* set error handling since we are using the setjmp/longjmp method
+ * (this is the normal method of doing things with libpng).
+ */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ sdlgl_warning("Problem within LibPNG (unknown)\n");
+ goto failed;
+--- a/win/share/tile2png.c
++++ b/win/share/tile2png.c
+@@ -26,6 +26,7 @@
+ #undef blue
+
+ #include <png.h>
++#include <zlib.h>
+ #include <assert.h>
+
+
+@@ -104,7 +105,7 @@
+ /* set error handling since we are using the setjmp/longjmp method
+ * (this is the normal method of doing things with libpng).
+ */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ fprintf(stderr, "tile2png: Unknown problem while writing PNG.\n");
+ goto failed;
Modified: packages/trunk/slashem/debian/patches/series
===================================================================
--- packages/trunk/slashem/debian/patches/series 2012-05-08 22:00:00 UTC (rev 13547)
+++ packages/trunk/slashem/debian/patches/series 2012-05-13 00:30:57 UTC (rev 13548)
@@ -1,2 +1,3 @@
spelling-error.patch
+fix-libpng15-ftbfs.patch
slashem-debian.patch
Modified: packages/trunk/slashem/debian/slashem-common.install
===================================================================
--- packages/trunk/slashem/debian/slashem-common.install 2012-05-08 22:00:00 UTC (rev 13547)
+++ packages/trunk/slashem/debian/slashem-common.install 2012-05-13 00:30:57 UTC (rev 13548)
@@ -1,9 +1,9 @@
+debian/slashem.xpm usr/share/pixmaps
+debian/tmp/usr/lib/games/slashem/nhushare
debian/tmp/usr/lib/games/slashem/recover
-debian/tmp/usr/lib/games/slashem/nhushare
debian/tmp/usr/share/doc/slashem-common/Guidebook.txt
+debian/tmp/usr/share/games/slashem/nhshare
+debian/tmp/usr/share/games/slashem/pet_mark.xbm
+debian/tmp/usr/share/games/slashem/rip.xpm
debian/tmp/usr/share/games/slashem/x11bigtiles
-debian/tmp/usr/share/games/slashem/rip.xpm
debian/tmp/usr/share/games/slashem/x11tiles
-debian/tmp/usr/share/games/slashem/nhshare
-debian/tmp/usr/share/games/slashem/pet_mark.xbm
-debian/slashem.xpm usr/share/pixmaps
Modified: packages/trunk/slashem/debian/slashem-gtk.install
===================================================================
--- packages/trunk/slashem/debian/slashem-gtk.install 2012-05-08 22:00:00 UTC (rev 13547)
+++ packages/trunk/slashem/debian/slashem-gtk.install 2012-05-13 00:30:57 UTC (rev 13548)
@@ -1,3 +1,4 @@
+debian/slashem-gtk.desktop usr/share/applications
debian/tmp/usr/games/slashem-gtk
debian/tmp/usr/share/games/slashem/gtkrc
debian/tmp/usr/share/games/slashem/x11big3dtiles
@@ -4,4 +5,3 @@
debian/tmp/usr/share/games/slashem/x11big3dtiles.map
debian/tmp/usr/share/games/slashem/x11bigtiles.map
debian/tmp/usr/share/games/slashem/x11tiles.map
-debian/slashem-gtk.desktop usr/share/applications
Modified: packages/trunk/slashem/debian/slashem-sdl.install
===================================================================
--- packages/trunk/slashem/debian/slashem-sdl.install 2012-05-08 22:00:00 UTC (rev 13547)
+++ packages/trunk/slashem/debian/slashem-sdl.install 2012-05-13 00:30:57 UTC (rev 13548)
@@ -1,11 +1,11 @@
+debian/slashem-sdl.desktop usr/share/applications/
debian/tmp/usr/games/slashem-sdl
+debian/tmp/usr/share/games/slashem/glfont14.png
+debian/tmp/usr/share/games/slashem/glfont20.png
+debian/tmp/usr/share/games/slashem/glfont22.png
+debian/tmp/usr/share/games/slashem/glfont8.png
+debian/tmp/usr/share/games/slashem/gllogo.png
debian/tmp/usr/share/games/slashem/glrip.png
debian/tmp/usr/share/games/slashem/gltile16.png
debian/tmp/usr/share/games/slashem/gltile32.png
debian/tmp/usr/share/games/slashem/gltile64.png
-debian/tmp/usr/share/games/slashem/glfont8.png
-debian/tmp/usr/share/games/slashem/glfont14.png
-debian/tmp/usr/share/games/slashem/glfont20.png
-debian/tmp/usr/share/games/slashem/glfont22.png
-debian/tmp/usr/share/games/slashem/gllogo.png
-debian/slashem-sdl.desktop usr/share/applications/
Modified: packages/trunk/slashem/debian/slashem-x11.install
===================================================================
--- packages/trunk/slashem/debian/slashem-x11.install 2012-05-08 22:00:00 UTC (rev 13547)
+++ packages/trunk/slashem/debian/slashem-x11.install 2012-05-13 00:30:57 UTC (rev 13548)
@@ -1,4 +1,4 @@
+debian/slashem-x11.desktop usr/share/applications
debian/tmp/etc/slashemrc.x11
debian/tmp/usr/games/slashem-x11
debian/tmp/usr/share/games/slashem/SlashEM.ad
-debian/slashem-x11.desktop usr/share/applications
Modified: packages/trunk/slashem/debian/slashem.install
===================================================================
--- packages/trunk/slashem/debian/slashem.install 2012-05-08 22:00:00 UTC (rev 13547)
+++ packages/trunk/slashem/debian/slashem.install 2012-05-13 00:30:57 UTC (rev 13548)
@@ -1,2 +1,2 @@
+debian/tmp/usr/games/slashem
debian/tmp/usr/lib/games/slashem/slashem
-debian/tmp/usr/games/slashem
More information about the Pkg-games-commits
mailing list