r4460 - in packages/trunk/jugglemaster: . debian debian/patches
Helmut Grohne
helmut-guest at alioth.debian.org
Wed Oct 24 20:51:35 UTC 2007
Author: helmut-guest
Date: 2007-10-24 20:51:35 +0000 (Wed, 24 Oct 2007)
New Revision: 4460
Added:
packages/trunk/jugglemaster/debian/
packages/trunk/jugglemaster/debian/aajm.1
packages/trunk/jugglemaster/debian/aajm.dirs
packages/trunk/jugglemaster/debian/aajm.install
packages/trunk/jugglemaster/debian/aajm.manpages
packages/trunk/jugglemaster/debian/aajm.menu
packages/trunk/jugglemaster/debian/changelog
packages/trunk/jugglemaster/debian/compat
packages/trunk/jugglemaster/debian/control
packages/trunk/jugglemaster/debian/copyright
packages/trunk/jugglemaster/debian/jmdlx.1
packages/trunk/jugglemaster/debian/jmdlx.dirs
packages/trunk/jugglemaster/debian/jmdlx.install
packages/trunk/jugglemaster/debian/jmdlx.manpages
packages/trunk/jugglemaster/debian/jmdlx.menu
packages/trunk/jugglemaster/debian/jmqt.1
packages/trunk/jugglemaster/debian/jmqt.dirs
packages/trunk/jugglemaster/debian/jmqt.install
packages/trunk/jugglemaster/debian/jmqt.manpages
packages/trunk/jugglemaster/debian/jmqt.menu
packages/trunk/jugglemaster/debian/patches/
packages/trunk/jugglemaster/debian/patches/00list
packages/trunk/jugglemaster/debian/patches/jmdlx-usr_patterns.dpatch
packages/trunk/jugglemaster/debian/patches/jmlib_sigfpe.dpatch
packages/trunk/jugglemaster/debian/patches/semaphore_segfault.dpatch
packages/trunk/jugglemaster/debian/rules
packages/trunk/jugglemaster/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: packages/trunk/jugglemaster/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/trunk/jugglemaster/debian/aajm.1
===================================================================
--- packages/trunk/jugglemaster/debian/aajm.1 (rev 0)
+++ packages/trunk/jugglemaster/debian/aajm.1 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,64 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH aajm 1 "September 24, 2007"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+aajm \- ascii art jugglemaster
+.SH SYNOPSIS
+.B aajm
+.RI [ options ]
+.br
+.SH DESCRIPTION
+Uses ascii art (aalib) to display a juggler in action juggling three balls by default.
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+.PP
+After being started aajm will present you a juggler in action. Pressing the `h'
+key will show a self-explaining help menu. It can be terminated by pressing the
+`q' key.
+.SH OPTIONS
+.TP
+.B \-s, \-\-siteswap <siteswap>
+Use given siteswap as pattern. If you do not know what a siteswap is, please
+have a look at http://www.juggling.org/help/siteswap/faq.html.
+.TP
+.B \-t, \-\-style <style>
+Use given style. Valid values are Normal, Reverse, Shower, Mills Mess, Center,
+Windmill and Random.
+.TP
+.B -i, \-\-ipc
+and
+.TP
+.B -p, \-\-port <number>
+These options are only useful when having the ipc client which is currently not
+part of this package.
+.TP
+.B \-h, \-\-help
+Print help.
+.TP
+.B \-a, \-\-aahelp
+Print help regarding aalib options.
+.SH SEE ALSO
+.BR jmdlx (1),
+.BR jmqt (1).
+.br
+.SH AUTHOR
+aajm was written by Gary Briggs. It is based on jmlib, which was written by
+Per Johan Persson, Gary Briggs and Ken Matsuoka.
+.PP
+This manual page was written by Helmut Grohne <helmut at subdivi.de>,
+for the Debian project (but may be used by others).
Added: packages/trunk/jugglemaster/debian/aajm.dirs
===================================================================
--- packages/trunk/jugglemaster/debian/aajm.dirs (rev 0)
+++ packages/trunk/jugglemaster/debian/aajm.dirs 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1 @@
+usr/bin
Added: packages/trunk/jugglemaster/debian/aajm.install
===================================================================
--- packages/trunk/jugglemaster/debian/aajm.install (rev 0)
+++ packages/trunk/jugglemaster/debian/aajm.install 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1 @@
+bin/aajm usr/bin
Added: packages/trunk/jugglemaster/debian/aajm.manpages
===================================================================
--- packages/trunk/jugglemaster/debian/aajm.manpages (rev 0)
+++ packages/trunk/jugglemaster/debian/aajm.manpages 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1 @@
+debian/aajm.1
Added: packages/trunk/jugglemaster/debian/aajm.menu
===================================================================
--- packages/trunk/jugglemaster/debian/aajm.menu (rev 0)
+++ packages/trunk/jugglemaster/debian/aajm.menu 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,5 @@
+?package(aajm):needs="vc" section="Games/Simulation"\
+ title="aajm" command="/usr/bin/aajm"
+
+?package(aajm):needs="X11" section="Games/Simulation"\
+ title="aajm (X11)" command="/usr/bin/aajm"
Added: packages/trunk/jugglemaster/debian/changelog
===================================================================
--- packages/trunk/jugglemaster/debian/changelog (rev 0)
+++ packages/trunk/jugglemaster/debian/changelog 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,20 @@
+jugglemaster (0.4-3) unstable; urgency=low
+
+ * Improved package descriptions.
+
+ -- Helmut Grohne <helmut at subdivi.de> Wed, 10 Oct 2007 19:54:51 +0200
+
+jugglemaster (0.4-2) unstable; urgency=low
+
+ * ITP Closes: 443904
+ * Improve dpatch descriptions.
+ * Use dh_install instead of install.
+
+ -- Helmut Grohne <helmut at subdivi.de> Tue, 25 Sep 2007 01:03:41 +0200
+
+jugglemaster (0.4-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Helmut Grohne <helmut at subdivi.de> Fri, 21 Sep 2007 19:55:39 +0200
+
Added: packages/trunk/jugglemaster/debian/compat
===================================================================
--- packages/trunk/jugglemaster/debian/compat (rev 0)
+++ packages/trunk/jugglemaster/debian/compat 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1 @@
+5
Added: packages/trunk/jugglemaster/debian/control
===================================================================
--- packages/trunk/jugglemaster/debian/control (rev 0)
+++ packages/trunk/jugglemaster/debian/control 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,56 @@
+Source: jugglemaster
+Section: games
+Priority: extra
+Maintainer: Helmut Grohne <helmut at subdivi.de>
+Build-Depends: debhelper (>= 5), dpatch,
+ libaa1-dev,
+ libwxgtk2.4-dev,
+ qt3-dev-tools, libqt3-headers, libqt3-mt-dev
+Standards-Version: 3.7.2
+
+Package: aajm
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ascii art version of jugglemaster
+ JuggleMaster is a siteswap animator. A siteswap is a textual representation
+ for patterns one can juggle (using balls, clubs, etc.). It is mainly useful
+ for understanding specific siteswaps by animating them (including
+ multiplexing). Other uses may include watching patterns without understanding
+ the notation behind them.
+ .
+ This package contains the ascii art interface. It can be run as an ascii
+ screensaver and doesn't come with patterns, so you better know siteswaps.
+ .
+ Siteswap FAQ: http://www.juggling.org/help/siteswap/faq.html
+Homepage: http://icculus.org/jugglemaster/
+
+Package: jmdlx
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: jugglemaster deluxe using wxWidgets
+ JuggleMaster is a siteswap animator. A siteswap is a textual representation
+ for patterns one can juggle (using balls, clubs, etc.). It is mainly useful
+ for understanding specific siteswaps by animating them (including
+ multiplexing). Other uses may include watching patterns without understanding
+ the notation behind them.
+ .
+ This package contains the wxWidgets interface and features a lot of builtin
+ patterns available via a menu.
+ .
+ Siteswap FAQ: http://www.juggling.org/help/siteswap/faq.html
+Homepage: http://icculus.org/jugglemaster/
+
+Package: jmqt
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: qt version of jugglemaster
+ JuggleMaster is a siteswap animator. A siteswap is a textual representation
+ for patterns one can juggle (using balls, clubs, etc.). It is mainly useful
+ for understanding specific siteswaps by animating them (including
+ multiplexing). Other uses may include watching patterns without understanding
+ the notation behind them.
+ .
+ This package contains the qt interface. It doesn't come with patterns.
+ .
+ Siteswap FAQ: http://www.juggling.org/help/siteswap/faq.html
+Homepage: http://icculus.org/jugglemaster/
Added: packages/trunk/jugglemaster/debian/copyright
===================================================================
--- packages/trunk/jugglemaster/debian/copyright (rev 0)
+++ packages/trunk/jugglemaster/debian/copyright 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,78 @@
+This package was debianized by Helmut Grohne <helmut at subdivi.de> on
+Fri, 21 Sep 2007 19:55:39 +0200.
+
+It was downloaded from http://icculus.org/jugglemaster/
+
+Upstream Authors:
+ aajm : Gary Briggs
+ jmdlx : Gary Briggs, Per Johan Persson
+ jmlib : Per Johan Persson, Gary Briggs, Ken Matsuoka
+ jmpocket : Per Johan Groland, Ken Matsuoka
+ jmqt : Greg Gilbert
+
+Copyright:
+ (C) Gary Briggs 2003
+ (C) Per Johan Persson 2000-2002
+ (C) Ken Matsuoka 1995-1996
+ (C) Per Johan Groland 2002-2004
+ (C) Greg Gilbert 2004
+
+Files:
+ src/aajm/*.[ch]* : GPL 2+
+ src/jmdlx/*.[ch]* : GPL 2+
+ src/jmlib/*.[ch]* : Modified BSD
+ src/jmpocket/resource.h : Autogenerated
+ src/jmpocket/*.[ch]* : GPL 2+
+ src/jmqt/siteswapdlgbase.cpp : Autogenerated
+ src/jmqt/siteswapdlgbase.h : Autogenerated
+ src/jmqt/*.[ch]* : GPL 2+
+
+License:
+
+JMLib Distribution License
+
+
+Berkeley-based copyrights:
+
+1) General
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+2) JMLib
+
+Version 2.0
+Copyright (C) Gary Briggs 2003-2004
+Copyright (C) Per Johan Persson 2000-2002
+
+Based on JuggleMaster Version 1.60
+Copyright (C) Ken Matsuoka 1995-1996
+
+
+On Debian systems, the complete text of the GPL License can be
+found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is (C) 2007, Helmut Grohne <helmut at subdivi.de> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: packages/trunk/jugglemaster/debian/jmdlx.1
===================================================================
--- packages/trunk/jugglemaster/debian/jmdlx.1 (rev 0)
+++ packages/trunk/jugglemaster/debian/jmdlx.1 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,52 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH jmdlx 1 "September 24, 2007"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+jmdlx \- wxWidgets jugglemaster
+.SH SYNOPSIS
+.B jmdlx
+.RI [ options ]
+.RI [ siteswap ]
+.br
+.SH DESCRIPTION
+This is the wxWidgets interface for jugglemaster. If no siteswap was given on
+the commandline `3' will be used. If you do not know what a siteswap is, please
+have a look at http://www.juggling.org/help/siteswap/faq.html.
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+.SH OPTIONS
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-p, \-\-pattern <name>
+Use a named pattern from the pattern library.
+.TP
+.B \-s, \-\-style <name>
+Use given style. Valid values are Normal, Reverse, Shower, Mills Mess, Center,
+Windmill and Random.
+.SH SEE ALSO
+.BR aajm (1),
+.BR jmqt (1).
+.br
+.SH AUTHOR
+jmdlx was written by Gary Briggs and Per Johan Persson. It is based on jmlib,
+which is written by Per Johan Persson, Gary Briggs and Ken Matsuoka.
+.PP
+This manual page was written by Helmut Grohne <helmut at subdivi.de>,
+for the Debian project (but may be used by others).
Added: packages/trunk/jugglemaster/debian/jmdlx.dirs
===================================================================
--- packages/trunk/jugglemaster/debian/jmdlx.dirs (rev 0)
+++ packages/trunk/jugglemaster/debian/jmdlx.dirs 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/jugglemaster
Added: packages/trunk/jugglemaster/debian/jmdlx.install
===================================================================
--- packages/trunk/jugglemaster/debian/jmdlx.install (rev 0)
+++ packages/trunk/jugglemaster/debian/jmdlx.install 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,2 @@
+data/*.jm usr/share/jugglemaster
+bin/jmdlx usr/bin
Added: packages/trunk/jugglemaster/debian/jmdlx.manpages
===================================================================
--- packages/trunk/jugglemaster/debian/jmdlx.manpages (rev 0)
+++ packages/trunk/jugglemaster/debian/jmdlx.manpages 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1 @@
+debian/jmdlx.1
Added: packages/trunk/jugglemaster/debian/jmdlx.menu
===================================================================
--- packages/trunk/jugglemaster/debian/jmdlx.menu (rev 0)
+++ packages/trunk/jugglemaster/debian/jmdlx.menu 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,2 @@
+?package(jmdlx):needs="X11" section="Games/Simulation"\
+ title="jmdlx" command="/usr/bin/jmdlx"
Added: packages/trunk/jugglemaster/debian/jmqt.1
===================================================================
--- packages/trunk/jugglemaster/debian/jmqt.1 (rev 0)
+++ packages/trunk/jugglemaster/debian/jmqt.1 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,39 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH jmqt 1 "September 24, 2007"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+jmqt \- qt jugglemaster
+.SH SYNOPSIS
+.B jmqt
+.br
+.SH DESCRIPTION
+This is the qt interface to jugglemaster. It does not recognize any options.
+If you do not know what a siteswap is, please have a look at
+http://www.juggling.org/help/siteswap/faq.html.
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+.SH SEE ALSO
+.BR aajm (1),
+.BR jmdlx (1).
+.br
+.SH AUTHOR
+jmqt was written by Greg Gilbert. It is based on jmlib, which was written by
+Per Johan Persson, Gary Briggs and Ken Matsuoka.
+.PP
+This manual page was written by Helmut Grohne <helmut at subdivi.de>,
+for the Debian project (but may be used by others).
Added: packages/trunk/jugglemaster/debian/jmqt.dirs
===================================================================
--- packages/trunk/jugglemaster/debian/jmqt.dirs (rev 0)
+++ packages/trunk/jugglemaster/debian/jmqt.dirs 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1 @@
+usr/bin
Added: packages/trunk/jugglemaster/debian/jmqt.install
===================================================================
--- packages/trunk/jugglemaster/debian/jmqt.install (rev 0)
+++ packages/trunk/jugglemaster/debian/jmqt.install 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1 @@
+bin/jmqt usr/bin
Added: packages/trunk/jugglemaster/debian/jmqt.manpages
===================================================================
--- packages/trunk/jugglemaster/debian/jmqt.manpages (rev 0)
+++ packages/trunk/jugglemaster/debian/jmqt.manpages 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1 @@
+debian/jmqt.1
Added: packages/trunk/jugglemaster/debian/jmqt.menu
===================================================================
--- packages/trunk/jugglemaster/debian/jmqt.menu (rev 0)
+++ packages/trunk/jugglemaster/debian/jmqt.menu 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,2 @@
+?package(jmqt):needs="X11" section="Games/Simulation"\
+ title="jmqt" command="/usr/bin/jmqt"
Added: packages/trunk/jugglemaster/debian/patches/00list
===================================================================
--- packages/trunk/jugglemaster/debian/patches/00list (rev 0)
+++ packages/trunk/jugglemaster/debian/patches/00list 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,3 @@
+jmdlx-usr_patterns.dpatch
+jmlib_sigfpe.dpatch
+semaphore_segfault.dpatch
Added: packages/trunk/jugglemaster/debian/patches/jmdlx-usr_patterns.dpatch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/jmdlx-usr_patterns.dpatch (rev 0)
+++ packages/trunk/jugglemaster/debian/patches/jmdlx-usr_patterns.dpatch 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## jmdlx-usr_patterns.dpatch by <Helmut Grohne <helmut at subdivi.de>>
+## DP: Modifies jmdlx to search the share data in /usr/share/jugglemaster.
+
+ at DPATCH@
+diff -urNad jugglemaster-0.4~/src/jmdlx/patt.cpp jugglemaster-0.4/src/jmdlx/patt.cpp
+--- jugglemaster-0.4~/src/jmdlx/patt.cpp 2004-09-02 02:48:19.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/patt.cpp 2007-09-21 21:39:32.000000000 +0200
+@@ -13,6 +13,7 @@
+ * General Public License for more details.
+ */
+
++#include <stdio.h>
+ #include "patt.h"
+ #include <wx/progdlg.h>
+ #ifndef __WXMSW__
+@@ -70,6 +71,9 @@
+ wxString targetfilename;
+ struct stat buf;
+ targetfilename = wxGetHomeDir();
++ char usr_filename[255];
++ snprintf(usr_filename, 255, "/usr/share/jugglemaster/%s", filename);
++
+ if(targetfilename.Len() > 0) {
+ targetfilename += "/.jugglemaster/";
+ if(!wxDirExists(targetfilename)) {
+@@ -89,6 +93,9 @@
+ wxCopyFile(filename,targetfilename);
+ patternfile = fopen((const char *)targetfilename,"r");
+ return(patternfile != NULL);
++ } else if(stat(usr_filename, &buf) != -1 && !redownload) {
++ patternfile = fopen(usr_filename, "r");
++ return (patternfile != NULL);
+ } else {
+ wxString fullurl(WEB_PREFIX);
+ wxString proxy;
Property changes on: packages/trunk/jugglemaster/debian/patches/jmdlx-usr_patterns.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/trunk/jugglemaster/debian/patches/jmlib_sigfpe.dpatch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/jmlib_sigfpe.dpatch (rev 0)
+++ packages/trunk/jugglemaster/debian/patches/jmlib_sigfpe.dpatch 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## jmlib_sigfpe.dpatch by <Helmut Grohne <helmut at subdivi.de>>
+## DP: Rejects zero length to avoid division by zero.
+
+ at DPATCH@
+diff -urNad jugglemaster-0.4~/src/jmlib/jmlib.cpp jugglemaster-0.4/src/jmlib/jmlib.cpp
+--- jugglemaster-0.4~/src/jmlib/jmlib.cpp 2004-09-02 02:48:19.000000000 +0200
++++ jugglemaster-0.4/src/jmlib/jmlib.cpp 2007-09-22 00:39:03.000000000 +0200
+@@ -255,6 +255,10 @@
+ error("Style name too long");
+ return false;
+ }
++ if (length == 0) {
++ error("Style name too short");
++ return false;
++ }
+
+ strcpy(stylename, name);
+ memcpy(styledata, data + offset, length*4);
Property changes on: packages/trunk/jugglemaster/debian/patches/jmlib_sigfpe.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/trunk/jugglemaster/debian/patches/semaphore_segfault.dpatch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/semaphore_segfault.dpatch (rev 0)
+++ packages/trunk/jugglemaster/debian/patches/semaphore_segfault.dpatch 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## semaphore_segfault.dpatch by <Helmut Grohne <helmut at subdivi.de>>
+## DP: Ignore current_style==NULL to avoid segfault
+
+ at DPATCH@
+diff -urNad jugglemaster-0.4~/src/jmdlx/newsemaphore.cpp jugglemaster-0.4/src/jmdlx/newsemaphore.cpp
+--- jugglemaster-0.4~/src/jmdlx/newsemaphore.cpp 2004-09-02 02:48:19.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/newsemaphore.cpp 2007-09-22 00:53:16.000000000 +0200
+@@ -124,10 +124,12 @@
+ }
+
+ newvalue = newsemaphore->GetValue();
+- jmlib->stopJuggle();
+- jmlib->setPattern((JML_CHAR *)"Semaphore","(2,2)",HR_DEF,DR_DEF);
+- jmlib->setStyle((JML_CHAR *)(const char *)newvalue,style_len/4,current_style);
+- jmlib->startJuggle();
++ if(current_style) {
++ jmlib->stopJuggle();
++ jmlib->setPattern((JML_CHAR *)"Semaphore","(2,2)",HR_DEF,DR_DEF);
++ jmlib->setStyle((JML_CHAR *)(const char *)newvalue,style_len/4,current_style);
++ jmlib->startJuggle();
++ }
+ free(current_style);
+ }
+
Property changes on: packages/trunk/jugglemaster/debian/patches/semaphore_segfault.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/trunk/jugglemaster/debian/rules
===================================================================
--- packages/trunk/jugglemaster/debian/rules (rev 0)
+++ packages/trunk/jugglemaster/debian/rules 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,74 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# use dpatch
+include /usr/share/dpatch/dpatch.make
+
+CFLAGS += -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+CXXFLAGS += $(CFLAGS)
+export CFLAGS
+export CXXFLAGS
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp patch-stamp
+ dh_testdir
+ mkdir bin
+ $(MAKE) -C src/jmlib CXXFLAGS="$(CXXFLAGS)"
+ $(MAKE) aajm jmdlx jmqt
+ touch $@
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ rm -Rf bin
+ $(MAKE) -C src/jmlib clean
+ $(MAKE) -C src/aajm clean
+ $(MAKE) -C src/jmdlx clean
+ rm -f src/jmqt/Makefile.jmqt src/jmqt/*.o src/jmqt/jmqt
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+
+
+binary-indep: build install
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
+ dh_install
+ dh_installmenu
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
Property changes on: packages/trunk/jugglemaster/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/trunk/jugglemaster/debian/watch
===================================================================
--- packages/trunk/jugglemaster/debian/watch (rev 0)
+++ packages/trunk/jugglemaster/debian/watch 2007-10-24 20:51:35 UTC (rev 4460)
@@ -0,0 +1,2 @@
+version=3
+http://icculus.org/jugglemaster/ ./download/jugglemaster-(.*)\.tar\.bz2
More information about the Pkg-games-commits
mailing list