[mupen64plus] 156/262: Correct minor dep3 patch tagging format problems

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:59:29 UTC 2015


This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit 9a22ff4abcc466878dd7f1fab64c76acca891ff5
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sat Oct 17 22:51:17 2009 +0200

    Correct minor dep3 patch tagging format problems
---
 debian/changelog                            |  1 +
 debian/patches/as-needed.patch              |  2 +-
 debian/patches/correct_fpr32_mapping.patch  | 12 +++++++-----
 debian/patches/debian-archs.patch           | 17 ++++++++--------
 debian/patches/fix_readpng.patch            |  2 +-
 debian/patches/ftbfs-debugger.patch         |  7 +++----
 debian/patches/ftbfs-dynarec.patch          |  4 ++--
 debian/patches/ftbfs-glibc210.patch         |  9 ++++-----
 debian/patches/gtk-open-filter.patch        | 14 +++++++-------
 debian/patches/jttl_fix_romclosed.patch     |  6 +++---
 debian/patches/noexecstack.patch            |  5 +++--
 debian/patches/osd-pause-crash.patch        |  4 ++--
 debian/patches/rice-texturepack-crash.patch |  2 +-
 debian/patches/system-libbz2.patch          |  2 +-
 debian/patches/system-libpng.patch          |  2 +-
 debian/patches/system-zlib.patch            |  2 +-
 debian/patches/xdg-basedir.patch            | 30 ++++++++++++++---------------
 17 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ae2abe..37ff11d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mupen64plus (1.5+dfsg1-7) UNRELEASED; urgency=low
 
   * debian/patches:
+    - Correct minor dep3 patch tagging format problems
     - Update correct_fpr32_mapping.patch, prevent corruption of upper registers
       in a register pair due to sign extension
     - Add system-liblzma.patch, use liblzma from debian instead of buildin
diff --git a/debian/patches/as-needed.patch b/debian/patches/as-needed.patch
index 97db9f5..8f202c9 100644
--- a/debian/patches/as-needed.patch
+++ b/debian/patches/as-needed.patch
@@ -1,5 +1,5 @@
 Description: Allow compilation using -Wl,--as-needed
-Origin: backported, commit:1390
+Origin: backport, commit:1390
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=236
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
diff --git a/debian/patches/correct_fpr32_mapping.patch b/debian/patches/correct_fpr32_mapping.patch
index 8f9d872..ae3907a 100644
--- a/debian/patches/correct_fpr32_mapping.patch
+++ b/debian/patches/correct_fpr32_mapping.patch
@@ -3,17 +3,19 @@ Description: Correct mapping of floating point registers in MIPS I mode
  set reference state that these are separated but not distinct and a program
  maybe switch between both with 'mtc0 $x, status' we must be sure that they
  don't override each other on write access in a non-compliant way.
+ .
  This is implemented by doing operations in separate floating point register
- banks for 32 bit and 64 bit wide FGRs. After a switch both gets synced to
- match the behavior specified in the documentation. Inside the savestate only
- the 64 bit wide FGRs gets saved and before a save and after a load of a
- savestate a sync of both is forced.
+ banks for 32 bit and 64 bit wide FGRs. After a switch both gets synced to match
+ the behavior specified in the documentation. Inside the savestate only the 64
+ bit wide FGRs gets saved and before a save and after a load of a savestate a
+ sync of both is forced.
+ .
  More informations about these registers can be found in
  * Charles Brice, "MIPS IV Instruction Set" Rev. 3.2, September 1995 in
    "B.3 Floating-Point Registers".
  * Joe Heinrich, "MIPS R4000 Microprocessor User’s Manual", Second Edition in
    "6.3 FPU Programming Model" and "B.4 Computational Instructions"
-Origin: backported, commit:1413
+Origin: backport, commit:1413
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=51
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 Author: Richard Goedeken <Richard at fascinationsoftware.com>
diff --git a/debian/patches/debian-archs.patch b/debian/patches/debian-archs.patch
index eef5408..5f51de9 100644
--- a/debian/patches/debian-archs.patch
+++ b/debian/patches/debian-archs.patch
@@ -1,12 +1,13 @@
 Description: Define new cpu architectures
