[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.5-1-4-g298c9f2

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 11550976dd9fe02f621ec91485251c95cce4e366
Merge: 124e4d42e0a2eb1dbf577d1fd23817e424486038 
48a120f883b7a215c27bf8acf7989dc7068b93da
Author: Stephen Kitt st...@sk2.org
Date:   Sat Feb 4 23:33:19 2012 +0100

Merge commit 'upstream/3.5.5'

Conflicts:
debian/changelog


-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.5-1-4-g298c9f2

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 298c9f2342e8aee4d71eb2fe3a7337e93aa2403b
Author: Stephen Kitt st...@sk2.org
Date:   Sun Feb 5 08:10:39 2012 +0100

Update manpage.

diff --git a/debian/changelog b/debian/changelog
index 23b0d92..561c98b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ stella (3.5.5-1) unstable; urgency=low
 
   * New upstream version.
   * Rewrite debian/copyright, using DEP-5 and updating for 2012.
+  * Update manpage.
 
  -- Stephen Kitt st...@sk2.org  Sun, 05 Feb 2012 08:09:05 +0100
 
diff --git a/debian/stella.6 b/debian/stella.6
index 020539b..9f5026c 100644
--- a/debian/stella.6
+++ b/debian/stella.6
@@ -135,11 +135,10 @@ all 4 directions.
 .BR \-grabmouse   1 | 0 
 Keeps the mouse in the game window in emulation mode.
 .TP
-.BR \-mcontrol   auto | \fIXY\fP 
-Enable using the mouse axes for various controllers automatically
-(paddle, driving, etc), or specifically use each axis for a particular
-paddle. In the latter case, \fIXY\fP indicates how to use the X/Y axis
-(ie, \fB02\fP is paddle0/paddle2).
+.BR \-mcontrol   never | auto | rom 
+Disable mouse input entirely, enable using the mouse axes for various
+controllers automatically (paddle, driving, etc), or use the settings
+specified by the current ROM.
 .TP
 .BR \-dsense  \fInumber\fP
 Sensitivity for emulation of paddles when using a digital device
@@ -148,7 +147,7 @@ may range from 1 to 10, with larger numbers causing faster 
movement.
 .TP
 .BR \-msense  \fInumber\fP
 Sensitivity for emulation of paddles when using a mouse. \fInumber\fP
-may range from 1 to 10, with larger numbers causing faster movement.
+may range from 1 to 15, with larger numbers causing faster movement.
 .TP
 .BR \-sa1   left | right 
 Stelladaptor/2600-daptor 1 emulates specified joystick port.
@@ -331,7 +330,12 @@ Sets both Controller.Left and Controller.Right 
properties. See the
 types.
 .TP
 .BR \-cp   Yes | No 
-Set Controller.SwapPaddles property.
+Set Controller.SwapPaddles property. See the \fIGame Properties\fP
+section in the provided documentation for valid types.
+.TP
+.BR \-ma   Auto | XY 
+Set Controller.MouseAxis property. See the \fIGame Properties\fP
+section in the provided documentation for valid types.
 .TP
 .BR \-format  \fIformat\fP
 Set Display.Format property. See the \fIGame Properties\fP section

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.5-1-4-g298c9f2

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 34cca073bf0882a193f3f01dc4f9071a5ad3f193
Author: Stephen Kitt st...@sk2.org
Date:   Sun Feb 5 08:09:56 2012 +0100

Rewrite debian/copyright, using DEP-5 and updating for 2012.

diff --git a/debian/changelog b/debian/changelog
index ce1405f..23b0d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+stella (3.5.5-1) unstable; urgency=low
+
+  * New upstream version.
+  * Rewrite debian/copyright, using DEP-5 and updating for 2012.
+
+ -- Stephen Kitt st...@sk2.org  Sun, 05 Feb 2012 08:09:05 +0100
+
 stella (3.5-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/copyright b/debian/copyright
index 6487ddd..57109af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,59 +1,134 @@
-This package was debianized first by Tom Lear t...@ticking.accesscom.com on
-Thu,  7 Oct 1999 08:57:16 -0700.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: stella
+Source: http://stella.sourceforge.net
+Copyright: 1995-2012 Bradford W. Mott, Stephen Anthony and the Stella Team
+License: GPL-2+
 
-It was adopted by Mario Iseli ad...@marioiseli.com on Sat, 08 Apr
-2006 18:38:25 +0200.
+Files: *
+Copyright: 1995-2012 Bradford W. Mott, Stephen Anthony and the Stella
+Team
+License: GPL-2+
 
-It was adopted by Stephen Kitt st...@sk2.org on Sun, 09 May 2010
-18:32:41 +0200.
+Files: debian/*
+Copyright: 1998-2004 Tom Lear t...@trap.mtview.ca.us
+  2006 Mario Iseli ad...@marioiseli.com
+  2010-2012 Stephen Kitt st...@sk2.org
+License: GPL-2+
 
-It was downloaded from http://stella.sourceforge.net
+Files: src/cheat/CheatCodeDialog.* src/common/Array.hxx
+   src/common/SharedPtr.hxx src/common/Stack.hxx
+   src/debugger/gui/* src/emucore/FSNode.* src/gp2x/FSNodeGP2X.cxx
+   src/gui/* src/unix/FSNodePOSIX.cxx src/win32/FSNodeWin32.cxx
+   src/yacc/YaccParser.*
+Copyright: 2002-2004 The ScummVM project
+License: GPL-2+
 
-Upstream Authors: Bradford W. Mott bwm...@acm.org
- Stephen Anthony
- The Stella Team
+Files: src/emucore/MD5.cxx
+Copyright: 1991-1992, RSA Data Security, Inc.
+License: RSA
+ License to copy and use this software is granted provided that it is
+ identified as the RSA Data Security, Inc. MD5 Message-Digest
+ Algorithm in all material mentioning or referencing this software or
+ this function.
+ .
+ License is also granted to make and use derivative works provided
+ that such works are identified as derived from the RSA Data
+ Security, Inc. MD5 Message-Digest Algorithm in all material
+ mentioning or referencing the derived work.
+ .
+ RSA Data Security, Inc. makes no representations concerning either
+ the merchantability of this software or the suitability of this
+ software for any particular purpose. It is provided as is without
+ express or implied warranty of any kind.
+ .
+ These notices must be retained in any copies of any part of this
+ documentation and/or software.
 
-Copyright information:
+Files: src/emucore/unzip.*
+Copyright: 1998 Gilles Vollant
+License: zlib
 
-   stella is
+Files: src/libpng/*
+Copyright: 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+  1996-1997 Andreas Dilger
+  1998-2012 Glenn Randers-Pehrson
+License: libpng
+ The PNG Reference Library is supplied AS IS.  The Contributing
+ Authors and Group 42, Inc. disclaim all warranties, expressed or
+ implied, including, without limitation, the warranties of
+ merchantability and of fitness for any purpose.  The Contributing
+ Authors and Group 42, Inc. assume no liability for direct, indirect,
+ incidental, special, exemplary, or consequential damages, which may
+ result from the use of the PNG Reference Library, even if advised of
+ the possibility of such damage.
+ .
+ Permission is hereby granted to use, copy, modify, and distribute
+ this source code, or portions hereof, for any purpose, without fee,
+ subject to the following restrictions:
+ .
+   1. The origin of this source code must not be misrepresented.
+ .
+   2. Altered versions must be plainly marked as such and must not be
+  misrepresented as being the original source.
+ .
+   3. This Copyright notice may not be removed or altered from any
+  source or altered source distribution.
+ .
+ The Contributing Authors and Group 42, Inc. specifically permit,
+ without fee, and encourage the use of this source code as a component
+ to supporting the PNG file format in commercial products.  If you use
+ this source code in a product, acknowledgment is not required but
+ would be appreciated.
+ .
+ There is no warranty against interference with your enjoyment of the
+ library or against infringement.  There is no warranty that our
+ efforts or the library will fulfill any of your particular purposes
+ or needs.  This library is provided with all faults, and the entire
+ risk of satisfactory quality, performance, accuracy

[SCM] Atari 2600 Emulator for SDL the X Window System branch, pristine-tar, updated. 11fe27e1d53c3342da28179b4a8d45b53bed3fae

[Stephen Kitt]

The following commit has been merged in the pristine-tar branch:
commit 11fe27e1d53c3342da28179b4a8d45b53bed3fae
Author: Stephen Kitt st...@sk2.org
Date:   Sat Feb 4 23:32:26 2012 +0100

pristine-tar data for stella_3.5.5.orig.tar.gz

diff --git a/stella_3.5.5.orig.tar.gz.delta b/stella_3.5.5.orig.tar.gz.delta
new file mode 100644
index 000..200724a
Binary files /dev/null and b/stella_3.5.5.orig.tar.gz.delta differ
diff --git a/stella_3.5.5.orig.tar.gz.id b/stella_3.5.5.orig.tar.gz.id
new file mode 100644
index 000..0b5c61d
--- /dev/null
+++ b/stella_3.5.5.orig.tar.gz.id
@@ -0,0 +1 @@
+48a120f883b7a215c27bf8acf7989dc7068b93da

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, debian/3.5.5-1, created. debian/3.5.5-1

[Stephen Kitt]

The annotated tag, debian/3.5.5-1 has been created
at  3412a936b93a10a987c004649972deba7520c523 (tag)
   tagging  298c9f2342e8aee4d71eb2fe3a7337e93aa2403b (commit)
  replaces  debian/3.5-1
 tagged by  Stephen Kitt
on  Sun Feb 5 22:37:46 2012 +0100

- Shortlog 
Debian release 3.5.5-1

Stephen Kitt (4):
  Imported Upstream version 3.5.5
  Merge commit 'upstream/3.5.5'
  Rewrite debian/copyright, using DEP-5 and updating for 2012.
  Update manpage.

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, upstream/3.5.5, created. upstream/3.5.5

[Stephen Kitt]

The annotated tag, upstream/3.5.5 has been created
at  0ee2ba957e3c38720e4846789ac2e5908bf00cdf (tag)
   tagging  48a120f883b7a215c27bf8acf7989dc7068b93da (commit)
  replaces  upstream/3.5
 tagged by  Stephen Kitt
on  Sat Feb 4 23:32:26 2012 +0100

- Shortlog 
Upstream version 3.5.5

Stephen Kitt (1):
  Imported Upstream version 3.5.5

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Packaging for quakespasm annotated tag, upstream/0.85.6, created. upstream/0.85.6

[Stephen Kitt]

The annotated tag, upstream/0.85.6 has been created
at  1fedae51cc237e91fe4eaffca8872bda918a3768 (tag)
   tagging  3297932809aa951ea4ca18977a2860e0af76e961 (commit)
  replaces  upstream/0.85.4
 tagged by  David Banks
on  Mon Feb 13 07:24:49 2012 +

- Shortlog 
tagging new upstream release for git-buildpackage

Stephen Kitt (1):
  Imported Upstream version 0.85.6

---

-- 
Packaging for quakespasm

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.5.5-1-2-gf69e69f

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 26b737022b3fcfaf528b0f03b5bf4b607e9170b0
Author: Colin Watson cjwat...@ubuntu.com
Date:   Sun Feb 19 00:34:31 2012 +0100

Use maintscript support in dh_installdeb and pre-depend on the appropriate 
version of dpkg.

diff --git a/debian/changelog b/debian/changelog
index 561c98b..2d83244 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+stella (3.5.5-2) unstable; urgency=low
+
+  * Use maintscript support in dh_installdeb rather than writing out
+dpkg-maintscript-helper commands by hand. We now simply Pre-Depend
+on a new enough version of dpkg rather than using 'dpkg-maintscript-
+helper supports' guards, leading to more predictable behaviour on
+upgrades. Thanks to Colin Watson for the patch (closes: #659792).
+
+ -- Stephen Kitt st...@sk2.org  Wed, 15 Feb 2012 08:32:12 +0100
+
 stella (3.5.5-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 8931b66..30949d0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,14 @@ Maintainer: Debian Games Team 
pkg-games-de...@lists.alioth.debian.org
 Uploaders: Stephen Kitt st...@sk2.org
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.2
-Build-Depends: debhelper (= 7.0.50), libsdl1.2-dev, zlib1g-dev, libpng12-dev, 
autotools-dev
+Build-Depends: debhelper (= 8.1.0~), libsdl1.2-dev, zlib1g-dev, libpng12-dev, 
autotools-dev
 Homepage: http://stella.sf.net
 Vcs-Git: git://git.debian.org/git/pkg-games/stella.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/stella.git
 
 Package: stella
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Atari 2600 Emulator for SDL  the X Window System
  Stella is a portable emulator of the old Atari 2600 video-game
diff --git a/debian/maintscript b/debian/maintscript
new file mode 100644
index 000..8276bc0
--- /dev/null
+++ b/debian/maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/stella.pro 3.2-1
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 053bb79..000
--- a/debian/postinst
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# postinst script for stella
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#* postinst `configure' most-recently-configured-version
-#* old-postinst `abort-upgrade' new version
-#* conflictor's-postinst `abort-remove' `in-favour' package
-#  new-version
-#* postinst `abort-remove'
-#* deconfigured's-postinst `abort-deconfigure' `in-favour'
-#  failed-install-package version `removing'
-#  conflicting-package version
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-if dpkg-maintscript-helper supports rm_conffile; then
-dpkg-maintscript-helper rm_conffile /etc/stella.pro 3.2-1 stella -- $@
-fi
-
-case $1 in
-configure)
-;;
-
-abort-upgrade|abort-remove|abort-deconfigure)
-;;
-
-*)
-echo postinst called with unknown argument \`$1' 2
-exit 1
-;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index 4bc6f36..000
--- a/debian/postrm
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-# postrm script for stella
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#* postrm `remove'
-#* postrm `purge'
-#* old-postrm `upgrade' new-version
-#* new-postrm `failed-upgrade' old-version
-#* new-postrm `abort-install'
-#* new-postrm `abort-install' old-version
-#* new-postrm `abort-upgrade' old-version
-#* disappearer's-postrm `disappear' overwriter
-#  overwriter-version
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-if dpkg-maintscript-helper supports rm_conffile; then
-dpkg-maintscript-helper rm_conffile /etc/stella.pro 3.2-1 stella -- $@
-fi
-
-case $1 in
-purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-;;
-
-*)
-echo postrm called with unknown argument \`$1' 2
-exit 1
-;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/preinst b/debian/preinst
deleted file mode 100644
index 28c6928..000
--- a/debian/preinst
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# preinst script for stella
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#* new-preinst `install'
-#* new-preinst `install' old-version
-#* new-preinst `upgrade' old-version
-#* old-preinst `abort-upgrade' new-version
-# for details, see http://www.debian.org/doc/debian-policy

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.5.5-1-2-gf69e69f

[Stephen Kitt]

The following commit has been merged in the master branch:
commit f69e69f263f1e0ba9cec4a97691e08e5de827d80
Author: Stephen Kitt st...@sk2.org
Date:   Sun Feb 19 00:39:44 2012 +0100

Update documentation with last-minute fix from upstream.

diff --git a/debian/changelog b/debian/changelog
index 2d83244..53b94ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ stella (3.5.5-2) unstable; urgency=low
 on a new enough version of dpkg rather than using 'dpkg-maintscript-
 helper supports' guards, leading to more predictable behaviour on
 upgrades. Thanks to Colin Watson for the patch (closes: #659792).
+  * Update documentation with last-minute fix from upstream.
 
- -- Stephen Kitt st...@sk2.org  Wed, 15 Feb 2012 08:32:12 +0100
+ -- Stephen Kitt st...@sk2.org  Sun, 19 Feb 2012 00:39:23 +0100
 
 stella (3.5.5-1) unstable; urgency=low
 
diff --git a/debian/stella.6 b/debian/stella.6
index 9f5026c..04c0863 100644
--- a/debian/stella.6
+++ b/debian/stella.6
@@ -387,13 +387,13 @@ Color TV
 .IP F4
 Black/White TV
 .IP F5
-Left Player Difficulty B
-.IP F6
 Left Player Difficulty A
+.IP F6
+Left Player Difficulty B
 .IP F7
-Right Player Difficulty B
-.IP F8
 Right Player Difficulty A
+.IP F8
+Right Player Difficulty B
 .IP F9
 Save state to current slot
 .IP F10

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, debian/3.5.5-2, created. debian/3.5.5-2

[Stephen Kitt]

The annotated tag, debian/3.5.5-2 has been created
at  d042c258284a679bd0fd4f37dd36d494e24dac75 (tag)
   tagging  f69e69f263f1e0ba9cec4a97691e08e5de827d80 (commit)
  replaces  debian/3.5.5-1
 tagged by  Stephen Kitt
on  Sun Feb 19 00:50:47 2012 +0100

- Shortlog 
Debian release 3.5.5-2

Colin Watson (1):
  Use maintscript support in dh_installdeb and pre-depend on the 
appropriate version of dpkg.

Stephen Kitt (1):
  Update documentation with last-minute fix from upstream.

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.5.5-2-2-ge40a8ef

[Stephen Kitt]

The following commit has been merged in the master branch:
commit f65de36150a501ac6464406b1f6fb1e240c86f03
Author: Stephen Kitt st...@sk2.org
Date:   Tue Mar 6 00:27:57 2012 +0100

Allow building with libpng-dev (closes: #662511).

diff --git a/debian/changelog b/debian/changelog
index 53b94ab..b87bec6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+stella (3.5.5-3) unstable; urgency=low
+
+  * Allow building with libpng-dev (closes: #662511); stella is known to
+build with libpng 1.5 so this shouldn't cause trouble when libpng-
+dev switches to 1.5.
+
+ -- Stephen Kitt st...@sk2.org  Tue, 06 Mar 2012 00:08:53 +0100
+
 stella (3.5.5-2) unstable; urgency=low
 
   * Use maintscript support in dh_installdeb rather than writing out
diff --git a/debian/control b/debian/control
index 30949d0..0e41d2f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,11 @@ Maintainer: Debian Games Team 
pkg-games-de...@lists.alioth.debian.org
 Uploaders: Stephen Kitt st...@sk2.org
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.2
-Build-Depends: debhelper (= 8.1.0~), libsdl1.2-dev, zlib1g-dev, libpng12-dev, 
autotools-dev
+Build-Depends: autotools-dev,
+   debhelper (= 8.1.0~),
+   libpng12-dev | libpng-dev,
+   libsdl1.2-dev,
+   zlib1g-dev
 Homepage: http://stella.sf.net
 Vcs-Git: git://git.debian.org/git/pkg-games/stella.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/stella.git
@@ -13,7 +17,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/stella.git
 Package: stella
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Atari 2600 Emulator for SDL  the X Window System
  Stella is a portable emulator of the old Atari 2600 video-game
  console. You can play most Atari 2600 games with it.

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.5.5-2-2-ge40a8ef

[Stephen Kitt]

The following commit has been merged in the master branch:
commit e40a8ef0bf5882fe77d4343ff74336f150450c5f
Author: Stephen Kitt st...@sk2.org
Date:   Tue Mar 6 00:52:54 2012 +0100

Standards-Version 3.9.3, no change required.

diff --git a/debian/changelog b/debian/changelog
index b87bec6..fd5d75a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ stella (3.5.5-3) unstable; urgency=low
   * Allow building with libpng-dev (closes: #662511); stella is known to
 build with libpng 1.5 so this shouldn't cause trouble when libpng-
 dev switches to 1.5.
+  * Standards-Version 3.9.3, no change required.
 
  -- Stephen Kitt st...@sk2.org  Tue, 06 Mar 2012 00:08:53 +0100
 
diff --git a/debian/control b/debian/control
index 0e41d2f..868a4f7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Stephen Kitt st...@sk2.org
 DM-Upload-Allowed: yes
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Build-Depends: autotools-dev,
debhelper (= 8.1.0~),
libpng12-dev | libpng-dev,

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, debian/3.5.5-3, created. debian/3.5.5-3

[Stephen Kitt]

The annotated tag, debian/3.5.5-3 has been created
at  a517a9c6f074904dc9e026767491ff08e84ef921 (tag)
   tagging  e40a8ef0bf5882fe77d4343ff74336f150450c5f (commit)
  replaces  debian/3.5.5-2
 tagged by  Stephen Kitt
on  Tue Mar 6 00:53:05 2012 +0100

- Shortlog 
Debian release 3.5.5-3

Stephen Kitt (2):
  Allow building with libpng-dev (closes: #662511).
  Standards-Version 3.9.3, no change required.

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-2-4-g6342dff

[Stephen Kitt]

The following commit has been merged in the master branch:
commit e316b36ce788e291357b16abcb5ef7194ec83672
Author: Stephen Kitt st...@sk2.org
Date:   Wed Feb 29 23:26:21 2012 +0100

Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski, adapted by 
Steven Chamberlain; closes: #661657).

diff --git a/debian/changelog b/debian/changelog
index db7566f..c298869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mednafen (0.8.D.3-3) unstable; urgency=low
+
+  * Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski, adapted
+by Steven Chamberlain; closes: #661657).
+
+ -- Stephen Kitt st...@sk2.org  Wed, 29 Feb 2012 22:45:10 +0100
+
 mednafen (0.8.D.3-2) unstable; urgency=low
 
   [ Stephen Kitt ]
diff --git a/debian/patches/series b/debian/patches/series
index 3d1d63b..142fdf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 hardening-fixes.patch
+zlib-1.2.6-fix.patch
diff --git a/debian/patches/zlib-1.2.6-fix.patch 
b/debian/patches/zlib-1.2.6-fix.patch
new file mode 100644
index 000..8ef7073
--- /dev/null
+++ b/debian/patches/zlib-1.2.6-fix.patch
@@ -0,0 +1,35 @@
+Description: fixes needed to build with zlib 1.2.6 or newer
+Author: Steven Chamberlain ste...@pyro.eu.org
+Bug-Debian: http://bugs.debian.org/661657
+
+Index: mednafen-0.8.D.3/src/file.cpp
+===
+--- mednafen-0.8.D.3.orig/src/file.cpp 2009-05-15 03:12:55.0 +0100
 mednafen-0.8.D.3/src/file.cpp  2012-02-29 19:48:21.0 +
+@@ -229,7 +229,7 @@
+goto doret;
+   }
+ 
+-  while((howmany = gzread(tz, tmp-data + cur_size, cur_alloced - cur_size)) 
 0)
++  while((howmany = gzread((gzFile)tz, tmp-data + cur_size, cur_alloced - 
cur_size))  0)
+   {
+cur_size += howmany;
+cur_alloced = 1;
+@@ -282,7 +282,7 @@
+  }
+  else if(type == MDFN_FILETYPE_GZIP)
+  {
+-  gzclose(tz);
++  gzclose((gzFile)tz);
+  }
+  else if(type == MDFN_FILETYPE_ZIP)
+  {
+@@ -444,7 +444,7 @@
+ 
+if(!(fceufp = MakeMemWrap(t, 1)))
+{
+-gzclose(t);
++gzclose((gzFile)t);
+ return(0);
+}
+ 

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-2-4-g6342dff

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 9d6d97a13d9bdaa194917eb1830d239175ae6857
Author: Stephen Kitt st...@sk2.org
Date:   Wed Feb 29 23:27:01 2012 +0100

Build-depend on debhelper 9.

diff --git a/debian/changelog b/debian/changelog
index c298869..ca88951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mednafen (0.8.D.3-3) unstable; urgency=low
 
   * Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski, adapted
 by Steven Chamberlain; closes: #661657).
+  * Build-depend on debhelper 9.
 
  -- Stephen Kitt st...@sk2.org  Wed, 29 Feb 2012 22:45:10 +0100
 
diff --git a/debian/control b/debian/control
index fd72840..da7ea0c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Stephen Kitt st...@sk2.org
-Build-Depends: debhelper (= 8.1.3), autotools-dev, x11proto-core-dev,
+Build-Depends: debhelper (= 9), autotools-dev, x11proto-core-dev,
  libgl1-mesa-dev | libgl-dev, zlib1g-dev | libz-dev, libsdl1.2-dev,
  libsamplerate0-dev, libsdl-net1.2-dev, libcdio-dev,
  libsndfile1-dev | libsndfile-dev,

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-2-4-g6342dff

[Stephen Kitt]

The following commit has been merged in the master branch:
commit ba592a9d51f14707f5e753c5fe8e8f7aa7a59fae
Author: Stephen Kitt st...@sk2.org
Date:   Wed Feb 29 23:28:35 2012 +0100

Standards-Version 3.9.3, no change required.

diff --git a/debian/changelog b/debian/changelog
index ca88951..01947d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ mednafen (0.8.D.3-3) unstable; urgency=low
   * Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski, adapted
 by Steven Chamberlain; closes: #661657).
   * Build-depend on debhelper 9.
+  * Standards-Version 3.9.3, no change required.
 
- -- Stephen Kitt st...@sk2.org  Wed, 29 Feb 2012 22:45:10 +0100
+ -- Stephen Kitt st...@sk2.org  Wed, 29 Feb 2012 23:28:31 +0100
 
 mednafen (0.8.D.3-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index da7ea0c..989b2f3 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (= 9), autotools-dev, 
x11proto-core-dev,
  libasound2-dev [linux-any],
  libjack-dev
 Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://mednafen.sourceforge.net
 Vcs-Git: git://git.debian.org/git/pkg-games/mednafen.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/mednafen.git

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-2-4-g6342dff

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 6342dff6c4da4edde19c2b9e22e4546213c4e76b
Author: Stephen Kitt st...@sk2.org
Date:   Wed Feb 29 23:34:03 2012 +0100

Drop the unused override since we depend on debhelper 9.

diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index c26be67..000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-mednafen source: package-needs-versioned-debhelper-build-depends 9

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.19-1-2-g781519a

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 18873b93128e6ee58d56b30386d70b5b94b7c9db
Author: Stephen Kitt st...@sk2.org
Date:   Mon Feb 20 08:36:56 2012 +0100

Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski).

diff --git a/debian/changelog b/debian/changelog
index 1b4f3ed..d88b35f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mednafen (0.9.19-2) experimental; urgency=low
+
+  * Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski).
+
+ -- Stephen Kitt st...@sk2.org  Mon, 20 Feb 2012 06:52:07 +0100
+
 mednafen (0.9.19-1) experimental; urgency=low
 
   * New upstream WIP version.
diff --git a/debian/patches/gzip-1.2.6-fix.patch 
b/debian/patches/gzip-1.2.6-fix.patch
new file mode 100644
index 000..fd4f7ac
--- /dev/null
+++ b/debian/patches/gzip-1.2.6-fix.patch
@@ -0,0 +1,32 @@
+Description: Use gzFile as appropriate for zlib 1.2.6 and later
+Origin: http://forum.fobby.net/index.php?t=rviewgoto=2411#msg_2411
+
+--- mednafen.orig/src/file.cpp
 mednafen/src/file.cpp
+@@ -293,7 +293,7 @@
+goto doret;
+   }
+ 
+-  while((howmany = gzread(tz, f_data + cur_size, cur_alloced - cur_size))  0)
++  while((howmany = gzread((gzFile)tz, f_data + cur_size, cur_alloced - 
cur_size))  0)
+   {
+cur_size += howmany;
+cur_alloced = 1;
+@@ -320,7 +320,7 @@
+   {
+int gzerrnum = 0;
+const char *gzerrstring;
+-   if((gzerrstring = gzerror(tz, gzerrnum))  gzerrnum != Z_OK  gzerrnum 
!= Z_STREAM_END)
++   if((gzerrstring = gzerror((gzFile)tz, gzerrnum))  gzerrnum != Z_OK  
gzerrnum != Z_STREAM_END)
+{
+ if(gzerrnum != Z_ERRNO)
+ {
+@@ -365,7 +365,7 @@
+  }
+  else if(type == MDFN_FILETYPE_GZIP)
+  {
+-  gzclose(tz);
++  gzclose((gzFile)tz);
+  }
+  else if(type == MDFN_FILETYPE_ZIP)
+  {
diff --git a/debian/patches/series b/debian/patches/series
index 6c59cc0..4f3f041 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 use-system-tremor.patch
 hardening-fixes.patch
 spelling-fixes.patch
+gzip-1.2.6-fix.patch

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.19-1-2-g781519a

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 781519ad4dc6141de1f6356a0477bf27abe83f58
Author: Stephen Kitt st...@sk2.org
Date:   Mon Feb 20 08:37:39 2012 +0100

Fix interpolation shaders (patch by Valfar).

diff --git a/debian/changelog b/debian/changelog
index d88b35f..5fe743d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mednafen (0.9.19-2) experimental; urgency=low
 
   * Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski).
+  * Fix interpolation shaders (patch by Valfar).
 
  -- Stephen Kitt st...@sk2.org  Mon, 20 Feb 2012 06:52:07 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 4f3f041..449f529 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ use-system-tremor.patch
 hardening-fixes.patch
 spelling-fixes.patch
 gzip-1.2.6-fix.patch
+shader-fix.patch
diff --git a/debian/patches/shader-fix.patch b/debian/patches/shader-fix.patch
new file mode 100644
index 000..b4e91db
--- /dev/null
+++ b/debian/patches/shader-fix.patch
@@ -0,0 +1,14 @@
+Description: Pass correct argument to texture2D() in interpolation shader
+Origin: http://forum.fobby.net/index.php?t=rviewgoto=2420#msg_2420
+
+--- mednafen.orig/src/drivers/shader.cpp
 mednafen/src/drivers/shader.cpp
+@@ -70,7 +70,7 @@
+  switch(ipolate_axis  3)
+  {
+   case 0:
+-  ret += std::string(gl_FragColor = texture2D(Tex0, gl_TexCoord[0]);\n);
++  ret += std::string(gl_FragColor = texture2D(Tex0, 
vec2(gl_TexCoord[0]));\n);
+   break;
+ 
+   case 1:

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine annotated tag, debian/0.8.D.3-3, created. debian/0.8.D.3-3

[Stephen Kitt]

The annotated tag, debian/0.8.D.3-3 has been created
at  650fea11e5d092bc1e66c8a8ff1ef78ef4fe28a8 (tag)
   tagging  6342dff6c4da4edde19c2b9e22e4546213c4e76b (commit)
  replaces  debian/0.8.D.3-2
 tagged by  Stephen Kitt
on  Tue Mar 6 00:54:34 2012 +0100

- Shortlog 
Debian release 0.8.D.3-3

Stephen Kitt (4):
  Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski, adapted by 
Steven Chamberlain; closes: #661657).
  Build-depend on debhelper 9.
  Standards-Version 3.9.3, no change required.
  Drop the unused override since we depend on debhelper 9.

---

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine annotated tag, debian/0.9.19-2, created. debian/0.9.19-2

[Stephen Kitt]

The annotated tag, debian/0.9.19-2 has been created
at  8788a49416c02aa2c0d5079d8bdb5da789b9c3c1 (tag)
   tagging  781519ad4dc6141de1f6356a0477bf27abe83f58 (commit)
  replaces  debian/0.9.19-1
 tagged by  Stephen Kitt
on  Tue Mar 6 00:57:37 2012 +0100

- Shortlog 
Debian release 0.9.19-2

Stephen Kitt (2):
  Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski).
  Fix interpolation shaders (patch by Valfar).

---

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.5.5-3-5-gb29c3df

[Stephen Kitt]

The following commit has been merged in the master branch:
commit b29c3dfa56a635f46e60148094d294053ffef244
Author: Stephen Kitt st...@sk2.org
Date:   Sat Mar 17 23:24:07 2012 +0100

Release.

diff --git a/debian/changelog b/debian/changelog
index ba8e7b1..f122b1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ stella (3.6-1) unstable; urgency=low
   * Drop libpng12-dev build-dependency entirely (in favour of
 libpng-dev).
 
- -- Stephen Kitt st...@sk2.org  Sat, 17 Mar 2012 13:37:20 +0100
+ -- Stephen Kitt st...@sk2.org  Sat, 17 Mar 2012 23:23:45 +0100
 
 stella (3.5.5-3) unstable; urgency=low
 

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, upstream/3.6, created. upstream/3.6

[Stephen Kitt]

The annotated tag, upstream/3.6 has been created
at  a7343a039f324fd79daac5719023f682fa32d9cc (tag)
   tagging  1ec18c1ddd39cec7b3cd57eb3af030c55c654890 (commit)
  replaces  upstream/3.5.5
 tagged by  Stephen Kitt
on  Sat Mar 17 13:36:15 2012 +0100

- Shortlog 
Upstream version 3.6

Stephen Kitt (1):
  Imported Upstream version 3.6

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, debian/3.6-1, created. debian/3.6-1

[Stephen Kitt]

The annotated tag, debian/3.6-1 has been created
at  d5fb4176fbbdf22ec0f2a481fd88e440928d6fbb (tag)
   tagging  b29c3dfa56a635f46e60148094d294053ffef244 (commit)
  replaces  debian/3.5.5-3
 tagged by  Stephen Kitt
on  Sun Mar 18 00:49:25 2012 +0100

- Shortlog 
Debian release 3.6-1

Stephen Kitt (5):
  Imported Upstream version 3.6
  Merge tag 'upstream/3.6'
  Update documentation.
  Drop libpng12-dev build-dependency entirely.
  Release.

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13432 - packages/trunk/xmoto/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-03-27 21:29:10 + (Tue, 27 Mar 2012)
New Revision: 13432

Modified:
   packages/trunk/xmoto/debian/control
Log:
Build-depend on debhelper 9 for compatibility level 9.

Modified: packages/trunk/xmoto/debian/control
===
--- packages/trunk/xmoto/debian/control 2012-03-27 10:08:48 UTC (rev 13431)
+++ packages/trunk/xmoto/debian/control 2012-03-27 21:29:10 UTC (rev 13432)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Miriam Ruiz little_m...@yahoo.es, Samuel Mimram 
smim...@debian.org,
  Barry deFreese bdefre...@debian.org, Stephen Kitt st...@sk2.org
-Build-Depends: debhelper (= 8.1.3), dpkg-dev (= 1.13.19), autotools-dev,
+Build-Depends: debhelper (= 9), dpkg-dev (= 1.13.19), autotools-dev,
  libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev,
  libjpeg-dev, libpng12-dev | libpng-dev, zlib1g-dev, libgl1-mesa-dev | 
libgl-dev,
  libode-dev, liblua5.1-0-dev, libcurl4-gnutls-dev, libbz2-dev, libsqlite3-dev,


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13433 - packages/trunk/xmoto/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-03-27 22:02:36 + (Tue, 27 Mar 2012)
New Revision: 13433

Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/control
   packages/trunk/xmoto/debian/rules
Log:
Use dh-autoreconf to update config.{guess,sub}.

Modified: packages/trunk/xmoto/debian/changelog
===
--- packages/trunk/xmoto/debian/changelog   2012-03-27 21:29:10 UTC (rev 
13432)
+++ packages/trunk/xmoto/debian/changelog   2012-03-27 22:02:36 UTC (rev 
13433)
@@ -16,8 +16,10 @@
   * Update debian/copyright.
   * Standards-Version 3.9.2 (no further change required).
   * Fix spelling mistakes spotted by Lintian.
+  * Use dh-autoreconf to update config.{guess,sub} (thanks to Ansgar
+Burchardt for the hint).
 
- -- Stephen Kitt st...@sk2.org  Mon, 05 Dec 2011 22:55:45 +0100
+ -- Stephen Kitt st...@sk2.org  Wed, 28 Mar 2012 00:01:08 +0200
 
 xmoto (0.5.5-1) unstable; urgency=low
 

Modified: packages/trunk/xmoto/debian/control
===
--- packages/trunk/xmoto/debian/control 2012-03-27 21:29:10 UTC (rev 13432)
+++ packages/trunk/xmoto/debian/control 2012-03-27 22:02:36 UTC (rev 13433)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Miriam Ruiz little_m...@yahoo.es, Samuel Mimram 
smim...@debian.org,
  Barry deFreese bdefre...@debian.org, Stephen Kitt st...@sk2.org
-Build-Depends: debhelper (= 9), dpkg-dev (= 1.13.19), autotools-dev,
+Build-Depends: debhelper (= 9), dh-autoreconf, dpkg-dev (= 1.13.19), 
autotools-dev,
  libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev,
  libjpeg-dev, libpng12-dev | libpng-dev, zlib1g-dev, libgl1-mesa-dev | 
libgl-dev,
  libode-dev, liblua5.1-0-dev, libcurl4-gnutls-dev, libbz2-dev, libsqlite3-dev,

Modified: packages/trunk/xmoto/debian/rules
===
--- packages/trunk/xmoto/debian/rules   2012-03-27 21:29:10 UTC (rev 13432)
+++ packages/trunk/xmoto/debian/rules   2012-03-27 22:02:36 UTC (rev 13433)
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-   dh $@
+   dh $@ --with autoreconf
 
 override_dh_auto_configure:
dh_auto_configure -- \


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13434 - packages/trunk/xmoto/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-03-27 22:08:24 + (Tue, 27 Mar 2012)
New Revision: 13434

Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/control
   packages/trunk/xmoto/debian/copyright
   packages/trunk/xmoto/debian/xmoto.install
Log:
wrap-and-sort control files.

Modified: packages/trunk/xmoto/debian/changelog
===
--- packages/trunk/xmoto/debian/changelog   2012-03-27 22:02:36 UTC (rev 
13433)
+++ packages/trunk/xmoto/debian/changelog   2012-03-27 22:08:24 UTC (rev 
13434)
@@ -18,8 +18,9 @@
   * Fix spelling mistakes spotted by Lintian.
   * Use dh-autoreconf to update config.{guess,sub} (thanks to Ansgar
 Burchardt for the hint).
+  * wrap-and-sort control files.
 
- -- Stephen Kitt st...@sk2.org  Wed, 28 Mar 2012 00:01:08 +0200
+ -- Stephen Kitt st...@sk2.org  Wed, 28 Mar 2012 00:07:26 +0200
 
 xmoto (0.5.5-1) unstable; urgency=low
 

Modified: packages/trunk/xmoto/debian/control
===
--- packages/trunk/xmoto/debian/control 2012-03-27 22:02:36 UTC (rev 13433)
+++ packages/trunk/xmoto/debian/control 2012-03-27 22:08:24 UTC (rev 13434)
@@ -2,13 +2,29 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
-Uploaders: Miriam Ruiz little_m...@yahoo.es, Samuel Mimram 
smim...@debian.org,
- Barry deFreese bdefre...@debian.org, Stephen Kitt st...@sk2.org
-Build-Depends: debhelper (= 9), dh-autoreconf, dpkg-dev (= 1.13.19), 
autotools-dev,
- libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev,
- libjpeg-dev, libpng12-dev | libpng-dev, zlib1g-dev, libgl1-mesa-dev | 
libgl-dev,
- libode-dev, liblua5.1-0-dev, libcurl4-gnutls-dev, libbz2-dev, libsqlite3-dev,
- libxdg-basedir-dev, libxml2-dev
+Uploaders: Miriam Ruiz little_m...@yahoo.es,
+   Samuel Mimram smim...@debian.org,
+   Barry deFreese bdefre...@debian.org,
+   Stephen Kitt st...@sk2.org
+Build-Depends: autotools-dev,
+   debhelper (= 9),
+   dh-autoreconf,
+   dpkg-dev (= 1.13.19),
+   libbz2-dev,
+   libcurl4-gnutls-dev,
+   libgl1-mesa-dev | libgl-dev,
+   libjpeg-dev,
+   liblua5.1-0-dev,
+   libode-dev,
+   libpng12-dev | libpng-dev,
+   libsdl-mixer1.2-dev,
+   libsdl-net1.2-dev,
+   libsdl-ttf2.0-dev,
+   libsdl1.2-dev,
+   libsqlite3-dev,
+   libxdg-basedir-dev,
+   libxml2-dev,
+   zlib1g-dev
 Standards-Version: 3.9.2
 Homepage: http://xmoto.tuxfamily.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/xmoto/?op=log
@@ -16,7 +32,7 @@
 
 Package: xmoto
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, xmoto-data (= ${source:Version})
+Depends: xmoto-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: 2D motocross platform game
  X-Moto is a challenging 2D motocross platform game, where physics play
  an all important role in the gameplay. You need to control your bike to
@@ -25,7 +41,7 @@
 
 Package: xmoto-data
 Architecture: all
-Depends: ${misc:Depends}, ttf-dejavu-core
+Depends: ttf-dejavu-core, ${misc:Depends}
 Suggests: xmoto (= ${source:Version})
 Description: 2D motocross platform game - data files
  X-Moto is a challenging 2D motocross platform game, where physics play

Modified: packages/trunk/xmoto/debian/copyright
===
--- packages/trunk/xmoto/debian/copyright   2012-03-27 22:02:36 UTC (rev 
13433)
+++ packages/trunk/xmoto/debian/copyright   2012-03-27 22:08:24 UTC (rev 
13434)
@@ -98,7 +98,7 @@
 Files: src/intl/*
 Copyright: 1984-2006 Free Software Foundation, Inc.
 License: LGPL-2+
- 
+
 Files: debian/*
 Copyright: 2005-2009 Samuel Mimram smim...@debian.org
2008 Miriam Ruiz little_m...@yahoo.es

Modified: packages/trunk/xmoto/debian/xmoto.install
===
--- packages/trunk/xmoto/debian/xmoto.install   2012-03-27 22:02:36 UTC (rev 
13433)
+++ packages/trunk/xmoto/debian/xmoto.install   2012-03-27 22:08:24 UTC (rev 
13434)
@@ -1,5 +1,5 @@
+extra/xmoto.desktop /usr/share/applications
+extra/xmoto.xpm /usr/share/pixmaps
 usr/games/xmoto
 usr/share/games/locale
 usr/share/man/man6/*
-extra/xmoto.desktop /usr/share/applications
-extra/xmoto.xpm /usr/share/pixmaps


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.6-1-2-gffdf51e

[Stephen Kitt]

The following commit has been merged in the master branch:
commit ffdf51e384fafa87d92df3d991aaebd53d60a990
Merge: b29c3dfa56a635f46e60148094d294053ffef244 
0a8a1e66947e640d39f20e527057833921d5107d
Author: Stephen Kitt st...@sk2.org
Date:   Sat Mar 31 10:34:07 2012 +0200

Merge tag 'upstream/3.6.1'

Upstream version 3.6.1

Conflicts:
debian/changelog

diff --combined debian/changelog
index f122b1d,acb..7e8bd85
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,214 -1,216 +1,220 @@@
 -stella (3.6.1-1) stable; urgency=high
++stella (3.6.1-1) unstable; urgency=low
+ 
 -  * Version 3.6.1 release
++  * New upstream version.
+ 
 - -- Stephen Anthony steph...@users.sf.net  Fri, 30 Mar 2012 18:38:25 +0200
++ -- Stephen Kitt st...@sk2.org  Sat, 31 Mar 2012 10:32:40 +0200
+ 
 +stella (3.6-1) unstable; urgency=low
  
 -stella (3.6-1) stable; urgency=high
 +  * New upstream version.
 +  * Update documentation with new features in 3.6, notably CompuMate
 +emulation and 2600-daptor II support.
 +  * Drop libpng12-dev build-dependency entirely (in favour of
 +libpng-dev).
  
 -  * Version 3.6 release
 + -- Stephen Kitt st...@sk2.org  Sat, 17 Mar 2012 23:23:45 +0100
  
 - -- Stephen Anthony steph...@users.sf.net  Fri, 16 Mar 2012 18:38:25 +0200
 +stella (3.5.5-3) unstable; urgency=low
  
 +  * Allow building with libpng-dev (closes: #662511); stella is known to
 +build with libpng 1.5 so this shouldn't cause trouble when libpng-
 +dev switches to 1.5.
 +  * Standards-Version 3.9.3, no change required.
  
 -stella (3.5.5-1) stable; urgency=high
 + -- Stephen Kitt st...@sk2.org  Tue, 06 Mar 2012 00:08:53 +0100
  
 -  * Version 3.5.5 release
 +stella (3.5.5-2) unstable; urgency=low
  
 - -- Stephen Anthony steph...@users.sf.net  Sat, 4 Feb 2012 18:38:25 +0200
 +  * Use maintscript support in dh_installdeb rather than writing out
 +dpkg-maintscript-helper commands by hand. We now simply Pre-Depend
 +on a new enough version of dpkg rather than using 'dpkg-maintscript-
 +helper supports' guards, leading to more predictable behaviour on
 +upgrades. Thanks to Colin Watson for the patch (closes: #659792).
 +  * Update documentation with last-minute fix from upstream.
  
 + -- Stephen Kitt st...@sk2.org  Sun, 19 Feb 2012 00:39:23 +0100
  
 -stella (3.5-1) stable; urgency=high
 +stella (3.5.5-1) unstable; urgency=low
  
 -  * Version 3.5 release
 +  * New upstream version.
 +  * Rewrite debian/copyright, using DEP-5 and updating for 2012.
 +  * Update manpage.
  
 - -- Stephen Anthony steph...@users.sf.net  Thu, 29 Dec 2011 18:38:25 +0200
 + -- Stephen Kitt st...@sk2.org  Sun, 05 Feb 2012 08:09:05 +0100
  
 +stella (3.5-1) unstable; urgency=low
  
 -stella (3.4.1-1) stable; urgency=high
 +  * New upstream version.
 +  * Drop all patches, merged upstream.
 +  * Update description and manpage (notably, OpenGL-based TV effects are
 +no longer supported).
  
 -  * Version 3.4.1 release
 + -- Stephen Kitt st...@sk2.org  Thu, 29 Dec 2011 23:56:39 +0100
  
 - -- Stephen Anthony steph...@users.sf.net  Sat, 11 June 2011 18:38:25 +0200
 +stella (3.4.1-2) unstable; urgency=low
  
 +  * Make Stella available in the Open With Other Applications... menu
 +in Gnome (and presumably similar entries in other desktop
 +environments; LP: #880114).
 +  * Build with gcc 4.6.1 (which identifies itself as gcc 4.6).
  
 -stella (3.4-1) stable; urgency=high
 + -- Stephen Kitt st...@sk2.org  Wed, 26 Oct 2011 23:04:32 +0200
  
 -  * Version 3.4 release
 +stella (3.4.1-1) unstable; urgency=low
  
 - -- Stephen Anthony steph...@users.sf.net  Sun, 29 May 2011 18:38:25 +0200
 +  * New upstream version.
 +  * Update manpage with new features in 3.4.1.
  
 + -- Stephen Kitt st...@sk2.org  Wed, 15 Jun 2011 23:48:31 +0200
  
 -stella (3.3-1) stable; urgency=high
 +stella (3.4-1) unstable; urgency=low
  
 -  * Version 3.3 release
 +  * New upstream version.
 +  * Update package description and manpage with new features in 3.4.
 +  * Standards-Version 3.9.2, no change required.
 +  * Drop all patches, merged upstream.
  
 - -- Stephen Anthony steph...@users.sf.net  Fri, 12 Nov 2010 18:38:25 +0200
 + -- Stephen Kitt st...@sk2.org  Mon, 30 May 2011 07:02:40 +0200
  
 +stella (3.3-2) unstable; urgency=low
  
 -stella (3.2.1-1) stable; urgency=high
 +  * Upload to unstable.
 +  * Drop explicit quilt usage and dependency since we're using format 3.0
 +(quilt).
  
 -  * Version 3.2.1 release
 + -- Stephen Kitt st...@sk2.org  Thu, 10 Mar 2011 17:38:47 +0100
  
 - -- Stephen Anthony steph...@users.sf.net  Wed, 25 Aug 2010 18:38:25 +0200
 +stella (3.3-1) experimental; urgency=low
  
 +  * New upstream version.
  
 -stella (3.2-1) stable; urgency=high
 + -- Stephen Kitt st...@sk2.org  Mon, 15 Nov 2010 21:59:47 +0100
  
 -  * Version 3.2 release
 +stella (3.2.2-1) experimental; urgency=low
  
 - -- Stephen Anthony steph...@users.sf.net  Fri 20 Aug 2010 18:38:25 +0200
 +  * New upstream version

[SCM] Atari 2600 Emulator for SDL the X Window System branch, pristine-tar, updated. aaf571cfee44331262c97b320bfe1574d674d7c1

[Stephen Kitt]

The following commit has been merged in the pristine-tar branch:
commit aaf571cfee44331262c97b320bfe1574d674d7c1
Author: Stephen Kitt st...@sk2.org
Date:   Sat Mar 31 10:31:56 2012 +0200

pristine-tar data for stella_3.6.1.orig.tar.gz

diff --git a/stella_3.6.1.orig.tar.gz.delta b/stella_3.6.1.orig.tar.gz.delta
new file mode 100644
index 000..4b3ac09
Binary files /dev/null and b/stella_3.6.1.orig.tar.gz.delta differ
diff --git a/stella_3.6.1.orig.tar.gz.id b/stella_3.6.1.orig.tar.gz.id
new file mode 100644
index 000..7bd3b92
--- /dev/null
+++ b/stella_3.6.1.orig.tar.gz.id
@@ -0,0 +1 @@
+96a9187cc3c03c931fd680e05e63613e3950fe90

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, debian/3.6.1-1, created. debian/3.6.1-1

[Stephen Kitt]

The annotated tag, debian/3.6.1-1 has been created
at  272621416e3ae758a72277cdb72a8c9213e1582c (tag)
   tagging  ffdf51e384fafa87d92df3d991aaebd53d60a990 (commit)
  replaces  debian/3.6-1
 tagged by  Stephen Kitt
on  Sat Mar 31 11:12:49 2012 +0200

- Shortlog 
Debian release 3.6.1-1

Stephen Kitt (2):
  Imported Upstream version 3.6.1
  Merge tag 'upstream/3.6.1'

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, upstream/3.6.1, created. upstream/3.6.1

[Stephen Kitt]

The annotated tag, upstream/3.6.1 has been created
at  59cdbb64eed37275674ebf2f60dfcb60574ea0d0 (tag)
   tagging  0a8a1e66947e640d39f20e527057833921d5107d (commit)
  replaces  upstream/3.6
 tagged by  Stephen Kitt
on  Sat Mar 31 10:31:56 2012 +0200

- Shortlog 
Upstream version 3.6.1

Stephen Kitt (1):
  Imported Upstream version 3.6.1

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.19-2-8-g025e592

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 5a460654f9c604ab5489d1cb12706d5423c3a783
Merge: 781519ad4dc6141de1f6356a0477bf27abe83f58 
5c6ffda2356ae15af2b2a4a0f8181b22146f1f3f
Author: Stephen Kitt st...@sk2.org
Date:   Mon Apr 2 01:42:29 2012 +0200

Merge tag 'upstream/0.9.21' into master-experimental

Upstream version 0.9.21


-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.19-2-8-g025e592

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit cae9d0c80e1acab1c009312d91b0c8841fca9bee
Author: Stephen Kitt st...@sk2.org
Date:   Tue Apr 3 00:16:01 2012 +0200

Standard-Version 3.9.3, no change required.

diff --git a/debian/changelog b/debian/changelog
index 702d803..0fe3383 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mednafen (0.9.21-1) experimental; urgency=low
 libmpcdec rather than the bundled version.
   * Add cdrom-if-memset-fix.patch to fix an incorrect memset invocation
 (spotted by gcc).
+  * Standard-Version 3.9.3, no change required.
 
  -- Stephen Kitt st...@sk2.org  Tue, 03 Apr 2012 00:05:58 +0200
 
diff --git a/debian/control b/debian/control
index ce6e25d..0d8d524 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (= 9), dh-autoreconf, 
autotools-dev, x11proto-core-dev
  libvorbisidec-dev,
  liblzo2-dev
 Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://mednafen.sourceforge.net
 Vcs-Git: git://git.debian.org/git/pkg-games/mednafen.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/mednafen.git

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.19-2-8-g025e592

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit c00cfcca42e2d9587ef798de78af4d841b6196fe
Author: Stephen Kitt st...@sk2.org
Date:   Tue Apr 3 00:10:36 2012 +0200

Fix an incorrect memset invocation.

diff --git a/debian/changelog b/debian/changelog
index de25803..702d803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mednafen (0.9.21-1) experimental; urgency=low
 gzip-1.2.6-fix.patch and shader-fix.patch (applied upstream).
   * Add use-system-mpcdec.patch to build using the Debian-provided
 libmpcdec rather than the bundled version.
+  * Add cdrom-if-memset-fix.patch to fix an incorrect memset invocation
+(spotted by gcc).
 
  -- Stephen Kitt st...@sk2.org  Tue, 03 Apr 2012 00:05:58 +0200
 
diff --git a/debian/patches/cdromif-memset-fix.patch 
b/debian/patches/cdromif-memset-fix.patch
new file mode 100644
index 000..39b63f9
--- /dev/null
+++ b/debian/patches/cdromif-memset-fix.patch
@@ -0,0 +1,17 @@
+Subject: Fix memset invocation
+Author: Stephen Kitt st...@sk2.org
+Forwarded: yes, http://forum.fobby.net/index.php?t=msggoto=2458#msg_2458
+
+This memset call has its last two arguments swapped.
+
+--- mednafen.orig/src/cdrom/cdromif.cpp
 mednafen/src/cdrom/cdromif.cpp
+@@ -344,7 +344,7 @@
+ 
+  if(UnrecoverableError)
+  {
+-  memset(buf, 2352 + 96, 0);
++  memset(buf, 0, 2352 + 96);
+   return(false);
+  }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f06589d..71fa0f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 use-system-tremor.patch
 use-system-mpcdec.patch
 hardening-fixes.patch
+cdromif-memset-fix.patch

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.19-2-8-g025e592

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 025e59284e98ff55abe305759ae076b43bb8be2a
Author: Stephen Kitt st...@sk2.org
Date:   Tue Apr 3 00:16:57 2012 +0200

wrap-and-sort control files.

diff --git a/debian/changelog b/debian/changelog
index 0fe3383..0adc862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mednafen (0.9.21-1) experimental; urgency=low
   * Add cdrom-if-memset-fix.patch to fix an incorrect memset invocation
 (spotted by gcc).
   * Standard-Version 3.9.3, no change required.
+  * wrap-and-sort control files.
 
  -- Stephen Kitt st...@sk2.org  Tue, 03 Apr 2012 00:05:58 +0200
 
diff --git a/debian/control b/debian/control
index 0d8d524..bdf8e33 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,22 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Stephen Kitt st...@sk2.org
-Build-Depends: debhelper (= 9), dh-autoreconf, autotools-dev, 
x11proto-core-dev,
- libgl1-mesa-dev | libgl-dev, zlib1g-dev | libz-dev, libsdl1.2-dev,
- libsamplerate0-dev, libsdl-net1.2-dev, libcdio-dev,
- libsndfile1-dev | libsndfile-dev,
- libasound2-dev [linux-any],
- libjack-dev,
- libmpcdec-dev,
- libvorbisidec-dev,
- liblzo2-dev
+Build-Depends: autotools-dev,
+   debhelper (= 9),
+   dh-autoreconf,
+   libasound2-dev [linux-any],
+   libcdio-dev,
+   libgl1-mesa-dev | libgl-dev,
+   libjack-dev,
+   liblzo2-dev,
+   libmpcdec-dev,
+   libsamplerate0-dev,
+   libsdl-net1.2-dev,
+   libsdl1.2-dev,
+   libsndfile1-dev | libsndfile-dev,
+   libvorbisidec-dev,
+   x11proto-core-dev,
+   zlib1g-dev | libz-dev
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.3
 Homepage: http://mednafen.sourceforge.net
@@ -21,10 +28,10 @@ DM-Upload-Allowed: yes
 
 Package: mednafen
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: nes-emulator
 Description: multi-platform emulator, including NES, GB/A, Lynx, PC Engine
- Mednafen is a command-line driven emulator for many different systems. It 
+ Mednafen is a command-line driven emulator for many different systems. It
  has full support for OpenGL and SDL graphics, network play, remappable input
  configuration, joystick and keyboard support, save states, game rewinding,
  GSF playback, and screenshots.
diff --git a/debian/copyright b/debian/copyright
index f0c0dd4..afce242 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -278,9 +278,9 @@ Files: src/compress/quicklz.*
 Comment: QuickLZ http://www.quicklz.com/
 Copyright: 2006-2008 Lasse Mikkel Reinhold
 License: GPL-1 or GPL-2
- QuickLZ can be used for free under the GPL-1 or GPL-2 license (where anything 
- released into public must be open source) or under a commercial license if 
such 
- has been acquired (see http://www.quicklz.com/order.html). The commercial 
license 
+ QuickLZ can be used for free under the GPL-1 or GPL-2 license (where anything
+ released into public must be open source) or under a commercial license if 
such
+ has been acquired (see http://www.quicklz.com/order.html). The commercial 
license
  does not cover derived or ported versions created by third parties under GPL.
  .
  On Debian systems, the complete text of the GNU General

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.19-2-8-g025e592

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit e021dfdb4b3d13bb2116d8eaf4cc1aa0cb0c0ffd
Author: Stephen Kitt st...@sk2.org
Date:   Tue Apr 3 00:11:00 2012 +0200

Delete obsolete patches.

diff --git a/debian/patches/gzip-1.2.6-fix.patch 
b/debian/patches/gzip-1.2.6-fix.patch
deleted file mode 100644
index fd4f7ac..000
--- a/debian/patches/gzip-1.2.6-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Use gzFile as appropriate for zlib 1.2.6 and later
-Origin: http://forum.fobby.net/index.php?t=rviewgoto=2411#msg_2411
-
 mednafen.orig/src/file.cpp
-+++ mednafen/src/file.cpp
-@@ -293,7 +293,7 @@
-goto doret;
-   }
- 
--  while((howmany = gzread(tz, f_data + cur_size, cur_alloced - cur_size))  0)
-+  while((howmany = gzread((gzFile)tz, f_data + cur_size, cur_alloced - 
cur_size))  0)
-   {
-cur_size += howmany;
-cur_alloced = 1;
-@@ -320,7 +320,7 @@
-   {
-int gzerrnum = 0;
-const char *gzerrstring;
--   if((gzerrstring = gzerror(tz, gzerrnum))  gzerrnum != Z_OK  gzerrnum 
!= Z_STREAM_END)
-+   if((gzerrstring = gzerror((gzFile)tz, gzerrnum))  gzerrnum != Z_OK  
gzerrnum != Z_STREAM_END)
-{
- if(gzerrnum != Z_ERRNO)
- {
-@@ -365,7 +365,7 @@
-  }
-  else if(type == MDFN_FILETYPE_GZIP)
-  {
--  gzclose(tz);
-+  gzclose((gzFile)tz);
-  }
-  else if(type == MDFN_FILETYPE_ZIP)
-  {
diff --git a/debian/patches/shader-fix.patch b/debian/patches/shader-fix.patch
deleted file mode 100644
index b4e91db..000
--- a/debian/patches/shader-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Pass correct argument to texture2D() in interpolation shader
-Origin: http://forum.fobby.net/index.php?t=rviewgoto=2420#msg_2420
-
 mednafen.orig/src/drivers/shader.cpp
-+++ mednafen/src/drivers/shader.cpp
-@@ -70,7 +70,7 @@
-  switch(ipolate_axis  3)
-  {
-   case 0:
--  ret += std::string(gl_FragColor = texture2D(Tex0, gl_TexCoord[0]);\n);
-+  ret += std::string(gl_FragColor = texture2D(Tex0, 
vec2(gl_TexCoord[0]));\n);
-   break;
- 
-   case 1:
diff --git a/debian/patches/spelling-fixes.patch 
b/debian/patches/spelling-fixes.patch
deleted file mode 100644
index c32fe43..000
--- a/debian/patches/spelling-fixes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Spelling fixes
-Author: Stephen Kitt st...@sk2.org
-
 mednafen.orig/src/vb/vb.cpp
-+++ mednafen/src/vb/vb.cpp
-@@ -969,7 +969,7 @@
- 
- static const MDFNSetting_EnumList VB3DMode_List[] =
- {
-- { anaglyph, VB3DMODE_ANAGLYPH, gettext_noop(Anaglyph), 
gettext_noop(Used in conjuction with classic dual-lens-color glasses.) },
-+ { anaglyph, VB3DMODE_ANAGLYPH, gettext_noop(Anaglyph), 
gettext_noop(Used in conjunction with classic dual-lens-color glasses.) },
-  { cscope,  VB3DMODE_CSCOPE, gettext_noop(CyberScope), 
gettext_noop(Intended for use with the CyberScope 3D device.) },
-  { sidebyside, VB3DMODE_SIDEBYSIDE, gettext_noop(Side-by-Side), 
gettext_noop(The left-eye image is displayed on the left, and the right-eye 
image is displayed on the right.) },
- // { overunder, VB3DMODE_OVERUNDER },

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine annotated tag, upstream/0.9.21, created. upstream/0.9.21

[Stephen Kitt]

The annotated tag, upstream/0.9.21 has been created
at  ff0cb1613a58797fac41f875236948892470ad26 (tag)
   tagging  5c6ffda2356ae15af2b2a4a0f8181b22146f1f3f (commit)
  replaces  upstream/0.9.19
 tagged by  Stephen Kitt
on  Mon Apr 2 01:42:28 2012 +0200

- Shortlog 
Upstream version 0.9.21

Stephen Kitt (1):
  Imported Upstream version 0.9.21

---

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13490 - packages/trunk/xmoto/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-04-17 05:35:24 + (Tue, 17 Apr 2012)
New Revision: 13490

Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/control
Log:
Build-depend on libpng-dev only, dropping the libpng12-dev alternative (closes: 
#662565).

Modified: packages/trunk/xmoto/debian/changelog
===
--- packages/trunk/xmoto/debian/changelog   2012-04-17 02:30:48 UTC (rev 
13489)
+++ packages/trunk/xmoto/debian/changelog   2012-04-17 05:35:24 UTC (rev 
13490)
@@ -19,8 +19,10 @@
   * Use dh-autoreconf to update config.{guess,sub} (thanks to Ansgar
 Burchardt for the hint).
   * wrap-and-sort control files.
+  * Build-depend on libpng-dev only, dropping the libpng12-dev alternative
+(closes: #662565).
 
- -- Stephen Kitt st...@sk2.org  Wed, 28 Mar 2012 00:07:26 +0200
+ -- Stephen Kitt st...@sk2.org  Tue, 17 Apr 2012 07:34:47 +0200
 
 xmoto (0.5.5-1) unstable; urgency=low
 

Modified: packages/trunk/xmoto/debian/control
===
--- packages/trunk/xmoto/debian/control 2012-04-17 02:30:48 UTC (rev 13489)
+++ packages/trunk/xmoto/debian/control 2012-04-17 05:35:24 UTC (rev 13490)
@@ -16,7 +16,7 @@
libjpeg-dev,
liblua5.1-0-dev,
libode-dev,
-   libpng12-dev | libpng-dev,
+   libpng-dev,
libsdl-mixer1.2-dev,
libsdl-net1.2-dev,
libsdl-ttf2.0-dev,


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13492 - in packages/trunk/xmoto/debian: . patches

[Stephen Kitt]

Author: steve-guest
Date: 2012-04-17 06:20:58 + (Tue, 17 Apr 2012)
New Revision: 13492

Added:
   packages/trunk/xmoto/debian/patches/gcc-4.7-fixes.patch
Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/patches/series
Log:
Fix ftbfs with GCC-4.7 by including unistd.h where appropriate (closes: 
#667422).

Modified: packages/trunk/xmoto/debian/changelog
===
--- packages/trunk/xmoto/debian/changelog   2012-04-17 05:55:28 UTC (rev 
13491)
+++ packages/trunk/xmoto/debian/changelog   2012-04-17 06:20:58 UTC (rev 
13492)
@@ -21,8 +21,11 @@
   * wrap-and-sort control files.
   * Build-depend on libpng-dev only, dropping the libpng12-dev alternative
 (closes: #662565).
+  * Fix ftbfs with GCC-4.7 by including unistd.h where appropriate
+(closes: #667422; thanks to Cyril Brulebois for his patch for another
+gcc-4.7-related issue, which was already included upstream).
 
- -- Stephen Kitt st...@sk2.org  Tue, 17 Apr 2012 07:34:47 +0200
+ -- Stephen Kitt st...@sk2.org  Tue, 17 Apr 2012 08:18:03 +0200
 
 xmoto (0.5.5-1) unstable; urgency=low
 

Added: packages/trunk/xmoto/debian/patches/gcc-4.7-fixes.patch
===
--- packages/trunk/xmoto/debian/patches/gcc-4.7-fixes.patch 
(rev 0)
+++ packages/trunk/xmoto/debian/patches/gcc-4.7-fixes.patch 2012-04-17 
06:20:58 UTC (rev 13492)
@@ -0,0 +1,14 @@
+Description: Add missing header, allowing building with gcc-4.7
+Author: Stephen Kitt st...@sk2.org
+Bug: http://todo.xmoto.tuxfamily.org/index.php?do=detailstask_id=800
+
+--- xmoto-0.5.9.orig/src/helpers/System.cpp
 xmoto-0.5.9/src/helpers/System.cpp
+@@ -24,6 +24,7 @@
+ #include Log.h
+ #include VExcept.h
+ #include sstream
++#include unistd.h
+ 
+ std::vectorstd::string* System::getDisplayModes(int windowed) {
+ std::vectorstd::string* modes = new std::vectorstd::string;

Modified: packages/trunk/xmoto/debian/patches/series
===
--- packages/trunk/xmoto/debian/patches/series  2012-04-17 05:55:28 UTC (rev 
13491)
+++ packages/trunk/xmoto/debian/patches/series  2012-04-17 06:20:58 UTC (rev 
13492)
@@ -2,3 +2,4 @@
 desktop.patch
 manpage.patch
 spelling.patch
+gcc-4.7-fixes.patch


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13504 - packages/trunk/xmoto/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-04-22 22:01:56 + (Sun, 22 Apr 2012)
New Revision: 13504

Modified:
   packages/trunk/xmoto/debian/
   packages/trunk/xmoto/debian/changelog
Log:
Repack source to avoid licensing problems.


Property changes on: packages/trunk/xmoto/debian
___
Modified: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/xmoto_0.5.9.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/xmoto_0.5.9+dfsg.orig.tar.gz

Modified: packages/trunk/xmoto/debian/changelog
===
--- packages/trunk/xmoto/debian/changelog   2012-04-22 21:34:53 UTC (rev 
13503)
+++ packages/trunk/xmoto/debian/changelog   2012-04-22 22:01:56 UTC (rev 
13504)
@@ -1,10 +1,16 @@
-xmoto (0.5.9-1) unstable; urgency=low
+xmoto (0.5.9+dfsg-1) unstable; urgency=low
 
   * New upstream release (closes: #644234):
 + builds with libpng 1.5 (closes: #649797);
 + uses libxml2;
 + uses DejaVuSansMono (add link and make ttf-dejavu-core a dependency
   of xmoto-data).
+  * Repacked to avoid licensing problems:
++ remove src/glext.h, licensed under SGI License B version 1.1;
++ add the missing contents in bin (closes: #661340).
+(I'm hoping that both issues will be fixed upstream, so I haven't
+added a get-orig-source target to debian/rules. README.dfsg in the
+repacked source explains the changes.)
   * Update patches:
 + fix_segfault.patch: refresh, add DEP-3 header, forward upstream;
 + desktop.patch: re-apply, add German translation (closes: #641822),
@@ -27,8 +33,9 @@
   * Fix ftbfs with GCC-4.7 by including unistd.h where appropriate
 (closes: #667422; thanks to Cyril Brulebois for his patch for another
 gcc-4.7-related issue, which was already included upstream).
+  * Fix the Vcs-Browser URL.
 
- -- Stephen Kitt st...@sk2.org  Sun, 22 Apr 2012 14:20:08 +0200
+ -- Stephen Kitt st...@sk2.org  Sun, 22 Apr 2012 23:34:22 +0200
 
 xmoto (0.5.5-1) unstable; urgency=low
 


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13505 - packages/trunk/xmoto/debian/source

[Stephen Kitt]

Author: steve-guest
Date: 2012-04-22 22:03:48 + (Sun, 22 Apr 2012)
New Revision: 13505

Removed:
   packages/trunk/xmoto/debian/source/lintian-overrides
Log:
Drop unneeded lintian-overrides since we build-depend on debhelper (= 9).

Deleted: packages/trunk/xmoto/debian/source/lintian-overrides
===
--- packages/trunk/xmoto/debian/source/lintian-overrides2012-04-22 
22:01:56 UTC (rev 13504)
+++ packages/trunk/xmoto/debian/source/lintian-overrides2012-04-22 
22:03:48 UTC (rev 13505)
@@ -1 +0,0 @@
-xmoto source: package-needs-versioned-debhelper-build-depends 9


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13507 - packages/trunk/xmoto/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-04-22 22:08:30 + (Sun, 22 Apr 2012)
New Revision: 13507

Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/control
Log:
Standards-Version 3.9.3 (no further change required).

Modified: packages/trunk/xmoto/debian/changelog
===
--- packages/trunk/xmoto/debian/changelog   2012-04-22 22:07:38 UTC (rev 
13506)
+++ packages/trunk/xmoto/debian/changelog   2012-04-22 22:08:30 UTC (rev 
13507)
@@ -24,7 +24,7 @@
   * Patch the manpage to fix hyphens and a few spelling mistakes.
   * Add myself to uploaders.
   * Update debian/copyright.
-  * Standards-Version 3.9.2 (no further change required).
+  * Standards-Version 3.9.3 (no further change required).
   * Fix spelling mistakes spotted by Lintian.
   * Use dh-autoreconf to update config.{guess,sub} (thanks to Ansgar
 Burchardt for the hint).
@@ -36,7 +36,7 @@
 gcc-4.7-related issue, which was already included upstream).
   * Fix the Vcs-Browser URL.
 
- -- Stephen Kitt st...@sk2.org  Mon, 23 Apr 2012 00:07:02 +0200
+ -- Stephen Kitt st...@sk2.org  Mon, 23 Apr 2012 00:07:50 +0200
 
 xmoto (0.5.5-1) unstable; urgency=low
 

Modified: packages/trunk/xmoto/debian/control
===
--- packages/trunk/xmoto/debian/control 2012-04-22 22:07:38 UTC (rev 13506)
+++ packages/trunk/xmoto/debian/control 2012-04-22 22:08:30 UTC (rev 13507)
@@ -25,7 +25,7 @@
libxdg-basedir-dev,
libxml2-dev,
zlib1g-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://xmoto.tuxfamily.org/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/xmoto/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/xmoto/


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13508 - packages/trunk/xmoto/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-04-22 22:21:11 + (Sun, 22 Apr 2012)
New Revision: 13508

Modified:
   packages/trunk/xmoto/debian/changelog
Log:
Remove gcc44-ftbfs.patch, no longer used.

Modified: packages/trunk/xmoto/debian/changelog
===
--- packages/trunk/xmoto/debian/changelog   2012-04-22 22:08:30 UTC (rev 
13507)
+++ packages/trunk/xmoto/debian/changelog   2012-04-22 22:21:11 UTC (rev 
13508)
@@ -17,7 +17,8 @@
 + desktop.patch: re-apply, add German translation (closes: #641822),
   forward upstream;
 + spelling.patch: refresh, forward upstream;
-+ manpage.patch: forward upstream.
++ manpage.patch: forward upstream;
++ gcc44-ftbfs.patch: no longer used, delete.
   * Switch to dh 9 with simple rules.
   * Use source format 3.0 (quilt).
   * Add ${misc:Depends} where appropriate.
@@ -36,7 +37,7 @@
 gcc-4.7-related issue, which was already included upstream).
   * Fix the Vcs-Browser URL.
 
- -- Stephen Kitt st...@sk2.org  Mon, 23 Apr 2012 00:07:50 +0200
+ -- Stephen Kitt st...@sk2.org  Mon, 23 Apr 2012 00:19:42 +0200
 
 xmoto (0.5.5-1) unstable; urgency=low
 


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13509 - packages/trunk/xmoto/debian/patches

[Stephen Kitt]

Author: steve-guest
Date: 2012-04-22 22:21:26 + (Sun, 22 Apr 2012)
New Revision: 13509

Removed:
   packages/trunk/xmoto/debian/patches/gcc44-ftbfs.patch
Log:
Remove gcc44-ftbfs.patch, no longer used.

Deleted: packages/trunk/xmoto/debian/patches/gcc44-ftbfs.patch
===
--- packages/trunk/xmoto/debian/patches/gcc44-ftbfs.patch   2012-04-22 
22:21:11 UTC (rev 13508)
+++ packages/trunk/xmoto/debian/patches/gcc44-ftbfs.patch   2012-04-22 
22:21:26 UTC (rev 13509)
@@ -1,39 +0,0 @@
-# See: http://bugs.debian.org/505414
-
-Index: xmoto-0.5.0/src/XMArgs.cpp
-===
 xmoto-0.5.0.orig/src/XMArgs.cpp2008-12-10 11:02:16.0 +0100
-+++ xmoto-0.5.0/src/XMArgs.cpp 2008-12-10 11:02:56.0 +0100
-@@ -23,6 +23,7 @@
- #include XMBuild.h
- #include VFileIO.h
- #include sstream
-+#include cstdio
- #include stdlib.h
- 
- XMArguments::XMArguments() {
-Index: xmoto-0.5.0/src/helpers/Log.cpp
-===
 xmoto-0.5.0.orig/src/helpers/Log.cpp   2008-12-10 11:02:16.0 
+0100
-+++ xmoto-0.5.0/src/helpers/Log.cpp2008-12-10 11:02:46.0 +0100
-@@ -22,6 +22,7 @@
- #include VExcept.h
- #include ../VFileIO.h
- #include assert.h
-+#include cstdio
- #include stdarg.h
- 
- bool  Logger::m_isInitialized = false;
-Index: xmoto-0.5.0/src/helpers/Text.cpp
-===
 xmoto-0.5.0.orig/src/helpers/Text.cpp  2008-12-10 11:02:16.0 
+0100
-+++ xmoto-0.5.0/src/helpers/Text.cpp   2008-12-10 11:02:36.0 +0100
-@@ -20,6 +20,8 @@
- 
- #include Text.h
- 
-+#include cstdio
-+
- std::string txtToLower(const std::string i_str) {
- std::string v_res;
- 


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-3-1-g16ad005

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 16ad005b00b9030856d2acd7fc5503018d6ef91e
Author: Stephen Kitt st...@sk2.org
Date:   Wed May 16 06:43:24 2012 +0200

Track stable releases only.

diff --git a/debian/changelog b/debian/changelog
index 01947d5..7e55596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mednafen (0.8.D.3-4) unstable; urgency=low
+
+  * Update debian/watch to track stable releases only.
+
+ -- Stephen Kitt st...@sk2.org  Wed, 16 May 2012 06:43:01 +0200
+
 mednafen (0.8.D.3-3) unstable; urgency=low
 
   * Build with zlib 1.2.6 and later (patch by Michał Ziąbkowski, adapted
diff --git a/debian/watch b/debian/watch
index e7a3585..cebf061 100644
--- a/debian/watch
+++ b/debian/watch
@@ -3,5 +3,5 @@
 # Compulsory line, this is a version 3 file
 version=3
 
-# Webpage URL string match
-http://sf.net/mednafen/mednafen-(\d+.*)\.tar\.bz2
+# Track stable releases only
+http://sf.net/mednafen/mednafen-(\d+\.\d*[02468]\..*)\.tar\.bz2

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.21-1-4-g57ac5e0

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 5c8fb8aacce5290f766d67de6c138572fdc123eb
Author: Stephen Kitt st...@sk2.org
Date:   Wed May 16 19:54:34 2012 +0200

Add a Built-Using relationship on the package MiniLZO was copied from.

diff --git a/debian/changelog b/debian/changelog
index 0adc862..16c362f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mednafen (0.9.21-2) experimental; urgency=low
+
+  * Add a Built-Using relationship on the package MiniLZO was copied
+from.
+
+ -- Stephen Kitt st...@sk2.org  Wed, 16 May 2012 07:07:29 +0200
+
 mednafen (0.9.21-1) experimental; urgency=low
 
   * New upstream WIP version.
diff --git a/debian/control b/debian/control
index bdf8e33..9ab5e42 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Package: mednafen
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: nes-emulator
+Built-Using: ${bu:liblzo2}
 Description: multi-platform emulator, including NES, GB/A, Lynx, PC Engine
  Mednafen is a command-line driven emulator for many different systems. It
  has full support for OpenGL and SDL graphics, network play, remappable input
diff --git a/debian/rules b/debian/rules
index dfd0044..58e1574 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+liblzo2_source := $(shell dpkg-query -W -f='$${Source} (= $${source:Version})' 
liblzo2-dev)
+
+
 %:
dh $@ --with autoreconf
 
@@ -28,3 +31,6 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
dh_auto_configure -- --bindir=/usr/games --enable-psx
+
+override_dh_gencontrol-arch:
+   dh_gencontrol -a -- '-Vbu:liblzo2=$(liblzo2_source)'

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.21-1-4-g57ac5e0

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 4b0209a738657fae0a841fbfc54138376322a656
Author: Stephen Kitt st...@sk2.org
Date:   Wed May 16 20:14:58 2012 +0200

Update README.source to indicate that mpcdec is now replaced as well as 
tremor.

diff --git a/debian/README.source b/debian/README.source
index bb84797..5371425 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,8 +3,8 @@ mednafen for Debian
 
 The upstream source includes copies of the following packages which
 are available separately in Debian:
-* libmpcdec-dev; the API has changed since the version in Mednafen so
-  the Debian version can't be used directly;
+* libmpcdec-dev; this is patched out of Mednafen and the Debian
+  version used instead;
 * libvorbisidec-dev (tremor); this is patched out of Mednafen and the
   Debian version used instead;
 * liblzo2-dev (minilzo); the source files are copied from the Debian
@@ -14,4 +14,4 @@ are available separately in Debian:
 * gettext, as usual for projects using gettext; the build doesn't
   update it.
 
- -- Stephen Kitt st...@sk2.org, Mon, 18 Apr 2011 11:22:43 +0200
+ -- Stephen Kitt st...@sk2.org, Wed, 16 May 2012 06:50:03 +0200
diff --git a/debian/changelog b/debian/changelog
index f89d0cd..00ba766 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ mednafen (0.9.21-2) experimental; urgency=low
 from.
   * Move away mpcdec and tremor at build time rather than through
 patches (this makes maintaining the patches easier).
+  * Update README.source to indicate that mpcdec is now replaced as well
+as tremor.
 
- -- Stephen Kitt st...@sk2.org  Wed, 16 May 2012 20:12:10 +0200
+ -- Stephen Kitt st...@sk2.org  Wed, 16 May 2012 20:14:49 +0200
 
 mednafen (0.9.21-1) experimental; urgency=low
 

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.21-1-4-g57ac5e0

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 57ac5e0903dfff4db592ede039f856d83eed4f1b
Author: Stephen Kitt st...@sk2.org
Date:   Wed May 16 20:42:55 2012 +0200

Track upstream WIP versions published on sourceforge.net.

diff --git a/debian/changelog b/debian/changelog
index 00ba766..128e7cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ mednafen (0.9.21-2) experimental; urgency=low
 patches (this makes maintaining the patches easier).
   * Update README.source to indicate that mpcdec is now replaced as well
 as tremor.
+  * Track upstream WIP versions published on sourceforge.net.
 
- -- Stephen Kitt st...@sk2.org  Wed, 16 May 2012 20:14:49 +0200
+ -- Stephen Kitt st...@sk2.org  Wed, 16 May 2012 20:42:34 +0200
 
 mednafen (0.9.21-1) experimental; urgency=low
 
diff --git a/debian/watch b/debian/watch
index e7a3585..789f136 100644
--- a/debian/watch
+++ b/debian/watch
@@ -3,5 +3,6 @@
 # Compulsory line, this is a version 3 file
 version=3
 
-# Webpage URL string match
-http://sf.net/mednafen/mednafen-(\d+.*)\.tar\.bz2
+# Track WIP releases only
+opts=uversionmangle=s/-wip$// \
+  http://sf.net/mednafen/mednafen-(\d+\.\d*[13579]\..*)\.tar\.bz2

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine annotated tag, debian/0.9.21-2, created. debian/0.9.21-2

[Stephen Kitt]

The annotated tag, debian/0.9.21-2 has been created
at  1d46c1d0bb40775e01412a716148c9d62524d730 (tag)
   tagging  57ac5e0903dfff4db592ede039f856d83eed4f1b (commit)
  replaces  debian/0.9.21-1
 tagged by  Stephen Kitt
on  Wed May 16 21:06:37 2012 +0200

- Shortlog 
Debian release 0.9.21-2

Stephen Kitt (4):
  Add a Built-Using relationship on the package MiniLZO was copied from.
  Move away mpcdec and tremor at build time rather than through patches.
  Update README.source to indicate that mpcdec is now replaced as well as 
tremor.
  Track upstream WIP versions published on sourceforge.net.

---

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-3-2-gedbea4a

[Stephen Kitt]

The following commit has been merged in the master branch:
commit edbea4ab7ab4737b3bf1c4ef52433590b0c7596d
Author: Stephen Kitt st...@sk2.org
Date:   Wed May 16 22:51:10 2012 +0200

Pull in relevant changes from the experimental package.

  - wrap-and-sort debian/control
  - add a Built-Using relationship to the package from which MiniLZO is
copied
  - build using libvorbisidec-dev rather than the provided tremor source
  - switch to DEP-5 format for debian/copyright
  - add cheats.txt to the shipped documentation
  - build with dh-autoreconf
  - use debian/gbp.conf to enforce pristine-tar use
  - add README.source describing the source code replacements

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..1aa7ea9
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,17 @@
+mednafen for Debian
+---
+
+The upstream source includes copies of the following packages which
+are available separately in Debian:
+* libmpcdec-dev; the API has changed since the version in Mednafen so
+  the Debian version can't be used directly;
+* libvorbisidec-dev (tremor); this is patched out of Mednafen and the
+  Debian version used instead;
+* liblzo2-dev (minilzo); the source files are copied from the Debian
+  package for the build;
+* libav (jrevdct.cpp); only one function is reproduced, and it doesn't
+  seem useful to modify the build to use libav instead;
+* gettext, as usual for projects using gettext; the build doesn't
+  update it.
+
+ -- Stephen Kitt st...@sk2.org, Wed, 16 May 2012 22:49:44 +0200
diff --git a/debian/changelog b/debian/changelog
index 7e55596..da31034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
 mednafen (0.8.D.3-4) unstable; urgency=low
 
   * Update debian/watch to track stable releases only.
-
- -- Stephen Kitt st...@sk2.org  Wed, 16 May 2012 06:43:01 +0200
+  * Pull in relevant changes from the experimental package:
+- wrap-and-sort debian/control
+- add a Built-Using relationship to the package from which MiniLZO is
+  copied
+- build using libvorbisidec-dev rather than the provided tremor source
+- switch to DEP-5 format for debian/copyright
+- add cheats.txt to the shipped documentation
+- build with dh-autoreconf
+- use debian/gbp.conf to enforce pristine-tar use
+- add README.source describing the source code replacements
+
+ -- Stephen Kitt st...@sk2.org  Wed, 16 May 2012 22:50:02 +0200
 
 mednafen (0.8.D.3-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 989b2f3..ca68e14 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,21 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Stephen Kitt st...@sk2.org
-Build-Depends: debhelper (= 9), autotools-dev, x11proto-core-dev,
- libgl1-mesa-dev | libgl-dev, zlib1g-dev | libz-dev, libsdl1.2-dev,
- libsamplerate0-dev, libsdl-net1.2-dev, libcdio-dev,
- libsndfile1-dev | libsndfile-dev,
- libasound2-dev [linux-any],
- libjack-dev
+Build-Depends: autotools-dev,
+   debhelper (= 9),
+   dh-autoreconf,
+   libasound2-dev [linux-any],
+   libcdio-dev,
+   libgl1-mesa-dev | libgl-dev,
+   libjack-dev,
+   liblzo2-dev,
+   libsamplerate0-dev,
+   libsdl-net1.2-dev,
+   libsdl1.2-dev,
+   libsndfile1-dev | libsndfile-dev,
+   libvorbisidec-dev,
+   x11proto-core-dev,
+   zlib1g-dev | libz-dev
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.3
 Homepage: http://mednafen.sourceforge.net
@@ -18,10 +27,11 @@ DM-Upload-Allowed: yes
 
 Package: mednafen
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: nes-emulator
+Built-Using: ${bu:liblzo2}
 Description: multi-platform emulator, including NES, GB/A, Lynx, PC Engine
- Mednafen is a command-line driven emulator for many different systems. It 
+ Mednafen is a command-line driven emulator for many different systems. It
  has full support for OpenGL and SDL graphics, network play, remappable input
  configuration, joystick and keyboard support, save states, game rewinding,
  GSF playback, and screenshots.
diff --git a/debian/copyright b/debian/copyright
index b92a870..88f1e15 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,216 +1,440 @@
-This package was debianized by Ryan Schultz schultz.r...@gmail.com on
-Tue, 22 Nov 2005 22:48:43 -0500.
-
-It was downloaded from http://mednafen.sourceforge.net
-
-It was adopted on Thu, 04 Feb 2010 14:50:12 +0100 by Stephen Kitt
-st...@sk2.org on behalf of the Debian games team.
-
-Copyright Holders: 
-  Mednafen Team  sarenc...@hotmail.com
-  Firebug  High-level mapper information.
-  Andrea Mazzoleni  Scale2x/Scale3x scalers included in Mednafen.
-  Bero  Original

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine annotated tag, debian/0.8.D.3-4, created. debian/0.8.D.3-4

[Stephen Kitt]

The annotated tag, debian/0.8.D.3-4 has been created
at  17cadcdc355ac77179f8d972e02764e5877dd35d (tag)
   tagging  edbea4ab7ab4737b3bf1c4ef52433590b0c7596d (commit)
  replaces  debian/0.8.D.3-3
 tagged by  Stephen Kitt
on  Wed May 16 23:07:29 2012 +0200

- Shortlog 
Debian release 0.8.D.3-4

Stephen Kitt (2):
  Track stable releases only.
  Pull in relevant changes from the experimental package.

---

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13604 - in packages/trunk/xmoto/debian: . patches

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-23 05:48:53 + (Wed, 23 May 2012)
New Revision: 13604

Added:
   packages/trunk/xmoto/debian/patches/remove-glext.patch
Modified:
   packages/trunk/xmoto/debian/README.source
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/patches/series
Log:
Document the use of xmoto --unpack to access xmoto.bin, instead of repacking 
the original tarball with the full bin folder. Update README.source, dropping 
quilt info and adding glext.h and xmoto.bin instructions. Patch xm_OpenGL.h via 
a quilt patch rather than in the repacked tarball.

Modified: packages/trunk/xmoto/debian/README.source
===
--- packages/trunk/xmoto/debian/README.source   2012-05-22 18:16:13 UTC (rev 
13603)
+++ packages/trunk/xmoto/debian/README.source   2012-05-23 05:48:53 UTC (rev 
13604)
@@ -1,57 +1,18 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
+xmoto for Debian
+
 
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
+The upstream source includes glext.h in a non-redistributable version,
+so the provided upstream tarball is repacked without that file.
+Building xmoto without glext.h required the remove-glext.patch
+provided in debian/patches (and automatically applied to the Debian
+package).
 
-for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-export QUILT_PATCHES=debian/patches
-fi
-done
+The source includes an XML file, bin/xmoto.bin, which is built from a
+series of separate files. The original files can be extracted as
+follows:
+   cd bin
+   xmoto --unpack xmoto.bin .
+and repacked as follows:
+   xmoto --pack xmoto.bin .
 
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-quilt new patch
-
-where patch is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-quilt add file
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-quilt import -P patch /path/to/patch
-quilt push -a
-
-(add -p 0 to quilt import if needed). patch as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-quilt delete patch
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
+ -- Stephen Kitt st...@sk2.org, Wed, 23 May 2012 07:42:41 +0200

Modified: packages/trunk/xmoto/debian/changelog
===
--- packages/trunk/xmoto/debian/changelog   2012-05-22 18:16:13 UTC (rev 
13603)
+++ packages/trunk/xmoto/debian/changelog   2012-05-23 05:48:53 UTC (rev 
13604)
@@ -5,14 +5,13 @@
 + uses libxml2;
 + uses DejaVuSansMono (add link and make ttf-dejavu-core a dependency
   of xmoto-data).
-  * Repacked to avoid licensing problems:
-+ remove src/glext.h, licensed under SGI License B version 1.1;
-+ add the missing contents in bin (closes: #661340).
-(I'm hoping that both issues will be fixed upstream, so I haven't
-added a get-orig-source target to debian/rules. README.dfsg in the
-repacked source explains the changes.)
+  * Repacked to remove src/glext.h, licensed under SGI License B version
+1.1. (I'm hoping that this will be fixed upstream, so I haven't added
+a get-orig-source target to debian/rules.)
   * Update debian/watch accordingly.
   * Update patches:
++ remove-glext.patch: add (allows building without glext.h), forward
+  upstream;
 + fix_segfault.patch: refresh, add DEP-3 header, forward upstream;
 + desktop.patch: re-apply, add German translation (closes: #641822),
   forward upstream;
@@ -20,7 +19,11 @@
 + manpage.patch: forward upstream;
 + gcc44-ftbfs.patch: no longer used, delete.
   * Switch to dh 9 with simple rules.
-  * Use source format 3.0 (quilt).
+  * Use source format 3.0 (quilt), drop explanations from

r13605 - packages/trunk/xmoto/debian/patches

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-23 06:13:36 + (Wed, 23 May 2012)
New Revision: 13605

Modified:
   packages/trunk/xmoto/debian/patches/remove-glext.patch
Log:
Add patch header.

Modified: packages/trunk/xmoto/debian/patches/remove-glext.patch
===
--- packages/trunk/xmoto/debian/patches/remove-glext.patch  2012-05-23 
05:48:53 UTC (rev 13604)
+++ packages/trunk/xmoto/debian/patches/remove-glext.patch  2012-05-23 
06:13:36 UTC (rev 13605)
@@ -1,3 +1,7 @@
+Description: Allow building without upstream-supplied glext.h
+Author: Stephen Kitt st...@sk2.org
+Bug: http://todo.xmoto.tuxfamily.org/index.php?do=detailstask_id=803
+
 --- xmoto-0.5.9+dfsg.orig/src/include/xm_OpenGL.h
 +++ xmoto-0.5.9+dfsg/src/include/xm_OpenGL.h
 @@ -1,7 +1,6 @@


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13606 - packages/trunk/xmoto/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-23 06:19:20 + (Wed, 23 May 2012)
New Revision: 13606

Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/control
Log:
Allow DM uploads and release.

Modified: packages/trunk/xmoto/debian/changelog
===
--- packages/trunk/xmoto/debian/changelog   2012-05-23 06:13:36 UTC (rev 
13605)
+++ packages/trunk/xmoto/debian/changelog   2012-05-23 06:19:20 UTC (rev 
13606)
@@ -39,8 +39,9 @@
 (closes: #667422; thanks to Cyril Brulebois for his patch for another
 gcc-4.7-related issue, which was already included upstream).
   * Fix the Vcs-Browser URL.
+  * Allow DM uploads as requested by Michael Gilbert.
 
- -- Stephen Kitt st...@sk2.org  Mon, 23 Apr 2012 00:19:42 +0200
+ -- Stephen Kitt st...@sk2.org  Wed, 23 May 2012 08:18:30 +0200
 
 xmoto (0.5.5-1) unstable; urgency=low
 

Modified: packages/trunk/xmoto/debian/control
===
--- packages/trunk/xmoto/debian/control 2012-05-23 06:13:36 UTC (rev 13605)
+++ packages/trunk/xmoto/debian/control 2012-05-23 06:19:20 UTC (rev 13606)
@@ -6,6 +6,7 @@
Samuel Mimram smim...@debian.org,
Barry deFreese bdefre...@debian.org,
Stephen Kitt st...@sk2.org
+DM-Upload-Allowed: yes
 Build-Depends: autotools-dev,
debhelper (= 9),
dh-autoreconf,


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13611 - in packages/trunk/jstest-gtk/debian: . patches

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-25 04:46:12 + (Fri, 25 May 2012)
New Revision: 13611

Added:
   packages/trunk/jstest-gtk/debian/patches/gcc-4.7.patch
Modified:
   packages/trunk/jstest-gtk/debian/changelog
   packages/trunk/jstest-gtk/debian/patches/series
Log:
Acknowledge NMU.

Modified: packages/trunk/jstest-gtk/debian/changelog
===
--- packages/trunk/jstest-gtk/debian/changelog  2012-05-24 09:05:39 UTC (rev 
13610)
+++ packages/trunk/jstest-gtk/debian/changelog  2012-05-25 04:46:12 UTC (rev 
13611)
@@ -1,10 +1,19 @@
 jstest-gtk (0.1.1~git20090722-2) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Acknowledge NMU (thanks Gregor!).
   * Limit architectures to those using Linux kernels.
 
- -- Stephen Kitt st...@sk2.org  Sun, 10 Apr 2011 08:35:54 +0200
+ -- Stephen Kitt st...@sk2.org  Fri, 25 May 2012 06:42:17 +0200
 
+jstest-gtk (0.1.1~git20090722-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix ftbfs with GCC-4.7: add patch gcc-4.7.patch from Paul Tagliamonte
+(adds missing include).
+Closes: #667217
+
+ -- gregor herrmann gre...@debian.org  Sun, 22 Apr 2012 15:56:27 +0200
+
 jstest-gtk (0.1.1~git20090722-1) unstable; urgency=low
 
   * Initial release (Closes: #527962).

Added: packages/trunk/jstest-gtk/debian/patches/gcc-4.7.patch
===
--- packages/trunk/jstest-gtk/debian/patches/gcc-4.7.patch  
(rev 0)
+++ packages/trunk/jstest-gtk/debian/patches/gcc-4.7.patch  2012-05-25 
04:46:12 UTC (rev 13611)
@@ -0,0 +1,18 @@
+Description: add missing include to avoid FTBFS with gcc 4.7
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/667217
+Forwarded: no
+Author: Paul Tagliamonte t...@pault.ag
+Reviewed-by: gregor herrmann gre...@debian.org
+Last-Update: 2012-04-22
+
+--- a/src/joystick.cpp 2012-04-20 22:45:45.387631756 -0400
 b/src/joystick.cpp 2012-04-20 22:45:50.731631472 -0400
+@@ -29,6 +29,7 @@
+ #include fcntl.h
+ #include string.h
+ #include sstream
++#include unistd.h
+ #include linux/joystick.h
+ #include glibmm/main.h
+ #include glibmm/convert.h

Modified: packages/trunk/jstest-gtk/debian/patches/series
===
--- packages/trunk/jstest-gtk/debian/patches/series 2012-05-24 09:05:39 UTC 
(rev 13610)
+++ packages/trunk/jstest-gtk/debian/patches/series 2012-05-25 04:46:12 UTC 
(rev 13611)
@@ -2,3 +2,4 @@
 libraries.patch
 strict-dependencies.patch
 persistent-settings.patch
+gcc-4.7.patch


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13612 - packages/trunk/jstest-gtk/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-25 05:15:22 + (Fri, 25 May 2012)
New Revision: 13612

Modified:
   packages/trunk/jstest-gtk/debian/changelog
   packages/trunk/jstest-gtk/debian/rules
Log:
Add build-arch/build-indep targets and clean up debian/rules.

Modified: packages/trunk/jstest-gtk/debian/changelog
===
--- packages/trunk/jstest-gtk/debian/changelog  2012-05-25 04:46:12 UTC (rev 
13611)
+++ packages/trunk/jstest-gtk/debian/changelog  2012-05-25 05:15:22 UTC (rev 
13612)
@@ -2,6 +2,8 @@
 
   * Acknowledge NMU (thanks Gregor!).
   * Limit architectures to those using Linux kernels.
+  * Add build-arch/build-indep targets and clean up debian/rules (in
+particular, avoid touching build-stamp from the binary target).
 
  -- Stephen Kitt st...@sk2.org  Fri, 25 May 2012 06:42:17 +0200
 

Modified: packages/trunk/jstest-gtk/debian/rules
===
--- packages/trunk/jstest-gtk/debian/rules  2012-05-25 04:46:12 UTC (rev 
13611)
+++ packages/trunk/jstest-gtk/debian/rules  2012-05-25 05:15:22 UTC (rev 
13612)
@@ -10,8 +10,10 @@
sed -e 's/:CFLAGS:/$(CFLAGS)/'  debian/options.cache  options.cache
touch $@
 
-build: build-stamp
-build-stamp: config
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp: config-stamp
dh_testdir
scons \
prefix=/usr \
@@ -49,22 +51,11 @@
dh_install
cp data/generic.png debian/jstest-gtk/usr/share/pixmaps/jstest-gtk.png
dh_installmenu
-#  dh_installdebconf
-#  dh_installlogrotate
-#  dh_installemacsen
-#  dh_installpam
-#  dh_installmime
-#  dh_python
-#  dh_installinit
-#  dh_installcron
-#  dh_installinfo
dh_installman debian/jstest-gtk.1
dh_link
dh_strip --dbg-package=jstest-gtk-dbg
dh_compress
dh_fixperms
-#  dh_perl
-#  dh_makeshlibs
[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo
dh_installdeb
dh_shlibdeps
@@ -73,4 +64,4 @@
dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: config build clean binary-indep binary-arch binary install 
+.PHONY: config build-indep build-arch build clean binary-indep binary-arch 
binary install 


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13614 - packages/tags/xmoto

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-26 10:33:41 + (Sat, 26 May 2012)
New Revision: 13614

Added:
   packages/tags/xmoto/0.5.9+dfsg-1/
Log:
[svn-buildpackage] Tagging xmoto 0.5.9+dfsg-1


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13615 - in packages/trunk/xmoto/debian: . patches

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-26 10:34:10 + (Sat, 26 May 2012)
New Revision: 13615

Added:
   packages/trunk/xmoto/debian/patches/sa_restorer-removal.patch
Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/patches/series
Log:
Remove reference to sa_restorer which is deprecated generally and not available 
on some architectures.

Modified: packages/trunk/xmoto/debian/changelog
===
--- packages/trunk/xmoto/debian/changelog   2012-05-26 10:33:41 UTC (rev 
13614)
+++ packages/trunk/xmoto/debian/changelog   2012-05-26 10:34:10 UTC (rev 
13615)
@@ -1,3 +1,10 @@
+xmoto (0.5.9+dfsg-2) unstable; urgency=low
+
+  * Remove reference to sa_restorer which is deprecated generally and
+not available on some architectures.
+
+ -- Stephen Kitt st...@sk2.org  Sat, 26 May 2012 11:55:37 +0200
+
 xmoto (0.5.9+dfsg-1) unstable; urgency=low
 
   * New upstream release (closes: #644234):

Added: packages/trunk/xmoto/debian/patches/sa_restorer-removal.patch
===
--- packages/trunk/xmoto/debian/patches/sa_restorer-removal.patch   
(rev 0)
+++ packages/trunk/xmoto/debian/patches/sa_restorer-removal.patch   
2012-05-26 10:34:10 UTC (rev 13615)
@@ -0,0 +1,16 @@
+Description: sa_restorer isn't defined in POSIX and is being removed
+Author: Stephen Kitt st...@sk2.org
+Bug: http://todo.xmoto.tuxfamily.org/index.php?do=detailstask_id=805
+
+--- xmoto-0.5.9+dfsg.orig/src/GameInit.cpp
 xmoto-0.5.9+dfsg/src/GameInit.cpp
+@@ -269,9 +269,6 @@
+ struct sigaction v_act;
+ 
+ v_act.sa_handler  = xmexit_term;
+-#if !defined(__APPLE__)  !defined(__FreeBSD__)
+-v_act.sa_restorer = NULL;
+-#endif
+ sigemptyset(v_act.sa_mask);
+ v_act.sa_flags = 0;
+ 

Modified: packages/trunk/xmoto/debian/patches/series
===
--- packages/trunk/xmoto/debian/patches/series  2012-05-26 10:33:41 UTC (rev 
13614)
+++ packages/trunk/xmoto/debian/patches/series  2012-05-26 10:34:10 UTC (rev 
13615)
@@ -4,3 +4,4 @@
 manpage.patch
 spelling.patch
 gcc-4.7-fixes.patch
+sa_restorer-removal.patch


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13619 - packages/trunk/jstest-gtk/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-27 16:21:28 + (Sun, 27 May 2012)
New Revision: 13619

Added:
   packages/trunk/jstest-gtk/debian/watch
Modified:
   packages/trunk/jstest-gtk/debian/changelog
Log:
Restore watch file.

Modified: packages/trunk/jstest-gtk/debian/changelog
===
--- packages/trunk/jstest-gtk/debian/changelog  2012-05-27 11:07:08 UTC (rev 
13618)
+++ packages/trunk/jstest-gtk/debian/changelog  2012-05-27 16:21:28 UTC (rev 
13619)
@@ -5,6 +5,7 @@
   * Add build-arch/build-indep targets and clean up debian/rules (in
 particular, avoid touching build-stamp from the binary target).
   * Correct Vcs-Browser URL.
+  * Restore watch file.
 
  -- Stephen Kitt st...@sk2.org  Fri, 25 May 2012 06:42:17 +0200
 

Added: packages/trunk/jstest-gtk/debian/watch
===
--- packages/trunk/jstest-gtk/debian/watch  (rev 0)
+++ packages/trunk/jstest-gtk/debian/watch  2012-05-27 16:21:28 UTC (rev 
13619)
@@ -0,0 +1,3 @@
+version=3
+
+http://pingus.seul.org/~grumbel/jstest-gtk/ jstest-gtk-(.*)\.tar\.bz2


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13623 - packages/trunk/jstest-gtk/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-27 17:03:27 + (Sun, 27 May 2012)
New Revision: 13623

Modified:
   packages/trunk/jstest-gtk/debian/changelog
   packages/trunk/jstest-gtk/debian/control
   packages/trunk/jstest-gtk/debian/rules
Log:
Drop build-dependency on quilt, and correct debian/rules appropriately.

Modified: packages/trunk/jstest-gtk/debian/changelog
===
--- packages/trunk/jstest-gtk/debian/changelog  2012-05-27 16:35:50 UTC (rev 
13622)
+++ packages/trunk/jstest-gtk/debian/changelog  2012-05-27 17:03:27 UTC (rev 
13623)
@@ -7,6 +7,8 @@
   * Correct Vcs-Browser URL.
   * Restore watch file.
   * Remove obsolete Encoding key from the desktop file.
+  * Drop build-dependency on quilt, and correct debian/rules
+appropriately.
 
  -- Stephen Kitt st...@sk2.org  Fri, 25 May 2012 06:42:17 +0200
 

Modified: packages/trunk/jstest-gtk/debian/control
===
--- packages/trunk/jstest-gtk/debian/control2012-05-27 16:35:50 UTC (rev 
13622)
+++ packages/trunk/jstest-gtk/debian/control2012-05-27 17:03:27 UTC (rev 
13623)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Stephen Kitt st...@sk2.org
-Build-Depends: debhelper (= 7), scons, dh-buildinfo, quilt,
+Build-Depends: debhelper (= 7), scons, dh-buildinfo,
  libgtkmm-2.4-dev, libsigc++-2.0-dev, libexpat1-dev, libx11-dev
 Standards-Version: 3.9.1
 Homepage: http://pingus.seul.org/~grumbel/jstest-gtk/

Modified: packages/trunk/jstest-gtk/debian/rules
===
--- packages/trunk/jstest-gtk/debian/rules  2012-05-27 16:35:50 UTC (rev 
13622)
+++ packages/trunk/jstest-gtk/debian/rules  2012-05-27 17:03:27 UTC (rev 
13623)
@@ -6,7 +6,6 @@
 config: config-stamp
 config-stamp: 
dh_testdir
-   [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
sed -e 's/:CFLAGS:/$(CFLAGS)/'  debian/options.cache  options.cache
touch $@
 
@@ -29,7 +28,6 @@
rm -f config.log options.cache
rm -f rm .sconsign.dblite
rm -rf .sconf_temp build
-   [ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make 
unpatch
dh_clean 
 
 install: build


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13624 - in packages/trunk/jstest-gtk/debian: . patches

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-27 18:04:40 + (Sun, 27 May 2012)
New Revision: 13624

Modified:
   packages/trunk/jstest-gtk/debian/changelog
   packages/trunk/jstest-gtk/debian/patches/datadir.patch
   packages/trunk/jstest-gtk/debian/patches/libraries.patch
   packages/trunk/jstest-gtk/debian/patches/persistent-settings.patch
   packages/trunk/jstest-gtk/debian/patches/series
   packages/trunk/jstest-gtk/debian/patches/strict-dependencies.patch
Log:
Add headers to all the patches.

Modified: packages/trunk/jstest-gtk/debian/changelog
===
--- packages/trunk/jstest-gtk/debian/changelog  2012-05-27 17:03:27 UTC (rev 
13623)
+++ packages/trunk/jstest-gtk/debian/changelog  2012-05-27 18:04:40 UTC (rev 
13624)
@@ -9,6 +9,7 @@
   * Remove obsolete Encoding key from the desktop file.
   * Drop build-dependency on quilt, and correct debian/rules
 appropriately.
+  * Add headers to all the patches.
 
  -- Stephen Kitt st...@sk2.org  Fri, 25 May 2012 06:42:17 +0200
 

Modified: packages/trunk/jstest-gtk/debian/patches/datadir.patch
===
--- packages/trunk/jstest-gtk/debian/patches/datadir.patch  2012-05-27 
17:03:27 UTC (rev 13623)
+++ packages/trunk/jstest-gtk/debian/patches/datadir.patch  2012-05-27 
18:04:40 UTC (rev 13624)
@@ -1,3 +1,7 @@
+Description: Specify full path for joystick icon
+Author: Miriam Ruiz mir...@debian.org
+Forwarded: no
+
 --- jstest-gtk-0.1.0.orig/src/joystick_list_widget.cpp
 +++ jstest-gtk-0.1.0/src/joystick_list_widget.cpp
 @@ -123,7 +123,7 @@

Modified: packages/trunk/jstest-gtk/debian/patches/libraries.patch
===
--- packages/trunk/jstest-gtk/debian/patches/libraries.patch2012-05-27 
17:03:27 UTC (rev 13623)
+++ packages/trunk/jstest-gtk/debian/patches/libraries.patch2012-05-27 
18:04:40 UTC (rev 13624)
@@ -1,3 +1,7 @@
+Description: Link with libx11
+Author: Miriam Ruiz mir...@debian.org
+Forwarded: no
+
 --- jstest-gtk-0.1.1~git20090722.orig/SConstruct
 +++ jstest-gtk-0.1.1~git20090722/SConstruct
 @@ -16,7 +16,7 @@

Modified: packages/trunk/jstest-gtk/debian/patches/persistent-settings.patch
===
--- packages/trunk/jstest-gtk/debian/patches/persistent-settings.patch  
2012-05-27 17:03:27 UTC (rev 13623)
+++ packages/trunk/jstest-gtk/debian/patches/persistent-settings.patch  
2012-05-27 18:04:40 UTC (rev 13624)
@@ -1,3 +1,7 @@
+Description: Explain how to store joystick settings permanently
+Author: Stephen Kitt st...@sk2.org
+Forwarded: no
+
 --- jstest-gtk-0.1.1~git20090722.orig/src/joystick_map_widget.cpp
 +++ jstest-gtk-0.1.1~git20090722/src/joystick_map_widget.cpp
 @@ -25,8 +25,9 @@

Modified: packages/trunk/jstest-gtk/debian/patches/series
===
--- packages/trunk/jstest-gtk/debian/patches/series 2012-05-27 17:03:27 UTC 
(rev 13623)
+++ packages/trunk/jstest-gtk/debian/patches/series 2012-05-27 18:04:40 UTC 
(rev 13624)
@@ -3,3 +3,4 @@
 strict-dependencies.patch
 persistent-settings.patch
 gcc-4.7.patch
+typos.patch

Modified: packages/trunk/jstest-gtk/debian/patches/strict-dependencies.patch
===
--- packages/trunk/jstest-gtk/debian/patches/strict-dependencies.patch  
2012-05-27 17:03:27 UTC (rev 13623)
+++ packages/trunk/jstest-gtk/debian/patches/strict-dependencies.patch  
2012-05-27 18:04:40 UTC (rev 13624)
@@ -1,3 +1,7 @@
+Description: Only link required libraries (--as-needed)
+Author: Miriam Ruiz mir...@debian.org
+Forwarded: no
+
 --- jstest-gtk-0.1.1~git20090722.orig/SConstruct
 +++ jstest-gtk-0.1.1~git20090722/SConstruct
 @@ -16,6 +16,7 @@


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13625 - packages/trunk/jstest-gtk/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-27 18:05:56 + (Sun, 27 May 2012)
New Revision: 13625

Modified:
   packages/trunk/jstest-gtk/debian/changelog
   packages/trunk/jstest-gtk/debian/docs
   packages/trunk/jstest-gtk/debian/rules
Log:
Ship NEWS as the upstream changelog.

Modified: packages/trunk/jstest-gtk/debian/changelog
===
--- packages/trunk/jstest-gtk/debian/changelog  2012-05-27 18:04:40 UTC (rev 
13624)
+++ packages/trunk/jstest-gtk/debian/changelog  2012-05-27 18:05:56 UTC (rev 
13625)
@@ -10,6 +10,7 @@
   * Drop build-dependency on quilt, and correct debian/rules
 appropriately.
   * Add headers to all the patches.
+  * Ship NEWS as the upstream changelog.
 
  -- Stephen Kitt st...@sk2.org  Fri, 25 May 2012 06:42:17 +0200
 

Modified: packages/trunk/jstest-gtk/debian/docs
===
--- packages/trunk/jstest-gtk/debian/docs   2012-05-27 18:04:40 UTC (rev 
13624)
+++ packages/trunk/jstest-gtk/debian/docs   2012-05-27 18:05:56 UTC (rev 
13625)
@@ -1,3 +1,2 @@
-NEWS
 README
 TODO

Modified: packages/trunk/jstest-gtk/debian/rules
===
--- packages/trunk/jstest-gtk/debian/rules  2012-05-27 18:04:40 UTC (rev 
13624)
+++ packages/trunk/jstest-gtk/debian/rules  2012-05-27 18:05:56 UTC (rev 
13625)
@@ -43,7 +43,7 @@
 binary-arch: install
dh_testdir
dh_testroot
-   dh_installchangelogs
+   dh_installchangelogs NEWS
dh_installdocs
dh_installexamples
dh_install


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13626 - packages/trunk/jstest-gtk/debian/patches

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-27 18:06:56 + (Sun, 27 May 2012)
New Revision: 13626

Modified:
   packages/trunk/jstest-gtk/debian/patches/typos.patch
Log:
Re-enable typos.patch to fix another typo.

Modified: packages/trunk/jstest-gtk/debian/patches/typos.patch
===
--- packages/trunk/jstest-gtk/debian/patches/typos.patch2012-05-27 
18:05:56 UTC (rev 13625)
+++ packages/trunk/jstest-gtk/debian/patches/typos.patch2012-05-27 
18:06:56 UTC (rev 13626)
@@ -1,11 +1,15 @@
 jstest-gtk-0.1.0.orig/src/joystick_list_widget.cpp
-+++ jstest-gtk-0.1.0/src/joystick_list_widget.cpp
-@@ -51,7 +51,7 @@
- DeviceListColumns* DeviceListColumns::instance_ = 0;
- 
+Description: Fix a typo
+Author: Stephen Kitt st...@sk2.org
+Forwarded: no
+
+--- jstest-gtk-0.1.1~git20090722.orig/src/joystick_list_widget.cpp
 jstest-gtk-0.1.1~git20090722/src/joystick_list_widget.cpp
+@@ -53,7 +53,7 @@
  JoystickListWidget::JoystickListWidget()
--  : Gtk::Dialog(Joystick Preferencs),
-+  : Gtk::Dialog(Joystick Preferences),
+   : Gtk::Dialog(Joystick Preferences),
  label(Below is a list of available joysticks on the system. Press 
Refresh to 
-   update the list, press Properties to get a seperate device dialog. 
The 
+-  update the list, press Properties to get a seperate device dialog. 
The 
++  update the list, press Properties to get a separate device dialog. 
The 
devices listed are only joystick devices, not evdev devices or SDL 

+   devices, you can view the other ones via the top tab.)
+ //frame(Device List),


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13627 - packages/trunk/jstest-gtk/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-27 18:07:15 + (Sun, 27 May 2012)
New Revision: 13627

Modified:
   packages/trunk/jstest-gtk/debian/changelog
Log:
Re-enable typos.patch to fix another typo.

Modified: packages/trunk/jstest-gtk/debian/changelog
===
--- packages/trunk/jstest-gtk/debian/changelog  2012-05-27 18:06:56 UTC (rev 
13626)
+++ packages/trunk/jstest-gtk/debian/changelog  2012-05-27 18:07:15 UTC (rev 
13627)
@@ -11,6 +11,7 @@
 appropriately.
   * Add headers to all the patches.
   * Ship NEWS as the upstream changelog.
+  * Re-enable typos.patch to fix another typo.
 
  -- Stephen Kitt st...@sk2.org  Fri, 25 May 2012 06:42:17 +0200
 


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13628 - packages/trunk/jstest-gtk/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-27 18:07:52 + (Sun, 27 May 2012)
New Revision: 13628

Modified:
   packages/trunk/jstest-gtk/debian/changelog
   packages/trunk/jstest-gtk/debian/copyright
Log:
Update copyright years and format URL.

Modified: packages/trunk/jstest-gtk/debian/changelog
===
--- packages/trunk/jstest-gtk/debian/changelog  2012-05-27 18:07:15 UTC (rev 
13627)
+++ packages/trunk/jstest-gtk/debian/changelog  2012-05-27 18:07:52 UTC (rev 
13628)
@@ -12,6 +12,7 @@
   * Add headers to all the patches.
   * Ship NEWS as the upstream changelog.
   * Re-enable typos.patch to fix another typo.
+  * Update copyright years and format URL.
 
  -- Stephen Kitt st...@sk2.org  Fri, 25 May 2012 06:42:17 +0200
 

Modified: packages/trunk/jstest-gtk/debian/copyright
===
--- packages/trunk/jstest-gtk/debian/copyright  2012-05-27 18:07:15 UTC (rev 
13627)
+++ packages/trunk/jstest-gtk/debian/copyright  2012-05-27 18:07:52 UTC (rev 
13628)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Ingo Ruhnke grum...@gmx.de
 Source: http://pingus.seul.org/~grumbel/jstest-gtk/
 Debianized-By: Miriam Ruiz little_m...@yahoo.es
@@ -8,13 +8,11 @@
 Copyright: 2009 Ingo Ruhnke grum...@gmx.de
 License: GPL-3+
 
-
 Files: debian/*
 Copyright: 2009-2011 Miriam Ruiz little_m...@yahoo.es
-   2011 Stephen Kitt st...@sk2.org
+   2011-2012 Stephen Kitt st...@sk2.org
 License: GPL-3+
 
-
 License: GPL-3+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13638 - in packages/trunk/jstest-gtk/debian: . patches

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-28 21:37:58 + (Mon, 28 May 2012)
New Revision: 13638

Modified:
   packages/trunk/jstest-gtk/debian/changelog
   packages/trunk/jstest-gtk/debian/patches/libraries.patch
Log:
Rework libraries.patch to use pkg-config for all libraries.

Modified: packages/trunk/jstest-gtk/debian/changelog
===
--- packages/trunk/jstest-gtk/debian/changelog  2012-05-28 19:38:20 UTC (rev 
13637)
+++ packages/trunk/jstest-gtk/debian/changelog  2012-05-28 21:37:58 UTC (rev 
13638)
@@ -13,6 +13,7 @@
   * Ship NEWS as the upstream changelog.
   * Re-enable typos.patch to fix another typo.
   * Update copyright years and format URL.
+  * Rework libraries.patch to use pkg-config for all libraries.
 
  -- Stephen Kitt st...@sk2.org  Fri, 25 May 2012 06:42:17 +0200
 

Modified: packages/trunk/jstest-gtk/debian/patches/libraries.patch
===
--- packages/trunk/jstest-gtk/debian/patches/libraries.patch2012-05-28 
19:38:20 UTC (rev 13637)
+++ packages/trunk/jstest-gtk/debian/patches/libraries.patch2012-05-28 
21:37:58 UTC (rev 13638)
@@ -1,15 +1,18 @@
-Description: Link with libx11
-Author: Miriam Ruiz mir...@debian.org
+Description: Link with libx11 and libexpat using pkg-config
+Author: Stephen Kitt st...@sk2.org
 Forwarded: no
 
 --- jstest-gtk-0.1.1~git20090722.orig/SConstruct
 +++ jstest-gtk-0.1.1~git20090722/SConstruct
-@@ -16,7 +16,7 @@
+@@ -15,9 +15,8 @@
+ ##  You should have received a copy of the GNU General Public License
  ##  along with this program.  If not, see http://www.gnu.org/licenses/.
  
- env = Environment(CXXFLAGS=[-g, -Wall, -Werror],
+-env = Environment(CXXFLAGS=[-g, -Wall, -Werror],
 -  LIBS=[expat])
-+  LIBS=[expat, X11])
- env.ParseConfig('pkg-config --cflags --libs gtkmm-2.4 sigc++-2.0')
+-env.ParseConfig('pkg-config --cflags --libs gtkmm-2.4 sigc++-2.0')
++env = Environment(CXXFLAGS=[-g, -Wall, -Werror])
++env.ParseConfig('pkg-config --cflags --libs gtkmm-2.4 sigc++-2.0 expat x11')
  env.Program('jstest-gtk', [
  'src/axis_widget.cpp',
+ 'src/button_widget.cpp',


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13640 - packages/trunk/jstest-gtk/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-05-28 21:49:35 + (Mon, 28 May 2012)
New Revision: 13640

Modified:
   packages/trunk/jstest-gtk/debian/changelog
   packages/trunk/jstest-gtk/debian/control
Log:
Standards-Version 3.9.3 and release.

Modified: packages/trunk/jstest-gtk/debian/changelog
===
--- packages/trunk/jstest-gtk/debian/changelog  2012-05-28 21:39:07 UTC (rev 
13639)
+++ packages/trunk/jstest-gtk/debian/changelog  2012-05-28 21:49:35 UTC (rev 
13640)
@@ -1,4 +1,4 @@
-jstest-gtk (0.1.1~git20090722-2) UNRELEASED; urgency=low
+jstest-gtk (0.1.1~git20090722-2) unstable; urgency=low
 
   * Acknowledge NMU (thanks Gregor!).
   * Limit architectures to those using Linux kernels.
@@ -15,8 +15,9 @@
   * Update copyright years and format URL.
   * Rework libraries.patch to use pkg-config for all libraries.
   * Rework flag management to allow hardened builds.
+  * Standards-Version 3.9.3, no further change required.
 
- -- Stephen Kitt st...@sk2.org  Fri, 25 May 2012 06:42:17 +0200
+ -- Stephen Kitt st...@sk2.org  Mon, 28 May 2012 23:49:12 +0200
 
 jstest-gtk (0.1.1~git20090722-1.1) unstable; urgency=low
 

Modified: packages/trunk/jstest-gtk/debian/control
===
--- packages/trunk/jstest-gtk/debian/control2012-05-28 21:39:07 UTC (rev 
13639)
+++ packages/trunk/jstest-gtk/debian/control2012-05-28 21:49:35 UTC (rev 
13640)
@@ -5,7 +5,7 @@
 Uploaders: Stephen Kitt st...@sk2.org
 Build-Depends: debhelper (= 7), scons, dh-buildinfo,
  libgtkmm-2.4-dev, libsigc++-2.0-dev, libexpat1-dev, libx11-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Homepage: http://pingus.seul.org/~grumbel/jstest-gtk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/jstest-gtk/
 Vcs-Browser: 
http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/jstest-gtk/


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.6.1-1-5-g0446588

[Stephen Kitt]

The following commit has been merged in the master branch:
commit aef0cfebbdee4a8188c0ebbc27a110b4adaa12ca
Merge: ffdf51e384fafa87d92df3d991aaebd53d60a990 
3cbab3edc5c9f9e73050531d48584b431eebee39
Author: Stephen Kitt st...@sk2.org
Date:   Fri Jun 1 20:47:55 2012 +0200

Merge tag 'upstream/3.7'

Upstream version 3.7

Conflicts:
debian/changelog


-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.6.1-1-5-g0446588

[Stephen Kitt]

The following commit has been merged in the master branch:
commit c7a79e304b4e053a43d61882d50a37cec672f3f5
Author: Stephen Kitt st...@sk2.org
Date:   Fri Jun 1 23:19:02 2012 +0200

New upstream version.

diff --git a/debian/changelog b/debian/changelog
index 7e8bd85..1cc354d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+stella (3.7-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Stephen Kitt st...@sk2.org  Fri, 01 Jun 2012 20:49:10 +0200
+
 stella (3.6.1-1) unstable; urgency=low
 
   * New upstream version.

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.6.1-1-5-g0446588

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 04465883cf2edf60264f251de4649e7f6f138cee
Author: Stephen Kitt st...@sk2.org
Date:   Sat Jun 2 07:54:04 2012 +0200

Switch to debhelper compatibility level 9.

diff --git a/debian/changelog b/debian/changelog
index 6549ef2..079fe8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ stella (3.7-1) unstable; urgency=low
   * Update description and documentation with new features in 3.7, notably
 Blargg TV filters (replacing the filters available in versions 3.4.1
 and earlier).
+  * Switch to debhelper compatibility level 9.
 
- -- Stephen Kitt st...@sk2.org  Fri, 01 Jun 2012 23:20:08 +0200
+ -- Stephen Kitt st...@sk2.org  Sat, 02 Jun 2012 07:33:16 +0200
 
 stella (3.6.1-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index ee97028..9a3cc25 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Stephen Kitt st...@sk2.org
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.3
 Build-Depends: autotools-dev,
-   debhelper (= 8.1.0~),
+   debhelper (= 9),
libpng-dev,
libsdl1.2-dev,
zlib1g-dev

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.6.1-1-5-g0446588

[Stephen Kitt]

The following commit has been merged in the master branch:
commit dbb2470129d0175b138a5565753478d69b60583c
Author: Stephen Kitt st...@sk2.org
Date:   Fri Jun 1 23:20:33 2012 +0200

Update documentation and description, and release.

diff --git a/debian/changelog b/debian/changelog
index 1cc354d..6549ef2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-stella (3.7-1) UNRELEASED; urgency=low
+stella (3.7-1) unstable; urgency=low
 
   * New upstream version.
+  * Update description and documentation with new features in 3.7, notably
+Blargg TV filters (replacing the filters available in versions 3.4.1
+and earlier).
 
- -- Stephen Kitt st...@sk2.org  Fri, 01 Jun 2012 20:49:10 +0200
+ -- Stephen Kitt st...@sk2.org  Fri, 01 Jun 2012 23:20:08 +0200
 
 stella (3.6.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 973cbd2..ee97028 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,9 @@ Description: Atari 2600 Emulator for SDL  the X Window System
 2600-daptor or 2600-daptor II;
   * support for real Atari 7800 controllers using the 2600-daptor II;
   * support for the speech portion of a real AtariVox device;
-  * support for Supercharger single-load and multi-load games.
+  * support for Supercharger single-load and multi-load games;
+  * emulation of CRT TV features, including texturing, colour bleed,
+RF noise and phosphor burn-off (requires OpenGL).
  .
  An extensive debugger is included, with the Distella disassembler.
  .
diff --git a/debian/stella.6 b/debian/stella.6
index 57ae067..13028b5 100644
--- a/debian/stella.6
+++ b/debian/stella.6
@@ -20,10 +20,9 @@ Use SDL software or OpenGL rendering mode.
 OpenGL mode only. Specify The OpenGL library to use (only use this if
 you know what you're doing).
 .TP
-.BR \-gl_filter   nearest | linear 
-OpenGL mode only. Use GL_NEAREST or GL_LINEAR filtering. GL_NEAREST
-results in a scaled, pixelated image, while GL_LINEAR introduces
-blurring.
+.BR \-gl_filter   1 | 0 
+OpenGL mode only. Use interpolation for the TIA image (results in
+blending/smoothing of the image).
 .TP
 .BR \-gl_aspectn  \fInumber\fP,  \-gl_aspectp  \fInumber\fP
 OpenGL mode only. Specify the amount (as a percentage) to scale the
@@ -32,8 +31,10 @@ use square pixels, you can reduce width until the pixels 
appear
 square. Allowable values are 80 - 120; I find 85 - 90 gives the most
 authentic look for NTSC, and 105 - 110 for PAL.
 .TP
-.BR \-gl_fsmax   1 | 0 
-OpenGL mode only. Strech TIA image while in fullscreen mode.
+.BR \-gl_fsscale   1 | 0 
+OpenGL mode only. Strech TIA image completely while in fullscreen
+mode (vs. an integral stretch which won't necessarily completely fill
+the screen).
 .TP
 .BR \-gl_vbo   1 | 0 
 OpenGL mode only. Use the Vertex Buffer Object extension, if
@@ -43,6 +44,69 @@ available. This is enabled by default.
 OpenGL mode only. Synchronize screen updates to the vertical blank
 period. This can result in smoother updates, and eliminate tearing.
 .TP
+.BR \-tv_filter   0 - 5 
+OpenGL mode only. Blargg TV effets:
+.IP 0
+disabled
+.IP 1
+composite
+.IP 2
+S-video
+.IP 3
+RGB
+.IP 4
+bad adjust
+.IP 5
+custom
+.TP
+.BR \-tv_scanlines   0 - 100 
+OpenGL mode only. Blargg TV effects scanline intensity, where 0 means
+completely off.
+.TP
+.BR \-tv_scaninter   1 | 0 
+OpenGL mode only. Blargg TV effects scanline interpolation, resulting
+in blending/smoothing of the scanlines.
+.TP
+.BR \-tv_contrast  \fIcontrast\fP
+OpenGL mode only. Blargg TV effects contrast (only available in custom
+mode, range \-1.0 to 1.0).
+.TP
+.BR \-tv_brightness  \fIbrightness\fP
+OpenGL mode only. Blargg TV effects brightness (only available in
+custom mode, range \-1.0 to 1.0).
+.TP
+.BR \-tv_hue  \fIhue\fP
+OpenGL mode only. Blargg TV effects hue (only available in custom
+mode, range \-1.0 to 1.0).
+.TP
+.BR \-tv_saturation  \fIsaturation\fP
+OpenGL mode only. Blargg TV effects saturation (only available in
+custom mode, range \-1.0 to 1.0).
+.TP
+.BR \-tv_gamma  \fIgamma\fP
+OpenGL mode only. Blargg TV effects gamma (only available in custom
+mode, range \-1.0 to 1.0).
+.TP
+.BR \-tv_sharpness  \fIsharpness\fP
+OpenGL mode only. Blargg TV effects sharpness (only available in
+custom mode, range \-1.0 to 1.0).
+.TP
+.BR \-tv_resolution  \fIresolution\fP
+OpenGL mode only. Blargg TV effects resolution (only available in
+custom mode, range \-1.0 to 1.0).
+.TP
+.BR \-tv_artifacts  \fIartifacts\fP
+OpenGL mode only. Blargg TV effects artifacts (only available in
+custom mode, range \-1.0 to 1.0).
+.TP
+.BR \-tv_fringing  \fIfringing\fP
+OpenGL mode only. Blargg TV effects fringing (only available in custom
+mode, range \-1.0 to 1.0).
+.TP
+.BR \-tv_bleed  \fIbleed\fP
+OpenGL mode only. Blargg TV effects bleed (only available in custom
+mode, range \-1.0 to 1.0).
+.TP
 .BR \-tia_filter  \fIfilter\fP
 Use the specified filter while in TIA/emulation mode. Currently, this
 can be \fBzoom\fP\fIZ\fP\fBx\fP, where

[SCM] Atari 2600 Emulator for SDL the X Window System branch, pristine-tar, updated. 974b9cf2fdf2443e48d84426c54c8ccb4f0db6ef

[Stephen Kitt]

The following commit has been merged in the pristine-tar branch:
commit 974b9cf2fdf2443e48d84426c54c8ccb4f0db6ef
Author: Stephen Kitt st...@sk2.org
Date:   Fri Jun 1 20:47:04 2012 +0200

pristine-tar data for stella_3.7.orig.tar.bz2

diff --git a/stella_3.7.orig.tar.bz2.delta b/stella_3.7.orig.tar.bz2.delta
new file mode 100644
index 000..4be5358
Binary files /dev/null and b/stella_3.7.orig.tar.bz2.delta differ
diff --git a/stella_3.7.orig.tar.bz2.id b/stella_3.7.orig.tar.bz2.id
new file mode 100644
index 000..5413851
--- /dev/null
+++ b/stella_3.7.orig.tar.bz2.id
@@ -0,0 +1 @@
+01bc111cf2a413ab308a6fbac60cc2d180cd4403

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, debian/3.7-1, created. debian/3.7-1

[Stephen Kitt]

The annotated tag, debian/3.7-1 has been created
at  b623fe2d2f94958829b5ca10d992b59397fbd241 (tag)
   tagging  04465883cf2edf60264f251de4649e7f6f138cee (commit)
  replaces  debian/3.6.1-1
 tagged by  Stephen Kitt
on  Sat Jun 2 08:11:49 2012 +0200

- Shortlog 
Debian release 3.7-1

Stephen Kitt (5):
  Imported Upstream version 3.7
  Merge tag 'upstream/3.7'
  New upstream version.
  Update documentation and description, and release.
  Switch to debhelper compatibility level 9.

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, upstream/3.7, created. upstream/3.7

[Stephen Kitt]

The annotated tag, upstream/3.7 has been created
at  5c7d3dfd4ecaf9a1891342ed5401ba6994018e1a (tag)
   tagging  3cbab3edc5c9f9e73050531d48584b431eebee39 (commit)
  replaces  upstream/3.6.1
 tagged by  Stephen Kitt
on  Fri Jun 1 20:47:04 2012 +0200

- Shortlog 
Upstream version 3.7

Stephen Kitt (1):
  Imported Upstream version 3.7

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, pristine-tar, updated. 29f8bf76d8a985edacedfd15ae441435011be1f9

[Stephen Kitt]

The following commit has been merged in the pristine-tar branch:
commit 29f8bf76d8a985edacedfd15ae441435011be1f9
Author: Stephen Kitt st...@sk2.org
Date:   Mon Jun 11 17:26:54 2012 +0200

pristine-tar data for stella_3.7.2.orig.tar.gz

diff --git a/stella_3.7.2.orig.tar.gz.delta b/stella_3.7.2.orig.tar.gz.delta
new file mode 100644
index 000..1f9f4d9
Binary files /dev/null and b/stella_3.7.2.orig.tar.gz.delta differ
diff --git a/stella_3.7.2.orig.tar.gz.id b/stella_3.7.2.orig.tar.gz.id
new file mode 100644
index 000..a4780d9
--- /dev/null
+++ b/stella_3.7.2.orig.tar.gz.id
@@ -0,0 +1 @@
+a0218c1d33ac41bd87a7797a9ab7fee8e51e6df8

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.7-1-4-g1e47b33

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 1e47b3303414397a353628988fcfac3d2277c792
Merge: 7ef4b77941ad85a2b167b8f39bd26d9ad7c32f60 
f6d25c4fbee8095cbbba0820f6c1a55a2485d08e
Author: Stephen Kitt st...@sk2.org
Date:   Mon Jun 11 17:28:41 2012 +0200

Merge tag 'upstream/3.7.2'

Upstream version 3.7.2

Conflicts:
debian/changelog

diff --combined debian/changelog
index b4ccd08,17544cc..01ca0ed
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,236 -1,237 +1,242 @@@
 -stella (3.7.2-1) stable; urgency=high
++stella (3.7.2-1) unstable; urgency=low
+ 
 -  * Version 3.7.2 release
++  * New upstream version.
+ 
 - -- Stephen Anthony steph...@users.sf.net  Sun, 10 Jun 2012 18:38:25 +0200
++ -- Stephen Kitt st...@sk2.org  Mon, 11 Jun 2012 17:28:16 +0200
+ 
 +stella (3.7.1-1) unstable; urgency=low
  
 -stella (3.7.1-1) stable; urgency=high
 +  * New upstream version.
  
 -  * Version 3.7.1 release
 + -- Stephen Kitt st...@sk2.org  Sat, 09 Jun 2012 11:33:23 +0200
  
 - -- Stephen Anthony steph...@users.sf.net  Fri, 8 Jun 2012 18:38:25 +0200
 +stella (3.7-1) unstable; urgency=low
  
 +  * New upstream version.
 +  * Update description and documentation with new features in 3.7, notably
 +Blargg TV filters (replacing the filters available in versions 3.4.1
 +and earlier).
 +  * Switch to debhelper compatibility level 9.
  
 -stella (3.7-1) stable; urgency=high
 + -- Stephen Kitt st...@sk2.org  Sat, 02 Jun 2012 07:33:16 +0200
  
 -  * Version 3.7 release
 +stella (3.6.1-1) unstable; urgency=low
  
 - -- Stephen Anthony steph...@users.sf.net  Fri, 1 Jun 2012 18:38:25 +0200
 +  * New upstream version.
  
 + -- Stephen Kitt st...@sk2.org  Sat, 31 Mar 2012 10:32:40 +0200
  
 -stella (3.6.1-1) stable; urgency=high
 +stella (3.6-1) unstable; urgency=low
  
 -  * Version 3.6.1 release
 +  * New upstream version.
 +  * Update documentation with new features in 3.6, notably CompuMate
 +emulation and 2600-daptor II support.
 +  * Drop libpng12-dev build-dependency entirely (in favour of
 +libpng-dev).
  
 - -- Stephen Anthony steph...@users.sf.net  Fri, 30 Mar 2012 18:38:25 +0200
 + -- Stephen Kitt st...@sk2.org  Sat, 17 Mar 2012 23:23:45 +0100
  
 +stella (3.5.5-3) unstable; urgency=low
  
 -stella (3.6-1) stable; urgency=high
 +  * Allow building with libpng-dev (closes: #662511); stella is known to
 +build with libpng 1.5 so this shouldn't cause trouble when libpng-
 +dev switches to 1.5.
 +  * Standards-Version 3.9.3, no change required.
  
 -  * Version 3.6 release
 + -- Stephen Kitt st...@sk2.org  Tue, 06 Mar 2012 00:08:53 +0100
  
 - -- Stephen Anthony steph...@users.sf.net  Fri, 16 Mar 2012 18:38:25 +0200
 +stella (3.5.5-2) unstable; urgency=low
  
 +  * Use maintscript support in dh_installdeb rather than writing out
 +dpkg-maintscript-helper commands by hand. We now simply Pre-Depend
 +on a new enough version of dpkg rather than using 'dpkg-maintscript-
 +helper supports' guards, leading to more predictable behaviour on
 +upgrades. Thanks to Colin Watson for the patch (closes: #659792).
 +  * Update documentation with last-minute fix from upstream.
  
 -stella (3.5.5-1) stable; urgency=high
 + -- Stephen Kitt st...@sk2.org  Sun, 19 Feb 2012 00:39:23 +0100
  
 -  * Version 3.5.5 release
 +stella (3.5.5-1) unstable; urgency=low
  
 - -- Stephen Anthony steph...@users.sf.net  Sat, 4 Feb 2012 18:38:25 +0200
 +  * New upstream version.
 +  * Rewrite debian/copyright, using DEP-5 and updating for 2012.
 +  * Update manpage.
  
 + -- Stephen Kitt st...@sk2.org  Sun, 05 Feb 2012 08:09:05 +0100
  
 -stella (3.5-1) stable; urgency=high
 +stella (3.5-1) unstable; urgency=low
  
 -  * Version 3.5 release
 +  * New upstream version.
 +  * Drop all patches, merged upstream.
 +  * Update description and manpage (notably, OpenGL-based TV effects are
 +no longer supported).
  
 - -- Stephen Anthony steph...@users.sf.net  Thu, 29 Dec 2011 18:38:25 +0200
 + -- Stephen Kitt st...@sk2.org  Thu, 29 Dec 2011 23:56:39 +0100
  
 +stella (3.4.1-2) unstable; urgency=low
  
 -stella (3.4.1-1) stable; urgency=high
 +  * Make Stella available in the Open With Other Applications... menu
 +in Gnome (and presumably similar entries in other desktop
 +environments; LP: #880114).
 +  * Build with gcc 4.6.1 (which identifies itself as gcc 4.6).
  
 -  * Version 3.4.1 release
 + -- Stephen Kitt st...@sk2.org  Wed, 26 Oct 2011 23:04:32 +0200
  
 - -- Stephen Anthony steph...@users.sf.net  Sat, 11 June 2011 18:38:25 +0200
 +stella (3.4.1-1) unstable; urgency=low
  
 +  * New upstream version.
 +  * Update manpage with new features in 3.4.1.
  
 -stella (3.4-1) stable; urgency=high
 + -- Stephen Kitt st...@sk2.org  Wed, 15 Jun 2011 23:48:31 +0200
  
 -  * Version 3.4 release
 +stella (3.4-1) unstable; urgency=low
  
 - -- Stephen Anthony steph...@users.sf.net  Sun, 29 May 2011 18:38:25 +0200
 +  * New upstream version.
 +  * Update package description

[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.7-1-4-g1e47b33

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 7ef4b77941ad85a2b167b8f39bd26d9ad7c32f60
Merge: 04465883cf2edf60264f251de4649e7f6f138cee 
2c61453bb18c7f9fc51d7f43a1d8ebdb3b310b7a
Author: Stephen Kitt st...@sk2.org
Date:   Sat Jun 9 11:33:40 2012 +0200

Merge tag 'upstream/3.7.1'

Upstream version 3.7.1

Conflicts:
debian/changelog

diff --combined debian/changelog
index 079fe8b,923e52b..b4ccd08
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,230 -1,230 +1,236 @@@
 -stella (3.7.1-1) stable; urgency=high
++stella (3.7.1-1) unstable; urgency=low
+ 
 -  * Version 3.7.1 release
++  * New upstream version.
+ 
 - -- Stephen Anthony steph...@users.sf.net  Fri, 8 Jun 2012 18:38:25 +0200
++ -- Stephen Kitt st...@sk2.org  Sat, 09 Jun 2012 11:33:23 +0200
+ 
 +stella (3.7-1) unstable; urgency=low
  
 -stella (3.7-1) stable; urgency=high
 +  * New upstream version.
 +  * Update description and documentation with new features in 3.7, notably
 +Blargg TV filters (replacing the filters available in versions 3.4.1
 +and earlier).
 +  * Switch to debhelper compatibility level 9.
  
 -  * Version 3.7 release
 + -- Stephen Kitt st...@sk2.org  Sat, 02 Jun 2012 07:33:16 +0200
  
 - -- Stephen Anthony steph...@users.sf.net  Fri, 1 Jun 2012 18:38:25 +0200
 +stella (3.6.1-1) unstable; urgency=low
  
 +  * New upstream version.
  
 -stella (3.6.1-1) stable; urgency=high
 + -- Stephen Kitt st...@sk2.org  Sat, 31 Mar 2012 10:32:40 +0200
  
 -  * Version 3.6.1 release
 +stella (3.6-1) unstable; urgency=low
  
 - -- Stephen Anthony steph...@users.sf.net  Fri, 30 Mar 2012 18:38:25 +0200
 +  * New upstream version.
 +  * Update documentation with new features in 3.6, notably CompuMate
 +emulation and 2600-daptor II support.
 +  * Drop libpng12-dev build-dependency entirely (in favour of
 +libpng-dev).
  
 + -- Stephen Kitt st...@sk2.org  Sat, 17 Mar 2012 23:23:45 +0100
  
 -stella (3.6-1) stable; urgency=high
 +stella (3.5.5-3) unstable; urgency=low
  
 -  * Version 3.6 release
 +  * Allow building with libpng-dev (closes: #662511); stella is known to
 +build with libpng 1.5 so this shouldn't cause trouble when libpng-
 +dev switches to 1.5.
 +  * Standards-Version 3.9.3, no change required.
  
 - -- Stephen Anthony steph...@users.sf.net  Fri, 16 Mar 2012 18:38:25 +0200
 + -- Stephen Kitt st...@sk2.org  Tue, 06 Mar 2012 00:08:53 +0100
  
 +stella (3.5.5-2) unstable; urgency=low
  
 -stella (3.5.5-1) stable; urgency=high
 +  * Use maintscript support in dh_installdeb rather than writing out
 +dpkg-maintscript-helper commands by hand. We now simply Pre-Depend
 +on a new enough version of dpkg rather than using 'dpkg-maintscript-
 +helper supports' guards, leading to more predictable behaviour on
 +upgrades. Thanks to Colin Watson for the patch (closes: #659792).
 +  * Update documentation with last-minute fix from upstream.
  
 -  * Version 3.5.5 release
 + -- Stephen Kitt st...@sk2.org  Sun, 19 Feb 2012 00:39:23 +0100
  
 - -- Stephen Anthony steph...@users.sf.net  Sat, 4 Feb 2012 18:38:25 +0200
 +stella (3.5.5-1) unstable; urgency=low
  
 +  * New upstream version.
 +  * Rewrite debian/copyright, using DEP-5 and updating for 2012.
 +  * Update manpage.
  
 -stella (3.5-1) stable; urgency=high
 + -- Stephen Kitt st...@sk2.org  Sun, 05 Feb 2012 08:09:05 +0100
  
 -  * Version 3.5 release
 +stella (3.5-1) unstable; urgency=low
  
 - -- Stephen Anthony steph...@users.sf.net  Thu, 29 Dec 2011 18:38:25 +0200
 +  * New upstream version.
 +  * Drop all patches, merged upstream.
 +  * Update description and manpage (notably, OpenGL-based TV effects are
 +no longer supported).
  
 + -- Stephen Kitt st...@sk2.org  Thu, 29 Dec 2011 23:56:39 +0100
  
 -stella (3.4.1-1) stable; urgency=high
 +stella (3.4.1-2) unstable; urgency=low
  
 -  * Version 3.4.1 release
 +  * Make Stella available in the Open With Other Applications... menu
 +in Gnome (and presumably similar entries in other desktop
 +environments; LP: #880114).
 +  * Build with gcc 4.6.1 (which identifies itself as gcc 4.6).
  
 - -- Stephen Anthony steph...@users.sf.net  Sat, 11 June 2011 18:38:25 +0200
 + -- Stephen Kitt st...@sk2.org  Wed, 26 Oct 2011 23:04:32 +0200
  
 +stella (3.4.1-1) unstable; urgency=low
  
 -stella (3.4-1) stable; urgency=high
 +  * New upstream version.
 +  * Update manpage with new features in 3.4.1.
  
 -  * Version 3.4 release
 + -- Stephen Kitt st...@sk2.org  Wed, 15 Jun 2011 23:48:31 +0200
  
 - -- Stephen Anthony steph...@users.sf.net  Sun, 29 May 2011 18:38:25 +0200
 +stella (3.4-1) unstable; urgency=low
  
 +  * New upstream version.
 +  * Update package description and manpage with new features in 3.4.
 +  * Standards-Version 3.9.2, no change required.
 +  * Drop all patches, merged upstream.
  
 -stella (3.3-1) stable; urgency=high
 + -- Stephen Kitt st...@sk2.org  Mon, 30 May 2011 07:02:40 +0200
  
 -  * Version 3.3 release
 +stella (3.3-2) unstable

[SCM] Atari 2600 Emulator for SDL the X Window System branch, pristine-tar, updated. 29f8bf76d8a985edacedfd15ae441435011be1f9

[Stephen Kitt]

The following commit has been merged in the pristine-tar branch:
commit 0f4015bb92bb1329d584298813da7e1384dc118a
Author: Stephen Kitt st...@sk2.org
Date:   Sat Jun 9 08:44:22 2012 +0200

pristine-tar data for stella_3.7.1.orig.tar.gz

diff --git a/stella_3.7.1.orig.tar.gz.delta b/stella_3.7.1.orig.tar.gz.delta
new file mode 100644
index 000..a831bac
Binary files /dev/null and b/stella_3.7.1.orig.tar.gz.delta differ
diff --git a/stella_3.7.1.orig.tar.gz.id b/stella_3.7.1.orig.tar.gz.id
new file mode 100644
index 000..beafd47
--- /dev/null
+++ b/stella_3.7.1.orig.tar.gz.id
@@ -0,0 +1 @@
+dffa3d4eb86efec4a20a598c61bf9cab1444b447

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, debian/3.7.2-1, created. debian/3.7.2-1

[Stephen Kitt]

The annotated tag, debian/3.7.2-1 has been created
at  eeaf9649168ffe3414c281972ee1e3dbc101fa5e (tag)
   tagging  1e47b3303414397a353628988fcfac3d2277c792 (commit)
  replaces  debian/3.7-1
 tagged by  Stephen Kitt
on  Tue Jun 12 06:41:42 2012 +0200

- Shortlog 
Debian release 3.7.2-1

Stephen Kitt (4):
  Imported Upstream version 3.7.1
  Merge tag 'upstream/3.7.1'
  Imported Upstream version 3.7.2
  Merge tag 'upstream/3.7.2'

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, upstream/3.7.2, created. upstream/3.7.2

[Stephen Kitt]

The annotated tag, upstream/3.7.2 has been created
at  a245c7a892179c430665f6f9f844a52dba79549e (tag)
   tagging  f6d25c4fbee8095cbbba0820f6c1a55a2485d08e (commit)
  replaces  upstream/3.7.1
 tagged by  Stephen Kitt
on  Mon Jun 11 17:26:54 2012 +0200

- Shortlog 
Upstream version 3.7.2

Stephen Kitt (1):
  Imported Upstream version 3.7.2

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, upstream/3.7.1, created. upstream/3.7.1

[Stephen Kitt]

The annotated tag, upstream/3.7.1 has been created
at  4690bdd24e3159861e2ed1e1202253bc30ba8fed (tag)
   tagging  2c61453bb18c7f9fc51d7f43a1d8ebdb3b310b7a (commit)
  replaces  upstream/3.7
 tagged by  Stephen Kitt
on  Sat Jun 9 08:44:22 2012 +0200

- Shortlog 
Upstream version 3.7.1

Stephen Kitt (1):
  Imported Upstream version 3.7.1

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] Atari 2600 Emulator for SDL the X Window System annotated tag, debian/3.7.1-1, created. debian/3.7.1-1

[Stephen Kitt]

The annotated tag, debian/3.7.1-1 has been created
at  4b1e6074d27a43e3776443b5319c93460d8831ca (tag)
   tagging  7ef4b77941ad85a2b167b8f39bd26d9ad7c32f60 (commit)
  replaces  debian/3.7-1
 tagged by  Stephen Kitt
on  Tue Jun 12 06:45:46 2012 +0200

- Shortlog 
Debian release 3.7.1-1

Stephen Kitt (2):
  Imported Upstream version 3.7.1
  Merge tag 'upstream/3.7.1'

---

-- 
Atari 2600 Emulator for SDL  the X Window System

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-4-4-gb21b66a

[Stephen Kitt]

The following commit has been merged in the master branch:
commit cb41ab5c7a9ab46440b5370db562dd80722234e5
Author: Stephen Kitt st...@sk2.org
Date:   Sun Jun 17 23:13:03 2012 +0200

Use ${source:Package} to avoid Built-Using mis-calculations with binNMUs 
(closes: #677867).

diff --git a/debian/changelog b/debian/changelog
index da31034..3a5c381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mednafen (0.8.D.3-5) UNRELEASED; urgency=low
+
+  * Use ${source:Package} with dpkg-query to retrieve only the package
+name in the Built-Using field (closes: #677867).
+
+ -- Stephen Kitt st...@sk2.org  Sun, 17 Jun 2012 19:57:18 +0200
+
 mednafen (0.8.D.3-4) unstable; urgency=low
 
   * Update debian/watch to track stable releases only.
diff --git a/debian/rules b/debian/rules
index ff70095..7fe720e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-liblzo2_source := $(shell dpkg-query -W -f='$${Source} (= $${source:Version})' 
liblzo2-dev)
+liblzo2_source := $(shell dpkg-query -W -f='$${source:Package} (= 
$${source:Version})' liblzo2-dev)
 
 
 %:

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-4-4-gb21b66a

[Stephen Kitt]

The following commit has been merged in the master branch:
commit cb6b757a25a99444ebf0a7dc542430e873f5bbe7
Author: Stephen Kitt st...@sk2.org
Date:   Sun Jun 17 23:13:33 2012 +0200

Drop unused GPL-2 license paragraph.

diff --git a/debian/changelog b/debian/changelog
index 3a5c381..2420bc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mednafen (0.8.D.3-5) UNRELEASED; urgency=low
 
   * Use ${source:Package} with dpkg-query to retrieve only the package
 name in the Built-Using field (closes: #677867).
+  * Drop unused GPL-2 license paragraph from debian/copyright.
 
  -- Stephen Kitt st...@sk2.org  Sun, 17 Jun 2012 19:57:18 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 88f1e15..01dcea7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -338,23 +338,6 @@ Comment: DSP Utils
 Copyright: 2000-2002 Fabrice Bellard
 License: LGPL-2+
 
-License: GPL-2
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in /usr/share/common-licenses/GPL-2
-
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-4-4-gb21b66a

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 72d9942dbb583cce78481fdc4675c1d97ff3cb41
Author: Stephen Kitt st...@sk2.org
Date:   Mon Jun 18 01:01:03 2012 +0200

Fix configure.ac to ensure dpkg-buildflags' CPPFLAGS make it all the way 
through the build.

diff --git a/debian/changelog b/debian/changelog
index 2420bc9..6cf65fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mednafen (0.8.D.3-5) UNRELEASED; urgency=low
   * Use ${source:Package} with dpkg-query to retrieve only the package
 name in the Built-Using field (closes: #677867).
   * Drop unused GPL-2 license paragraph from debian/copyright.
+  * Fix configure.ac to ensure dpkg-buildflags' CPPFLAGS make it all the
+way through the build.
 
  -- Stephen Kitt st...@sk2.org  Sun, 17 Jun 2012 19:57:18 +0200
 
diff --git a/debian/patches/hardening-fixes.patch 
b/debian/patches/hardening-fixes.patch
index cb0aa65..9fd4257 100644
--- a/debian/patches/hardening-fixes.patch
+++ b/debian/patches/hardening-fixes.patch
@@ -28,3 +28,32 @@ Author: Stephen Kitt st...@sk2.org
  
if(subcon_tb != subcon_wc)
{
+--- mednafen.orig/configure.ac
 mednafen/configure.ac
+@@ -58,7 +58,7 @@
+ else
+  AC_PATH_X
+  CFLAGS=-I${x_includes} ${CFLAGS}
+- CPPFLAGS=-I${x_includes} ${CFLAGS}
++ CPPFLAGS=-I${x_includes} ${CPPFLAGS}
+ 
+  AC_CHECK_HEADER([GL/gl.h],HAVE_GL_GL_H=true, HAVE_GL_GL_H=false)
+ 
+@@ -359,7 +359,7 @@
+ CFLAGS_SDLNET_BACK=$CFLAGS
+ CPPFLAGS_SDLNET_BACK=$CPPFLAGS
+ CFLAGS=$CFLAGS $SDL_CFLAGS
+-CPPFLAGS=$CFLAGS $SDL_CFLAGS
++CPPFLAGS=$CPPFLAGS $SDL_CFLAGS
+ AC_CHECK_HEADER([SDL_net.h],[], [HAS_SDL_NET=no])
+ if test x$HAS_SDL_NET = xno; then
+ AC_MSG_ERROR([*** SDL_net not found!])
+@@ -393,7 +393,7 @@
+ AX_CFLAGS_GCC_OPTION([-maltivec], ALTIVEC_FLAGS)
+ if test x$ALTIVEC_FLAGS != x; then
+ CFLAGS=$CFLAGS $ALTIVEC_FLAGS
+-CPPFLAGS=$CFLAGS $ALTIVEC_FLAGS
++CPPFLAGS=$CPPFLAGS $ALTIVEC_FLAGS
+ AC_DEFINE([ARCH_POWERPC_ALTIVEC], [1], [Define if we 
are compiling with AltiVec usage.])
+ AM_CONDITIONAL(ARCH_POWERPC_ALTIVEC, true)
+ fi

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-4-4-gb21b66a

[Stephen Kitt]

The following commit has been merged in the master branch:
commit b21b66a19ed184afdd920414691a3544b1d16f89
Author: Stephen Kitt st...@sk2.org
Date:   Mon Jun 18 06:46:15 2012 +0200

Release.

diff --git a/debian/changelog b/debian/changelog
index 6cf65fe..ca12dc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mednafen (0.8.D.3-5) UNRELEASED; urgency=low
+mednafen (0.8.D.3-5) unstable; urgency=low
 
   * Use ${source:Package} with dpkg-query to retrieve only the package
 name in the Built-Using field (closes: #677867).
@@ -6,7 +6,7 @@ mednafen (0.8.D.3-5) UNRELEASED; urgency=low
   * Fix configure.ac to ensure dpkg-buildflags' CPPFLAGS make it all the
 way through the build.
 
- -- Stephen Kitt st...@sk2.org  Sun, 17 Jun 2012 19:57:18 +0200
+ -- Stephen Kitt st...@sk2.org  Mon, 18 Jun 2012 01:01:20 +0200
 
 mednafen (0.8.D.3-4) unstable; urgency=low
 

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.21-2-6-g08984bc

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 98fe0322e306f7b4972446f908a75b88ae67f70b
Merge: 57ac5e0903dfff4db592ede039f856d83eed4f1b 
a216c7a7b9d02c26486c66e700155f9bac903161
Author: Stephen Kitt st...@sk2.org
Date:   Wed May 30 06:40:07 2012 +0200

Merge tag 'upstream/0.9.22' into master-experimental

Upstream version 0.9.22


-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.21-2-6-g08984bc

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit f86395eb9d32fdfffc21a7bfc27187a8fe54459c
Author: Stephen Kitt st...@sk2.org
Date:   Wed May 30 07:42:34 2012 +0200

Note that this version breaks Genesis save games and release.

diff --git a/debian/changelog b/debian/changelog
index d052e52..c24c9b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mednafen (0.9.22-1) UNRELEASED; urgency=low
+mednafen (0.9.22-1) experimental; urgency=low
 
-  * New upstream WIP version.
+  * New upstream WIP version (breaks Genesis/Megadrive save games).
   * Drop hardening-fixes.patch and cdromif-memset-fix.patch, merged
 upstream.
 
- -- Stephen Kitt st...@sk2.org  Wed, 30 May 2012 06:47:49 +0200
+ -- Stephen Kitt st...@sk2.org  Wed, 30 May 2012 07:42:07 +0200
 
 mednafen (0.9.21-2) experimental; urgency=low
 

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.21-2-6-g08984bc

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 38be0ad5c83b8475ccabab218c6fd64fb6eeff8c
Author: Stephen Kitt st...@sk2.org
Date:   Wed May 30 06:51:16 2012 +0200

New upstream WIP version.

diff --git a/debian/changelog b/debian/changelog
index 128e7cb..d052e52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mednafen (0.9.22-1) UNRELEASED; urgency=low
+
+  * New upstream WIP version.
+  * Drop hardening-fixes.patch and cdromif-memset-fix.patch, merged
+upstream.
+
+ -- Stephen Kitt st...@sk2.org  Wed, 30 May 2012 06:47:49 +0200
+
 mednafen (0.9.21-2) experimental; urgency=low
 
   * Add a Built-Using relationship on the package MiniLZO was copied
diff --git a/debian/copyright b/debian/copyright
index afce242..f561e4a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -177,7 +177,8 @@ License: GPL-2+
 
 Files: src/hw_cpu/z80-fuse/*
 Comment: Fuse Z80 emulation code http://fuse-emulator.sourceforge.net/
-Copyright: 1999-2004 Philip Kendall, Witold Filipczyk
+Copyright: 1999-2005 Philip Kendall, Witold Filipczyk
+  1999-2011 Philip Kendall
 License: GPL-2+
 
 Files: src/ngp/*
@@ -301,7 +302,7 @@ Comment: Genesis Plus http://cgfm2.emuviews.com/
 Copyright: 1998-2003 Charles MacDonald
 License: GPL-2+
 
-Files: src/md/cart/map_eeprom.cpp
+Files: src/md/hvc.h src/md/cart/map_eeprom.cpp
 Comment: Genesis Plus GX
 Copyright: 2007-2009 EkeEke
 License: GPL-2+
diff --git a/debian/patches/cdromif-memset-fix.patch 
b/debian/patches/cdromif-memset-fix.patch
deleted file mode 100644
index 39b63f9..000
--- a/debian/patches/cdromif-memset-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject: Fix memset invocation
-Author: Stephen Kitt st...@sk2.org
-Forwarded: yes, http://forum.fobby.net/index.php?t=msggoto=2458#msg_2458
-
-This memset call has its last two arguments swapped.
-
 mednafen.orig/src/cdrom/cdromif.cpp
-+++ mednafen/src/cdrom/cdromif.cpp
-@@ -344,7 +344,7 @@
- 
-  if(UnrecoverableError)
-  {
--  memset(buf, 2352 + 96, 0);
-+  memset(buf, 0, 2352 + 96);
-   return(false);
-  }
- 
diff --git a/debian/patches/hardening-fixes.patch 
b/debian/patches/hardening-fixes.patch
deleted file mode 100644
index 538defb..000
--- a/debian/patches/hardening-fixes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Always use format specifier when formatting a variable string
-Author: Stephen Kitt st...@sk2.org
-
 mednafen.orig/src/ngp/TLCS-900h/TLCS900h_disassemble.cpp
-+++ mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble.cpp
-@@ -209,7 +209,7 @@
- 
-   if (size == 0  first == 0xC7)
-   {
--  sprintf(str_r, extra);
-+  sprintf(str_r, %s, extra);
-   return;
-   }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 71fa0f7..a355c18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 use-system-tremor.patch
 use-system-mpcdec.patch
-hardening-fixes.patch
-cdromif-memset-fix.patch

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, pristine-tar, updated. 44f20b674cbe4619a8a07ccdc482e293d5a87383

[Stephen Kitt]

The following commit has been merged in the pristine-tar branch:
commit 44f20b674cbe4619a8a07ccdc482e293d5a87383
Author: Stephen Kitt st...@sk2.org
Date:   Wed May 30 06:40:06 2012 +0200

pristine-tar data for mednafen_0.9.22.orig.tar.bz2

diff --git a/mednafen_0.9.22.orig.tar.bz2.delta 
b/mednafen_0.9.22.orig.tar.bz2.delta
new file mode 100644
index 000..fc9589f
Binary files /dev/null and b/mednafen_0.9.22.orig.tar.bz2.delta differ
diff --git a/mednafen_0.9.22.orig.tar.bz2.id b/mednafen_0.9.22.orig.tar.bz2.id
new file mode 100644
index 000..8b60bf4
--- /dev/null
+++ b/mednafen_0.9.22.orig.tar.bz2.id
@@ -0,0 +1 @@
+b9b40ee3dab4d6b09f91490aebe923016e39d71b

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.21-2-6-g08984bc

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit b5ddbf7163c734a914349c46078083888a46aebe
Author: Stephen Kitt st...@sk2.org
Date:   Mon Jun 18 06:53:00 2012 +0200

Use ${source:Package} to avoid Built-Using mis-calculations with binNMUs 
(closes: #677867).

diff --git a/debian/changelog b/debian/changelog
index c24c9b0..489c354 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mednafen (0.9.22-2) UNRELEASED; urgency=low
+
+  * Use ${source:Package} with dpkg-query to retrieve only the package
+name in the Built-Using field (closes: #677867).
+
+ -- Stephen Kitt st...@sk2.org  Mon, 18 Jun 2012 06:52:11 +0200
+
 mednafen (0.9.22-1) experimental; urgency=low
 
   * New upstream WIP version (breaks Genesis/Megadrive save games).
diff --git a/debian/rules b/debian/rules
index a4e1b73..29045b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-liblzo2_source := $(shell dpkg-query -W -f='$${Source} (= $${source:Version})' 
liblzo2-dev)
+liblzo2_source := $(shell dpkg-query -W -f='$${source:Package} (= 
$${source:Version})' liblzo2-dev)
 
 
 %:

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.21-2-6-g08984bc

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 08984bce6cbd0a2356d571baef20529cea72f73d
Author: Stephen Kitt st...@sk2.org
Date:   Tue Jun 19 00:18:50 2012 +0200

Release.

diff --git a/debian/changelog b/debian/changelog
index 489c354..2d29350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mednafen (0.9.22-2) UNRELEASED; urgency=low
+mednafen (0.9.22-2) experimental; urgency=low
 
   * Use ${source:Package} with dpkg-query to retrieve only the package
 name in the Built-Using field (closes: #677867).

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine annotated tag, upstream/0.9.22, created. upstream/0.9.22

[Stephen Kitt]

The annotated tag, upstream/0.9.22 has been created
at  f9829120d2876aa4bdf2382cef13664bdc436dc1 (tag)
   tagging  a216c7a7b9d02c26486c66e700155f9bac903161 (commit)
  replaces  upstream/0.9.21
 tagged by  Stephen Kitt
on  Wed May 30 06:40:07 2012 +0200

- Shortlog 
Upstream version 0.9.22

Stephen Kitt (1):
  Imported Upstream version 0.9.22

---

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine annotated tag, debian/0.9.22-2, created. debian/0.9.22-2

[Stephen Kitt]

The annotated tag, debian/0.9.22-2 has been created
at  acb9c771cae9fd0e5736e753af4c9d74f6102ae5 (tag)
   tagging  08984bce6cbd0a2356d571baef20529cea72f73d (commit)
  replaces  debian/0.9.21-2
 tagged by  Stephen Kitt
on  Tue Jun 19 00:19:12 2012 +0200

- Shortlog 
Debian release 0.9.22-2

Stephen Kitt (6):
  Imported Upstream version 0.9.22
  Merge tag 'upstream/0.9.22' into master-experimental
  New upstream WIP version.
  Note that this version breaks Genesis save games and release.
  Use ${source:Package} to avoid Built-Using mis-calculations with binNMUs 
(closes: #677867).
  Release.

---

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine annotated tag, debian/0.9.22-1, created. debian/0.9.22-1

[Stephen Kitt]

The annotated tag, debian/0.9.22-1 has been created
at  081715686dae2c0691aca32e9736cf31b63c2cd9 (tag)
   tagging  f86395eb9d32fdfffc21a7bfc27187a8fe54459c (commit)
  replaces  debian/0.9.21-2
 tagged by  Stephen Kitt
on  Tue Jun 19 00:21:11 2012 +0200

- Shortlog 
Debian release 0.9.22-1

Stephen Kitt (4):
  Imported Upstream version 0.9.22
  Merge tag 'upstream/0.9.22' into master-experimental
  New upstream WIP version.
  Note that this version breaks Genesis save games and release.

---

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13737 - in packages/trunk/xmoto/debian: . patches

[Stephen Kitt]

Author: steve-guest
Date: 2012-06-27 05:56:06 + (Wed, 27 Jun 2012)
New Revision: 13737

Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/patches/sa_restorer-removal.patch
Log:
Use better sa_restorer patch provided by Pino Toscano.

Modified: packages/trunk/xmoto/debian/changelog
===
--- packages/trunk/xmoto/debian/changelog   2012-06-26 19:38:43 UTC (rev 
13736)
+++ packages/trunk/xmoto/debian/changelog   2012-06-27 05:56:06 UTC (rev 
13737)
@@ -1,3 +1,10 @@
+xmoto (0.5.9+dfsg-3) unstable; urgency=low
+
+  * Pino Toscano provided a better patch to remove the use of sa_restorer,
+thanks! (Closes: #674636.)
+
+ -- Stephen Kitt st...@sk2.org  Sat, 26 May 2012 20:31:17 +0200
+
 xmoto (0.5.9+dfsg-2) unstable; urgency=low
 
   * Remove reference to sa_restorer which is deprecated generally and

Modified: packages/trunk/xmoto/debian/patches/sa_restorer-removal.patch
===
--- packages/trunk/xmoto/debian/patches/sa_restorer-removal.patch   
2012-06-26 19:38:43 UTC (rev 13736)
+++ packages/trunk/xmoto/debian/patches/sa_restorer-removal.patch   
2012-06-27 05:56:06 UTC (rev 13737)
@@ -1,16 +1,20 @@
 Description: sa_restorer isn't defined in POSIX and is being removed
-Author: Stephen Kitt st...@sk2.org
-Bug: http://todo.xmoto.tuxfamily.org/index.php?do=detailstask_id=805
+Author: Pino Toscano p...@debian.org
+Bug: http://todo.xmoto.tuxfamily.org/index.php?do=detailstask_id=806
 
 --- xmoto-0.5.9+dfsg.orig/src/GameInit.cpp
 +++ xmoto-0.5.9+dfsg/src/GameInit.cpp
-@@ -269,9 +269,6 @@
+@@ -268,12 +268,9 @@ void GameApp::run_load(int nNumArgs, cha
+   if(v_xmArgs.isOptServerOnly()) {
  struct sigaction v_act;
  
++memset(v_act, 0, sizeof(struct sigaction));
  v_act.sa_handler  = xmexit_term;
 -#if !defined(__APPLE__)  !defined(__FreeBSD__)
 -v_act.sa_restorer = NULL;
 -#endif
  sigemptyset(v_act.sa_mask);
- v_act.sa_flags = 0;
+-v_act.sa_flags = 0;
  
+ if(sigaction(SIGTERM, v_act, NULL) != 0) {
+   LogWarning(sigaction failed);


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13740 - packages/trunk/xmoto/debian

[Stephen Kitt]

Author: steve-guest
Date: 2012-06-27 06:52:01 + (Wed, 27 Jun 2012)
New Revision: 13740

Modified:
   packages/trunk/xmoto/debian/
Log:
origUrl property set for xmoto 0.5.10+dfsg.


Property changes on: packages/trunk/xmoto/debian
___
Modified: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/xmoto_0.5.9+dfsg.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/xmoto_0.5.10+dfsg.orig.tar.bz2


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r13741 - in packages/tags/xmoto: . 0.5.10+dfsg-1

[Stephen Kitt]

Author: steve-guest
Date: 2012-06-27 07:03:38 + (Wed, 27 Jun 2012)
New Revision: 13741

Added:
   packages/tags/xmoto/0.5.10+dfsg-1/
   packages/tags/xmoto/0.5.10+dfsg-1/debian/
Removed:
   packages/tags/xmoto/0.5.10+dfsg-1/debian/
Log:
[svn-buildpackage] Tagging xmoto 0.5.10+dfsg-1


___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[SCM] logic game ported from ATARI XE/XL branch, master, updated. debian/0.62-1-2-gd98009e

[Stephen Kitt]

The following commit has been merged in the master branch:
commit dc90b5ae7a1b6e32e2f9a30f4a235e0b6b8a51bd
Author: Stephen Kitt st...@sk2.org
Date:   Tue Oct 27 07:09:40 2009 +0100

Mangle suffixes.

diff --git a/debian/changelog b/debian/changelog
index 24774ea..225865d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnurobbo (0.62+dfsg-1) unstable; urgency=low
+
+  * Update watch file to handle upstream's -source suffix and our
++dfsg suffix.
+
+ -- Stephen Kitt st...@sk2.org  Tue, 27 Oct 2009 07:08:11 +0100
+
 gnurobbo (0.62-1) unstable; urgency=low
 
   * New maintainer (Closes: #544913).
diff --git a/debian/watch b/debian/watch
index df49353..8ce0458 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
-http://sf.net/gnurobbo/gnurobbo-([0-9].*)\.tar\.(?:gz|bz2)
+opts=uversionmangle=s/-source$//,dversionmangle=s/.dfsg$// \
+  http://sf.net/gnurobbo/gnurobbo-([0-9].*)(?:-source|)\.tar\.(?:gz|bz2)
 

-- 
logic game ported from ATARI XE/XL

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] logic game ported from ATARI XE/XL branch, master, updated. debian/0.62-1-2-gd98009e

[Stephen Kitt]

The following commit has been merged in the master branch:
commit d98009ea7fe9b80f558b7174a33f010e956585ce
Author: Stephen Kitt st...@sk2.org
Date:   Tue Oct 27 07:11:52 2009 +0100

Add get-orig-source target.

diff --git a/debian/changelog b/debian/changelog
index 225865d..6a4cc28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 gnurobbo (0.62+dfsg-1) unstable; urgency=low
 
+  * Repackage upstream tarball to avoid shipping non-free files in the
+source package.
   * Update watch file to handle upstream's -source suffix and our
 +dfsg suffix.
+  * Add get-orig-source target to repackage the original tarball, removing
+non-free fonts (with their incorrect license files) and unnecessary
+binaries.
 
  -- Stephen Kitt st...@sk2.org  Tue, 27 Oct 2009 07:08:11 +0100
 
diff --git a/debian/rules b/debian/rules
index efa1c0a..311a719 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,4 +30,26 @@ binary-indep:
 binary:
dh binary
 
-.PHONY: build clean binary-indep binary-arch binary install 
+get-orig-source:
+   DEHS=$$(mktemp)  \
+   uscan --dehs --download --destdir . --package gnurobbo \
+ --upstream-version 0 --repack \
+ --force-download --watchfile $(dir $(_))/watch  $$DEHS  \
+   VERSION=$$(sed -n 
's/.*upstream-version\(.*\)\/upstream-version.*/\1/p' $$DEHS)  \
+   DESTDIR=$$PWD  \
+   SRC=$$PWD/gnurobbo_$$VERSION.orig.tar.gz  \
+   DEST=$$PWD/gnurobbo_$$VERSION+dfsg.orig.tar.gz  \
+   TMPDIR=$$(mktemp -d)  \
+   cd $$TMPDIR  \
+   tar xzf $$SRC  \
+   mv gnurobbo-$$VERSION gnurobbo-$$VERSION+dfsg  \
+   cd gnurobbo-$$VERSION+dfsg  \
+   rm -f data/skins/*/*.ttf data/skins/*/LICENSE-ttf gnurobbo  \
+   cd ..  \
+   rm -f $$DEST  \
+   tar czf $$DEST gnurobbo-$$VERSION+dfsg  \
+   cd $$DESTDIR  \
+   rm -rf $$TMPDIR  \
+   rm -f $$DEHS
+
+.PHONY: build clean binary-indep binary-arch binary install get-orig-source

-- 
logic game ported from ATARI XE/XL

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits