[yquake2] 01/02: Move patches from upstream to the beginning of the patch series, and add DEP-3 metadata

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository yquake2.

commit f98f6262c84a31d5b3ed76e5388f240da3c1c0d4
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Sep 30 08:23:51 2015 +0100

    Move patches from upstream to the beginning of the patch series, and add DEP-3 metadata
---
 debian/changelog                                                  | 7 +++++++
 debian/patches/0001-Fix-crosshair_scale.patch                     | 8 +++-----
 .../patches/0002-Rename-SCR_GetScale-to-SCR_GetDefaultScale.patch | 7 ++-----
 debian/patches/series                                             | 4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 403dc96..d682981 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+yquake2 (5.31~dfsg1-2) UNRELEASED; urgency=medium
+
+  * Move patches from upstream to the beginning of the patch series,
+    and add DEP-3 metadata
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 30 Sep 2015 08:21:33 +0100
+
 yquake2 (5.31~dfsg1-1) unstable; urgency=medium
 
   * Imported Upstream version 5.31~dfsg1
diff --git a/debian/patches/0001-Fix-crosshair_scale.patch b/debian/patches/0001-Fix-crosshair_scale.patch
index 3845c52..8d7b392 100644
--- a/debian/patches/0001-Fix-crosshair_scale.patch
+++ b/debian/patches/0001-Fix-crosshair_scale.patch
@@ -1,10 +1,11 @@
-From f2e53e657b4275343d0d03a94799539e9bcb9723 Mon Sep 17 00:00:00 2001
 From: Yamagi Burmeister <yamagi at yamagi.org>
 Date: Mon, 14 Sep 2015 19:05:08 +0200
-Subject: [PATCH 1/3] Fix crosshair_scale
+Subject: Fix crosshair_scale
 
 The crosshair_scale cvar was broken a long time ago at Icculus Q2 or
 even back at it. The fix is easy... This is part of issue #87.
+
+Origin: upstream, 5.32, commit:f2e53e657b4275343d0d03a94799539e9bcb9723
 ---
  src/client/cl_screen.c | 58 +++++++++++++++++++++++---------------------------
  1 file changed, 27 insertions(+), 31 deletions(-)
@@ -98,6 +99,3 @@ index 5acf9e0..9f541b1 100644
  }
  
  float
--- 
-2.5.3
-
diff --git a/debian/patches/0002-Rename-SCR_GetScale-to-SCR_GetDefaultScale.patch b/debian/patches/0002-Rename-SCR_GetScale-to-SCR_GetDefaultScale.patch
index 19c61ff..5e42506 100644
--- a/debian/patches/0002-Rename-SCR_GetScale-to-SCR_GetDefaultScale.patch
+++ b/debian/patches/0002-Rename-SCR_GetScale-to-SCR_GetDefaultScale.patch
@@ -1,8 +1,8 @@
-From eba4ce95d4088c436920a5be85cbd48fa39a33cf Mon Sep 17 00:00:00 2001
 From: Yamagi Burmeister <yamagi at yamagi.org>
 Date: Mon, 14 Sep 2015 19:23:11 +0200
-Subject: [PATCH 2/3] Rename SCR_GetScale() to SCR_GetDefaultScale()
+Subject: Rename SCR_GetScale() to SCR_GetDefaultScale()
 
+Origin: upstream, 5.32, commit:eba4ce95d4088c436920a5be85cbd48fa39a33cf
 ---
  src/client/cl_screen.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
@@ -56,6 +56,3 @@ index 9f541b1..8100a74 100644
  	}
  	else
  	{
--- 
-2.5.3
-
diff --git a/debian/patches/series b/debian/patches/series
index 3d16204..ef3474b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
+0001-Fix-crosshair_scale.patch
+0002-Rename-SCR_GetScale-to-SCR_GetDefaultScale.patch
 Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
 Fix-spelling-errors-detected-by-lintian.patch
 Optionally-link-libopenal-at-compile-time.patch
 Add-BUILDDATE-macro-which-overrides-__DATE__-for-rep.patch
-0001-Fix-crosshair_scale.patch
-0002-Rename-SCR_GetScale-to-SCR_GetDefaultScale.patch

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