Imported Debian patch 0.5-2

diff --git a/Makefile b/Makefile
index 76692f2e8b25d11453545a8e0d2ede5f61634e51..83359e0bac4ef5ec7fb2c0428578100822208777 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ CC = gcc
 COPT = -O2
 CEXTRA = -DNDEBUG
 LEXTRA = 
-LFLAGS =   -lnsl -lncurses
+LFLAGS =  -lncurses -lnsl
 CFLAGS = $(CEXTRA) $(COPT)
 
 PROG = netris
@@ -76,124 +76,168 @@ game.o: game.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/alloca.h /usr/include/ctype.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/socketbits.h /usr/include/sockaddrcom.h \
- /usr/include/asm/socket.h /usr/include/asm/sockios.h
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/alloca.h /usr/include/ctype.h /usr/include/netinet/in.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/limits.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+ /usr/include/bits/posix2_lim.h /usr/include/stdint.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/socket.h \
+ /usr/include/bits/sockaddr.h /usr/include/asm/socket.h \
+ /usr/include/asm/sockios.h /usr/include/bits/in.h \
+ /usr/include/bits/byteswap.h
 curses.o: curses.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
- /usr/include/sys/types.h /usr/include/endian.h /usr/include/bytesex.h \
- /usr/include/unistd.h /usr/include/posix_opt.h \
- /usr/include/confname.h /usr/include/curses.h /usr/include/unctrl.h \
- /usr/include/stdlib.h /usr/include/alloca.h
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
+ /usr/include/sys/types.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+ /usr/include/bits/confname.h /usr/include/curses.h \
+ /usr/include/unctrl.h /usr/include/stdlib.h /usr/include/alloca.h
 shapes.o: shapes.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/alloca.h
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/alloca.h
 board.o: board.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/alloca.h
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/alloca.h
 util.o: util.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/alloca.h /usr/include/unistd.h \
- /usr/include/posix_opt.h /usr/include/confname.h /usr/include/netdb.h \
- /usr/include/rpc/netdb.h /usr/include/errno.h /usr/include/errnos.h \
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/alloca.h /usr/include/unistd.h \
+ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
+ /usr/include/netdb.h /usr/include/rpc/netdb.h \
+ /usr/include/sys/socket.h /usr/include/bits/socket.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/limits.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+ /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h \
+ /usr/include/asm/socket.h /usr/include/asm/sockios.h \
+ /usr/include/errno.h /usr/include/bits/errno.h \
  /usr/include/linux/errno.h /usr/include/asm/errno.h
 inet.o: inet.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
- /usr/include/sys/types.h /usr/include/endian.h /usr/include/bytesex.h \
- /usr/include/unistd.h /usr/include/posix_opt.h \
- /usr/include/confname.h /usr/include/stdlib.h /usr/include/alloca.h \
- /usr/include/sys/socket.h /usr/include/socketbits.h \
- /usr/include/sockaddrcom.h /usr/include/asm/socket.h \
- /usr/include/asm/sockios.h /usr/include/netinet/in.h \
- /usr/include/netdb.h /usr/include/rpc/netdb.h /usr/include/errno.h \
- /usr/include/errnos.h /usr/include/linux/errno.h \
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
+ /usr/include/sys/types.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+ /usr/include/bits/confname.h /usr/include/stdlib.h \
+ /usr/include/alloca.h /usr/include/sys/socket.h \
+ /usr/include/bits/socket.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/limits.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+ /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h \
+ /usr/include/asm/socket.h /usr/include/asm/sockios.h \
+ /usr/include/netinet/in.h /usr/include/stdint.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/in.h \
+ /usr/include/bits/byteswap.h /usr/include/netdb.h \
+ /usr/include/rpc/netdb.h /usr/include/errno.h \
+ /usr/include/bits/errno.h /usr/include/linux/errno.h \
  /usr/include/asm/errno.h
 robot.o: robot.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
