Package: zsnes Version: 1.510-2.1 Severity: normal Tags: patch User: [EMAIL PROTECTED] Usertags: origin-ubuntu intrepid ubuntu-patch
In Ubuntu, we've applied the attached patch to achieve the following: * Add dh_desktop call to debian/rules. * Build amd64 package on Ubuntu * New .desktop file. * Fix some inaccuracies in debian/control file. We thought you might be interested in doing the same.
diff -u zsnes-1.510/debian/zsnes.desktop zsnes-1.510/debian/zsnes.desktop
--- zsnes-1.510/debian/zsnes.desktop
+++ zsnes-1.510/debian/zsnes.desktop
@@ -2,8 +2,9 @@
-Encoding=UTF-8
-Name=zsnes
-Comment=A Super Nintendo Entertainment System (TM) emulator
+Name=ZSNES Emulator
+Name[ru_RU]=Эмулятор ZSNES
+Comment=Play Super Nintendo (SNES) games
+Comment[ru_RU]=Запуск игр для Super Nintendo (SNES)
Exec=zsnes
-Icon=zsnes.xpm
+Icon=zsnes
Terminal=false
Type=Application
-Categories=Application;Game;2DGraphics;Emulator
+Categories=Game;Emulator;
diff -u zsnes-1.510/debian/rules zsnes-1.510/debian/rules
--- zsnes-1.510/debian/rules
+++ zsnes-1.510/debian/rules
@@ -2,6 +2,22 @@
# debian/rules for zsnes
# 2001-2005 Aaron Lehmann <[EMAIL PROTECTED]>
# 2006 Joshua Kwan <[EMAIL PROTECTED]>
+# 2007 William Pitcock <[EMAIL PROTECTED]>
+
+# XXX: ugly hack to avoid FTBFS on amd64 with ia32-libs binary.
+# XXX: bork bork bork! this at least allows it to build. this one is a bug in
ia32-libs tho.
+ifeq ($(DEB_HOST_ARCH),amd64)
+ CFLAGS = -m32
+ ifneq ($(shell test -e /usr/lib32/libSDL.so && echo ok),ok)
+ MAKE_LINKS = mkdir -p lib \
+ && ln -sf /usr/lib32/libao.so.2 lib/libao.so \
+ && ln -sf /usr/lib32/libSDL-1.2.so.0 lib/libSDL.so \
+ && ln -sf /usr/lib32/libGL.so.1 lib/libGL.so \
+ && ln -sf /usr/lib32/libpng12.so.0 lib/libpng.so
+ LDFLAGS = -L../lib -L/usr/lib32
+ endif
+endif
+
patch-stamp:
dpatch apply-all
@@ -15,7 +31,8 @@
build-stamp:
dh_testdir
- cd src && ./configure --enable-opengl --disable-cpucheck
--enable-release --disable-debugger --enable-libao force_arch=i486 && $(MAKE)
+ $(MAKE_LINKS)
+ cd src && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure
--enable-opengl --disable-cpucheck --enable-release --disable-debugger
--enable-libao force_arch=i486 && $(MAKE)
touch $@
@@ -75,6 +92,7 @@
dh_testroot
dh_installdocs
dh_installmenu
+ dh_desktop
dh_installman
dh_installchangelogs
dh_link
diff -u zsnes-1.510/debian/changelog zsnes-1.510/debian/changelog
--- zsnes-1.510/debian/changelog
+++ zsnes-1.510/debian/changelog
@@ -1,3 +1,13 @@
+zsnes (1.510-2.1ubuntu1) intrepid; urgency=low
+
+ * Merge from debian unstable, remaining changes (LP: #238671):
+ - Add dh_desktop call to debian/rules.
+ - Build amd64 package on Ubuntu
+ - New .desktop file.
+ - Fix some inaccuracies in debian/control file.
+
+ -- Nathan Handler <[EMAIL PROTECTED]> Thu, 19 Jun 2008 12:26:28 -0500
+
zsnes (1.510-2.1) unstable; urgency=high
* Non-maintainer upload.
@@ -5,6 +15,20 @@
-- Ian Beckwith <[EMAIL PROTECTED]> Thu, 10 Apr 2008 22:20:59 +0100
+zsnes (1.510-2ubuntu1) hardy; urgency=low
+
+ [ Siegfried-Angel Gevatter Pujals (RainCT) ]
+ * Add dh_desktop call to debian/rules.
+
+ [ Kirill Chunaev ]
+ * Build amd64 package on Ubuntu (thanks to William Pitcock).
+ * New .desktop file.
+ * Fix some inaccuracies in debian/control file.
+ * Change maintainership to Ubuntu MOTU team due to local changes,
+ and follow DebianMaintainer spec.
+
+ -- Kirill Chunaev <[EMAIL PROTECTED]> Wed, 13 Feb 2008 17:53:40 +0300
+
zsnes (1.510-2) unstable; urgency=low
* Acknowledge NMU, closes: #447366
@@ -142,0 +167 @@
+
diff -u zsnes-1.510/debian/control zsnes-1.510/debian/control
--- zsnes-1.510/debian/control
+++ zsnes-1.510/debian/control
@@ -5,14 +5,13 @@
-Build-Depends: debhelper (>= 4), nasm, libsdl1.2-dev (>= 1.2.2-3.1),
zlib1g-dev, sharutils, xutils, libpng12-dev | libpng-dev, xlibmesa-gl-dev,
dpatch, libao-dev
+Build-Depends: debhelper (>= 4), nasm, libsdl1.2-dev (>= 1.2.2-3.1),
zlib1g-dev, sharutils, xutils, libpng12-dev | libpng-dev, xlibmesa-gl-dev,
dpatch, libao-dev, ia32-libs [amd64], lib32z1-dev [amd64], lib32stdc++6
[amd64], gcc-multilib [amd64], g++-multilib [amd64]
Standards-Version: 3.7.3
Package: zsnes
-Architecture: i386
+Architecture: i386 amd64
Depends: ${shlibs:Depends}
-Description: Emulator of the Super Nintendo Entertainment System (TM)
- ZSNES allows you to play classic games written for the "SNES" game
- console on a GNU/Linux system. It supports advanced features such as
+Description: Emulator of the Super Nintendo Entertainment System
+ ZSNES allows you to play classic games written for the Super Nintendo (SNES)
+ game console on a GNU/Linux system. It supports advanced features such as
multiplayer gameplay over a TCP/IP network.
.
- Please note that many separately-available games playable under this
- emulator are non-free. See /usr/share/doc/zsnes/README.Debian for more
- information.
+ Please note that many separately-available games playable under this emulator
+ are non-free. See /usr/share/doc/zsnes/README.Debian for more information.
signature.asc
Description: This is a digitally signed message part