- mupen64plus must exactly know for which architectures it is build and
- which word size and endianness it has. Most architectures supported
- by debian weren't listed here. That means that the build would
- probably fail or generate unusable binaries.
- To better support unknown architectures NO_ASM must be enabled by
- default and known good architectures can then override this value. The
- user can still force to change that behavior by NO_ASM=0 or NO_ASM=1
- on the commandline.
+ mupen64plus must exactly know for which architectures it is build and which
+ word size and endianness it has. Most architectures supported by debian weren't
+ listed here. That means that the build would probably fail or generate unusable
+ binaries.
+ .
+ To better support unknown architectures NO_ASM must be enabled by default and
+ known good architectures can then override this value. The user can still force
+ to change that behavior by NO_ASM=0 or NO_ASM=1 on the commandline.
+ .
 Origin: upstream, commit:1408
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=260
 Bug-Debian: http://bugs.debian.org/544673
diff --git a/debian/patches/fix_readpng.patch b/debian/patches/fix_readpng.patch
index 6f21d07..a90c36c 100644
--- a/debian/patches/fix_readpng.patch
+++ b/debian/patches/fix_readpng.patch
@@ -3,7 +3,7 @@ Description: Fix crash when loading png due to reordering optimizer
  it looks safe to him. It isn't said that all variables are initialised right
  before the call of the first setjmp and thus we cannot rely on there value to
  determine if they are point to actual data.
-Origin: backported, commit:1411
+Origin: backport, commit:1411
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=209
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 Author: Richard Goedeken <Richard at fascinationsoftware.com>
diff --git a/debian/patches/ftbfs-debugger.patch b/debian/patches/ftbfs-debugger.patch
index 813ef89..927e8de 100644
--- a/debian/patches/ftbfs-debugger.patch
+++ b/debian/patches/ftbfs-debugger.patch
@@ -1,9 +1,8 @@
 Description: Define dynarec debugger functions for non-x86 systems
  The debugger checks for valid memory for dynarec. In case of architectures
- without dynarec support it should skip this check. The needed macro
- is not defined, but can be replaced with an empty check.
- Also functions to decode recompiled code have to be implemented as dummy
- functions.
+ without dynarec support it should skip this check. The needed macro is not
+ defined, but can be replaced with an empty check. Also functions to decode
+ recompiled code have to be implemented as dummy functions.
 Origin: upstream, commit:1409
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=259
 Bug-Debian: http://bugs.debian.org/544549
diff --git a/debian/patches/ftbfs-dynarec.patch b/debian/patches/ftbfs-dynarec.patch
index 7a8dce6..cb49471 100644
--- a/debian/patches/ftbfs-dynarec.patch
+++ b/debian/patches/ftbfs-dynarec.patch
@@ -1,6 +1,6 @@
 Description: Don't try to compile dynarec with not set dynarec architecture
- If we cannot find a valid architecture for dynarec we shouldn't try
- to build the needed object files which are architecture dependend.
+ If we cannot find a valid architecture for dynarec we shouldn't try to build
+ the needed object files which are architecture dependend.
 Origin: upstream, commit:1410
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=258
 Bug-Debian: http://bugs.debian.org/544548
diff --git a/debian/patches/ftbfs-glibc210.patch b/debian/patches/ftbfs-glibc210.patch
index 6ef716e..9164359 100644
--- a/debian/patches/ftbfs-glibc210.patch
+++ b/debian/patches/ftbfs-glibc210.patch
@@ -1,9 +1,8 @@
 Description: Fix FTBFS using g++-4.4 and libc 2.10 due to missing const keywords
- G++ 4.4 checks correctly if a pointer is converted from const to
- non-const without an explicit cast. As glibc 2.10 provides a more
- strict declaration of strstr and mupen64plus doesn't use const in
- that places, it will fail hard.
-Origin: backported, commit:1407
+ G++ 4.4 checks correctly if a pointer is converted from const to non-const
+ without an explicit cast. As glibc 2.10 provides a more strict declaration of
+ strstr and mupen64plus doesn't use const in that places, it will fail hard.
+Origin: backport, commit:1407
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=261
 Bug-Debian: http://bugs.debian.org/545462
 Author: Adam Sampson <ats-googlecode at offog.org>