- /usr/include/unistd.h /usr/include/posix_opt.h \
- /usr/include/confname.h /usr/include/stdlib.h \
- /usr/include/sys/types.h /usr/include/endian.h /usr/include/bytesex.h \
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
+ /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+ /usr/include/bits/confname.h /usr/include/stdlib.h \
+ /usr/include/sys/types.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
  /usr/include/alloca.h /usr/include/ctype.h /usr/include/fcntl.h \
- /usr/include/fcntlbits.h /usr/include/errno.h /usr/include/errnos.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h
+ /usr/include/bits/fcntl.h /usr/include/errno.h \
+ /usr/include/bits/errno.h /usr/include/linux/errno.h \
+ /usr/include/asm/errno.h
 version.o: version.c

diff --git a/debian/README.debian b/debian/README.debian
deleted file mode 100644 (file)
index 3f232d8..0000000
--- a/debian/README.debian
+++ /dev/null
@@ -1,6 +0,0 @@
-netris for DEBIAN
-----------------------
-
-So far nothing to say.
-
-Gergely Madarasz <gorgo@caesar.elte.hu>, Wed,  6 Aug 1997 22:10:42 +0200

diff --git a/debian/changelog b/debian/changelog
index 46d373fd3aa192672a814042df0300c0d25f767c..0bf43fb02deed20dbcbcb28ef1b4594bc795fa64 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+netris (0.5-2) unstable; urgency=low
+
+  * Change maintainer address
+  * FHS compliant
+  * Standards: 3.0.1
+
+ -- Gergely Madarasz <gorgo@sztaki.hu>  Tue,  7 Sep 1999 21:17:37 +0200
+
+netris (0.5-1) unstable; urgency=low
+
+  * Compile with libncurses4
+  * Update menu file and standards version
+  * New upstream version
+
+ -- Gergely Madarasz <gorgo@caesar.elte.hu>  Thu,  3 Jun 1999 15:19:38 +0200
+
 netris (0.4-3) unstable; urgency=low
 
   * Fix spelling mistake in extended description (Closes: #18922)

diff --git a/debian/control b/debian/control
index 525acc8084c5db7e708e3baf3cbe8387db1f363f..972a560459da2a94532415a4d445f48733a19781 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: netris
 Section: games
 Priority: extra
-Maintainer: Gergely Madarasz <gorgo@caesar.elte.hu>
-Standards-Version: 2.1.2.2
+Maintainer: Gergely Madarasz <gorgo@sztaki.hu>
+Standards-Version: 3.0.1
 
 Package: netris
 Architecture: any

diff --git a/debian/copyright b/debian/copyright
index 670cfd4b5150584e285351102b2b8c716caa61fc..82868fbc613dd47b70be372b85a0103b808cd50c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,4 +25,4 @@ Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/doc/copyright/GPL'.
+Public License can be found in `/usr/share/common-licences/GPL'.

diff --git a/debian/dirs b/debian/dirs
index 4a756221e28ed6f82e14d8987bd11b0d3c9187c6..33359b8769910c20507e330f7655a58b40a3d546 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1 @@
 usr/games
-usr/doc/netris/examples

diff --git a/debian/menu b/debian/menu
index d2e21a2dfbbcc49449ae7b99810c822a9f870507..844c2e8350f411088cf9016b0c49ecea0b5eacd2 100644 (file)
--- a/debian/menu
+++ b/debian/menu
@@ -1 +1,2 @@
-text Games/Tetris-like netris none "netris" /usr/games/netris
+?package(netris):needs=text section=Games/Tetris-like title="netris" \
+  command="/usr/games/netris" longtitle="Networked Tetris"

diff --git a/debian/rules b/debian/rules
index d2110ad5cf36810349c9ceb65e181ec7e26b3557..2622a1db33c2faa65376ea06eae4871259279e94 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ binary-indep: build
 
 # Build architecture-dependent files here.
 binary-arch: build
-#      dh_testversion
+       dh_testversion 2.0.40
        dh_testdir
        dh_testroot
        dh_clean -k