[yquake2] 06/09: Stop using numbered patches for gbp pq

Simon McVittie smcv at debian.org
Tue May 5 10:40:25 UTC 2015


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

smcv pushed a commit to branch master
in repository yquake2.

commit cd74572f3ccfa26bc49d99d3840b75d11ca58747
Author: Simon McVittie <smcv at debian.org>
Date:   Tue May 5 10:42:28 2015 +0100

    Stop using numbered patches for gbp pq
---
 debian/changelog                                                    | 1 +
 debian/gbp.conf                                                     | 3 ++-
 ...h => Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch} | 0
 ...-lintian.patch => Fix-spelling-errors-detected-by-lintian.patch} | 0
 ...e-time.patch => Optionally-link-libopenal-at-compile-time.patch} | 0
 debian/patches/series                                               | 6 +++---
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e47ec6..c60c788 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ yquake2 (5.30~dfsg1-1) UNRELEASED; urgency=medium
       to the executable, which happens to be exactly the directory we were
       using as our LIBDIR
   * Use https and cgit for Vcs-Browser
+  * Stop using numbered patches for gbp pq
 
  -- Simon McVittie <smcv at debian.org>  Tue, 05 May 2015 10:26:54 +0100
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 37a16b9..fbc109d 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,7 +2,8 @@
 debian-branch = master
 upstream-branch = upstream
 pristine-tar = True
+patch-numbers = False
 
-[git-import-orig]
+[import-orig]
 filter = [ 'stuff/osx/*', 'stuff/misc/*', 'stuff/win32-libs/*', 'stuff/icon/*', 'src/backends/sdl_osx/*' ]
 filter-pristine-tar = True
diff --git a/debian/patches/0001-Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
similarity index 100%
rename from debian/patches/0001-Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
rename to debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
diff --git a/debian/patches/0002-Fix-spelling-errors-detected-by-lintian.patch b/debian/patches/Fix-spelling-errors-detected-by-lintian.patch
similarity index 100%
rename from debian/patches/0002-Fix-spelling-errors-detected-by-lintian.patch
rename to debian/patches/Fix-spelling-errors-detected-by-lintian.patch
diff --git a/debian/patches/0004-Optionally-link-libopenal-at-compile-time.patch b/debian/patches/Optionally-link-libopenal-at-compile-time.patch
similarity index 100%
rename from debian/patches/0004-Optionally-link-libopenal-at-compile-time.patch
rename to debian/patches/Optionally-link-libopenal-at-compile-time.patch
diff --git a/debian/patches/series b/debian/patches/series
index 2941827..99be82b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-0001-Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
-0002-Fix-spelling-errors-detected-by-lintian.patch
-0004-Optionally-link-libopenal-at-compile-time.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

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



More information about the Pkg-games-commits mailing list