--- jugglemaster-0.4.orig/debian/jmdlx.1
+++ jugglemaster-0.4/debian/jmdlx.1
@@ -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@subdivi.de>,
+for the Debian project (but may be used by others).
--- jugglemaster-0.4.orig/debian/control
+++ jugglemaster-0.4/debian/control
@@ -0,0 +1,57 @@
+Source: jugglemaster
+Section: games
+Priority: extra
+Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
+Uploaders: Helmut Grohne <helmut@subdivi.de>
+Build-Depends: debhelper (>= 5), dpatch, 
+ libaa1-dev,
+ libwxgtk2.6-dev,
+ qt3-dev-tools, libqt3-headers, libqt3-mt-dev
+Standards-Version: 3.8.0
+Homepage: http://icculus.org/jugglemaster/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/jugglemaster/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/jugglemaster/?op=log
+
+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
+
+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
+
+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
--- jugglemaster-0.4.orig/debian/jmdlx.menu
+++ jugglemaster-0.4/debian/jmdlx.menu
@@ -0,0 +1,2 @@
+?package(jmdlx):needs="X11" section="Games/Simulation"\
+  title="jmdlx" command="/usr/games/jmdlx"
--- jugglemaster-0.4.orig/debian/jmqt.install
+++ jugglemaster-0.4/debian/jmqt.install
@@ -0,0 +1 @@
+bin/jmqt usr/games
--- jugglemaster-0.4.orig/debian/rules
+++ jugglemaster-0.4/debian/rules
@@ -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
--- jugglemaster-0.4.orig/debian/watch
+++ jugglemaster-0.4/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://icculus.org/jugglemaster/ ./download/jugglemaster-(.*)\.tar\.bz2
--- jugglemaster-0.4.orig/debian/aajm.menu
+++ jugglemaster-0.4/debian/aajm.menu
@@ -0,0 +1,5 @@
+?package(aajm):needs="vc" section="Games/Simulation"\
+  title="aajm" command="/usr/games/aajm"
+
+?package(aajm):needs="X11" section="Games/Simulation"\
+  title="aajm (X11)" command="/usr/games/aajm"
--- jugglemaster-0.4.orig/debian/README.source
+++ jugglemaster-0.4/debian/README.source
@@ -0,0 +1,12 @@
+This package uses dpatch for modifications to upstream files. While you may
+make changes directly for NMU purposes etc, it would be appreciated if NMUers
+would make any such changes using dpatch as well.
+
+To edit an existing patch, or create a new one, simply do:
+  dpatch-edit-patch <patchname>
+The patch will be placed in debian/patches. If you are creating a new one,
+you will also need to add it to debian/patches/00list.
+
+You can obtain the patched source, or remove the applied patches, with the
+debian/rules 'patch' and 'unpatch' targets. debian/rules clean will invoke
+unpatch automatically.
--- jugglemaster-0.4.orig/debian/changelog
+++ jugglemaster-0.4/debian/changelog
@@ -0,0 +1,38 @@
+jugglemaster (0.4-3) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * Add data copyright details to debian/copyright.
+    + Formerly in data_license.mbox file. (Closes:465646)
+
+  [ Helmut Grohne ]
+  * Bumped Standards-Version to 3.8.0:
+    + Added README.source (from gimp-resynthesizer).
+
+ -- Helmut Grohne <helmut@subdivi.de>  Tue, 22 Jul 2008 13:22:05 +0200
+
+jugglemaster (0.4-2) unstable; urgency=low
+
+  [ Helmut Grohne ]
+  * Bumped Standards-Version to 3.7.3, no changes needed.
+
+  [ Barry deFreese ]
+  * 010_wx26_trans.dpatch - Build with wx2.6.
+  * Move maintainer to Debian Games Team.
+  * Add VCS fields in control.
+  * Remove unneeded .dirs files.
+  * Install in /usr/games, not /usr/bin.
+    + Update menus accordingly.
+  * Don't install extra license file.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Mon, 10 Dec 2007 13:42:27 +0100
+
+jugglemaster (0.4-1) unstable; urgency=low
+
+  * Initial release.
+  * ITP Closes: 443904
+  * Improve dpatch descriptions.
+  * Use dh_install instead of install.
+  * Improved package descriptions.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Tue, 06 Nov 2007 09:42:28 +0100
+
--- jugglemaster-0.4.orig/debian/aajm.install
+++ jugglemaster-0.4/debian/aajm.install
@@ -0,0 +1 @@
+bin/aajm usr/games
--- jugglemaster-0.4.orig/debian/jmqt.manpages
+++ jugglemaster-0.4/debian/jmqt.manpages
@@ -0,0 +1 @@
+debian/jmqt.1
--- jugglemaster-0.4.orig/debian/aajm.1
+++ jugglemaster-0.4/debian/aajm.1
@@ -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@subdivi.de>,
+for the Debian project (but may be used by others).
--- jugglemaster-0.4.orig/debian/compat
+++ jugglemaster-0.4/debian/compat
@@ -0,0 +1 @@
+5
--- jugglemaster-0.4.orig/debian/jmdlx.install
+++ jugglemaster-0.4/debian/jmdlx.install
@@ -0,0 +1,2 @@
+data/*.jm usr/share/jugglemaster
+bin/jmdlx usr/games
--- jugglemaster-0.4.orig/debian/jmqt.1
+++ jugglemaster-0.4/debian/jmqt.1
@@ -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@subdivi.de>,
+for the Debian project (but may be used by others).
--- jugglemaster-0.4.orig/debian/jmqt.menu
+++ jugglemaster-0.4/debian/jmqt.menu
@@ -0,0 +1,2 @@
+?package(jmqt):needs="X11" section="Games/Simulation"\
+  title="jmqt" command="/usr/games/jmqt"
--- jugglemaster-0.4.orig/debian/copyright
+++ jugglemaster-0.4/debian/copyright
@@ -0,0 +1,181 @@
+This package was debianized by Helmut Grohne <helmut@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+
+ data/*.jm                    : Modified BSD (see below)
+
+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
+
+----------------------------------------------------------------------
+Details on data files Copyright:
+----------------------------------------------------------------------
+
+Date: Sat, 27 Oct 2007 17:58:49 +0200
+From: Helmut Grohne <helmut@subdivi.de>
+To: jugglemaster@icculus.org
+Message-ID: <20071027155849.GB7279@alf.mars>
+Subject: [jugglemaster] Copyright of data files
+
+Hi,
+
+I'm currently packaging jugglemaster for the Debian GNU/Linux software
+distribution. Unfortunately the copyright and licenses of the files
+located in data/* seem a bit unclear. It would therefore great if you
+could clarify this.
+
+Thank your very much for the great work on jugglemaster
+
+Helmut
+
+-----------
+
+Date: Sun, 28 Oct 2007 21:20:51 +0900
+From: "Per Johan Groland" <curwenx@gmail.com>
+To: jugglemaster@icculus.org
+Subject: Re: [jugglemaster] Copyright of data files
+
+Hi,
+
+I assume you are going to package jmdlx. The license information can
+be found in the file LICENSE in the root directory.
+
+As for the files in the data directory, you can assume that they are
+covered by the same license as jmlib (modified bsd)
+
+semaphore.jm was created by Chunky Kibbles for jmdlx.
+
+patterns.jm was originally created by Ken Matsuoka for the original
+JuggleMaster (for DOS). Several other people have since contributed to
+this file, see the file CREDITS for a complete list.
+
+Some of the additions to the patterns.jm file were made before the
+project was made open source (notably those made by Isaac Orr).
+However, these modifications were all included in various jugglemaster
+versions with permission. Ken Matsuoka later gave his permission to
+release the jugglemaster library I created from his sources as open
+source, so it is safe to
+assume that this also covers the patterns.jm file.
+
+Sincerely,
+  Per Johan Groland
+
+On 10/28/07, Helmut Grohne <helmut@subdivi.de> wrote:
+> Hi,
+>
+> I'm currently packaging jugglemaster for the Debian GNU/Linux software
+> distribution. Unfortunately the copyright and licenses of the files
+> located in data/* seem a bit unclear. It would therefore great if you
+> could clarify this.
+>
+> Thank your very much for the great work on jugglemaster
+>
+> Helmut
+>
+
+-----------
+
+Date: Sun, 28 Oct 2007 20:26:36 -0400
+From: Chunky Kibbles <chunky@icculus.org>
+To: jugglemaster@icculus.org
+Subject: Re: [jugglemaster] Copyright of data files
+
+On Sun, Oct 28, 2007 at 09:20:51PM +0900, Per Johan Groland wrote:
+> I assume you are going to package jmdlx. The license information can
+> be found in the file LICENSE in the root directory.
+> 
+> As for the files in the data directory, you can assume that they are
+> covered by the same license as jmlib (modified bsd)
+> 
+> semaphore.jm was created by Chunky Kibbles for jmdlx.
+> 
+> patterns.jm was originally created by Ken Matsuoka for the original
+> JuggleMaster (for DOS). Several other people have since contributed to
+> this file, see the file CREDITS for a complete list.
+> 
+> Some of the additions to the patterns.jm file were made before the
+> project was made open source (notably those made by Isaac Orr).
+> However, these modifications were all included in various jugglemaster
+> versions with permission. Ken Matsuoka later gave his permission to
+> release the jugglemaster library I created from his sources as open
+> source, so it is safe to
+> assume that this also covers the patterns.jm file.
+
+Reading the LICENSE file, I see the point that we haven't explicitly
+given a license to the pattern datafiles. Please consider them to be
+licensed under the modified BSD license, exactly like the jmlib core.
+
+Gary (-;
+
+--------------------------------------------------------------------------
+
+
+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@subdivi.de> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
--- jugglemaster-0.4.orig/debian/data_license.mbox
+++ jugglemaster-0.4/debian/data_license.mbox
@@ -0,0 +1,235 @@
+From jugglemaster-return-96-helmut=subdivi.de@icculus.org Sat Oct 27 17:59:16 2007
+Return-path: <jugglemaster-return-96-helmut=subdivi.de@icculus.org>
+X-Spam-Checker-Version: SpamAssassin 3.1.7-deb (2006-10-05) on 
+	colin.subdivi.de
+X-Spam-Level: 
+X-Spam-Status: No, score=-3.0 required=6.0 tests=BAYES_00 autolearn=ham 
+	version=3.1.7-deb
+Envelope-to: helmut@subdivi.de
+Delivery-date: Sat, 27 Oct 2007 17:59:09 +0200
+Received: from icculus.org ([67.106.77.212])
+	by subdivi.de with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
+	(Exim 4.63)
+	(envelope-from <jugglemaster-return-96-helmut=subdivi.de@icculus.org>)
+	id 1Ilo45-00041q-As
+	for helmut@subdivi.de; Sat, 27 Oct 2007 17:59:09 +0200
+Received: (qmail 16816 invoked by alias); 27 Oct 2007 11:59:08 -0400
+Mailing-List: contact jugglemaster-help@icculus.org; run by ezmlm
+Precedence: bulk
+X-No-Archive: yes
+List-Post: <mailto:jugglemaster@icculus.org>
+List-Help: <mailto:jugglemaster-help@icculus.org>
+List-Unsubscribe: <mailto:jugglemaster-unsubscribe@icculus.org>
+List-Subscribe: <mailto:jugglemaster-subscribe@icculus.org>
+Reply-To: jugglemaster@icculus.org
+Delivered-To: mailing list jugglemaster@icculus.org
+Received: (qmail 16798 invoked by uid 305); 27 Oct 2007 11:59:07 -0400
+Date: Sat, 27 Oct 2007 17:58:49 +0200
+From: Helmut Grohne <helmut@subdivi.de>
+To: jugglemaster@icculus.org
+Message-ID: <20071027155849.GB7279@alf.mars>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+User-Agent: Mutt/1.5.16 (2007-06-11)
+Subject: [jugglemaster] Copyright of data files
+Status: RO
+Content-Length: 451
+Lines: 17
+
+Hi,
+
+I'm currently packaging jugglemaster for the Debian GNU/Linux software
+distribution. Unfortunately the copyright and licenses of the files
+located in data/* seem a bit unclear. It would therefore great if you
+could clarify this.
+
+Thank your very much for the great work on jugglemaster
+
+Helmut
+
+---
+To unsubscribe, send a blank email to jugglemaster-unsubscribe@icculus.org
+Mailing list archives: http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?43
+
+
+
+
+From jugglemaster-return-98-helmut=subdivi.de@icculus.org Sun Oct 28 13:21:40 2007
+Return-path: <jugglemaster-return-98-helmut=subdivi.de@icculus.org>
+X-Spam-Checker-Version: SpamAssassin 3.1.7-deb (2006-10-05) on 
+	colin.subdivi.de
+X-Spam-Level: 
+X-Spam-Status: No, score=-3.0 required=6.0 tests=BAYES_00 autolearn=ham 
+	version=3.1.7-deb
+Envelope-to: helmut@subdivi.de
+Delivery-date: Sun, 28 Oct 2007 13:20:57 +0100
+Received: from icculus.org ([67.106.77.212])
+	by subdivi.de with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
+	(Exim 4.63)
+	(envelope-from <jugglemaster-return-98-helmut=subdivi.de@icculus.org>)
+	id 1Im78T-0000Lo-Lu
+	for helmut@subdivi.de; Sun, 28 Oct 2007 13:20:57 +0100
+Received: (qmail 25955 invoked by alias); 28 Oct 2007 08:20:59 -0400
+Mailing-List: contact jugglemaster-help@icculus.org; run by ezmlm
+Precedence: bulk
+X-No-Archive: yes
+List-Post: <mailto:jugglemaster@icculus.org>
+List-Help: <mailto:jugglemaster-help@icculus.org>
+List-Unsubscribe: <mailto:jugglemaster-unsubscribe@icculus.org>
+List-Subscribe: <mailto:jugglemaster-subscribe@icculus.org>
+Reply-To: jugglemaster@icculus.org
+Delivered-To: mailing list jugglemaster@icculus.org
+Received: (qmail 25946 invoked by uid 305); 28 Oct 2007 08:20:59 -0400
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=gmail.com; s=beta;
+        h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
+        bh=6OIf26yyg4UwnNNRkEX+mhFomGB0vJxuRnUjV3C2mZI=;
+        b=s6Orp70A+aoIUY3USFY/lgwLkbjFBUKmTHddYKRqapQnknKp0Yw2y9uV1fS2Ha1ZOlbAIrhR1tJ6VEvh3Hz3jOUsesQCBVAZDRVRtlfHldt6T1H0ct28w6FFD/j7EPg7dHAsvOATm8d1fQQ0v20tjZH43smLDcXvs8rS+YYjOio=
+DomainKey-Signature: a=rsa-sha1; c=nofws;
+        d=gmail.com; s=beta;
+        h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
+        b=c3IONHGFMxOjCn/bW8ZHuHcbjUTFMANoHe8tqC4ZgQ24Nhk6eeiWhVarKNPsuEmCHHPXq+JOE4kFMEXzWcj2nDCRj3wHrzkDEBYo7Rp64AvtMyksQIJicbHo1bnHi8Vh77GLOTQEV8qJk/2r4PGTsoevjRq2807F3FlEKTAPNac=
+Message-ID: <379a63490710280520j3d191840ie000728e0c559f3d@mail.gmail.com>
+Date: Sun, 28 Oct 2007 21:20:51 +0900
+From: "Per Johan Groland" <curwenx@gmail.com>
+To: jugglemaster@icculus.org
+In-Reply-To: <20071027155849.GB7279@alf.mars>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+References: <20071027155849.GB7279@alf.mars>
+Subject: Re: [jugglemaster] Copyright of data files
+Status: RO
+Content-Length: 1628
+Lines: 50
+
+Hi,
+
+I assume you are going to package jmdlx. The license information can
+be found in the file LICENSE in the root directory.
+
+As for the files in the data directory, you can assume that they are
+covered by the same license as jmlib (modified bsd)
+
+semaphore.jm was created by Chunky Kibbles for jmdlx.
+
+patterns.jm was originally created by Ken Matsuoka for the original
+JuggleMaster (for DOS). Several other people have since contributed to
+this file, see the file CREDITS for a complete list.
+
+Some of the additions to the patterns.jm file were made before the
+project was made open source (notably those made by Isaac Orr).
+However, these modifications were all included in various jugglemaster
+versions with permission. Ken Matsuoka later gave his permission to
+release the jugglemaster library I created from his sources as open
+source, so it is safe to
+assume that this also covers the patterns.jm file.
+
+Sincerely,
+  Per Johan Groland
+
+On 10/28/07, Helmut Grohne <helmut@subdivi.de> wrote:
+> Hi,
+>
+> I'm currently packaging jugglemaster for the Debian GNU/Linux software
+> distribution. Unfortunately the copyright and licenses of the files
+> located in data/* seem a bit unclear. It would therefore great if you
+> could clarify this.
+>
+> Thank your very much for the great work on jugglemaster
+>
+> Helmut
+>
+> ---
+> To unsubscribe, send a blank email to jugglemaster-unsubscribe@icculus.org
+> Mailing list archives: http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?43
+>
+>
+>
+
+---
+To unsubscribe, send a blank email to jugglemaster-unsubscribe@icculus.org
+Mailing list archives: http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?43
+
+
+
+
+From jugglemaster-return-99-helmut=subdivi.de@icculus.org Mon Oct 29 01:27:15 2007
+Return-path: <jugglemaster-return-99-helmut=subdivi.de@icculus.org>
+X-Spam-Checker-Version: SpamAssassin 3.1.7-deb (2006-10-05) on 
+	colin.subdivi.de
+X-Spam-Level: 
+X-Spam-Status: No, score=-3.0 required=6.0 tests=BAYES_00 autolearn=ham 
+	version=3.1.7-deb
+Envelope-to: helmut@subdivi.de
+Delivery-date: Mon, 29 Oct 2007 01:26:35 +0100
+Received: from icculus.org ([67.106.77.212])
+	by subdivi.de with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
+	(Exim 4.63)
+	(envelope-from <jugglemaster-return-99-helmut=subdivi.de@icculus.org>)
+	id 1ImISg-0001K3-P2
+	for helmut@subdivi.de; Mon, 29 Oct 2007 01:26:35 +0100
+Received: (qmail 31779 invoked by alias); 28 Oct 2007 20:26:36 -0400
+Mailing-List: contact jugglemaster-help@icculus.org; run by ezmlm
+Precedence: bulk
+X-No-Archive: yes
+List-Post: <mailto:jugglemaster@icculus.org>
+List-Help: <mailto:jugglemaster-help@icculus.org>
+List-Unsubscribe: <mailto:jugglemaster-unsubscribe@icculus.org>
+List-Subscribe: <mailto:jugglemaster-subscribe@icculus.org>
+Reply-To: jugglemaster@icculus.org
+Delivered-To: mailing list jugglemaster@icculus.org
+Received: (qmail 31768 invoked by uid 1050); 28 Oct 2007 20:26:36 -0400
+Date: Sun, 28 Oct 2007 20:26:36 -0400
+From: Chunky Kibbles <chunky@icculus.org>
+To: jugglemaster@icculus.org
+Message-ID: <20071029002635.GA2200@gamehenge.icculus.org>
+References: <20071027155849.GB7279@alf.mars> <379a63490710280520j3d191840ie000728e0c559f3d@mail.gmail.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+In-Reply-To: <379a63490710280520j3d191840ie000728e0c559f3d@mail.gmail.com>
+Organization: Kibbles'n'Bits
+X-disclaimer: Standard Disclaimer Applies. I don't care.
+User-Agent: Mutt/1.5.13 (2006-08-11)
+Subject: Re: [jugglemaster] Copyright of data files
+Status: RO
+Content-Length: 1382
+Lines: 33
+
+On Sun, Oct 28, 2007 at 09:20:51PM +0900, Per Johan Groland wrote:
+> I assume you are going to package jmdlx. The license information can
+> be found in the file LICENSE in the root directory.
+> 
+> As for the files in the data directory, you can assume that they are
+> covered by the same license as jmlib (modified bsd)
+> 
+> semaphore.jm was created by Chunky Kibbles for jmdlx.
+> 
+> patterns.jm was originally created by Ken Matsuoka for the original
+> JuggleMaster (for DOS). Several other people have since contributed to
+> this file, see the file CREDITS for a complete list.
+> 
+> Some of the additions to the patterns.jm file were made before the
+> project was made open source (notably those made by Isaac Orr).
+> However, these modifications were all included in various jugglemaster
+> versions with permission. Ken Matsuoka later gave his permission to
+> release the jugglemaster library I created from his sources as open
+> source, so it is safe to
+> assume that this also covers the patterns.jm file.
+
+Reading the LICENSE file, I see the point that we haven't explicitly
+given a license to the pattern datafiles. Please consider them to be
+licensed under the modified BSD license, exactly like the jmlib core.
+
+Gary (-;
+
+---
+To unsubscribe, send a blank email to jugglemaster-unsubscribe@icculus.org
+Mailing list archives: http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?43
+
+
+
+
--- jugglemaster-0.4.orig/debian/aajm.manpages
+++ jugglemaster-0.4/debian/aajm.manpages
@@ -0,0 +1 @@
+debian/aajm.1
--- jugglemaster-0.4.orig/debian/jmdlx.manpages
+++ jugglemaster-0.4/debian/jmdlx.manpages
@@ -0,0 +1 @@
+debian/jmdlx.1
--- jugglemaster-0.4.orig/debian/patches/semaphore_segfault.dpatch
+++ jugglemaster-0.4/debian/patches/semaphore_segfault.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## semaphore_segfault.dpatch by  <Helmut Grohne <helmut@subdivi.de>>
+## DP: Ignore current_style==NULL to avoid segfault
+
+@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);
+ }
+ 
--- jugglemaster-0.4.orig/debian/patches/00list
+++ jugglemaster-0.4/debian/patches/00list
@@ -0,0 +1,4 @@
+jmdlx-usr_patterns.dpatch
+jmlib_sigfpe.dpatch
+semaphore_segfault.dpatch
+010_wx26_trans.dpatch
--- jugglemaster-0.4.orig/debian/patches/010_wx26_trans.dpatch
+++ jugglemaster-0.4/debian/patches/010_wx26_trans.dpatch
@@ -0,0 +1,884 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 010_wx26_trans.dpatch by Barry deFreese <bddebian@comcast.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build with wx2.6
+
+@DPATCH@
+diff -urNad jugglemaster-0.4~/src/jmdlx/Makefile jugglemaster-0.4/src/jmdlx/Makefile
+--- jugglemaster-0.4~/src/jmdlx/Makefile	2004-09-01 20:48:19.000000000 -0400
++++ jugglemaster-0.4/src/jmdlx/Makefile	2008-01-06 13:19:07.000000000 -0500
+@@ -2,7 +2,6 @@
+ 
+ CXXFLAGS+=-Wall -fsigned-char `wx-config --cppflags`
+ # -ansi -pedantic cause warnings from some compilers [wx uses long long]
+-LDFLAGS+=`wx-config --ldflags`
+ # STATICFLAGS=-Wl,-Bstatic
+ STATICFLAGS=-static
+ LIBS+=`wx-config --libs`
+diff -urNad jugglemaster-0.4~/src/jmdlx/advsite.cpp jugglemaster-0.4/src/jmdlx/advsite.cpp
+--- jugglemaster-0.4~/src/jmdlx/advsite.cpp	2004-09-01 20:48:19.000000000 -0400
++++ jugglemaster-0.4/src/jmdlx/advsite.cpp	2008-01-06 13:19:07.000000000 -0500
+@@ -25,7 +25,7 @@
+ END_EVENT_TABLE()
+ 
+ AdvancedSiteSwap::AdvancedSiteSwap(wxWindow *p, JMLib *j)
+-	: wxDialog(p, -1, "New SiteSwap",
++	: wxDialog(p, -1, wxT("New SiteSwap"),
+ 			wxDefaultPosition, wxDefaultSize,
+ 			wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) {
+ 
+@@ -35,8 +35,8 @@
+   int i;
+  // SiteSwap
+   wxBoxSizer *siteswapsizer = new wxBoxSizer(wxHORIZONTAL);
+-  newsiteswap = new wxTextCtrl(this,-1,jmlib->getSite());
+-  siteswapsizer->Add(new wxStaticText(this, 0, "Enter New Siteswap"),
++  newsiteswap = new wxTextCtrl(this,-1,wxString(jmlib->getSite(), wxConvUTF8));
++  siteswapsizer->Add(new wxStaticText(this, 0, wxT("Enter New Siteswap")),
+ 					0,
+ 					wxALIGN_CENTER_VERTICAL|wxALL,
+ 					5);
+@@ -53,12 +53,12 @@
+   newstyle = new wxChoice ( this,-1,wxDefaultPosition, wxDefaultSize);
+ 
+   for(i=0;i<jmlib->numStyles();i++) {
+-        newstyle->Append(style_list[i]);
++        newstyle->Append(wxString(style_list[i], wxConvUTF8));
+   }
+   
+   newstyle->SetSelection(0);
+ 
+-  stylesizer->Add(new wxStaticText(this, 0, "Style"),
++  stylesizer->Add(new wxStaticText(this, 0, wxT("Style")),
+ 					0,
+ 					wxALIGN_CENTER_VERTICAL|wxALL,
+ 					5);
+@@ -80,7 +80,7 @@
+ 					(int)(HR_MIN * 100.0F),
+ 					(int)(HR_MAX * 100.0F),
+ 					(int)(jmlib->getHR() * 100.0F));
+-  hrdrsizer->Add(new wxStaticText(this, 0, "Height Ratio %"),
++  hrdrsizer->Add(new wxStaticText(this, 0, wxT("Height Ratio %")),
+ 				1,
+ 				wxALIGN_RIGHT|wxALL,
+ 				5);
+@@ -99,7 +99,7 @@
+ 					(int)(DR_MIN*100.0F),
+ 					(int)(DR_MAX*100.0F),
+ 					(int)(jmlib->getDR() * 100.0F));
+-  hrdrsizer->Add(new wxStaticText(this, 0, "Dwell Ratio %"),
++  hrdrsizer->Add(new wxStaticText(this, 0, wxT("Dwell Ratio %")),
+ 				1,
+ 				wxALIGN_CENTRE|wxALL,
+ 				5);
+@@ -110,9 +110,9 @@
+ 
+  // Buttons
+ 
+-  wxButton *ok = new wxButton(this, wxID_OK, "OK");
+-  wxButton *apply = new wxButton(this, wxID_APPLY, "Apply");
+-  wxButton *cancel = new wxButton(this, wxID_CANCEL, "Cancel");
++  wxButton *ok = new wxButton(this, wxID_OK, wxT("OK"));
++  wxButton *apply = new wxButton(this, wxID_APPLY, wxT("Apply"));
++  wxButton *cancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"));
+   wxBoxSizer *buttonsizer = new wxBoxSizer(wxHORIZONTAL);
+   buttonsizer->Add(ok, 1, wxALIGN_CENTRE|wxALL, 5);
+   buttonsizer->Add(apply, 1, wxALIGN_CENTRE|wxALL, 5);
+@@ -141,14 +141,14 @@
+   JML_FLOAT dr = (JML_FLOAT)drspinner->GetValue()/100.0F;
+ 
+   jmlib->stopJuggle();
+-  jmlib->setPattern("Something",(JML_CHAR *)(const char *)newpattern, hr, dr);
+-  jmlib->setStyle((JML_CHAR *)(const char *)style);
++  jmlib->setPattern("Something",(JML_CHAR *)(const char *)newpattern.mb_str(wxConvUTF8), hr, dr);
++  jmlib->setStyle((JML_CHAR *)(const char *)style.mb_str(wxConvUTF8));
+   jmlib->startJuggle();
+   haschanged=0;
+ }
+ 
+ void AdvancedSiteSwap::OnApply(wxCommandEvent &WXUNUSED(event)) {
+-	if(haschanged || newstyle->GetStringSelection()=="Random") {
++	if(haschanged || newstyle->GetStringSelection()==wxT("Random")) {
+ 		ApplySettings();
+ 	}
+ }
+diff -urNad jugglemaster-0.4~/src/jmdlx/choosepatt.cpp jugglemaster-0.4/src/jmdlx/choosepatt.cpp
+--- jugglemaster-0.4~/src/jmdlx/choosepatt.cpp	2004-09-01 20:48:19.000000000 -0400
++++ jugglemaster-0.4/src/jmdlx/choosepatt.cpp	2008-01-06 13:19:07.000000000 -0500
+@@ -25,7 +25,7 @@
+ END_EVENT_TABLE()
+ 
+ ChoosePatt::ChoosePatt(wxWindow *parent, JMLib *j, PatternLoader *p)
+-	: wxDialog(parent, -1, "Choose Pattern",
++	: wxDialog(parent, -1, wxT("Choose Pattern"),
+ 			wxDefaultPosition, wxDefaultSize,
+ 			wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) {
+ 
+@@ -43,7 +43,7 @@
+                                 wxDefaultSize);
+   const char *curr_sect;
+   for(curr_sect = patterns->GetFirstSection(); curr_sect ; curr_sect=patterns->GetNextSection()) {
+-        sectionChoice->Append(curr_sect);
++        sectionChoice->Append(wxString(curr_sect, wxConvUTF8));
+   }
+   sectionChoice->SetSelection(0);
+ 
+@@ -66,34 +66,34 @@
+   choicesizer->Add(patternListBox,1,wxALIGN_CENTER|wxEXPAND|wxALL,5);
+ 
+   wxBoxSizer *showSitesizer = new wxBoxSizer(wxHORIZONTAL);
+-  showSitesizer->Add(new wxStaticText(this, 0, "Site"),
++  showSitesizer->Add(new wxStaticText(this, 0, wxT("Site")),
+                                         0,
+                                         wxALIGN_CENTER_VERTICAL|wxALL,
+                                         3);
+ 
+   showSite = new wxTextCtrl(this, -1,
+-				jmlib->getSite(),
++				wxString(jmlib->getSite(), wxConvUTF8),
+ 				wxDefaultPosition,
+ 				wxDefaultSize,
+ 				wxTE_READONLY);
+   showSitesizer->Add(showSite, 1, wxALIGN_CENTRE|wxEXPAND|wxALL, 3);
+ 
+   wxBoxSizer *showStylesizer = new wxBoxSizer(wxHORIZONTAL);
+-  showStylesizer->Add(new wxStaticText(this, 0, "Style"),
++  showStylesizer->Add(new wxStaticText(this, 0, wxT("Style")),
+                                         0,
+                                         wxALIGN_CENTER_VERTICAL|wxALL,
+                                         3);
+   showStyle = new wxTextCtrl(this, -1,
+-				jmlib->getStyle(),
++				wxString(jmlib->getStyle(), wxConvUTF8),
+ 				wxDefaultPosition,
+ 				wxDefaultSize,
+ 				wxTE_READONLY);
+   showStylesizer->Add(showStyle, 1, wxALIGN_CENTRE|wxEXPAND|wxALL, 3);
+ 
+ 
+-  wxButton *ok = new wxButton(this, wxID_OK, "OK");
+-  wxButton *apply = new wxButton(this, wxID_APPLY, "Apply");
+-  wxButton *cancel = new wxButton(this, wxID_CANCEL, "Cancel");
++  wxButton *ok = new wxButton(this, wxID_OK, wxT("OK"));
++  wxButton *apply = new wxButton(this, wxID_APPLY, wxT("Apply"));
++  wxButton *cancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"));
+   wxBoxSizer *buttonsizer = new wxBoxSizer(wxHORIZONTAL);
+   buttonsizer->Add(ok, 1, wxALIGN_CENTRE|wxALL, 5);
+   buttonsizer->Add(apply, 1, wxALIGN_CENTRE|wxALL, 5);
+@@ -127,7 +127,7 @@
+ 	if(!newSection || !newPattern) {
+ 		return;
+ 	}
+-	patt = patterns->GetPattern((const char *)newSection,(const char *)newPattern);
++	patt = patterns->GetPattern((const char *)newSection.mb_str(wxConvUTF8),(const char *)newPattern.mb_str(wxConvUTF8));
+ 	jmlib->stopJuggle();
+ 	jmlib->setPattern((JML_CHAR *)Patt_GetName(patt),(JML_CHAR *)Patt_GetData(patt), Patt_GetHR(patt), Patt_GetDR(patt));
+ 	JML_UINT8 style_length = patterns->GetStyleLength(Patt_GetStyle(patt));
+@@ -148,10 +148,10 @@
+ 
+ 	newPattern = patternListBox->GetStringSelection();
+ 	newSection = sectionChoice->GetStringSelection();
+-	patt = patterns->GetPattern((const char *)newSection,(const char *)newPattern);
++	patt = patterns->GetPattern((const char *)newSection.mb_str(wxConvUTF8),(const char *)newPattern.mb_str(wxConvUTF8));
+ 
+-	showStyle->SetValue(Patt_GetStyle(patt));
+-	showSite->SetValue(Patt_GetData(patt));
++	showStyle->SetValue(wxString(Patt_GetStyle(patt), wxConvUTF8));
++	showSite->SetValue(wxString(Patt_GetData(patt), wxConvUTF8));
+ }
+ 
+ void ChoosePatt::OnApply(wxCommandEvent &WXUNUSED(event)) {
+@@ -184,11 +184,11 @@
+ 
+ void ChoosePatt::SectionChange() {
+ 	wxString newSection=sectionChoice->GetStringSelection();
+-	patterns->SetSection((const char *)newSection);
++	patterns->SetSection((const char *)newSection.mb_str(wxConvUTF8));
+ 	patternListBox->Clear();
+ 	const char *curr_patt;
+ 	while ((curr_patt = patterns->GetNextPatternName())) {
+-		patternListBox->Append(curr_patt);
++		patternListBox->Append(wxString(curr_patt, wxConvUTF8));
+ 	}
+ 	haschanged=1;
+ }
+diff -urNad jugglemaster-0.4~/src/jmdlx/choosestyle.cpp jugglemaster-0.4/src/jmdlx/choosestyle.cpp
+--- jugglemaster-0.4~/src/jmdlx/choosestyle.cpp	2004-09-01 20:48:19.000000000 -0400
++++ jugglemaster-0.4/src/jmdlx/choosestyle.cpp	2008-01-06 13:19:07.000000000 -0500
+@@ -22,7 +22,7 @@
+ END_EVENT_TABLE()
+ 
+ ChooseStyle::ChooseStyle(wxWindow *parent, JMLib *j)
+-	: wxDialog(parent, -1, "Change Style",
++	: wxDialog(parent, -1, wxT("Change Style"),
+ 			wxDefaultPosition, wxDefaultSize,
+ 			wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) {
+ 
+@@ -35,16 +35,16 @@
+   stylechoice = new wxChoice ( this,-1,wxDefaultPosition, wxDefaultSize);
+ 
+   for(i=0;i<jmlib->numStyles();i++) {
+-	stylechoice->Append(style_list[i]);
++	stylechoice->Append(wxString(style_list[i], wxConvUTF8));
+   }
+ 
+   stylechoice->SetSelection(0);
+ 
+  // Buttons
+ 
+-  wxButton *ok = new wxButton(this, wxID_OK, "OK");
+-  wxButton *apply = new wxButton(this, wxID_APPLY, "Apply");
+-  wxButton *cancel = new wxButton(this, wxID_CANCEL, "Cancel");
++  wxButton *ok = new wxButton(this, wxID_OK, wxT("OK"));
++  wxButton *apply = new wxButton(this, wxID_APPLY, wxT("Apply"));
++  wxButton *cancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"));
+   wxBoxSizer *buttonsizer = new wxBoxSizer(wxHORIZONTAL);
+   buttonsizer->Add(ok, 1, wxALIGN_CENTRE|wxALL, 5);
+   buttonsizer->Add(apply, 1, wxALIGN_CENTRE|wxALL, 5);
+@@ -67,7 +67,7 @@
+ void ChooseStyle::ApplySettings() {
+   JML_CHAR *newstyle;
+ 
+-  newstyle = (JML_CHAR *)(const char *)stylechoice->GetStringSelection();
++  newstyle = (JML_CHAR *)(const char *)stylechoice->GetStringSelection().mb_str(wxConvUTF8);
+   jmlib->setStyle(newstyle);
+ }
+ 
+diff -urNad jugglemaster-0.4~/src/jmdlx/choosestyle.h jugglemaster-0.4/src/jmdlx/choosestyle.h
+--- jugglemaster-0.4~/src/jmdlx/choosestyle.h	2004-09-01 20:48:19.000000000 -0400
++++ jugglemaster-0.4/src/jmdlx/choosestyle.h	2008-01-06 13:19:07.000000000 -0500
+@@ -21,12 +21,12 @@
+ #include "../jmlib/jmlib.h"
+ #include "jmdlx.h"
+ 
+-const wxString possible_styles[] = {   "Normal",
+-                              "Mills Mess",
+-                              "Windmill",
+-                              "Reverse",
+-                              "Shower",
+-                              "Center"
++const wxString possible_styles[] = {   wxT("Normal"),
++                              wxT("Mills Mess"),
++                              wxT("Windmill"),
++                              wxT("Reverse"),
++                              wxT("Shower"),
++                              wxT("Center")
+                                 };
+ 
+ 
+diff -urNad jugglemaster-0.4~/src/jmdlx/jmdlx.cpp jugglemaster-0.4/src/jmdlx/jmdlx.cpp
+--- jugglemaster-0.4~/src/jmdlx/jmdlx.cpp	2004-09-01 20:48:19.000000000 -0400
++++ jugglemaster-0.4/src/jmdlx/jmdlx.cpp	2008-01-06 13:19:07.000000000 -0500
+@@ -26,7 +26,7 @@
+   windowx = min(480,wxGetDisplaySize().x);
+   windowy = min(400,wxGetDisplaySize().y);
+ 
+-	frame = new JMFrame(NULL, -1, "JuggleMaster Deluxe", wxDefaultPosition, wxSize(windowx,windowy));
++	frame = new JMFrame(NULL, -1, wxT("JuggleMaster Deluxe"), wxDefaultPosition, wxSize(windowx,windowy));
+ 
+   // Set the frame as the top window (this ensures that the application is closed
+   // when the frame is closed
+@@ -34,28 +34,28 @@
+ 
+ 
+   wxCmdLineParser cmdline(cmdLineDesc, argc, argv);
+-  cmdline.SetLogo("JuggleMaster Deluxe");
++  cmdline.SetLogo(wxT("JuggleMaster Deluxe"));
+   
+   if(cmdline.Parse() == -1) {
+ 	exit(0);
+   }
+   wxString initialsiteswap,initialstyle,named_pattern,semaphore;
+ 
+-  if(cmdline.Found("help")) {
++  if(cmdline.Found(wxT("help"))) {
+ 	cmdline.Usage();
+ 	printf("\n Style can be anything in the \"Change Style\" menu, eg \"Mills Mess\"\n");
+ 	exit(0);
+   }
+-  if(cmdline.Found("style",&initialstyle)) {
++  if(cmdline.Found(wxT("style"),&initialstyle)) {
+ 	frame->setStyle(&initialstyle);
+   }
+-  if(cmdline.Found("pattern",&named_pattern)) {
++  if(cmdline.Found(wxT("pattern"),&named_pattern)) {
+ 	/* FIXME */
+-	printf("Named Pattern: %s\n",(const char *)named_pattern);
++	printf("Named Pattern: %s\n",(const char *)named_pattern.mb_str(wxConvUTF8));
+   }
+-  if(cmdline.Found("semaphore",&semaphore)) {
++  if(cmdline.Found(wxT("semaphore"),&semaphore)) {
+ 	/* FIXME */
+-	printf("Semaphore Requested: %s\n",(const char *)semaphore);
++	printf("Semaphore Requested: %s\n",(const char *)semaphore.mb_str(wxConvUTF8));
+   }
+   if (cmdline.GetParamCount() > 0) {
+     initialsiteswap = cmdline.GetParam(0);
+@@ -114,43 +114,43 @@
+ JMFrame::JMFrame(wxWindow* parent, wxWindowID id, const wxString& title,
+                        const wxPoint& pos, const wxSize& size) :
+                        wxFrame(parent,id,title,pos,size) {
+-	SetIcon(wxIcon("IDI_WIZICON"));
++	SetIcon(wxIcon(wxT("IDI_WIZICON")));
+ 
+   fileMenu = new wxMenu();
+   optionsMenu = new wxMenu();
+   helpMenu = new wxMenu();
+   speedMenu = new wxMenu();
+ 
+-  fileMenu->Append(CHANGE_SITESWAP_S, "Change &SiteSwap (Simple)");
+-  fileMenu->Append(CHANGE_SITESWAP_A, "Change SiteSwap (Advanced)");
++  fileMenu->Append(CHANGE_SITESWAP_S, wxT("Change &SiteSwap (Simple)"));
++  fileMenu->Append(CHANGE_SITESWAP_A, wxT("Change SiteSwap (Advanced)"));
+   fileMenu->AppendSeparator();
+-  fileMenu->Append(CHANGE_STYLE_S, "Change S&tyle");
++  fileMenu->Append(CHANGE_STYLE_S, wxT("Change S&tyle"));
+   fileMenu->AppendSeparator();
+-  fileMenu->Append(CHOOSE_PATTERN, "Choose P&attern");
+-  fileMenu->Append(CHOOSE_SEMAPHORE, "Show Se&maphore");
++  fileMenu->Append(CHOOSE_PATTERN, wxT("Choose P&attern"));
++  fileMenu->Append(CHOOSE_SEMAPHORE, wxT("Show Se&maphore"));
+   fileMenu->AppendSeparator();
+-  fileMenu->Append(PRINT_PS, "&Print...");
++  fileMenu->Append(PRINT_PS, wxT("&Print..."));
+   fileMenu->AppendSeparator();
+-  fileMenu->Append(ID_EXIT, "E&xit");
++  fileMenu->Append(ID_EXIT, wxT("E&xit"));
+ 
+-  optionsMenu->AppendCheckItem(OPTION_MIRROR, "&Mirror");
+-  optionsMenu->AppendCheckItem(OPTION_PAUSE, "&Pause");
+-  optionsMenu->AppendCheckItem(OPTION_COLORBALLS, "&Color Balls");
+-  optionsMenu->Append(OPTION_REDOWNLOAD, "Re&Download Patterns");
++  optionsMenu->AppendCheckItem(OPTION_MIRROR, wxT("&Mirror"));
++  optionsMenu->AppendCheckItem(OPTION_PAUSE, wxT("&Pause"));
++  optionsMenu->AppendCheckItem(OPTION_COLORBALLS, wxT("&Color Balls"));
++  optionsMenu->Append(OPTION_REDOWNLOAD, wxT("Re&Download Patterns"));
+ 
+-  speedMenu->Append(SPEED_UP,"&Up");
+-  speedMenu->Append(SPEED_DOWN,"&Down");
+-  speedMenu->Append(SPEED_RESET,"&Reset");
++  speedMenu->Append(SPEED_UP,wxT("&Up"));
++  speedMenu->Append(SPEED_DOWN,wxT("&Down"));
++  speedMenu->Append(SPEED_RESET,wxT("&Reset"));
+ 
+-  helpMenu->Append(ID_ABOUT, "&About");
++  helpMenu->Append(ID_ABOUT, wxT("&About"));
+ 
+   // The menu bar
+   wxMenuBar* menuBar = new wxMenuBar();
+ 
+-  menuBar->Append(fileMenu, "&File");
+-  menuBar->Append(optionsMenu, "&Options");
+-  menuBar->Append(speedMenu, "&Speed");
+-  menuBar->Append(helpMenu, "&Help");
++  menuBar->Append(fileMenu, wxT("&File"));
++  menuBar->Append(optionsMenu, wxT("&Options"));
++  menuBar->Append(speedMenu, wxT("&Speed"));
++  menuBar->Append(helpMenu, wxT("&Help"));
+   SetMenuBar(menuBar);
+ 
+   // Initialize jmlib
+@@ -180,7 +180,7 @@
+ }
+ 
+ void JMFrame::OnAbout(wxCommandEvent &WXUNUSED(event)) {
+-	wxMessageBox("(C) Ken Matsuoka 1995-6, Per Johan Groland 2002, Gary Briggs 2003", "About JMDeluxe", wxOK, this);
++	wxMessageBox(wxT("(C) Ken Matsuoka 1995-6, Per Johan Groland 2002, Gary Briggs 2003"), wxT("About JMDeluxe"), wxOK, this);
+ }
+ 
+ void JMFrame::changeMirror(wxCommandEvent& WXUNUSED(event)) {
+@@ -208,25 +208,25 @@
+ }
+ 
+ void JMFrame::setSiteSwap(wxString *newsite) {
+-  jmlib->setPattern("Something",(JML_CHAR *)(const char *)*newsite,HR_DEF, DR_DEF);
++  jmlib->setPattern("Something",(JML_CHAR *)(const char *)*newsite->mb_str(wxConvUTF8),HR_DEF, DR_DEF);
+ }
+ 
+ void JMFrame::setStyle(wxString *newstyle) {
+-  jmlib->setStyle((JML_CHAR *)(const char *)*newstyle);
++  jmlib->setStyle((JML_CHAR *)(const char *)*newstyle->mb_str(wxConvUTF8));
+ }
+ 
+ void JMFrame::changeSiteSwap(wxCommandEvent& WXUNUSED(event))
+ {
+   JML_CHAR *newpattern;
+   wxTextEntryDialog dialog(this,
+-                           "Change SiteSwap",
+-                           "Please Enter SiteSwap Here",
+-			   jmlib->getSite(),
++                           _("Change SiteSwap"),
++                           _("Please Enter SiteSwap Here"),
++			   wxString(jmlib->getSite(), wxConvUTF8),
+                            wxOK | wxCANCEL | wxCENTRE);
+ 
+   if (dialog.ShowModal() == wxID_OK)
+   {
+-	newpattern = (JML_CHAR *)(const char *)dialog.GetValue();
++	newpattern = (JML_CHAR *)(const char *)dialog.GetValue().mb_str(wxConvUTF8);
+         jmlib->stopJuggle();
+ 	jmlib->setPattern("Something",newpattern,HR_DEF, DR_DEF);
+         jmlib->setStyleDefault();
+@@ -248,7 +248,7 @@
+ 		return;
+ 	}
+   }
+-  wxMessageDialog *popup = new wxMessageDialog(this, "No Patterns Loaded!", "Error", wxOK|wxICON_ERROR);
++  wxMessageDialog *popup = new wxMessageDialog(this, wxT("No Patterns Loaded!"), wxT("Error"), wxOK|wxICON_ERROR);
+   popup->ShowModal();
+ }
+ 
+@@ -260,7 +260,7 @@
+ 		return;
+ 	}
+   }
+-  wxMessageDialog *popup = new wxMessageDialog(this, "No Semaphores Loaded!", "Error", wxOK|wxICON_ERROR);
++  wxMessageDialog *popup = new wxMessageDialog(this, wxT("No Semaphores Loaded!"), wxT("Error"), wxOK|wxICON_ERROR);
+   popup->ShowModal();
+ }
+ 
+@@ -292,8 +292,8 @@
+ void JMFrame::ErrorCallBack(void *aUData, JML_CHAR *aErrMsg) {
+   /* Massive thanks go to Colin Bayer for his teaching me how this works */
+   wxString error_message;
+-  error_message = aErrMsg;
+-  wxMessageDialog *message = new wxMessageDialog((JMFrame *)aUData, error_message, "Error", wxOK|wxICON_ERROR);
++  error_message = wxString(aErrMsg, wxConvUTF8);
++  wxMessageDialog *message = new wxMessageDialog((JMFrame *)aUData, error_message, wxT("Error"), wxOK|wxICON_ERROR);
+   message->ShowModal();
+ }
+ 
+@@ -376,7 +376,9 @@
+     dc.DrawEllipse(jmlib->b[i].gx, jmlib->b[i].gy, diam, diam);
+   }
+   wxString balltext;
+-  balltext.Printf("Site: %s    Style: %s    Balls: %i",jmlib->getSite(),jmlib->getStyle(),jmlib->balln);
++  balltext.Printf(wxT("Site: %s    Style: %s    Balls: %i"),
++                  wxString(jmlib->getSite(),wxConvUTF8).c_str(),
++                  wxString(jmlib->getStyle(),wxConvUTF8).c_str(),jmlib->balln);
+   dc.DrawText(balltext, 10, 10);
+ 
+   // flip
+diff -urNad jugglemaster-0.4~/src/jmdlx/jmdlx.h jugglemaster-0.4/src/jmdlx/jmdlx.h
+--- jugglemaster-0.4~/src/jmdlx/jmdlx.h	2004-09-01 20:48:19.000000000 -0400
++++ jugglemaster-0.4/src/jmdlx/jmdlx.h	2008-01-06 13:19:07.000000000 -0500
+@@ -92,11 +92,11 @@
+ 
+ static const wxCmdLineEntryDesc cmdLineDesc[] =
+ {
+-    { wxCMD_LINE_SWITCH, "h", "help", "help" },
+-    { wxCMD_LINE_OPTION, "p", "pattern", "named pattern", wxCMD_LINE_VAL_STRING},
+-    { wxCMD_LINE_OPTION, "s", "style", "style", wxCMD_LINE_VAL_STRING },
+-    { wxCMD_LINE_OPTION, "m", "semaphore", "semaphore", wxCMD_LINE_VAL_STRING },
+-    { wxCMD_LINE_PARAM,  NULL, NULL, "siteswap", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL},
++    { wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("help") },
++    { wxCMD_LINE_OPTION, wxT("p"), wxT("pattern"), wxT("named pattern"), wxCMD_LINE_VAL_STRING},
++    { wxCMD_LINE_OPTION, wxT("s"), wxT("style"), wxT("style"), wxCMD_LINE_VAL_STRING },
++    { wxCMD_LINE_OPTION, wxT("m"), wxT("semaphore"), wxT("semaphore"), wxCMD_LINE_VAL_STRING },
++    { wxCMD_LINE_PARAM,  NULL, NULL, wxT("siteswap"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL},
+     { wxCMD_LINE_NONE }
+ };
+ 
+diff -urNad jugglemaster-0.4~/src/jmdlx/newsemaphore.cpp jugglemaster-0.4/src/jmdlx/newsemaphore.cpp
+--- jugglemaster-0.4~/src/jmdlx/newsemaphore.cpp	2008-01-06 13:18:24.000000000 -0500
++++ jugglemaster-0.4/src/jmdlx/newsemaphore.cpp	2008-01-06 13:19:07.000000000 -0500
+@@ -22,18 +22,18 @@
+ END_EVENT_TABLE()
+ 
+ ChooseSemaphore::ChooseSemaphore(wxWindow *parent, JMLib *j, PatternLoader *s)
+-	: wxDialog(parent, -1, "Show Semaphore",
++	: wxDialog(parent, -1, wxT("Show Semaphore"),
+ 			wxDefaultPosition, wxDefaultSize,
+ 			wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) {
+ 
+   jmlib = j;
+   semaphores = s;
+ 
+-  newsemaphore = new wxTextCtrl(this,-1,jmlib->getStyle(),wxDefaultPosition,wxDefaultSize);
++  newsemaphore = new wxTextCtrl(this,-1,wxString(jmlib->getStyle(), wxConvUTF8),wxDefaultPosition,wxDefaultSize);
+ 
+-  wxButton *ok = new wxButton(this, wxID_OK, "OK");
+-  wxButton *apply = new wxButton(this, wxID_APPLY, "Apply");
+-  wxButton *cancel = new wxButton(this, wxID_CANCEL, "Cancel");
++  wxButton *ok = new wxButton(this, wxID_OK, wxT("OK"));
++  wxButton *apply = new wxButton(this, wxID_APPLY, wxT("Apply"));
++  wxButton *cancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"));
+   wxBoxSizer *buttonsizer = new wxBoxSizer(wxHORIZONTAL);
+   buttonsizer->Add(ok, 1, wxALIGN_CENTRE|wxALL, 5);
+   buttonsizer->Add(apply, 1, wxALIGN_CENTRE|wxALL, 5);
+@@ -62,14 +62,14 @@
+ 	newvalue = newsemaphore->GetValue();
+ 	newvalue.MakeLower();
+ 	if(newvalue.Last() != ' ') {
+-		newvalue.Append(" ");
++		newvalue.Append(wxT(" "));
+ 	}
+ 
+ 	for(unsigned int i=0; i < newvalue.Length(); i++) {
+ 		current_letter = newvalue.Mid(i,1);
+ 		// current_style_length  =  semaphores->GetStyleLength(current_letter);
+-		if(current_letter == " ") {
+-			current_letter="break";
++		if(current_letter == wxT(" ")) {
++			current_letter=wxT("break");
+ 		} else if (current_letter.IsNumber()) {
+ 			current_index = style_len;
+ 			style_len += semaphores->GetStyleLength("numeral");
+@@ -83,51 +83,51 @@
+ 			ascii stuff isn't safe in unicode or similar. */
+ 			switch((int)value) {
+ 				case 1:
+-					current_letter="a";
++					current_letter=wxT("a");
+ 					break;
+ 				case 2:
+-					current_letter="b";
++					current_letter=wxT("b");
+ 					break;
+ 				case 3:
+-					current_letter="c";
++					current_letter=wxT("c");
+ 					break;
+ 				case 4:
+-					current_letter="d";
++					current_letter=wxT("d");
+ 					break;
+ 				case 5:
+-					current_letter="e";
++					current_letter=wxT("e");
+ 					break;
+ 				case 6:
+-					current_letter="f";
++					current_letter=wxT("f");
+ 					break;
+ 				case 7:
+-					current_letter="g";
++					current_letter=wxT("g");
+ 					break;
+ 				case 8:
+-					current_letter="h";
++					current_letter=wxT("h");
+ 					break;
+ 				case 9:
+-					current_letter="i";
++					current_letter=wxT("i");
+ 					break;
+ 				case 0:
+-					current_letter="j";
++					current_letter=wxT("j");
+ 					break;
+ 				default:
+-					current_letter="break";
++					current_letter=wxT("break");
+ 					break;
+ 			}
+ 		}
+ 		current_index = style_len;
+-		style_len += semaphores->GetStyleLength(current_letter);
++		style_len += semaphores->GetStyleLength(current_letter.mb_str(wxConvUTF8));
+ 		current_style = (JML_INT8 *)realloc((void *)current_style,(size_t)sizeof(JML_INT8)*style_len);
+-		memcpy((void *)(current_style+current_index),(void *)semaphores->GetStyle(current_letter),semaphores->GetStyleLength(current_letter)*sizeof(JML_INT8));
++		memcpy((void *)(current_style+current_index),(void *)semaphores->GetStyle(current_letter.mb_str(wxConvUTF8)),semaphores->GetStyleLength(current_letter.mb_str(wxConvUTF8))*sizeof(JML_INT8));
+ 	}
+ 
+ 	newvalue = newsemaphore->GetValue();
+ 	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->setStyle((JML_CHAR *)(const char *)newvalue.mb_str(wxConvUTF8),style_len/4,current_style);
+ 		jmlib->startJuggle();
+ 	}
+ 	free(current_style);
+diff -urNad jugglemaster-0.4~/src/jmdlx/patt.cpp jugglemaster-0.4/src/jmdlx/patt.cpp
+--- jugglemaster-0.4~/src/jmdlx/patt.cpp	2008-01-06 13:18:24.000000000 -0500
++++ jugglemaster-0.4/src/jmdlx/patt.cpp	2008-01-06 13:19:07.000000000 -0500
+@@ -75,41 +75,41 @@
+ 	snprintf(usr_filename, 255, "/usr/share/jugglemaster/%s", filename);
+ 
+ 	if(targetfilename.Len() > 0) {
+-		targetfilename += "/.jugglemaster/";
++		targetfilename += wxT("/.jugglemaster/");
+ 		if(!wxDirExists(targetfilename)) {
+ 			if(!wxMkdir(targetfilename,0755)) {
+-				targetfilename = "";
++				targetfilename = wxT("");
+ 			}
+ 		}
+-		targetfilename += filename;
++		targetfilename += wxString(filename, wxConvUTF8);
+ 	} else {
+-		targetfilename = filename;
++		targetfilename = wxString(filename, wxConvUTF8);
+ 	}
+ 
+-	if(stat((const char *)targetfilename,&buf) != -1 && !redownload) {
+-		patternfile = fopen((const char *)targetfilename,"r");
++	if(stat((const char *)targetfilename.mb_str(wxConvUTF8),&buf) != -1 && !redownload) {
++		patternfile = fopen((const char *)(targetfilename.mb_str(wxConvUTF8)),"r");
+ 		return(patternfile != NULL);
+ 	} else if(stat(filename,&buf) != -1 && !redownload) {
+-		wxCopyFile(filename,targetfilename);
+-		patternfile = fopen((const char *)targetfilename,"r");
++		wxCopyFile(wxString(filename, wxConvUTF8),targetfilename);
++		patternfile = fopen((const char *)(targetfilename.mb_str(wxConvUTF8)),"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 fullurl(WEB_PREFIX, wxConvUTF8);
+ 		wxString proxy;
+ 		wxString message;
+-		fullurl.Append(filename);
+-		message.Printf("Downloading File: %s\n",(const char *)fullurl);
++		fullurl.Append(wxString(filename, wxConvUTF8));
++		message.Printf(wxT("Downloading File: %s\n"),(const char *)fullurl.c_str());
+ 		unsigned int current_progress = 0;
+ 		char buffer[1024];
+ 
+ 		wxURL url(fullurl);
+ 
+-		if(wxGetEnv("http_proxy",&proxy)) {
+-			if(proxy.Find("//") > -1) {
+-				proxy = proxy.Mid(proxy.Find("//")+2);
++		if(wxGetEnv(wxT("http_proxy"),&proxy)) {
++			if(proxy.Find(wxT("//")) > -1) {
++				proxy = proxy.Mid(proxy.Find(wxT("//"))+2);
+ 			}
+ 			url.SetProxy(proxy);
+ 		}
+@@ -119,7 +119,7 @@
+ 		// wxInputStream *data = url.GetInputStream(fullurl);
+ 
+ 		if ( data ) {
+-			wxProgressDialog progress("Progress",message,(int)data->GetSize());
++			wxProgressDialog progress(wxT("Progress"),message,(int)data->GetSize());
+ 			wxFileOutputStream outputfile(targetfilename);
+ 			while(!data->Eof() && current_progress!=data->GetSize()) {
+ 				data->Read((void *)buffer,1024);
+@@ -131,10 +131,10 @@
+ 			// printf("Downloading Done\n");
+ 			delete data;
+ 		} else {
+-			wxMessageDialog errordlg(parent,"An error occured while downloading","Error",wxOK|wxICON_ERROR);
++			wxMessageDialog errordlg(parent,wxT("An error occured while downloading"),wxT("Error"),wxOK|wxICON_ERROR);
+ 			errordlg.ShowModal();
+ 		}
+-		patternfile = fopen((const char *)targetfilename,"r");
++		patternfile = fopen((const char *)targetfilename.mb_str(wxConvUTF8),"r");
+ 		return(patternfile != NULL);
+ 	}
+ }
+diff -urNad jugglemaster-0.4~/src/jmdlx/print.cpp jugglemaster-0.4/src/jmdlx/print.cpp
+--- jugglemaster-0.4~/src/jmdlx/print.cpp	2004-09-01 20:48:19.000000000 -0400
++++ jugglemaster-0.4/src/jmdlx/print.cpp	2008-01-06 13:19:07.000000000 -0500
+@@ -34,7 +34,7 @@
+ END_EVENT_TABLE()
+ 
+ Print::Print(wxWindow *parent, JMLib *j)
+-	: wxDialog(parent, -1, "Print",
++	: wxDialog(parent, -1, wxT("Print"),
+ 			wxDefaultPosition, wxDefaultSize,
+ 			wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) {
+ 
+@@ -44,8 +44,8 @@
+ 
+   // Filename
+ 	wxBoxSizer *filenamesizer = new wxBoxSizer(wxHORIZONTAL);
+-	filename = new wxTextCtrl(this,-1,jmlib->getPattName());
+-	filenamesizer->Add(new wxStaticText(this, 0, "Filename"),
++	filename = new wxTextCtrl(this,-1,wxString(jmlib->getPattName(), wxConvUTF8));
++	filenamesizer->Add(new wxStaticText(this, 0, wxT("Filename")),
+                                         0,
+                                         wxALIGN_CENTER_VERTICAL|wxALL,
+                                         5);
+@@ -54,7 +54,7 @@
+                         wxALIGN_CENTRE_VERTICAL|wxALL,
+                         5);
+ 
+-	filenamesizer->Add(new wxButton(this, CHOOSEFILE, "Choose File"),
++	filenamesizer->Add(new wxButton(this, CHOOSEFILE, wxT("Choose File")),
+                         1,
+                         wxALIGN_CENTRE_VERTICAL|wxALL,
+                         5);
+@@ -62,16 +62,16 @@
+   // Output Type
+ 	wxBoxSizer *typesizer = new wxBoxSizer(wxHORIZONTAL);
+ 	output_type = new wxChoice(this,-1);
+-	output_type->Append("Image");
+-	output_type->Append("PostScript");
+-	output_type->SetStringSelection("PostScript");
++	output_type->Append(wxT("Image"));
++	output_type->Append(wxT("PostScript"));
++	output_type->SetStringSelection(wxT("PostScript"));
+ 
+ #ifdef HAVE_AVCODEC_H
+ 	output_type->Append("MPEG");
+ 	output_type->SetStringSelection("MPEG");
+ #endif
+ 
+-	typesizer->Add(new wxStaticText(this, 0, "Output Type"),
++	typesizer->Add(new wxStaticText(this, 0, wxT("Output Type")),
+                                         0,
+                                         wxALIGN_CENTER_VERTICAL|wxALL,
+                                         5);
+@@ -123,26 +123,26 @@
+ 				10000,
+ 				1000);
+ 
+-	whdm->Add(new wxStaticText(this, 0, "Output Width"),
++	whdm->Add(new wxStaticText(this, 0, wxT("Output Width")),
+ 				1, wxALIGN_RIGHT|wxALL, 5);
+ 	whdm->Add(output_width,
+ 				1, wxALIGN_CENTRE|wxALL, 5);
+-	whdm->Add(new wxStaticText(this, 0, "Output Height"),
++	whdm->Add(new wxStaticText(this, 0, wxT("Output Height")),
+ 				1, wxALIGN_RIGHT|wxALL, 5);
+ 	whdm->Add(output_height,
+ 				1, wxALIGN_CENTRE|wxALL, 5);
+-	whdm->Add(new wxStaticText(this, 0, "Delay"),
++	whdm->Add(new wxStaticText(this, 0, wxT("Delay")),
+ 				1, wxALIGN_RIGHT|wxALL, 5);
+ 	whdm->Add(delay,
+ 				1, wxALIGN_CENTRE|wxALL, 5);
+-	whdm->Add(new wxStaticText(this, 0, "Max Iterations"),
++	whdm->Add(new wxStaticText(this, 0, wxT("Max Iterations")),
+ 				1, wxALIGN_RIGHT|wxALL, 5);
+ 	whdm->Add(max_iterations,
+ 				1, wxALIGN_CENTRE|wxALL, 5);
+ 
+   // Width, Height, Delay, Max Frames
+-	wxButton *ok = new wxButton(this, wxID_OK, "OK");
+-	wxButton *cancel = new wxButton(this, wxID_CANCEL, "Cancel");
++	wxButton *ok = new wxButton(this, wxID_OK, wxT("OK"));
++	wxButton *cancel = new wxButton(this, wxID_CANCEL, wxT("Cancel"));
+ 	wxBoxSizer *buttonsizer = new wxBoxSizer(wxHORIZONTAL);
+ 	buttonsizer->Add(ok, 1, wxALIGN_CENTRE|wxALL, 5);
+ 	buttonsizer->Add(cancel, 1, wxALIGN_CENTRE|wxALL, 5);
+@@ -173,10 +173,10 @@
+ 	struct stat buf; /* for stat */
+ 	wxMessageDialog* message;
+ 
+-	if(stat((const char *)filename->GetValue(),&buf) != -1) {
++	if(stat((const char *)filename->GetValue().mb_str(wxConvUTF8),&buf) != -1) {
+ 		message = new wxMessageDialog(this,
+-			"File Already Exists! Overwrite?",
+-			"Overwrite?",
++			wxT("File Already Exists! Overwrite?"),
++			wxT("Overwrite?"),
+ 			wxYES_NO|wxICON_EXCLAMATION);
+ 		if(message->ShowModal() != wxID_YES) {
+ 			delete outputfile;
+@@ -197,23 +197,23 @@
+ 		for (i=0; i<400; i++) jmlib->doJuggle();
+ 	}
+ 
+-	if (output_type->GetStringSelection() == "Image") {
++	if (output_type->GetStringSelection() == wxT("Image")) {
+ 		print_success = printImage();
+ 	}
+ 
+-	if (output_type->GetStringSelection() == "PostScript") {
++	if (output_type->GetStringSelection() == wxT("PostScript")) {
+ 		print_success = printPS();
+ 	}
+ 
+ #ifdef HAVE_AVCODEC_H
+-	if (output_type->GetStringSelection() == "MPEG") {
++	if (output_type->GetStringSelection() == wxT("MPEG")) {
+ 		print_success = printMPEG();
+ 	}
+ #endif
+ 
+ 	if(print_success != 0) {
+ 		wxMessageDialog message(this,
+-				"Printing Aborted!", "Aborted",
++				wxT("Printing Aborted!"), wxT("Aborted"),
+ 				wxOK|wxICON_EXCLAMATION);
+ 		message.ShowModal();
+ 		wxRemoveFile(filename->GetValue());
+@@ -233,8 +233,8 @@
+ 
+ void Print::OnChooseFile(wxCommandEvent &WXUNUSED(event)) {
+ 	wxFileDialog filedialog(this, _("Choose a File to Print to"),
+-		lastpath, "",
+-		"All Files|*",
++		lastpath, wxT(""),
++		wxT("All Files|*"),
+ 		wxSAVE);
+ 
+ 	if(filedialog.ShowModal() != wxID_OK) return;
+@@ -250,7 +250,7 @@
+ 
+ 
+ int Print::printImage() {
+-	wxDialog formatchooser(this, -1, "Choose Format",
++	wxDialog formatchooser(this, -1, wxT("Choose Format"),
+ 			wxDefaultPosition, wxDefaultSize,
+ 			wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
+ 
+@@ -273,11 +273,11 @@
+ 		extn = handler->GetExtension();
+ 		/* Don't append if wx doesn't support writing */
+ 		if(extn.Len() > 0 &&
+-			extn != "cur" && /* Silly format */
+-			extn != "ico" && /* Silly format */
+-			extn != "iff" && /* wx Doesn't support writing */
+-			extn != "gif" && /* wx Doesn't support writing */
+-			extn != "ani" /* wx Doesn't support writing */
++			extn != wxT("cur") && /* Silly format */
++			extn != wxT("ico") && /* Silly format */
++			extn != wxT("iff") && /* wx Doesn't support writing */
++			extn != wxT("gif") && /* wx Doesn't support writing */
++			extn != wxT("ani") /* wx Doesn't support writing */
+ 			) {
+ 			formatchoice->Append(handler->GetExtension(), (void *)handler);
+ 			if(extn == fileextn) {
+@@ -289,14 +289,14 @@
+ 	}
+ 
+ 	if(formatfound == 0) {
+-		int png_pos = formatchoice->FindString("png");
++		int png_pos = formatchoice->FindString(wxT("png"));
+ 		if(-1 != png_pos) formatchoice->SetSelection(png_pos);
+ 		else formatchoice->SetSelection(0);
+ 	}
+ 
+ 
+-	wxButton *ok = new wxButton(&formatchooser, wxID_OK, "OK");
+-	wxButton *cancel = new wxButton(&formatchooser, wxID_CANCEL, "Cancel");
++	wxButton *ok = new wxButton(&formatchooser, wxID_OK, wxT("OK"));
++	wxButton *cancel = new wxButton(&formatchooser, wxID_CANCEL, wxT("Cancel"));
+ 	wxBoxSizer *buttonsizer = new wxBoxSizer(wxHORIZONTAL);
+ 	buttonsizer->Add(ok, 1, wxALIGN_CENTRE|wxALL, 5);
+ 	buttonsizer->Add(cancel, 1, wxALIGN_CENTRE|wxALL, 5);
+@@ -347,7 +347,7 @@
+ 				balls were when we started, and check
+ 				against it */
+ 
+-	wxProgressDialog progress("Progress","Creating PostScript",
++	wxProgressDialog progress(wxT("Progress"),wxT("Creating PostScript"),
+ 		max_iterations->GetValue(), this,
+ 		wxPD_APP_MODAL|wxPD_CAN_ABORT);
+ 
+@@ -362,7 +362,7 @@
+ 	ball* lhand = &(jmlib->lhand);
+ 	hand* handp = &(jmlib->handpoly);
+ 
+-	outputfile = fopen((const char *)filename->GetValue(),"w");
++	outputfile = fopen((const char *)filename->GetValue().mb_str(wxConvUTF8),"w");
+ 	if(outputfile == NULL) return 1;
+ 
+ 	/* Some PS guff */
+@@ -732,7 +732,7 @@
+ 		dc->DrawEllipse(j->b[i].gx, j->b[i].gy, diam, diam);
+ 	}
+ 	wxString balltext;
+-	balltext.Printf("Site: %s    Style: %s    Balls: %i",j->getSite(),j->getStyle(),j->balln);
++	balltext.Printf(wxT("Site: %s    Style: %s    Balls: %i"),j->getSite(),j->getStyle(),j->balln);
+ 	dc->DrawText(balltext, 10, 10);
+ 
+ }
--- jugglemaster-0.4.orig/debian/patches/jmlib_sigfpe.dpatch
+++ jugglemaster-0.4/debian/patches/jmlib_sigfpe.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## jmlib_sigfpe.dpatch by  <Helmut Grohne <helmut@subdivi.de>>
+## DP: Rejects zero length to avoid division by zero.
+
+@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);
--- jugglemaster-0.4.orig/debian/patches/jmdlx-usr_patterns.dpatch
+++ jugglemaster-0.4/debian/patches/jmdlx-usr_patterns.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## jmdlx-usr_patterns.dpatch by  <Helmut Grohne <helmut@subdivi.de>>
+## DP: Modifies jmdlx to search the share data in /usr/share/jugglemaster.
+
+@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;