--- njam-1.25.orig/debian/njam.postrm +++ njam-1.25/debian/njam.postrm @@ -0,0 +1,22 @@ +#! /bin/sh + +set -e +if [ "$1" = "purge" ] ; then + +# remove empty/unused scorefiles + +SCORE="hiscore.dat" +SCORE_NEW="njam-hiscore.dat" + + if [ -f /var/games/$SCORE ]; then + rm -f /var/games/$SCORE + fi + rm -f /var/games/$SCORE_NEW + rm -f /usr/share/games/njam/* + + if [ -d /var/games ]; then + rmdir --ignore-fail-on-non-empty /var/games + fi +fi + +#DEBHELPER# --- njam-1.25.orig/debian/njam.manpages +++ njam-1.25/debian/njam.manpages @@ -0,0 +1 @@ +debian/njam.1 --- njam-1.25.orig/debian/njam.preinst +++ njam-1.25/debian/njam.preinst @@ -0,0 +1,18 @@ +#! /bin/sh + +set -e + +if [ "$1" = "upgrade" ] ; then +# preserve the old hiscore if there is one +SCORE="hiscore.dat" +SCORE_NEW="njam-hiscore.dat" +SCORE_OLD="njam-hiscore-old.dat" + if [ -L /usr/share/njam/$SCORE ] ; then + cp -f /usr/share/njam/$SCORE /var/games/$SCORE_NEW + fi + if [ -L /usr/share/games/njam/$SCORE_NEW ] ; then + cp -f /usr/share/games/njam/$SCORE_NEW /var/games/$SCORE_OLD + fi +fi + +#DEBHELPER# --- njam-1.25.orig/debian/njam.1 +++ njam-1.25/debian/njam.1 @@ -0,0 +1,93 @@ +.\" $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/cmd/docbook-to-man.sh,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $ +.\" +.\" transcript compatibility for postscript use. +.\" +.\" synopsis: .P! +.\" +.de P! +.fl +\!!1 setgray +.fl +\\&.\" +.fl +\!!0 setgray +.fl \" force out current output buffer +\!!save /psv exch def currentpoint translate 0 0 moveto +\!!/showpage{}def +.fl \" prolog +.sy sed \-e 's/^/!/' \\$1\" bring in postscript file +\!!psv restore +. +.de pF +.ie \\*(f1 .ds f1 \\n(.f +.el .ie \\*(f2 .ds f2 \\n(.f +.el .ie \\*(f3 .ds f3 \\n(.f +.el .ie \\*(f4 .ds f4 \\n(.f +.el .tm ? font overflow +.ft \\$1 +.. +.de fP +.ie !\\*(f4 \{\ +. ft \\*(f4 +. ds f4\" +' br \} +.el .ie !\\*(f3 \{\ +. ft \\*(f3 +. ds f3\" +' br \} +.el .ie !\\*(f2 \{\ +. ft \\*(f2 +. ds f2\" +' br \} +.el .ie !\\*(f1 \{\ +. ft \\*(f1 +. ds f1\" +' br \} +.el .tm ? font underflow +.. +.ds f1\" +.ds f2\" +.ds f3\" +.ds f4\" +'\" t +.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n +.TH "NJAM" "1" +.SH "NAME" +njam \(em a full-featured cross-platform PacMan clone +.SH "SYNOPSIS" +.PP +\fBnjam\fR [-w] [-h] [-d] +.SH "DESCRIPTION" +.PP +This manual page documents briefly the +\fBnjam\fR +.PP +This manual page was written for the \fBUbuntu\fP distribution +because the original program does not have a manual page. +.PP +\fBnjam\fR is a full-featured, cross-platform, network playable PacMan clone +.SH "OPTIONS" +.PP +The options are; + +.IP "\fB\-w\fP " 10 +Start in windowed mode (as opposed to fullscreen) +.IP "\fB\-h\fP " 10 +use hardware surfaces (faster, doesn't work well with all graphic cards +.IP "\fB\-d\fP " 10 +use DGA driver on Linux, (must faster, but must run as root) +.SH "AUTHOR" +.IP "Application:" 10 +M.Babuskov +.PP +This manual page was written by Anibal Avelar avelar@gmail.com for +Debian Project based in the manual wrote by Stephan Hermann sh@sourcecode.de +for the \fBUbuntu\fP system. Permission is granted to copy, distribute +and/or modify this document under the terms of the GNU General Public License, +Version 2 any later version published by the Free Software Foundation. + +.PP +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL. + +.\" created by instant / docbook-to-man, Sun 20 Nov 2005, 20:58 --- njam-1.25.orig/debian/njamicon.xpm +++ njam-1.25/debian/njamicon.xpm @@ -0,0 +1,51 @@ +/* XPM */ +static char * njamicon_xpm[] = { +"32 32 16 1", +" c None", +". c #000100", +"+ c #262510", +"@ c #312E04", +"# c #515024", +"$ c #686305", +"% c #8E881C", +"& c #968D02", +"* c #94925D", +"= c #B1AA02", +"- c #C5BC07", +"; c #D5CA04", +"> c #EAE012", +", c #F2EA5B", +"' c #E1F27C", +") c #FBF898", +"')))))))))))))))))))))))))))))))", +"'..............................'", +"'..............................'", +"'..............................'", +"'..............................'", +"'..............................'", +"'............+#***#+...........'", +"'..........#*)))))',%#.........'", +"'........+*)))))),,,,,%@.......'", +"'.......+*)))),,,,,,,>>&@......'", +"'.......*))),,,>>>>>>>>>&......'", +"'......#))),,>>>>>>>>$>>;@.....'", +"'......*)),,>>>>>>>>>;--=%.....'", +"'.....+)),,>>>>>>>;;-=&&&$+....'", +"'.....#,,,>>>>>>>;;-=&%%$%$....'", +"'.....$,,,>>>>>>>;-=&%$$$#+....'", +"'.....%,,>>>>>>>;;=&%$@+.......'", +"'.....$>>>>>>>>>>;&@...........'", +"'.....$>>>>>>>>>>>;-$..........'", +"'.....@;>>>>>>>>>>>>;=#........'", +"'......=>>>>>>>>>>>>>;;&@......'", +"'......#;;;;;;>>>>>;;-==&......'", +"'.......$----------==&&&$......'", +"'.......+$==&===&&&&%$$#+......'", +"'........+$&&&&%%%$$$$@........'", +"'..........@$$$$$$$#@+.........'", +"'............++@@@+............'", +"'..............................'", +"'..............................'", +"'..............................'", +"'..............................'", +"''''''''''''''''''''''''''''''''"}; --- njam-1.25.orig/debian/compat +++ njam-1.25/debian/compat @@ -0,0 +1 @@ +4 --- njam-1.25.orig/debian/control +++ njam-1.25/debian/control @@ -0,0 +1,24 @@ +Source: njam +Section: games +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Anibal Avelar +Build-Depends: debhelper (>= 4.0.0), libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl1.2-dev, dpatch +Homepage: http://njam.sourceforge.net +Standards-Version: 3.7.3 + +Package: njam +Architecture: any +Depends: ${shlibs:Depends} +Description: pacman-like game with multiplayer support + Njam is a pacman-like game with many features, including networked + multiplayer mode. It is available on many platforms. + . + Features: + o Single and multiplayer mode (local or network) + o Cooperative and competetive multiplayer modes + o Customizable level skins + o Many different levels + o Integrated level editor + o Great music and sound effects + . --- njam-1.25.orig/debian/njam.desktop +++ njam-1.25/debian/njam.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Njam +Comment=pacman-like game with multiplayer support +TryExec=njam +Exec=njam +Icon=njamicon.png +Terminal=false +Type=Application +Categories=Game;ArcadeGame; --- njam-1.25.orig/debian/watch +++ njam-1.25/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/njam/njam-([\d.]*)-i386.tar.bz2 --- njam-1.25.orig/debian/changelog +++ njam-1.25/debian/changelog @@ -0,0 +1,80 @@ +njam (1.25-5.2fakesync1) quantal; urgency=low + + * Fake sync due to mismatching orig tarball. + + -- Micah Gersten Sun, 08 Jul 2012 20:42:46 -0500 + +njam (1.25-5.2) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * drop DGA support (Closes: #651896). + + -- Luk Claes Wed, 04 Jul 2012 15:49:52 +0000 + +njam (1.25-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "ftbfs with gcc-4.5": add patch gcc_46.dpatch from Ubuntu / + Andreas Moog: + - Fix compile with newer gcc versions. + (LP: #756133) (Closes: #565087) + + -- gregor herrmann Tue, 18 Oct 2011 19:02:41 +0200 + +njam (1.25-5) unstable; urgency=medium + + * Fixed the bug when njam overwrites the high scores file on upgrade + (Closes: 452313) + * Cleaned the bad description in debian/control file + (Closes: 474716) Thank you to Bas Wijnen and Christoph Berg + * Added the path to the njam's icon in debian/njam.menu file + (Closes: #450451) Thank you Mario Bonino + * Fixed the debian/watch file to point to the correct latest upstream + version (Closes: #453566) + * Changed the datadir path from /usr/share to /usr/share/games in the + debian/rules script (Closes: #464875) + * Fixed some details in the debian/njam.desktop file. There was a + previous file but it needed to be registered with dh_desktop + (Closes: #478929) + * Bumped to the Standards-Version 3.7.3 + * Added the field Homepage inside Source stanza in debian/control file. + * Added a njam icon to the package. + * Added the dpatch package in the dependencies list. + * Created the patch to modify the hiscore name to the program. + * Modified the scripts debian/njam.postinst and debian/njam.postrm to + fix the hiscore path. + * Added the debian/njam.prerm script to backup the old hiscore before to + install the new hiscore file. + * Cleaned the debian/dirs file. Were removed some dirs below /usr dir. + * Updated the debian/copyright file. + + -- Anibal Avelar Tue, 03 Jun 2008 21:57:27 -0500 + +njam (1.25-4) unstable; urgency=low + + * Added njam.desktop file (Closes: #439699) + * Make .desktop file freedesktop-compliant + * njam binary should be in /usr/games (Closes: #439787) + * Fixed njam can't write to hi score file (Closes: #439786) + + -- Anibal Avelar (Fixxxer) Tue, 23 Oct 2007 00:34:27 -0500 + +njam (1.25-3) unstable; urgency=low + + * debian/control: - update standards version + * Fixed a white space in control debian file on upstream URL site. + * Added a watch file for scan new releases. + + -- Anibal Avelar (Fixxxer) Sun, 14 Jun 2006 11:00:27 -0500 + +njam (1.25-2) unstable; urgency=low + + * Fixed the copy-n-paste typo in description bug, Closes: #352414 + + -- Anibal Avelar (Fixxxer) Sun, 12 Feb 2006 11:00:27 -0500 + +njam (1.25-1) unstable; urgency=low + + * Initial release Closes: #316706 + + -- Anibal Avelar (Fixxxer) Thu, 15 Dec 2005 00:00:27 -0500 --- njam-1.25.orig/debian/docs +++ njam-1.25/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- njam-1.25.orig/debian/copyright +++ njam-1.25/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Anibal Avelar (Fixxxer) on +Thu, 28 Dec 2005 23:00:27 -0500. + +It was downloaded from: http://njam.sourceforge.net + +Upstream Author: Milan Babuskov + +Copyright (c) 2003-2008 Milan Babuskov + +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. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License with +the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; +if not, write to the Free Software Foundation, Inc., 51 Franklin St, +Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public +License, version 2, can be found in /usr/share/common-licenses/GPL-2. --- njam-1.25.orig/debian/dirs +++ njam-1.25/debian/dirs @@ -0,0 +1,3 @@ +usr +usr/share/applications +usr/share/games/njam/pixmaps --- njam-1.25.orig/debian/njam.postinst +++ njam-1.25/debian/njam.postinst @@ -0,0 +1,41 @@ +#! /bin/sh + +set -e + +if [ "$1" = "configure" ] ; then + +# njam scores file get root:games + +SCORE="hiscore.dat" +SCORE_NEW="njam-hiscore.dat" +SCORE_OLD="njam-hiscore-old.dat" + +if [ ! -d /var/games ]; then + mkdir /var/games +fi + +if [ -f /var/games/$SCORE ]; then + rm -f /var/games/$SCORE +fi + +if [ -f /var/games/$SCORE_OLD ]; then + rm -f /var/games/$SCORE_NEW + mv /var/games/$SCORE_OLD /var/games/$SCORE_NEW +fi + +if [ -f /var/games/$SCORE_NEW ]; then + rm -f /usr/share/games/njam/$SCORE_NEW + ln -s /var/games/$SCORE_NEW /usr/share/games/njam/$SCORE_NEW +else + mv /usr/share/games/njam/$SCORE /var/games/$SCORE_NEW + ln -s /var/games/$SCORE_NEW /usr/share/games/njam/$SCORE_NEW +fi + +chown root:games /var/games/$SCORE_NEW +chmod 664 /var/games/$SCORE_NEW +chown root:games /usr/games/njam +chmod g+s /usr/games/njam + +fi + +#DEBHELPER# --- njam-1.25.orig/debian/njam.menu +++ njam-1.25/debian/njam.menu @@ -0,0 +1,3 @@ +?package(njam):needs="X11" section="Games/Board"\ + title="njam" command="/usr/games/njam"\ + icon="/usr/share/games/njam/pixmaps/njamicon.xpm" --- njam-1.25.orig/debian/rules +++ njam-1.25/debian/rules @@ -0,0 +1,95 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure + dh_testdir + # Add here commands to configure the package. +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + ./configure --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games + +build: patch build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + -rm -f config.sub config.guess + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/njam. + $(MAKE) install DESTDIR=$(CURDIR)/debian/njam + install -m 0644 debian/njam.desktop $(CURDIR)/debian/njam/usr/share/applications/njam.desktop + install -m 0644 debian/njamicon.xpm $(CURDIR)/debian/njam/usr/share/games/njam/pixmaps/njamicon.xpm + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installmenu + dh_desktop + dh_installman -A + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- njam-1.25.orig/debian/patches/00list +++ njam-1.25/debian/patches/00list @@ -0,0 +1,3 @@ +changed_hiscore_name +gcc_46.dpatch +drop_gda.dpatch --- njam-1.25.orig/debian/patches/changed_hiscore_name.dpatch +++ njam-1.25/debian/patches/changed_hiscore_name.dpatch @@ -0,0 +1,68 @@ +#! /bin/sh -e +## changed_hiscore_name.dpatch by Anibal Avelar +## +## DP: apply patch to change the hiscore name + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argum +ent" + exit 1;; +esac + +exit 0 +diff -bBdNrw -U5 njam-1.25/src/njam.cpp njam-1.25.modif/src/njam.cpp +--- njam-1.25/src/njam.cpp 2005-12-13 05:56:43.000000000 -0600 ++++ njam-1.25.modif/src/njam.cpp 2008-05-12 11:59:46.694847801 -0500 +@@ -235,11 +235,11 @@ + fprintf(fp, "I=%s\n", m_GameOptions.ServerIP); + fclose(fp); + } + + // format: NAME#POINTS#LEVEL# +- fp = fopen("hiscore.dat", "w+"); ++ fp = fopen("njam-hiscore.dat", "w+"); + if (fp) + { + for (int i=0; i<10; i++) + fprintf(fp, "%s#%d#%d#\n", TopTenScores[i].name, TopTenScores[i].points, TopTenScores[i].level); + fclose(fp); +@@ -647,11 +647,11 @@ + } + else + LogFile("Failed to open conf file.\n"); + + // create default hiscore +- LogFile("Creating default hiscore.\n"); ++ LogFile("Creating default njam-hiscore.\n"); + char DefaultNames[10][10] = { + "MILAN", "TANJA", + "DULIO", "DJORDJE", + "CLAUS", "ENZO", + "JOLAN", "JAAP", +@@ -663,14 +663,14 @@ + sprintf(TopTenScores[i].name, "%s\0", DefaultNames[i]); + } + + // load hiscore from file (if any) + // format: NAME#POINTS#LEVEL# +- fp = fopen("hiscore.dat", "r"); ++ fp = fopen("njam-hiscore.dat", "r"); + if (fp) + { +- LogFile("Reading hiscore.dat\n"); ++ LogFile("Reading njam-hiscore.dat\n"); + char buff[40]; + int number = 0; + while (!feof(fp) && number < 10) + { + fgets(buff, 40, fp); --- njam-1.25.orig/debian/patches/gcc_46.dpatch +++ njam-1.25/debian/patches/gcc_46.dpatch @@ -0,0 +1,28 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +Description: gcc4.5 and later are more restrictive with c++ function calls, + this trivial patch fixes build failures with -fpermissive +Author: Andreas Moog +Last-Update: 2011-07-15 + +=== modified file 'src/njamedit.cpp' +--- a/src/njamedit.cpp 2006-07-27 23:15:50 +0000 ++++ b/src/njamedit.cpp 2011-07-15 20:01:54 +0000 +@@ -114,7 +114,7 @@ + key = SDLK_a; + else if (CheckForSave()) + { +- LogFile::LogFile("Saving maps"); ++ LogFile("Saving maps"); + m_Maps.Save(filename); + level_type_was = level_type; + changed = false; +@@ -131,7 +131,7 @@ + char types[2][5] = { "COOP", "DUEL" }; + sprintf(buf, "levels/%s.%s\0", filename, types[level_type]); + sprintf(filename, "%s\0", buf); +- LogFile::LogFile("Saving maps"); ++ LogFile("Saving maps"); + m_Maps.Save(filename); + level_type_was = level_type; + changed = false; + --- njam-1.25.orig/debian/patches/drop_gda.dpatch +++ njam-1.25/debian/patches/drop_gda.dpatch @@ -0,0 +1,103 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +Description: drop DGA support, fixing SDL_VIDEODRIVER parsing issues +Author: Hans de Goede +Last-Update: 2011-12-13 + +Index: njam-1.25/src/njam.cpp +=================================================================== +--- njam-1.25.orig/src/njam.cpp 2012-07-04 16:46:32.000000000 +0000 ++++ njam-1.25/src/njam.cpp 2012-07-04 16:49:29.000000000 +0000 +@@ -52,7 +52,6 @@ + { + bool Fullscreen = true; + bool SWSurface = true; +- bool UseDGA = false; + if (argc > 1) + { + for (int i=1; i