r3078 - packages/trunk/desmume/debian

Pascal Giard pascal at alioth.debian.org
Tue Jun 26 06:26:01 UTC 2007


Author: pascal
Date: 2007-06-26 06:26:01 +0000 (Tue, 26 Jun 2007)
New Revision: 3078

Modified:
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/control
   packages/trunk/desmume/debian/copyright
   packages/trunk/desmume/debian/desmume.1
   packages/trunk/desmume/debian/dirs
   packages/trunk/desmume/debian/docs
   packages/trunk/desmume/debian/rules
Log:
Merging with my packaging files.


Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2007-06-26 06:24:33 UTC (rev 3077)
+++ packages/trunk/desmume/debian/changelog	2007-06-26 06:26:01 UTC (rev 3078)
@@ -1,9 +1,17 @@
-desmume (0.6.0-1) UNRELEASED; urgency=low
+desmume (0.7.1-1) unstable; urgency=low
 
+  [ Pascal Giard ]
   * Upload to unstable
+  * [debian/README.Debian]: Clarified CVS build instructions.
+  * [debian/rules]:
+    Removed CFLAGS="-D_REENTRANT" as it was slowing things down considerably.
+  * [debian/docs]:
+    Removed empty files.
+	
+  [ Reinhard Tartler ]
   * Change maintainer to 'Debian Games Team'
 
- -- Reinhard Tartler <siretart at tauware.de>  Sat, 10 Feb 2007 22:59:06 +0100
+ -- Pascal Giard <pascal at debian.org>  Sat, 10 Feb 2007 22:59:06 +0100
 
 desmume (0.6.0-0ubuntu1) feisty; urgency=low
 

Modified: packages/trunk/desmume/debian/control
===================================================================
--- packages/trunk/desmume/debian/control	2007-06-26 06:24:33 UTC (rev 3077)
+++ packages/trunk/desmume/debian/control	2007-06-26 06:26:01 UTC (rev 3078)
@@ -2,14 +2,20 @@
 Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Reinhard Tartler <siretart at tauware.de>
-Build-Depends: debhelper (>= 5), libglade2-dev, libgtk2.0-dev, libsdl1.2-dev
+Uploaders: Reinhard Tartler <siretart at tauware.de>, Pascal Giard <pascal at debian.org>
+Build-Depends: debhelper (>= 5), libglade2-dev, libgtk2.0-dev, libsdl1.2-dev, libgtkglext1-dev
 Standards-Version: 3.7.2
 
 Package: desmume
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Nintendo DS emulator
- DeSmuME is a Nintendo DS emulator running homebrew demos and
- commercial games. 
+ DeSmuME is a Nintendo DS emulator running homebrew demos and commercial games.
+ .
+ This package includes all three binaries:
+   * desmume: gtk user interface;
+   * desmume-glade: gtk-glade user interface;
+   * desmume-cli: command line user interface.
+ .
+ Homepage: http://desmume.org
 

Modified: packages/trunk/desmume/debian/copyright
===================================================================
--- packages/trunk/desmume/debian/copyright	2007-06-26 06:24:33 UTC (rev 3077)
+++ packages/trunk/desmume/debian/copyright	2007-06-26 06:26:01 UTC (rev 3078)
@@ -1,68 +1,19 @@
-This package was debianized by Reinhard Tartler <siretart at tauware.de> on
-Sat, 10 Feb 2007 19:22:16 +0100.
+This is the Debian GNU/Linux packaged version of DeSmuME, a is a Nintendo DS emulator.
 
-It was downloaded from http://sourceforge.net/projects/desmume
+This package was put together by Reinhard Tartler <siretart at tauware.de> and 
+Pascal Giard <pascal at debian.org> with sources obtained from:
+	http://desmume.sf.net
 
-Upstream Author: 
+Copyright: GNU General Public Licence, Version 2
 
-Copyright (C) 2006 yopyop
-Copyright (C) 2006-2007 DeSmuME team
+    DeSmuME is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-Team members include (taken from AUTHORs file)
+On Debian systems, the complete text of the GNU General Public License
+can be found in the '/usr/share/common-licenses/GPL' file.
 
-Original author
----------------
-yopyop
+The original copyright owner was a French developer known as YopYop156 <yopyop156 at ifrance.com>.
+Current upstream development is being made by the DeSmuME team, see /usr/share/doc/desmume/AUTHORS.
 
-Current team
-------------
-Allustar
-amponzi
-ape
-delfare
-Guillaume Duhamel
-Normmatt
-Romain Vallet
-shash
-Theo Berkau
-thoduv
-Tim Seidel (Mighty Max)
-Damien Nozay (damdoum)
-Pascal Giard (evilynux)
-
-Contributors
-------------
-Anthony Molinaro
-
-Contact information:
-
-E-mail:	guillaume.duhamel at gmail.com
-Web:    http://desmume.sourceforge.net
-IRC:    irc://irc.freenode.net/desmume
-
-Please don't ask for roms, bios files or any other
-copyrighted stuff.
-
-
-License:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This package 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 package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2007, Reinhard Tartler <siretart at tauware.de> and
-is licensed under the GPL, see above.
-

