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
