[nexuiz-data] 05/17: Add DEP-3 patch metadata

Simon McVittie smcv at debian.org
Tue Jan 9 09:56:37 UTC 2018 

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

smcv pushed a commit to annotated tag debian/2.5.2-7
in repository nexuiz-data.

commit e2bb56c8e89c19170b7909f53d6e5138f717d6b9
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jan 2 09:42:58 2018 +0000

    Add DEP-3 patch metadata
---
 debian/changelog                                   |  1 +
 debian/patches/01_remove_broken_keys.diff          | 19 +++++++++++++-----
 debian/patches/02_disable_update_check.diff        | 19 +++++++++++-------
 debian/patches/03_no_datapk3_timestamp.diff        | 16 +++++++++++----
 debian/patches/04_exclude_music_in_datapk3.diff    | 18 ++++++++++++-----
 debian/patches/05_disable_development_warning.diff | 23 ++++++++++++++++------
 debian/patches/exclude_textures_from_data.pk3.diff | 19 +++++++++++++-----
 debian/patches/reproducible_build.diff             |  7 ++++++-
 debian/patches/windowed_by_default.diff            | 18 ++++++++++++-----
 9 files changed, 102 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9328ce..f8e238b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ nexuiz-data (2.5.2-7) UNRELEASED; urgency=low
   * Add Multi-Arch: foreign to all the binary packages
   * Apply patch from Reiner Herrmann for locale-independent sorting
     (Closes: #808652)
+  * Add DEP-3 patch metadata
 
  -- Anton Balashov <sicness at darklogic.ru>  Fri, 23 Aug 2013 09:18:43 +0400
 
diff --git a/debian/patches/01_remove_broken_keys.diff b/debian/patches/01_remove_broken_keys.diff
index d22c280..ba32abe 100644
--- a/debian/patches/01_remove_broken_keys.diff
+++ b/debian/patches/01_remove_broken_keys.diff
@@ -1,8 +1,17 @@
-Index: nexuiz-data-2.5.2/data/defaultNexuiz.cfg
-===================================================================
---- nexuiz-data-2.5.2.orig/data/defaultNexuiz.cfg	2009-10-16 16:41:34.000000000 +0200
-+++ nexuiz-data-2.5.2/data/defaultNexuiz.cfg	2009-10-16 16:41:38.000000000 +0200
-@@ -886,8 +886,6 @@
+From: Bruno "Fuddl" Kleinert <fuddl at tauware.de>
+Date: Fri, 23 May 2008 15:23:24 +0200
+Subject: Remove broken keys from default keyboard configuration
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477397
+---
+ data/defaultNexuiz.cfg | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg
+index 6612eb8..ba6258f 100644
+--- a/data/defaultNexuiz.cfg
++++ b/data/defaultNexuiz.cfg
+@@ -886,8 +886,6 @@ bind f +use
  
  // misc
  bind e +hook
diff --git a/debian/patches/02_disable_update_check.diff b/debian/patches/02_disable_update_check.diff
index 9442560..6d63884 100644
--- a/debian/patches/02_disable_update_check.diff
+++ b/debian/patches/02_disable_update_check.diff
@@ -1,11 +1,16 @@
-Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
-Description: Disable update check so it won't nag users (closes: #522738)
+From: Gerfried Fuchs <rhonda at debian.at>
+Date: Tue, 2 Jan 2018 09:29:56 +0000
+Subject: Disable update check so it won't nag users (closes: #522738)
 
-Index: nexuiz-data-2.5.2/data/defaultNexuiz.cfg
-===================================================================
---- nexuiz-data-2.5.2.orig/data/defaultNexuiz.cfg	2009-10-16 16:41:48.000000000 +0200
-+++ nexuiz-data-2.5.2/data/defaultNexuiz.cfg	2009-10-16 16:42:05.000000000 +0200
-@@ -1553,7 +1553,7 @@
+---
+ data/defaultNexuiz.cfg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg
+index ba6258f..2d802fa 100644
+--- a/data/defaultNexuiz.cfg
++++ b/data/defaultNexuiz.cfg
+@@ -1553,7 +1553,7 @@ alias unmute "prvm_edictset server $1 muted 0" // dito
  
  rcon_secure 1
  
diff --git a/debian/patches/03_no_datapk3_timestamp.diff b/debian/patches/03_no_datapk3_timestamp.diff
index 567d7fa..434fa76 100644
--- a/debian/patches/03_no_datapk3_timestamp.diff
+++ b/debian/patches/03_no_datapk3_timestamp.diff
@@ -1,7 +1,15 @@
-Index: nexuiz-data-2.5.2/data/Makefile
-===================================================================
---- nexuiz-data-2.5.2.orig/data/Makefile	2009-10-16 17:27:05.000000000 +0200
-+++ nexuiz-data-2.5.2/data/Makefile	2009-10-16 17:27:33.000000000 +0200
+From: Bruno "Fuddl" Kleinert <fuddl at tauware.de>
+Date: Fri, 23 May 2008 15:23:24 +0200
+Subject: Remove unnecessary release timestamps from .pk3-files
+
+---
+ data/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/Makefile b/data/Makefile
+index 778276a..042b983 100644
+--- a/data/Makefile
++++ b/data/Makefile
 @@ -1,6 +1,6 @@
  FTEQCC ?= fteqcc
  PERL ?= perl
diff --git a/debian/patches/04_exclude_music_in_datapk3.diff b/debian/patches/04_exclude_music_in_datapk3.diff
index a6bf65a..f3bb913 100644
--- a/debian/patches/04_exclude_music_in_datapk3.diff
+++ b/debian/patches/04_exclude_music_in_datapk3.diff
@@ -1,8 +1,16 @@
-Index: nexuiz-data-2.5.2/data/Makefile
-===================================================================
---- nexuiz-data-2.5.2.orig/data/Makefile	2009-10-20 16:20:36.000000000 +0200
-+++ nexuiz-data-2.5.2/data/Makefile	2009-10-20 16:29:32.000000000 +0200
-@@ -2,7 +2,7 @@
+From: Bruno "Fuddl" Kleinert <fuddl at debian.org>
+Date: Tue, 20 Oct 2009 19:46:24 +0200
+Subject: Exclude the music files from the big data.pk3 ZIP archive
+
+---
+ data/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/Makefile b/data/Makefile
+index 042b983..0cbb7fe 100644
+--- a/data/Makefile
++++ b/data/Makefile
+@@ -2,7 +2,7 @@ FTEQCC ?= fteqcc
  PERL ?= perl
  PK3NAME ?= data.pk3
  ZIP ?= 7za a -tzip -mx=9
diff --git a/debian/patches/05_disable_development_warning.diff b/debian/patches/05_disable_development_warning.diff
index 1444a7a..2bf9076 100644
--- a/debian/patches/05_disable_development_warning.diff
+++ b/debian/patches/05_disable_development_warning.diff
@@ -1,11 +1,20 @@
-Index: nexuiz-data-2.5.2/data/defaultNexuiz.cfg
-===================================================================
---- nexuiz-data-2.5.2.orig/data/defaultNexuiz.cfg	2009-10-20 18:36:44.000000000 +0200
-+++ nexuiz-data-2.5.2/data/defaultNexuiz.cfg	2009-10-20 18:37:32.000000000 +0200
+From: Bruno "Fuddl" Kleinert <fuddl at debian.org>
+Date: Tue, 20 Oct 2009 19:46:24 +0200
+Subject: Make nexuiz not complain about being a development snapshot
+
+This is necessary because we fetch sources from the upstream Subversion
+repository.
+---
+ data/defaultNexuiz.cfg | 16 +++-------------
+ 1 file changed, 3 insertions(+), 13 deletions(-)
+
+diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg
+index 2d802fa..7bfe733 100644
+--- a/data/defaultNexuiz.cfg
++++ b/data/defaultNexuiz.cfg
 @@ -1,16 +1,6 @@
 -set g_nexuizversion 2.5svn	"Nexuiz version (formatted for humans)"
-+set g_nexuizversion 2.5.2	"Nexuiz version (formatted for humans)"
- 
+-
 -//!<showbrand
 -showbrand 3
 -echo
@@ -17,6 +26,8 @@ Index: nexuiz-data-2.5.2/data/defaultNexuiz.cfg
 -echo to your autoexec.cfg.
 -echo
 -//!>showbrand
++set g_nexuizversion 2.5.2	"Nexuiz version (formatted for humans)"
++
 +showbrand 0
  
  // changes a cvar and reports it to the server (for the menu to notify the
diff --git a/debian/patches/exclude_textures_from_data.pk3.diff b/debian/patches/exclude_textures_from_data.pk3.diff
index 3ab09c8..a5577a7 100644
--- a/debian/patches/exclude_textures_from_data.pk3.diff
+++ b/debian/patches/exclude_textures_from_data.pk3.diff
@@ -1,8 +1,17 @@
-Index: nexuiz-data/data/Makefile
-===================================================================
---- nexuiz-data.orig/data/Makefile	2009-11-20 17:40:02.000000000 +0100
-+++ nexuiz-data/data/Makefile	2009-11-20 17:40:24.000000000 +0100
-@@ -2,7 +2,7 @@
+From: Bruno "Fuddl" Kleinert <fuddl at debian.org>
+Date: Fri, 20 Nov 2009 19:58:30 +0100
+Subject: Split out textures for the nexuiz-textures binary package
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557218
+---
+ data/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/Makefile b/data/Makefile
+index 0cbb7fe..1b0098a 100644
+--- a/data/Makefile
++++ b/data/Makefile
+@@ -2,7 +2,7 @@ FTEQCC ?= fteqcc
  PERL ?= perl
  PK3NAME ?= data.pk3
  ZIP ?= 7za a -tzip -mx=9
diff --git a/debian/patches/reproducible_build.diff b/debian/patches/reproducible_build.diff
index ab512d0..df1293a 100644
--- a/debian/patches/reproducible_build.diff
+++ b/debian/patches/reproducible_build.diff
@@ -1,6 +1,6 @@
 From: Reiner Herrmann <reiner at reiner-h.de>
-Subject: Sort in a locale-independent way
 Date: Mon, 21 Dec 2015 19:09:04 +0100
+Subject: Sort in a locale-independent way
 
 During build a checksum over configuration settings is calculated and
 embedded in some files. The lines are sorted before generating the
@@ -10,7 +10,12 @@ Sort with the locale set to C, so that the same values are generated
 independent of the current locale.
 
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=808652
+---
+ data/update-cvarcount.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
+diff --git a/data/update-cvarcount.sh b/data/update-cvarcount.sh
+index 6bddb3a..4305bc1 100755
 --- a/data/update-cvarcount.sh
 +++ b/data/update-cvarcount.sh
 @@ -2,10 +2,10 @@
diff --git a/debian/patches/windowed_by_default.diff b/debian/patches/windowed_by_default.diff
index 1f000b7..f716b6f 100644
--- a/debian/patches/windowed_by_default.diff
+++ b/debian/patches/windowed_by_default.diff
@@ -1,8 +1,16 @@
-Index: nexuiz-data/data/defaultNexuiz.cfg
-===================================================================
---- nexuiz-data.orig/data/defaultNexuiz.cfg	2011-06-29 15:33:29.731871692 +0200
-+++ nexuiz-data/data/defaultNexuiz.cfg	2011-06-29 15:34:02.976035552 +0200
-@@ -215,7 +215,7 @@
+From: Bruno "Fuddl" Kleinert <fuddl at debian.org>
+Date: Wed, 29 Jun 2011 15:34:29 +0200
+Subject: Make the engine start in windowed mode by default
+
+---
+ data/defaultNexuiz.cfg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg
+index 7bfe733..af3b33d 100644
+--- a/data/defaultNexuiz.cfg
++++ b/data/defaultNexuiz.cfg
+@@ -215,7 +215,7 @@ bgmvolume 1
  volume 0.5
  // fullscreen 1024x768x32bit
  vid_bitsperpixel 32

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

More information about the Pkg-games-commits mailing list