[mupen64plus-core] 306/310: Move patches to alternative DEP-3 format and manage them with gbp pq

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

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

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

commit 8266458367a0387fa4a6709000e5fc42fb2492f9
Author: Sven Eckelmann <sven at narfation.org>
Date:   Thu May 28 21:22:50 2015 +0200

    Move patches to alternative DEP-3 format and manage them with gbp pq
---
 debian/changelog                                   |  2 ++
 ...xup.patch => Add-printf-format-attribute.patch} | 26 +++++++++++++-------
 ...-the-disassembler-of-the-recompiled-code.patch} | 28 +++++++++++++---------
 ...atch => Use-font-from-ttf-bitstream-vera.patch} | 15 ++++++++----
 debian/patches/series                              |  6 ++---
 5 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd072bc..9b7d9cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mupen64plus-core (2.5-2) UNRELEASED; urgency=medium
     - move ConfigSetParameterHelp to the first official release version 2.5
   * debian/control:
     - Change Vcs-Browser to new alioth CGit URL
+  * debian/patches:
+    - Move patches to alternative DEP-3 format and manage them with gbp pq
 
  -- Sven Eckelmann <sven at narfation.org>  Fri, 01 May 2015 15:33:16 +0200
 
diff --git a/debian/patches/printf_fixup.patch b/debian/patches/Add-printf-format-attribute.patch
similarity index 79%
rename from debian/patches/printf_fixup.patch
rename to debian/patches/Add-printf-format-attribute.patch
index 7e75d62..edd98fc 100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/Add-printf-format-attribute.patch
@@ -1,12 +1,20 @@
-Description: Add printf-format attribute
- The compiler needs to get more information for function declaration to
- help to find printf specific format attacks.
-Forwarded: not-needed
-Author: Sven Eckelmann <sven at narfation.org>
+From: Sven Eckelmann <sven at narfation.org>
+Date: Thu, 9 Sep 2010 13:11:05 +0200
+Subject: Add printf-format attribute
+
+The compiler needs to get more information for function declaration to
+help to find printf specific format attacks.
 
+Forwarded: not-needed
 ---
+ src/api/callbacks.h        | 2 +-
+ src/debugger/dbg_decoder.c | 5 +++++
+ src/main/main.h            | 2 +-
+ src/osd/osd.h              | 4 ++--
+ 4 files changed, 9 insertions(+), 4 deletions(-)
+
 diff --git a/src/api/callbacks.h b/src/api/callbacks.h
-index de260c72c1f6a72c70514f4c57ba5f5e2d3943c0..697ef5c026797c32c95f773767f190dd175dcebe 100644
+index de260c7..697ef5c 100644
 --- a/src/api/callbacks.h
 +++ b/src/api/callbacks.h
 @@ -32,7 +32,7 @@
@@ -19,7 +27,7 @@ index de260c72c1f6a72c70514f4c57ba5f5e2d3943c0..697ef5c026797c32c95f773767f190dd
  
  #endif /* API_CALLBACKS_H */
 diff --git a/src/debugger/dbg_decoder.c b/src/debugger/dbg_decoder.c
