[xgalaga] 10/16: Update all patch headers.

Markus Koschany apo-guest at moszumanska.debian.org
Sat Dec 12 20:46:52 UTC 2015


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

apo-guest pushed a commit to branch master
in repository xgalaga.

commit 84cc1a584a3528b422073bda1bd18b026e13e9b2
Author: Markus Koschany <apo at debian.org>
Date:   Sat Dec 12 21:12:57 2015 +0100

    Update all patch headers.
---
 debian/patches/0001-manpages-install.patch      | 17 +++++++++++++----
 debian/patches/0002-implicit-declarations.patch | 19 ++++++++++++++-----
 debian/patches/0003-obsolete-xf86dga.patch      | 20 ++++++++++++++++----
 debian/patches/0004-clang-ftbfs.patch           | 12 ++++++++++++
 4 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/debian/patches/0001-manpages-install.patch b/debian/patches/0001-manpages-install.patch
index 37ddf5f..a4208d7 100644
--- a/debian/patches/0001-manpages-install.patch
+++ b/debian/patches/0001-manpages-install.patch
@@ -1,9 +1,18 @@
-Description: Uses DESTDIR for manpage installation.
-Origin: Pre-quilt-3.0 source modifications by Joey Hess.
+From: Joey Hess
+Date: Sat, 12 Dec 2015 21:09:31 +0100
+Subject: manpages-install
 
+Uses DESTDIR for man page installation
+Forwarded: no
+---
+ Makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index d046125..72e8c12 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -65,8 +65,8 @@
+@@ -65,8 +65,8 @@ install: all
  	for i in levels/*.xgl; do $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i ; done
  	for i in sounds/*.raw; do $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i ; done
  	$(INSTALL) CREDITS $(DESTDIR)$(creditsfile)
@@ -14,7 +23,7 @@ Origin: Pre-quilt-3.0 source modifications by Joey Hess.
  #	touch $(prefix)/scores
  #	chmod 666 $(prefix)/scores
  #       chown ${GAMEOWN}:${GAMEGRP} $(prefix)/scores
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ $(TARGET2): subdirs $(OBJS_HYPER)
  	$(CC) $(LDFLAGS) -o $(TARGET2) $(OBJS_HYPER) $(LIBS)
  
  %.6x.gz: %.6x
diff --git a/debian/patches/0002-implicit-declarations.patch b/debian/patches/0002-implicit-declarations.patch
index 1d365cc..de5a969 100644
--- a/debian/patches/0002-implicit-declarations.patch
+++ b/debian/patches/0002-implicit-declarations.patch
@@ -1,6 +1,15 @@
-Description: Fixed build warnings due to implicit type defaults.
-Author: Stephen M. Webb  <stephen.webb at bregmasoft.ca>
+From: Stephen M. Webb  <stephen.webb at bregmasoft.ca>
+Date: Sat, 12 Dec 2015 21:09:31 +0100
+Subject: implicit-declarations
 
+Fixed build warnings due to implicit type defaults.
+Forwarded: no
+---
+ title.c | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/title.c b/title.c
+index ee747af..341f700 100644
 --- a/title.c
 +++ b/title.c
 @@ -15,11 +15,12 @@
@@ -19,7 +28,7 @@ Author: Stephen M. Webb  <stephen.webb at bregmasoft.ca>
  char *gchLBuf;
  int giCreditLines=0, giActCreditLine=0;
  
-@@ -107,7 +108,7 @@
+@@ -107,7 +108,7 @@ static void show_help()
  		top+150, W_Cyan);
  }
  
@@ -28,7 +37,7 @@ Author: Stephen M. Webb  <stephen.webb at bregmasoft.ca>
  {
      int hsf;
      int i,j,l,lines;
-@@ -174,8 +175,7 @@
+@@ -174,8 +175,7 @@ int read_credits()
  
  void undo_credits()
  {
@@ -38,7 +47,7 @@ Author: Stephen M. Webb  <stephen.webb at bregmasoft.ca>
    int top = 460;
    char chLBuf[LINESIZE+1];
  
-@@ -200,8 +200,7 @@
+@@ -200,8 +200,7 @@ void undo_credits()
  
  void show_credits()
  {
diff --git a/debian/patches/0003-obsolete-xf86dga.patch b/debian/patches/0003-obsolete-xf86dga.patch
index 4329d94..67bfb04 100644
--- a/debian/patches/0003-obsolete-xf86dga.patch
+++ b/debian/patches/0003-obsolete-xf86dga.patch
@@ -1,10 +1,20 @@
-Description: Replaced deprecated header <xf86dga.h> with recommended
+From: Stephen M. Webb  <stephen.webb at bregmasoft.ca>
+Date: Sat, 12 Dec 2015 21:09:31 +0100
+Subject: obsolete-xf86dga
+
+Replaced deprecated header <xf86dga.h> with recommended
  <Xxf86dga.h>
-Author: Stephen M. Webb  <stephen.webb at bregmasoft.ca>
+Forwarded: no
+---
+ Wlib.h           | 2 +-
+ libsprite/Wlib.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/Wlib.h b/Wlib.h
+index 1663887..ea7562c 100644
 --- a/Wlib.h
 +++ b/Wlib.h
-@@ -94,7 +94,7 @@
+@@ -94,7 +94,7 @@ extern unsigned long w_socket;
  
  /* For XF86VIDMODE Support */
  #ifdef XF86VIDMODE
@@ -13,9 +23,11 @@ Author: Stephen M. Webb  <stephen.webb at bregmasoft.ca>
  #include <X11/extensions/xf86vmode.h>   
  
  struct xf86vidmode_data {
+diff --git a/libsprite/Wlib.h b/libsprite/Wlib.h
+index ac1cf8e..4038257 100644
 --- a/libsprite/Wlib.h
 +++ b/libsprite/Wlib.h
-@@ -94,7 +94,7 @@
+@@ -94,7 +94,7 @@ extern unsigned long w_socket;
  
  /* For XF86VIDMODE Support */
  #ifdef XF86VIDMODE
diff --git a/debian/patches/0004-clang-ftbfs.patch b/debian/patches/0004-clang-ftbfs.patch
index ff6cab9..a671147 100644
--- a/debian/patches/0004-clang-ftbfs.patch
+++ b/debian/patches/0004-clang-ftbfs.patch
@@ -1,3 +1,15 @@
+From: Arthur Marble <arthur at info9.net>
+Date: Sat, 12 Dec 2015 21:09:31 +0100
+Subject: clang-ftbfs
+
+Fix FTBFS with the clang compiler.
+Forwarded: no
+---
+ title.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/title.c b/title.c
+index 341f700..adb224d 100644
 --- a/title.c
 +++ b/title.c
 @@ -117,9 +117,9 @@ void read_credits()

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



More information about the Pkg-games-commits mailing list