From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 3 Apr 2009 15:59:34 +0000 (+0200)
Subject: patches/: Removed tigrc-example-fix.dpatch.
X-Git-Tag: tig-0.14.1-1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c2bbbbd53a0fbb9ad171470a3e7e07dd9c200225;p=pkg-tig.git

patches/: Removed tigrc-example-fix.dpatch.

This patch has been included upstream.
---

diff --git a/debian/changelog b/debian/changelog
index 9268af0..2cca57c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ tig (0.14.1-1) unstable; urgency=low
   * Uploading to unstable - Lenny has been released (Closes: #520636).
   * debian/control:
     - Moved tig from section "utils" to the newly added "vcs".
+  * debian/patches:
+    - Removed tigrc-example-fix.dpatch - included upstream.
 
- -- Sebastian Harl <sh@tokkee.org>  Fri, 03 Apr 2009 17:53:58 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Fri, 03 Apr 2009 17:59:10 +0200
 
 tig (0.14-1) experimental; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 20c4e5a..f160897 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,2 @@
-tigrc-example-fix.dpatch
 quoted-config-opts-fix.dpatch
 
diff --git a/debian/patches/tigrc-example-fix.dpatch b/debian/patches/tigrc-example-fix.dpatch
deleted file mode 100755
index cd4b943..0000000
--- a/debian/patches/tigrc-example-fix.dpatch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## tigrc-example-fix.dpatch by Jonas Fonseca <fonseca@diku.dk>
-##
-## DP: tigrc(5): fix error in examples for the set command
-## DP:
-## DP: Fixes Debian bug #514990 reported by Gerfried Fuchs.
-
-diff a/tigrc.5.txt b/tigrc.5.txt
---- a/tigrc.5.txt
-+++ b/tigrc.5.txt
-@@ -46,21 +46,21 @@ Examples:
- 
- --------------------------------------------------------------------------
- set show-author = yes		# Show author?
--set show-date = yes		# Show commit date?
- set show-rev-graph = yes	# Show revision graph?
- set show-refs = yes		# Show references?
- set show-line-numbers = no	# Show line numbers?
- set line-number-interval = 5	# Interval between line numbers
-+set commit-encoding = "UTF-8"	# Commit encoding
- --------------------------------------------------------------------------
- 
- Or in the git configuration files:
- 
- --------------------------------------------------------------------------
- [tig]
-+	show-date = yes		# Show commit date?
- 	author-width = 10	# Set width of the author column
- 	line-graphics = no	# Disable graphics characters
- 	tab-size = 8		# Number of spaces per tab
--	encoding = "UTF-8"	# Commit encoding
- --------------------------------------------------------------------------
- 
- The type of variables are either bool, int, and string.