Modified: packages/trunk/desmume/debian/desmume.1
===================================================================
--- packages/trunk/desmume/debian/desmume.1	2007-06-26 06:24:33 UTC (rev 3077)
+++ packages/trunk/desmume/debian/desmume.1	2007-06-26 06:26:01 UTC (rev 3078)
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH DESMUME SECTION "Februar 10, 2007"
+.TH DESMUME 1 "June 26, 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,30 +16,49 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-desmume \- Emulator for Nintendo DS ROMs
+desmume \- Nintendo DS emulator
 .SH SYNOPSIS
 .B desmume
 .RI [ options ] " files" ...
-.br
-.B bar
-.RI [ options ] " files" ...
 .SH DESCRIPTION
 This manual page documents briefly the
 .B desmume
-Programm
+program
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
-\fBdesmume\fP emulates software for the Nintendo DS. Please note that
-most software is proprietary, but there is also some homebrew software
-for the DS out there.
+\fBdesmume\fP is a Nintendo DS emulator running homebrew demos and commercial games.
 .SH OPTIONS
 These programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
 A summary of options is included below.
 For a complete description, see the Info files.
 .TP
+.B \-\-opengl-2d
+Enables using OpenGL for screen rendering
+.TP
+.B \-\-soft-convert
+Use software colour conversion during OpenGL screen rendering. May produce better or worse frame rates depending on hardware.
+.TP
+.B \-\-disable-3d
+Disables the 3D emulation
+.TP
+.B \-\-disable-sound
+Disables the sound emulation
+.TP
+.B \-\-disable-limiter
+Disables the 60 fps limiter
+.TP
+.B \-\-arm9gdb=PORT_NUM
+Enable the ARM9 GDB stub on the given port
+.TP
+.B \-\-arm7gdb=PORT_NUM
+Enable the ARM7 GDB stub on the given port
+.TP
+.B \-\-cflash=PATH_TO_DISK_IMAGE
+Enable disk image GBAMP compact flash emulation
+.TP
 .B \-h, \-\-help
 Show summary of options.
 .TP
@@ -52,5 +71,4 @@
 desmume was written by DeSmuME team
 (http://sourceforge.net/projects/desmume).
 .PP
-This manual page was written by Reinhard Tartler <siretart at tauware.de>,
-for the Debian project (but may be used by others).
+This manual page was written by Reinhard Tartler <siretart at tauware.de> and modified by Pascal Giard <pascal at debian.org>, for the Debian project (but may be used by others).

Modified: packages/trunk/desmume/debian/dirs
===================================================================
--- packages/trunk/desmume/debian/dirs	2007-06-26 06:24:33 UTC (rev 3077)
+++ packages/trunk/desmume/debian/dirs	2007-06-26 06:26:01 UTC (rev 3078)
@@ -1 +1,3 @@
 usr/games
+usr/share/pixmaps
+usr/share/applications

Modified: packages/trunk/desmume/debian/docs
===================================================================
--- packages/trunk/desmume/debian/docs	2007-06-26 06:24:33 UTC (rev 3077)
+++ packages/trunk/desmume/debian/docs	2007-06-26 06:26:01 UTC (rev 3078)
@@ -1,5 +1,2 @@
-NEWS
 README
 README.LIN
-README.WIN
-TODO

Modified: packages/trunk/desmume/debian/rules
===================================================================
--- packages/trunk/desmume/debian/rules	2007-06-26 06:24:33 UTC (rev 3077)
+++ packages/trunk/desmume/debian/rules	2007-06-26 06:26:01 UTC (rev 3078)
@@ -22,7 +22,7 @@
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --mandir=\$${prefix}/share/man \
-		--bindir=/usr/games \
+		--bindir=/usr/games --datadir=/usr/share/games \
 		CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 build: build-stamp
@@ -36,7 +36,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-	-$(MAKE) distclean
+	$(MAKE) distclean
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -52,8 +52,13 @@
 	dh_clean -k 
 	dh_installdirs
 	$(MAKE) DESTDIR=$(CURDIR)/debian/desmume install
+	mv debian/desmume/usr/share/games/pixmaps/DeSmuME.xpm \
+		debian/desmume/usr/share/pixmaps/
+	rm -rf debian/desmume/usr/share/games/pixmaps
+	mv debian/desmume/usr/share/games/applications/desmume*.desktop \
+                debian/desmume/usr/share/applications/
+	rm -rf debian/desmume/usr/share/games/applications
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -64,7 +69,8 @@
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_installman
+	dh_installman debian/desmume.1 debian/desmume-cli.1 debian/desmume-glade.1
+	dh_desktop
 	dh_link
 	dh_strip
 	dh_compress




More information about the Pkg-games-commits mailing list