Browse Source

Replace a patch with the version cherry-picked

Christoph Biedl 1 year ago
parent
commit
e6317e18f2
2 changed files with 6 additions and 5 deletions
  1. 4 4
      debian/patches/fix-typos.patch
  2. 2 1
      debian/patches/series

+ 4 - 4
debian/patches/fix-typos.patch

@@ -1,7 +1,7 @@
-Description: Fix wording as suggested by lintian
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Forwarded: yes
-Last-Update: 2019-01-27
+Subject: Ngircd.conf.5: Fix wording as suggested by lintian
+Origin: rel-25-1-gaec86aa8
+Upstream-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Date: Mon Jan 28 10:45:53 2019 +0100
 
 --- a/man/ngircd.conf.5.tmpl
 +++ b/man/ngircd.conf.5.tmpl

+ 2 - 1
debian/patches/series

@@ -1 +1,2 @@
-fix-typos.patch
+# cherry-picked from upstream. Keep in chronological order
+cherry-pick.rel-25-1-gaec86aa8.ngircd-conf-5-fix-wording-as-suggested-by-lintian.patch