r13583 - in packages/trunk/slashem/debian: . patches
Vincent Cheng
vincentc-guest at alioth.debian.org
Sat May 19 00:47:42 UTC 2012
Author: vincentc-guest
Date: 2012-05-19 00:47:41 +0000 (Sat, 19 May 2012)
New Revision: 13583
Added:
packages/trunk/slashem/debian/slashem-common.manpages
Removed:
packages/trunk/slashem/debian/slashem-gtk.lintian-overrides
packages/trunk/slashem/debian/slashem-sdl.lintian-overrides
packages/trunk/slashem/debian/slashem-x11.lintian-overrides
packages/trunk/slashem/debian/slashem.lintian-overrides
Modified:
packages/trunk/slashem/debian/changelog
packages/trunk/slashem/debian/patches/fix-libpng15-ftbfs.patch
packages/trunk/slashem/debian/patches/series
packages/trunk/slashem/debian/patches/slashem-debian.patch
packages/trunk/slashem/debian/patches/spelling-error.patch
packages/trunk/slashem/debian/rules
Log:
slashem: Update to release 0.0.7E7F3-5
Modified: packages/trunk/slashem/debian/changelog
===================================================================
--- packages/trunk/slashem/debian/changelog 2012-05-18 07:22:58 UTC (rev 13582)
+++ packages/trunk/slashem/debian/changelog 2012-05-19 00:47:41 UTC (rev 13583)
@@ -1,3 +1,15 @@
+slashem (0.0.7E7F3-5) unstable; urgency=low
+
+ * Modify debian/patches/slashem-debian.patch to fix FTBFS on kfreebsd
+ (and maybe on hurd). (Closes: #672810)
+ - Workaround FTBFS by disabling optimization (on non-Linux archs).
+ * Add DEP-3 patch headers to existing patches.
+ * Switch to dh 7 "rules.tiny" style debian/rules.
+ * Enable build hardening.
+ * Remove unused lintian overrides (menu-icon-missing).
+
+ -- Vincent Cheng <Vincentc1208 at gmail.com> Thu, 17 May 2012 22:26:17 -0700
+
slashem (0.0.7E7F3-4) unstable; urgency=low
* Add debian/patches/fix-libpng15-ftbfs.patch to fix FTBFS with libpng 1.5.
Modified: packages/trunk/slashem/debian/patches/fix-libpng15-ftbfs.patch
===================================================================
--- packages/trunk/slashem/debian/patches/fix-libpng15-ftbfs.patch 2012-05-18 07:22:58 UTC (rev 13582)
+++ packages/trunk/slashem/debian/patches/fix-libpng15-ftbfs.patch 2012-05-19 00:47:41 UTC (rev 13583)
@@ -1,8 +1,9 @@
Description: Fix FTBFS with libpng 1.5.
+Forwarded: http://sourceforge.net/support/tracker.php?aid=3526441
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
+Last-Update: 05-13-2012
--- a/win/gl/gl_image.c
+++ b/win/gl/gl_image.c
Modified: packages/trunk/slashem/debian/patches/series
===================================================================
--- packages/trunk/slashem/debian/patches/series 2012-05-18 07:22:58 UTC (rev 13582)
+++ packages/trunk/slashem/debian/patches/series 2012-05-19 00:47:41 UTC (rev 13583)
@@ -1,3 +1,3 @@
+fix-libpng15-ftbfs.patch
spelling-error.patch
-fix-libpng15-ftbfs.patch
slashem-debian.patch
Modified: packages/trunk/slashem/debian/patches/slashem-debian.patch
===================================================================
--- packages/trunk/slashem/debian/patches/slashem-debian.patch 2012-05-18 07:22:58 UTC (rev 13582)
+++ packages/trunk/slashem/debian/patches/slashem-debian.patch 2012-05-19 00:47:41 UTC (rev 13583)
@@ -1,4 +1,8 @@
-This patch contains a variety of Debian-specific patches.
+Description: Debian-specific patchset for slashem
+ This is a collection of patches against slashem specifically for Debian.
+ (TODO: Separate this gigantic patch into several smaller quilt-style patches)
+Forwarded: not-needed
+Last-Update: 05-13-2012
--- a/include/config.h
+++ b/include/config.h
@@ -148,9 +152,22 @@
#define NH_OPTIONAREA FILE_AREA_SHARE
--- a/include/unixconf.h
+++ b/include/unixconf.h
-@@ -33,12 +33,12 @@
+@@ -20,9 +20,11 @@
+ */
+ /* define exactly one of the following four choices */
+-/* #define BSD 1 */ /* define for 4.n/Free/Open/Net BSD */
++#if defined(__FreeBSD_kernel__)
++#define BSD 1 /* define for 4.n/Free/Open/Net BSD */
+ /* also for relatives like SunOS 4.x, DG/UX, and */
+ /* older versions of Linux */
++#endif
+ /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */
+ /* Use BSD for < v3.0 */
+ /* "ULTRIX" not to be confused with "ultrix" */
+@@ -33,12 +35,14 @@
+
/* define any of the following that are appropriate */
-#define SVR4 /* use in addition to SYSV for System V Release 4 */
+/* #define SVR4 */ /* use in addition to SYSV for System V Release 4 */
@@ -159,11 +176,13 @@
/* e.g. Suns sharing a playground through NFS */
/* #define SUNOS4 */ /* SunOS 4.x */
-/* #define LINUX */ /* Another Unix clone */
++#if defined(LINUX)
+#define LINUX /* Another Unix clone */
++#endif
/* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */
/* #define GENIX */ /* Yet Another Unix Clone */
/* #define HISX */ /* Bull Unix for XPS Machines */
-@@ -113,7 +113,7 @@
+@@ -113,7 +117,7 @@
* FILE_AREA_DOC For human-readable documentation
*/
@@ -196,14 +215,29 @@
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
-@@ -124,11 +124,11 @@
+@@ -1,3 +1,6 @@
++# Determine kernel name
++UNAME := $(shell uname -s)
++
+ # NetHack Makefile.
+ # SCCS Id: @(#)Makefile.src 3.4 2002/03/02
- # flags for Linux
+@@ -122,13 +125,18 @@
+ # CFLAGS = -O -I../include -I/usr/X11/include
+ # LFLAGS = -L/usr/X11/lib
+
+-# flags for Linux
++# flags for Linux and kFreeBSD
# compile normally
-# CFLAGS = -O2 -fomit-frame-pointer -I../include
-# LFLAGS = -L/usr/X11R6/lib
-+CFLAGS = -DDEBIAN_$(GUI) -O2 -fomit-frame-pointer -I../include -I/usr/X11R6/include
-+LFLAGS = -L/usr/X11R6/lib
++# disable optimization on non-Linux archs due to FTBFS
++ifeq ($(UNAME),Linux)
++CFLAGS = -DDEBIAN_$(GUI) -O2 -fomit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -I../include -I/usr/X11R6/include
++else
++CFLAGS = -DDEBIAN_$(GUI) -fstack-protector --param=ssp-buffer-size=4 -I../include -I/usr/X11R6/include
++endif
++LFLAGS = -L/usr/X11R6/lib -Wl,-z,relro
# OR compile backwards compatible a.out format
-# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
-# LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib
@@ -212,7 +246,7 @@
# flags for BeOS
# on a Mac/BeBox:
-@@ -144,8 +144,8 @@
+@@ -144,8 +152,8 @@
# flags for debugging:
# CFLAGS = -g -I../include
@@ -223,7 +257,7 @@
# Only used for the Gnome interface.
# When including the Gnome interface, you need to include gnome specific
-@@ -163,6 +163,7 @@
+@@ -163,6 +171,7 @@
# RedHat 6.1
# QTDIR = /usr/lib/qt-2.0.1
#
@@ -231,7 +265,7 @@
QTLIBDIR=$(QTDIR)/lib
QTINCDIR=$(QTDIR)/include
QTBINDIR=$(QTDIR)/bin
-@@ -178,10 +179,12 @@
+@@ -178,10 +187,12 @@
# The Qt and Be window systems are written in C++, while the rest of
# NetHack is standard C. If using Qt, uncomment the LINK line here to get
# the C++ libraries linked in.
@@ -248,7 +282,7 @@
# For cross-compiling, eg. with gcc on Linux (see also CC further up):
#CXX=arm-linux-g++
#LINK=arm-linux-gcc
-@@ -291,27 +294,37 @@
+@@ -291,27 +302,37 @@
SDLGL_CFLAGS = `sdl-config --cflags`
# Use these declarations if you only want to support the TTY windowing system
@@ -299,7 +333,7 @@
# Use these declarations if you want to support external windowing systems
# WINSRC = $(WINTTYSRC) $(WINPROXYSRC) $(PROXYUTLSRC) $(PROXYCOMSRC)
# WINOBJ = $(WINTTYOBJ) $(WINPROXYOBJ) $(PROXYUTLOBJ) $(PROXYCOMOBJ)
-@@ -336,12 +349,12 @@
+@@ -336,12 +357,12 @@
# WINTTYLIB = -ltermcap
# WINTTYLIB = -lcurses
# WINTTYLIB = -lcurses16
@@ -315,7 +349,7 @@
# WINX11LIB = -lXaw -lXmu -lXt -lX11
# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
# WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
-@@ -366,24 +379,35 @@
+@@ -366,24 +387,35 @@
#
# libraries for SDL/GL window port
WINSDLLIB = `sdl-config --libs` -lz -lpng
@@ -356,7 +390,7 @@
# WINLIB = $(WINGLLIB)
# Use this declaration if you want to support external windowing systems
# WINLIB = $(WINTTYLIB) $(WINPROXYLIB)
-@@ -530,7 +554,7 @@
+@@ -530,7 +562,7 @@
Sysunix: $(HOBJ) Makefile
@echo "Loading ..."
@@ -482,18 +516,33 @@
chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
--- a/sys/unix/Makefile.utl
+++ b/sys/unix/Makefile.utl
-@@ -72,8 +72,8 @@
+@@ -1,3 +1,6 @@
++# Determine kernel name
++UNAME := $(shell uname -s)
++
+ # Makefile for NetHack's utility programs.
+ # SCCS Id: @(#)Makefile.utl 3.4 1997/04/19
- # flags for Linux
+@@ -70,10 +73,15 @@
+ # SGI cc 3.10 will fail to compile makedefs with -O
+ # CFLAGS = -I../include -D__STDC__ -woff 100,293
+
+-# flags for Linux
++# flags for Linux and kFreeBSD
# compile normally
-# CFLAGS = -O2 -fomit-frame-pointer -I../include
-# LFLAGS = -L/usr/X11R6/lib
-+CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11R6/include
-+LFLAGS = -L/usr/X11R6/lib
++# disable optimization on non-Linux archs due to FTBFS
++ifeq ($(UNAME),Linux)
++CFLAGS = -DDEBIAN_$(GUI) -O2 -fomit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -I../include -I/usr/X11R6/include
++else
++CFLAGS = -DDEBIAN_$(GUI) -fstack-protector --param=ssp-buffer-size=4 -I../include -I/usr/X11R6/include
++endif
++LFLAGS = -L/usr/X11R6/lib -Wl,-z,relro
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
# LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib
-@@ -89,8 +89,8 @@
+@@ -89,8 +97,8 @@
# flags for debugging:
# CFLAGS = -g -I../include
@@ -504,7 +553,7 @@
LIBS =
-@@ -101,11 +101,11 @@
+@@ -101,11 +109,11 @@
# yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c.
# if, instead of yacc/lex you have bison/flex, comment/uncomment the following.
@@ -543,3 +592,55 @@
case $1 in
-s*)
exec $HACK "$@"
+--- a/win/tty/termcap.c
++++ b/win/tty/termcap.c
+@@ -960,10 +960,6 @@
+
+ #include <curses.h>
+
+-#if !defined(LINUX) && !defined(__FreeBSD__)
+-extern char *tparm();
+-#endif
+-
+ # ifdef COLOR_BLACK /* trust include file */
+ #ifndef VIDEOSHADES
+ #undef COLOR_BLACK
+--- a/include/system.h
++++ b/include/system.h
+@@ -530,7 +530,11 @@
+ E time_t FDECL(time, (time_t *));
+ # endif
+ # else
++# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++E time_t FDECL(time, (time_t *));
++# else
+ E long FDECL(time, (time_t *));
++# endif
+ # endif /* ULTRIX */
+
+ #ifdef VMS
+--- a/src/hacklib.c
++++ b/src/hacklib.c
+@@ -4,6 +4,9 @@
+ /* NetHack may be freely redistributed. See license for details. */
+
+ /* We could include only config.h, except for the overlay definitions... */
++#if defined(__FreeBSD_kernel__)
++ #include <time.h>
++#endif
+ #include "hack.h"
+ /*=
+ Assorted 'small' utility routines. They're virtually independent of
+--- a/util/makedefs.c
++++ b/util/makedefs.c
+@@ -4,6 +4,10 @@
+ /* Copyright (c) Dean Luick, 1990. */
+ /* NetHack may be freely redistributed. See license for details. */
+
++#if defined(__FreeBSD_kernel__)
++ #include <time.h>
++#endif
++
+ #define MAKEDEFS_C /* use to conditionally include file sections */
+ /* #define DEBUG */ /* uncomment for debugging info */
+
Modified: packages/trunk/slashem/debian/patches/spelling-error.patch
===================================================================
--- packages/trunk/slashem/debian/patches/spelling-error.patch 2012-05-18 07:22:58 UTC (rev 13582)
+++ packages/trunk/slashem/debian/patches/spelling-error.patch 2012-05-19 00:47:41 UTC (rev 13583)
@@ -1,4 +1,7 @@
-Fix various spelling errors identified by lintian.
+Description: Fix various spelling errors identified by lintian
+Forwarded: http://sourceforge.net/support/tracker.php?aid=3526444
+Author: Vincent Cheng <Vincentc1208 at gmail.com>
+Last-Update: 05-13-2012
--- a/src/cmd.c
+++ b/src/cmd.c
Modified: packages/trunk/slashem/debian/rules
===================================================================
--- packages/trunk/slashem/debian/rules 2012-05-18 07:22:58 UTC (rev 13582)
+++ packages/trunk/slashem/debian/rules 2012-05-19 00:47:41 UTC (rev 13583)
@@ -1,60 +1,48 @@
#!/usr/bin/make -f
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Cristoph Lameter.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DH_OPTIONS
+%:
+ dh $@
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
- dh_testdir
+override_dh_clean:
+ -rm -f build-stamp
+ rm -f slashem-tty slashem-sdl slashem-x11 slashem-gtk slashem-qt
+ -$(MAKE) spotless
+ rm -f Makefile src/Makefile dat/Makefile doc/Makefile util/Makefile
+ dh_clean
+override_dh_auto_configure:
+ # "Configuring" has been done in the form of that gigantic
+ # slashem-debian.patch. Unfortunately upstream doesn't have any coherent
+ # build system in place, so there's not much of an alternative...
+
+override_dh_auto_build:
# Copy out the Makefiles
$(SHELL) ./sys/unix/setup.sh foobar
(cd util ; $(MAKE) recover)
-
+
touch include/config.h
$(MAKE) slashem GUI=TTY
mv src/slashem slashem-tty
-
+
touch include/config.h
$(MAKE) slashem GUI=X11
mv src/slashem slashem-x11
-
+
touch include/config.h
$(MAKE) slashem GUI=SDL
mv src/slashem slashem-sdl
-
+
touch include/config.h
$(MAKE) all GUI=GTK
mv src/slashem slashem-gtk
+
+ # touch include/config.h
+ # $(MAKE) all GUI=QT
+ # mv src/slashem slashem-qt
-# touch include/config.h
-# $(MAKE) all GUI=QT
-# mv src/slashem slashem-qt
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- -rm -f build-stamp
- rm -f slashem-tty slashem-sdl slashem-x11 slashem-gtk slashem-qt
- -$(MAKE) spotless
- rm -f Makefile src/Makefile dat/Makefile doc/Makefile util/Makefile
- dh_clean
- debconf-updatepo
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
+override_dh_auto_install:
cp slashem-tty src/slashem
- $(MAKE) install PREFIX=`pwd`/debian/tmp
+ $(MAKE) install PREFIX=$(CURDIR)/debian/tmp
-cp slashem-x11 debian/tmp/usr/games/
-cp slashem-sdl debian/tmp/usr/games/
-cp slashem-gtk debian/tmp/usr/games/
@@ -74,115 +62,17 @@
-chmod 02755 debian/tmp/usr/games/slashem-gtk
-chown root:games debian/tmp/usr/games/slashem-qt
-chmod 02755 debian/tmp/usr/games/slashem-qt
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-slashem: DH_OPTIONS=--package=slashem
-slashem: install
- dh_testdir
- dh_testroot
- dh_installdirs
+
dh_install
- dh_installdocs
- dh_installmenu
- dh_lintian
- dh_installchangelogs
- dh_strip
- dh_fixperms -Xusr/lib/games/slashem/slashem
- dh_compress
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-slashem-common: DH_OPTIONS=--package=slashem-common
-slashem-common: install
- dh_testdir
- dh_testroot
- dh_install
- dh_installdirs
+override_dh_installinit:
dh_installinit -r -u "start 80 S ."
- dh_installdocs
- dh_installchangelogs
- dh_installman doc/slashem.6
- dh_installdebconf
- dh_strip
- dh_fixperms
- dh_compress
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-slashem-x11: DH_OPTIONS=--package=slashem-x11
-slashem-x11: install
- dh_testdir
- dh_testroot
- dh_install
- dh_installdirs
- dh_installdocs
- dh_installmenu
- dh_lintian
- dh_installchangelogs
+override_dh_link:
ln -s slashem.6.gz debian/slashem-x11/usr/share/man/man6/slashem-x11.6.gz
- dh_strip
- dh_fixperms -Xusr/games/slashem-x11
- dh_compress
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-slashem-sdl: DH_OPTIONS=--package=slashem-sdl
-slashem-sdl: install
- dh_testdir
- dh_testroot
- dh_install
- dh_installdirs
- dh_installdocs
- dh_installmenu
- dh_lintian
- dh_installchangelogs
ln -s slashem.6.gz debian/slashem-sdl/usr/share/man/man6/slashem-sdl.6.gz
- dh_strip
- dh_fixperms -Xusr/games/slashem-sdl
- dh_compress
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-slashem-gtk: DH_OPTIONS=--package=slashem-gtk
-slashem-gtk: install
- dh_testdir
- dh_testroot
- dh_install
- dh_installdirs
- dh_installdocs
- dh_installmenu
- dh_lintian
- dh_installchangelogs
ln -s slashem.6.gz debian/slashem-gtk/usr/share/man/man6/slashem-gtk.6.gz
- dh_strip
- dh_fixperms -Xusr/games/slashem-gtk
- dh_compress
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-# Build architecture-dependent files here.
-binary-arch: slashem slashem-common slashem-x11 slashem-sdl slashem-gtk
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+override_dh_fixperms:
+ dh_fixperms -Xusr/lib/games/slashem/slashem -Xusr/games/slashem-x11 \
+ -Xusr/games/slashem-sdl -Xusr/games/slashem-gtk
Added: packages/trunk/slashem/debian/slashem-common.manpages
===================================================================
--- packages/trunk/slashem/debian/slashem-common.manpages (rev 0)
+++ packages/trunk/slashem/debian/slashem-common.manpages 2012-05-19 00:47:41 UTC (rev 13583)
@@ -0,0 +1 @@
+doc/slashem.6
Deleted: packages/trunk/slashem/debian/slashem-gtk.lintian-overrides
===================================================================
--- packages/trunk/slashem/debian/slashem-gtk.lintian-overrides 2012-05-18 07:22:58 UTC (rev 13582)
+++ packages/trunk/slashem/debian/slashem-gtk.lintian-overrides 2012-05-19 00:47:41 UTC (rev 13583)
@@ -1,2 +0,0 @@
-# menu icon is installed in slashem-common
-slashem-gtk: menu-icon-missing usr/share/pixmaps/slashem.xpm
Deleted: packages/trunk/slashem/debian/slashem-sdl.lintian-overrides
===================================================================
--- packages/trunk/slashem/debian/slashem-sdl.lintian-overrides 2012-05-18 07:22:58 UTC (rev 13582)
+++ packages/trunk/slashem/debian/slashem-sdl.lintian-overrides 2012-05-19 00:47:41 UTC (rev 13583)
@@ -1,2 +0,0 @@
-# menu icon is installed in slashem-common
-slashem-sdl: menu-icon-missing usr/share/pixmaps/slashem.xpm
Deleted: packages/trunk/slashem/debian/slashem-x11.lintian-overrides
===================================================================
--- packages/trunk/slashem/debian/slashem-x11.lintian-overrides 2012-05-18 07:22:58 UTC (rev 13582)
+++ packages/trunk/slashem/debian/slashem-x11.lintian-overrides 2012-05-19 00:47:41 UTC (rev 13583)
@@ -1,3 +0,0 @@
-# menu icon is installed in slashem-common
-slashem-x11: menu-icon-missing usr/share/pixmaps/slashem.xpm
-slashem-x11: menu-command-not-in-package usr/share/menu/slashem-x11:4 x-terminal-emulator
Deleted: packages/trunk/slashem/debian/slashem.lintian-overrides
===================================================================
--- packages/trunk/slashem/debian/slashem.lintian-overrides 2012-05-18 07:22:58 UTC (rev 13582)
+++ packages/trunk/slashem/debian/slashem.lintian-overrides 2012-05-19 00:47:41 UTC (rev 13583)
@@ -1,2 +0,0 @@
-# menu icon is installed in slashem-common
-slashem: menu-icon-missing usr/share/pixmaps/slashem.xpm
More information about the Pkg-games-commits
mailing list