-index 94cbdc81c70eaedadc4933eb0b198aa9bfa94446..1a036745072800c5e2789d6bf2a536c9644dedcf 100644
+index 94cbdc8..1a03674 100644
 --- a/src/debugger/dbg_decoder.c
 +++ b/src/debugger/dbg_decoder.c
 @@ -229,6 +229,11 @@ lookup_rel_lo16 ( struct r4k_dis_t * state,
@@ -35,7 +43,7 @@ index 94cbdc81c70eaedadc4933eb0b198aa9bfa94446..1a036745072800c5e2789d6bf2a536c9
  {
      int l;
 diff --git a/src/main/main.h b/src/main/main.h
-index 3b4f72c5fe0340832ab13d8270eccf4045ea8236..e556170a63416a9759a3d85942f491ade48411c3 100644
+index 3b4f72c..e556170 100644
 --- a/src/main/main.h
 +++ b/src/main/main.h
 @@ -72,7 +72,7 @@ void new_frame(void);
@@ -48,7 +56,7 @@ index 3b4f72c5fe0340832ab13d8270eccf4045ea8236..e556170a63416a9759a3d85942f491ad
  m64p_error main_run(void);
  void main_stop(void);
 diff --git a/src/osd/osd.h b/src/osd/osd.h
-index bbdd699ed8c49fa869e37cd931fc4d1dba62da70..8779ffb9ebf3b0dbcbc06d548a4951866198454d 100644
+index bbdd699..8779ffb 100644
 --- a/src/osd/osd.h
 +++ b/src/osd/osd.h
 @@ -93,8 +93,8 @@ extern "C" {
diff --git a/debian/patches/disable_recompiler_disassembler.patch b/debian/patches/Disable-the-disassembler-of-the-recompiled-code.patch
similarity index 58%
rename from debian/patches/disable_recompiler_disassembler.patch
rename to debian/patches/Disable-the-disassembler-of-the-recompiled-code.patch
index f693ca5..0980f34 100644
--- a/debian/patches/disable_recompiler_disassembler.patch
+++ b/debian/patches/Disable-the-disassembler-of-the-recompiled-code.patch
@@ -1,16 +1,22 @@
-Description: Disable the disassembler of the recompiled code
- The interface of libopcode.so and libbfd.so is not stable and therefore not
- allowed to use in Debian. The libopcode.a and libbfd.a don't provide PIC
- object files and therefore cannot be linked to the PIC shared object.
- .
- This part of the debugging interface can be disabled because their is no known
- user interface that has support for it.
-Forwarded: not-needed
-Author: Sven Eckelmann <sven at narfation.org>
+From: Sven Eckelmann <sven at narfation.org>
+Date: Mon, 28 May 2012 14:14:12 +0200
+Subject: Disable the disassembler of the recompiled code
+
+The interface of libopcode.so and libbfd.so is not stable and therefore not
+allowed to use in Debian. The libopcode.a and libbfd.a don't provide PIC
+object files and therefore cannot be linked to the PIC shared object.
+
+This part of the debugging interface can be disabled because their is no known
+user interface that has support for it.
 
+Forwarded: not-needed
 ---
+ projects/unix/Makefile    | 2 +-
+ src/debugger/dbg_memory.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index f4f26b43f76cea3561d0db2d5103d253f299ffe1..7d5e8489147e96972af43023a3b11db1d23a82f4 100755
+index f4f26b4..7d5e848 100755
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
 @@ -575,7 +575,7 @@ ifeq ($(DEBUGGER), 1)
@@ -23,7 +29,7 @@ index f4f26b43f76cea3561d0db2d5103d253f299ffe1..7d5e8489147e96972af43023a3b11db1
  
  # generate a list of object files to build, make a temporary directory for them
 diff --git a/src/debugger/dbg_memory.c b/src/debugger/dbg_memory.c
-index f11304b4b6029650fa145de1b937b8164b694ff4..55f84be1fe886b705aab76b4fa1536483046b542 100644
+index f11304b..55f84be 100644
 --- a/src/debugger/dbg_memory.c
 +++ b/src/debugger/dbg_memory.c
 @@ -42,7 +42,7 @@
diff --git a/debian/patches/bitstream-font.patch b/debian/patches/Use-font-from-ttf-bitstream-vera.patch
similarity index 80%
rename from debian/patches/bitstream-font.patch
rename to debian/patches/Use-font-from-ttf-bitstream-vera.patch
index edbe78b..a069c46 100644
--- a/debian/patches/bitstream-font.patch
+++ b/debian/patches/Use-font-from-ttf-bitstream-vera.patch
@@ -1,10 +1,15 @@
-Description: Use font from ttf-bitstream-vera
-Forwarded: not-needed
-Author: Sven Eckelmann <sven at narfation.org>
+From: Sven Eckelmann <sven at narfation.org>
+Date: Tue, 2 Jul 2013 10:25:55 +0200
+Subject: Use font from ttf-bitstream-vera
 
+Forwarded: not-needed
 ---
+ projects/unix/Makefile | 1 +
+ src/osd/osd.cpp        | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 56a30a3f41880b1f075b6050feae21779b239bda..f4f26b43f76cea3561d0db2d5103d253f299ffe1 100755
+index 56a30a3..f4f26b4 100755
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
 @@ -633,6 +633,7 @@ install: $(TARGET)
@@ -16,7 +21,7 @@ index 56a30a3f41880b1f075b6050feae21779b239bda..f4f26b43f76cea3561d0db2d5103d253
  	$(INSTALL) -m 0644 ../../src/api/m64p_*.h "$(DESTDIR)$(INCDIR)"
  	-$(LDCONFIG) "$(DESTDIR)$(LIBDIR)"
 diff --git a/src/osd/osd.cpp b/src/osd/osd.cpp
-index 3ccf9ae5df4000e7f76e6261a7f96e29f278f804..9908282bdb7e1c157da9e8d0171d5d73ee7a7636 100644
+index 3ccf9ae..9908282 100644
 --- a/src/osd/osd.cpp
 +++ b/src/osd/osd.cpp
 @@ -46,7 +46,7 @@ extern "C" {
diff --git a/debian/patches/series b/debian/patches/series
index c2b7fb9..72383ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-bitstream-font.patch
-printf_fixup.patch
-disable_recompiler_disassembler.patch
+Use-font-from-ttf-bitstream-vera.patch
+Add-printf-format-attribute.patch
+Disable-the-disassembler-of-the-recompiled-code.patch

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

More information about the Pkg-games-commits mailing list