[SCM] packaging for the mame arcade game emulator branch, master, updated. 7986b88b4fe54a5500bfd4359c9ad74fa3bf93fe
The following commit has been merged in the master branch: commit 7986b88b4fe54a5500bfd4359c9ad74fa3bf93fe Author: Emmanuel Kasper emman...@libera.cc Date: Sat Feb 18 11:31:08 2012 +0100 Begin work on building with system libjpeg compile but does not link yet diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch new file mode 100644 index 000..eb9e3c1 --- /dev/null +++ b/debian/patches/build_with_system_libjpeg.patch @@ -0,0 +1,46 @@ +Description: WIP build with system libjpeg +compile but does link properly at the momment +Author: Emmanuel Kasper emman...@libera.cc +Forwarded: no|not-needed|url proving that it has been forwarded + +--- mame-0.145.orig/src/osd/osdcomm.h mame-0.145/src/osd/osdcomm.h +@@ -45,6 +45,7 @@ + + #include stdio.h + #include string.h ++#include inttypes.h + //#include stdlib.h + + +@@ -143,7 +144,9 @@ __extension__ typedef signed long long + + #endif + +- ++/* avoid typedef conflicts when building with system libjpeg */ ++#define INT32 int32_t ++#define INT64 int64_t + + /*** + FUNDAMENTAL CONSTANTS +--- mame-0.145.orig/src/mame/drivers/sliver.c mame-0.145/src/mame/drivers/sliver.c +@@ -62,12 +62,16 @@ Notes: + VSync- 60Hz + */ + ++ + #include emu.h + #include cpu/m68000/m68000.h + #include sound/okim6295.h + #include cpu/mcs51/mcs51.h + #include video/ramdac.h +-#include ../../lib/libjpeg/jpeglib.h ++#include X11/Xmd.h ++#include jpeglib.h ++ ++ + + + #define FIFO_SIZE 1024 -- packaging for the mame arcade game emulator ___ 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 Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-19-ga768338
The following commit has been merged in the master branch: commit a76833886931c493ecd3c399277af247551407d7 Author: Sylvain Beucler b...@beuc.net Date: Sat Feb 18 17:47:17 2012 + Status update on Alan license diff --git a/debian/copyright b/debian/copyright index ea92a5a..48487fc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -25,7 +25,13 @@ removed to create the -free tarball: Note: the license for the Alan and Hugo interpreters may change in the near future (as of 2009). Authors were contacted again in 2010: - http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812060c426caf#16a03dba1a255277 + http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812060c426caf#16a03dba1a255277 + The Alan3 3.0a9 (and upgoing) source code was made available under + the Artistic license 2.0 in 2010/2011: + Clearified licensing, read COPYING - COPYING being licenses/Artistic License 2.0.txt + http://groups.google.com/group/garglk-dev/browse_thread/thread/00f35c1cbc01f203 + http://www.alanif.se/index.php?option=com_contentview=articleid=137:changes-in-v30alpha9catid=29Itemid=16 + The Alan2 source code is not available as of 2012-02. - fonts/LuxiMonoBoldOblique.pfb, fonts/LuxiMonoBold.pfb, garglk/fonts/LuxiMonoOblique.pfb, @@ -90,7 +96,7 @@ Copyright: Copyright (C) 2002-2008 Simon Baldwin Copyright (C) 1995-1997 Stefan Jokisch Copyright (C) 2006 Mark Tilford -Copyrihgt (C) 2006 David Jones +Copyright (C) 2006 David Jones Copyright (C) 2003 Iain Merrick Copyright (C) 1998-2009 Andrew Plotkin Copyright (C) 1992-2008 Stuart Allen @@ -104,6 +110,7 @@ Copyright: Copyright (c) 1989-1992 Bistream Inc., Cambridge, MA Copyright: (C) 2007 Red Hat, Inc. Copyright: (C) 2003-2009 Philipp H. Poll philthel...@users.sourceforge.net +Copyright (C) 1985-2011 Thomas Nilsson (ALAN) License: -- Packaging for Gargoyle - graphical player for Interactive Fiction games ___ 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
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/ or
[SCM] Atari 2600 Emulator for SDL the X Window System branch, master, updated. debian/3.5.5-1-2-gf69e69f
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
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