diff --git a/debian/patches/gtk-open-filter.patch b/debian/patches/gtk-open-filter.patch
index 994c8dc..31e8036 100644
--- a/debian/patches/gtk-open-filter.patch
+++ b/debian/patches/gtk-open-filter.patch
@@ -1,11 +1,11 @@
 Description: Show *.n64 and *.v64 in filtered gtk open dialog
- When somebody tries to open files with the extension n64 or v64 the
- filter says that they are supported but they will not be shown. If the
- user switches to to "all files" mode they will be shown. GTK has a
- special gtk_file_filter_add_pattern to add the actual pattern and
- gtk_file_filter_set_name to give them a name which will presented to the
- user. To show [vn]64 files the filter for z64 has to be altered and not
- only the name of the filter.
+ When somebody tries to open files with the extension n64 or v64 the filter says
+ that they are supported but they will not be shown. If the user switches to to
+ "all files" mode they will be shown. GTK has a special
+ gtk_file_filter_add_pattern to add the actual pattern and
+ gtk_file_filter_set_name to give them a name which will presented to the user.
+ To show [vn]64 files the filter for z64 has to be altered and not only the name
+ of the filter.
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=264
 Bug-Debian: http://bugs.debian.org/546046
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
diff --git a/debian/patches/jttl_fix_romclosed.patch b/debian/patches/jttl_fix_romclosed.patch
index a554612..a0fa76e 100644
--- a/debian/patches/jttl_fix_romclosed.patch
+++ b/debian/patches/jttl_fix_romclosed.patch
@@ -1,11 +1,11 @@
 Description: Stop audio processing thread before freeing buffers
  SDL_PauseAudio is called to stop the audio, but that doesn't stop the audio
  processing right away. This means if it still is in SDL_MixAudio to change the
- volume and we start right away to free all buffers, it will segfault.
- We can call SDL_CloseAudio before freeing all buffers to be sure that
+ volume and we start right away to free all buffers, it will segfault. We can
+ call SDL_CloseAudio before freeing all buffers to be sure that
  my_audio_callback is stopped and doesn't process any data from the buffers
  anymore when we clean everything up in RomClosed.
-Origin: backported, commit:1405
+Origin: backport, commit:1405
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=269
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
diff --git a/debian/patches/noexecstack.patch b/debian/patches/noexecstack.patch
index 3c0f37b..3fa83b5 100644
--- a/debian/patches/noexecstack.patch
+++ b/debian/patches/noexecstack.patch
@@ -1,11 +1,12 @@
 Description: Don't enable executable stack by default
- A non executable stack is asecurity feature on modern platforms to protect
+ A non executable stack is a security feature on modern platforms to protect
  against an attack made possble by a flaws that allows an attacker to fill stack
  memory with executable code.
+ .
  As mupen64plus needs executable pages store its recompiled code the code blocks
  and wrapper blocks must be allocated page aligned to change the protection bits
  to executable of pages which belong to that memory block.
-Origin: backported, commit:1414
+Origin: backport, commit:1414
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=268
 Bug-Debian: http://bugs.debian.org/547644
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
diff --git a/debian/patches/osd-pause-crash.patch b/debian/patches/osd-pause-crash.patch
index d581dd2..5d322d4 100644
--- a/debian/patches/osd-pause-crash.patch
+++ b/debian/patches/osd-pause-crash.patch
@@ -1,8 +1,8 @@
 Description: Fix OSD crash after pause-stop-start-pause of emulator
  The osd message handler for pause messages are managed outside the message
  queue of the osd and will only be updated during pauseContinueEmulation, but
- the message is bound to an OpenGL context and thus must be also be deleted
- when the emulator is stopped and the video plugin shuts down.
+ the message is bound to an OpenGL context and thus must be also be deleted when
+ the emulator is stopped and the video plugin shuts down.
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=283
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
diff --git a/debian/patches/rice-texturepack-crash.patch b/debian/patches/rice-texturepack-crash.patch
index b86b65e..48404fa 100644
--- a/debian/patches/rice-texturepack-crash.patch
+++ b/debian/patches/rice-texturepack-crash.patch
@@ -1,5 +1,5 @@
 Description: Fix segfault in rice_video using TexturePack
