From: Sebastian Harl <sh@tokkee.org>
Date: Mon, 20 Sep 2010 23:25:38 +0000 (+0200)
Subject: patches: Removed bts594549-pager-segfault -- included upstream.
X-Git-Tag: tig-0.16.2-1~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e9a6ee033ba29716eb3b6e4a03569d94d91bfbe6;p=pkg-tig.git

patches: Removed bts594549-pager-segfault -- included upstream.

Also, no longer use dpatch ;-)
---

diff --git a/debian/changelog b/debian/changelog
index 962aa77..1d1ceaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 tig (0.16.1-1) unstable; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - Removed bts594549-pager-segfault -- included upstream.
+  * debian/control, debian/rules:
+    - No longer use dpatch.
 
- -- Sebastian Harl <tokkee@debian.org>  Tue, 21 Sep 2010 01:18:22 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 21 Sep 2010 01:24:20 +0200
 
 tig (0.16-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 76d76c3..e16f07a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tig
 Section: vcs
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 5), dpatch, dpkg-dev (>= 1.14.6), libncursesw5-dev, asciidoc (>= 8.4), xmlto, docbook-utils
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), libncursesw5-dev, asciidoc (>= 8.4), xmlto, docbook-utils
 Standards-Version: 3.8.4
 Homepage: http://jonas.nitro.dk/tig/
 Vcs-Git: git://git.tokkee.org/pkg-tig.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ce9434d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-bts594549-pager-segfault.dpatch
-
diff --git a/debian/patches/bts594549-pager-segfault.dpatch b/debian/patches/bts594549-pager-segfault.dpatch
deleted file mode 100755
index a28d31a..0000000
--- a/debian/patches/bts594549-pager-segfault.dpatch
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bts594549-pager-segfault.dpatch by Jonas Fonseca <fonseca@diku.dk>
-##
-## DP: Fix segfault when starting tig in pager mode.
-## DP:
-## DP: (Upstream commit 5355b6ed446a22714d944c316f3c037348f67d76)
-
-@DPATCH@
-
-diff a/tig.c b/tig.c
---- a/tig.c
-+++ b/tig.c
-@@ -2308,7 +2308,7 @@
- 	VIEW_(BLAME,  "blame",  &blame_ops,  TRUE,  ref_commit),
- 	VIEW_(BRANCH, "branch",	&branch_ops, TRUE,  ref_head),
- 	VIEW_(HELP,   "help",   &help_ops,   FALSE, ""),
--	VIEW_(PAGER,  "pager",  &pager_ops,  FALSE, "stdin"),
-+	VIEW_(PAGER,  "pager",  &pager_ops,  FALSE, ""),
- 	VIEW_(STATUS, "status", &status_ops, TRUE,  ""),
- 	VIEW_(STAGE,  "stage",	&stage_ops,  TRUE,  ""),
- };
-@@ -3700,6 +3700,13 @@
- 		break;
- 
- 	case REQ_VIEW_PAGER:
-+		if (view == NULL) {
-+			if (!io_open(&VIEW(REQ_VIEW_PAGER)->io, ""))
-+				die("Failed to open stdin");
-+			open_view(view, request, OPEN_PREPARED);
-+			break;
-+		}
-+
- 		if (!VIEW(REQ_VIEW_PAGER)->pipe && !VIEW(REQ_VIEW_PAGER)->lines) {
- 			report("No pager content, press %s to run command from prompt",
- 			       get_key(view->keymap, REQ_PROMPT));
-@@ -7729,10 +7736,8 @@
- 	const char **filter_argv = NULL;
- 	int i;
- 
--	if (!isatty(STDIN_FILENO)) {
--		io_open(&VIEW(REQ_VIEW_PAGER)->io, "");
-+	if (!isatty(STDIN_FILENO))
- 		return REQ_VIEW_PAGER;
--	}
- 
- 	if (argc <= 1)
- 		return REQ_VIEW_MAIN;
diff --git a/debian/rules b/debian/rules
index 969f53d..9666fa1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,9 +19,7 @@ else
 	CFLAGS += -O2
 endif
 
-include /usr/share/dpatch/dpatch.make
-
-config.status: configure $(DPATCH_STAMPFN)
+config.status: configure
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc \
@@ -36,7 +34,7 @@ build-stamp: config.status
 	
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp