--- Begin Message ---
package: zsnes
version: 1.420-2.1
Severity: wishlist
On 28/12/2006, there was a big update to zsnes, followed by a smaller update
on 25/01/2007. I've packaged the newest version, in the hope of
getting it into Debian faster. I'm presenting my changes as a diff to
the debian directory, since there are no Debian-specific changes
outside of there.
diff -urN zsnes-1.420/debian/changelog zsnes-1.510/debian/changelog
--- zsnes-1.420/debian/changelog 2007-05-07 22:03:41.000000000 -0400
+++ zsnes-1.510/debian/changelog 2007-05-13 20:31:44.000000000 -0400
@@ -1,3 +1,14 @@
+zsnes (1.510-0.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * New upstream release.
+ * Upstream tarball recompressed to gz from bz2.
+ * build-depend on latest version of automake instead of 1.4
+ * Moved patch 02 into debian/rules clean, removed the rest, they have been
+ obsoleted by upstream
+
+ -- Simon Ruggier <[EMAIL PROTECTED]> Sun, 13 May 2007 20:31:34 -0400
+
zsnes (1.420-2.1) unstable; urgency=low
* NMU
diff -urN zsnes-1.420/debian/compat zsnes-1.510/debian/compat
--- zsnes-1.420/debian/compat 2007-05-07 22:03:41.000000000 -0400
+++ zsnes-1.510/debian/compat 2007-05-12 21:03:04.000000000 -0400
@@ -1 +1 @@
-4
+5
diff -urN zsnes-1.420/debian/control zsnes-1.510/debian/control
--- zsnes-1.420/debian/control 2007-05-07 22:03:41.000000000 -0400
+++ zsnes-1.510/debian/control 2007-05-13 20:29:13.000000000 -0400
@@ -2,8 +2,8 @@
Section: otherosfs
Priority: optional
Maintainer: Joshua Kwan <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4), nasm, libsdl1.2-dev (>= 1.2.2-3.1), zlib1g-dev, sharutils, xutils, libpng12-dev | libpng-dev, xlibmesa-gl-dev, autoconf, automake1.4, dpatch
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5), nasm, libsdl1.2-dev (>= 1.2.2-3.1), zlib1g-dev, sharutils, xutils, libpng12-dev | libpng-dev, xlibmesa-gl-dev, autoconf, automake, dpatch, libao-dev, libncurses5-dev | libncurses-dev
+Standards-Version: 3.7.2
Package: zsnes
Architecture: i386
diff -urN zsnes-1.420/debian/docs zsnes-1.510/debian/docs
--- zsnes-1.420/debian/docs 1969-12-31 19:00:00.000000000 -0500
+++ zsnes-1.510/debian/docs 2007-05-13 18:20:31.000000000 -0400
@@ -0,0 +1 @@
+docs/readme.htm
diff -urN zsnes-1.420/debian/overrides zsnes-1.510/debian/overrides
--- zsnes-1.420/debian/overrides 1969-12-31 19:00:00.000000000 -0500
+++ zsnes-1.510/debian/overrides 2007-05-13 20:59:30.000000000 -0400
@@ -0,0 +1,3 @@
+# override for html license file, omitting it would leave broken links in the
+# other documents
+extra-license-file usr/share/doc/zsnes/readme.htm/license.htm
diff -urN zsnes-1.420/debian/patches/00list zsnes-1.510/debian/patches/00list
--- zsnes-1.420/debian/patches/00list 2007-05-07 22:03:41.000000000 -0400
+++ zsnes-1.510/debian/patches/00list 1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-01_save_state_fix.dpatch
-02_clean_idempotent.dpatch
-03_2xsai.dpatch
-04_gui_cpu_usage.dpatch
diff -urN zsnes-1.420/debian/patches/01_save_state_fix.dpatch zsnes-1.510/debian/patches/01_save_state_fix.dpatch
--- zsnes-1.420/debian/patches/01_save_state_fix.dpatch 2007-05-07 22:03:41.000000000 -0400
+++ zsnes-1.510/debian/patches/01_save_state_fix.dpatch 1969-12-31 19:00:00.000000000 -0500
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_save_state_fix.dpatch by Joshua Kwan <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix for #164622, #199461
-
---- zsnes-1.420.orig/src/linux/zfilew.c
-+++ zsnes-1.420/src/linux/zfilew.c
-@@ -501,6 +501,7 @@
- }
-
- extern char fnamest, fnames;
-+extern int statefileloc;
-
- void GetFilename()
- {
-@@ -514,6 +515,9 @@
- strcpy(&fnamest, tmp);
- fnamest = size;
-
-+ /* statefileloc has been invalidated if anything was changed */
-+ statefileloc-=(tmp-&fnamest);
-+
- tmp = &fnames;
- *tmp = '/';
- while (*tmp!=0) tmp++;
diff -urN zsnes-1.420/debian/patches/02_clean_idempotent.dpatch zsnes-1.510/debian/patches/02_clean_idempotent.dpatch
--- zsnes-1.420/debian/patches/02_clean_idempotent.dpatch 2007-05-07 22:03:41.000000000 -0400
+++ zsnes-1.510/debian/patches/02_clean_idempotent.dpatch 1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_clean_idempotent.dpatch by Joshua Kwan <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove autogenerated files in distclean target.
-
---- zsnes-1.420.orig/src/Makefile.in
-+++ zsnes-1.420/src/Makefile.in
-@@ -224,6 +224,7 @@
-
- distclean:
- rm -f ${CHIPDIR}/*.o ${CPUDIR}/*.o ${VIDEODIR}/*.o ${GUIDIR}/*.o ${DOSDIR}/*.o ${WINDIR}/*.o ${ZIPDIR}/*.o ${EFFECTSDIR}/*.o ${JMADIR}/*.o *.o @ZSNESEXE@ Makefile config.cache config.log config.status config.h
-+ rm -rf aclocal.m4 configure autom4te.cache
-
-
-
diff -urN zsnes-1.420/debian/patches/03_2xsai.dpatch zsnes-1.510/debian/patches/03_2xsai.dpatch
--- zsnes-1.420/debian/patches/03_2xsai.dpatch 2007-05-07 22:03:41.000000000 -0400
+++ zsnes-1.510/debian/patches/03_2xsai.dpatch 1969-12-31 19:00:00.000000000 -0500
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_2xsai.dpatch by Joshua Kwan <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Some random 2xSai patch from long ago.
-
---- zsnes-1.420.orig/src/video/2xsaiw.inc
-+++ zsnes-1.420/src/video/2xsaiw.inc
-@@ -1291,7 +1291,7 @@
- jz Bits565
- end2:
- mov eax, 1
-- jmp end
-+ jmp end1
- Bits555:
- mov edx, 0x7BDE7BDE
- mov eax, colorMask
-@@ -1310,7 +1310,7 @@
- mov [eax], edx
- mov [eax+4], edx
- mov eax, 0
-- jmp end
-+ jmp end1
- Bits565:
- mov edx, 0xF7DEF7DE
- mov eax, colorMask
-@@ -1329,8 +1329,8 @@
- mov [eax], edx
- mov [eax+4], edx
- mov eax, 0
-- jmp end
--end:
-+ jmp end1
-+end1:
- pop edx
- mov esp, ebp
- pop ebp
diff -urN zsnes-1.420/debian/patches/04_gui_cpu_usage.dpatch zsnes-1.510/debian/patches/04_gui_cpu_usage.dpatch
--- zsnes-1.420/debian/patches/04_gui_cpu_usage.dpatch 2007-05-07 22:03:41.000000000 -0400
+++ zsnes-1.510/debian/patches/04_gui_cpu_usage.dpatch 1969-12-31 19:00:00.000000000 -0500
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_gui_cpu_usage.dpatch by Joshua Kwan <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
---- zsnes-1.420/src/linux/sdllink.c~ 2005-01-14 05:11:18.000000000 -0800
-+++ zsnes-1.420/src/linux/sdllink.c 2006-01-09 00:01:14.000000000 -0800
-@@ -117,7 +117,7 @@
- DWORD LastUsedPos = 0;
- DWORD CurMode = -1;
-
--extern BYTE GUIOn2;
-+extern BYTE GUIOn, GUIOn2;
- static BYTE IsActivated = 1;
-
- /* TIMER VARIABLES/MACROS */
-@@ -1043,6 +1043,9 @@
- CheckTimers();
- Main_Proc();
-
-+ /* 100% CPU fix (partial) */
-+ if (GUIOn || GUIOn2) { usleep(6000); }
-+
- /* Process sound */
-
- /* take care of the things we left behind last time */
diff -urN zsnes-1.420/debian/README.Debian zsnes-1.510/debian/README.Debian
--- zsnes-1.420/debian/README.Debian 2007-05-07 22:03:41.000000000 -0400
+++ zsnes-1.510/debian/README.Debian 2007-05-10 20:54:14.000000000 -0400
@@ -2,13 +2,7 @@
----------------
The zsnes package is not portable to non-i386 architectures because of
-the fact that most of it is writen in i386 assembly.
-
-The Debian tar file of zsnes' source is identical to the upstream
-source except that a few object files in src/obj were removed. These
-files do not have surviving source code, but are not used in the Linux
-build and have been removed to avoid debate as to whether they are free
-software.
+the fact that most of it is written in i386 assembly.
zsnes itself is available under the GNU GPL. However, almost all of the
"ROMs" that it is designed to run are distributed under stricter licenses,
diff -urN zsnes-1.420/debian/rules zsnes-1.510/debian/rules
--- zsnes-1.420/debian/rules 2007-05-07 22:03:41.000000000 -0400
+++ zsnes-1.510/debian/rules 2007-05-13 21:31:49.000000000 -0400
@@ -9,7 +9,7 @@
build-stamp:
dh_testdir
- cd src && (./autogen.sh --with-opengl i486-pc-linux-gnu --x-includes=/usr/include --x-libraries=/usr/lib && $(MAKE))
+ cd src && (./autogen.sh --enable-opengl --enable-libao i486-pc-linux-gnu --x-includes=/usr/include --x-libraries=/usr/lib --enable-release --disable-cpucheck force_arch=i586 && $(MAKE))
touch build-stamp
@@ -19,6 +19,7 @@
rm -f build-stamp
-cd src && $(MAKE) distclean
+ cd src && rm -rf aclocal.m4 configure config.log autom4te.cache
dh_clean
@@ -34,10 +35,15 @@
# I want to install docs here because I want to change their names
install -D docs/README.LINUX debian/zsnes/usr/share/doc/zsnes/README.linux
install docs/authors.txt debian/zsnes/usr/share/doc/zsnes/AUTHORS
- install docs/readme.txt debian/zsnes/usr/share/doc/zsnes/README
+ install -d debian/zsnes/usr/share/doc/zsnes/README/
+ install docs/readme.txt/* debian/zsnes/usr/share/doc/zsnes/README/
+ rm debian/zsnes/usr/share/doc/zsnes/README/license.txt
install docs/srcinfo.txt debian/zsnes/usr/share/doc/zsnes/SRCINFO
install docs/todo.txt debian/zsnes/usr/share/doc/zsnes/TODO
+ install -d debian/zsnes/usr/share/lintian/overrides/
+ install -m 0644 debian/overrides debian/zsnes/usr/share/lintian/overrides/zsnes
+
mkdir -p debian/zsnes/usr/share/pixmaps
cp -f debian/zsnes.xpm debian/zsnes/usr/share/pixmaps/zsnes.xpm
--- End Message ---