-Origin: backported, commit:1290
+Origin: backport, commit:1290
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=194
 Author: OJ <olejl77 at gmail.com>
 
diff --git a/debian/patches/system-libbz2.patch b/debian/patches/system-libbz2.patch
index 4f41169..169ce53 100644
--- a/debian/patches/system-libbz2.patch
+++ b/debian/patches/system-libbz2.patch
@@ -1,5 +1,5 @@
 Description: Use libbz2 from system instead of buildin one
-Origin: backported, commit:1391
+Origin: backport, commit:1391
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=235
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
diff --git a/debian/patches/system-libpng.patch b/debian/patches/system-libpng.patch
index 458ec1f..2599a47 100644
--- a/debian/patches/system-libpng.patch
+++ b/debian/patches/system-libpng.patch
@@ -1,5 +1,5 @@
 Description: Use libpng from system instead of buildin one
-Origin: backported, commit:1391
+Origin: backport, commit:1391
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=235
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
diff --git a/debian/patches/system-zlib.patch b/debian/patches/system-zlib.patch
index f30b190..fb36f28 100644
--- a/debian/patches/system-zlib.patch
+++ b/debian/patches/system-zlib.patch
@@ -1,5 +1,5 @@
 Description: Use zlib from system instead of buildin one
-Origin: backported, commit:1391
+Origin: backport, commit:1391
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=235
 Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
diff --git a/debian/patches/xdg-basedir.patch b/debian/patches/xdg-basedir.patch
index c7fee53..206d6d9 100644
--- a/debian/patches/xdg-basedir.patch
+++ b/debian/patches/xdg-basedir.patch
@@ -1,33 +1,31 @@
 Description: Use XDG Base Directory compliant directories
- The freedesktop standard for basedir[1] defines three different types of
- user directories which mupen64plus uses. They are defined by environment
- variables and in the case if they are absend by well defined standard
- paths.
+ The freedesktop standard for basedir[1] defines three different types of user
+ directories which mupen64plus uses. They are defined by environment variables
+ and in the case if they are absend by well defined standard paths.
  .
   * Data directory ($XDG_DATA_HOME); default: $HOME/.local/share/
     - save, screenshots, hires_texture, texture_dump
   * Config directory ($XDG_CONFIG_HOME); default: $HOME/.config/
     - mupen64plus.conf, configuration files of plugins
   * Cache directory ($XDG_DATA_HOME); default: $HOME/.cache/
-    - rombrowser.cache and all other files which could be deleted
-      without loosing essential data
+    - rombrowser.cache and all other files which could be deleted without
+      loosing essential data
  .
  Specific directories for each tool should be created below that base
- directories. libxdg-basedir can be used to find the correct paths
- without caring much about the actual specification.
+ directories. libxdg-basedir can be used to find the correct paths without
+ caring much about the actual specification.
  .
- The current config dir has to be splitted in these three different
- directories. That also means that plugins have to be informed about that
- dirs. New functions SetDataDir and SetCacheDir have been specified
- inside the API headers and implemented were the plugin would benefit
- from it. This is the case in rice_video for texture_dump and
- hires_texture.
+ The current config dir has to be splitted in these three different directories.
+ That also means that plugins have to be informed about that dirs. New functions
+ SetDataDir and SetCacheDir have been specified inside the API headers and
+ implemented were the plugin would benefit from it. This is the case in
+ rice_video for texture_dump and hires_texture.
  .
  The user can also override the data and cache directories by the new
  commandline options --datadir and --cachedir.
  .
- As there is no real specification for Windows available the behavior on
- that platform was not changed.
+ As there is no real specification for Windows available the behavior on that
+ platform was not changed.
  .
  [1] http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 Bug: http://code.google.com/p/mupen64plus/issues/detail?id=137

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git



More information about the Pkg-games-commits mailing list