From 9a2f7d12b5d2b877ffed5e0bbfe9c32bf09d217f Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 3 Apr 2009 18:04:31 +0200 Subject: [PATCH] patches: Removed quoted-config-opts-fix.dpatch. This patch has been included upstream. Since this was the last patch, dpatch is no longer required and has been removed. --- debian/changelog | 3 ++- debian/control | 2 +- debian/patches/00list | 2 -- debian/patches/quoted-config-opts-fix.dpatch | 27 -------------------- debian/rules | 8 +++--- 5 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 debian/patches/00list delete mode 100755 debian/patches/quoted-config-opts-fix.dpatch diff --git a/debian/changelog b/debian/changelog index 2cca57c..0079b94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ tig (0.14.1-1) unstable; urgency=low - Moved tig from section "utils" to the newly added "vcs". * debian/patches: - Removed tigrc-example-fix.dpatch - included upstream. + - Removed quoted-config-opts-fix.dpatch - included upstream. - -- Sebastian Harl Fri, 03 Apr 2009 17:59:10 +0200 + -- Sebastian Harl Fri, 03 Apr 2009 18:01:54 +0200 tig (0.14-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 5f09bb0..bbab4ca 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: tig Section: vcs Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), dpatch, dpkg-dev (>= 1.14.6), git-core, libncursesw5-dev, asciidoc (>= 7), xmlto, docbook-utils +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), git-core, libncursesw5-dev, asciidoc (>= 7), xmlto, docbook-utils Standards-Version: 3.8.0 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 f160897..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,2 +0,0 @@ -quoted-config-opts-fix.dpatch - diff --git a/debian/patches/quoted-config-opts-fix.dpatch b/debian/patches/quoted-config-opts-fix.dpatch deleted file mode 100755 index 460b988..0000000 --- a/debian/patches/quoted-config-opts-fix.dpatch +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## quoted-config-opts-fix.dpatch by Sebastian Harl -## -## DP: Fix handling of quoted strings in the config file -## DP: -## DP: parse_string() adapts the string length to automatically remove quotation -## DP: marks when copying the string. However, when calling string_ncopy_do() -## DP: strlen(arg) used to be called again instead of using the adapted value. -## DP: -## DP: This e.g. led to wrong locale settings when using -## DP: set commit-encoding = "UTF-8" -## DP: and thus a slightly messed up display. -## DP: -## DP: Thanks to Gerfried Fuchs for reporting this. - -diff a/tig.c b/tig.c ---- a/tig.c -+++ b/tig.c -@@ -1519,7 +1519,7 @@ option_set_command(int argc, const char *argv[]) - } - arg += 1; arglen -= 2; - default: -- string_ncopy(opt_encoding, arg, strlen(arg)); -+ string_ncopy(opt_encoding, arg, arglen); - return OK; - } - } diff --git a/debian/rules b/debian/rules index 1ddab6c..54cb1cf 100755 --- a/debian/rules +++ b/debian/rules @@ -19,8 +19,6 @@ else CFLAGS += -O2 endif -include /usr/share/dpatch/dpatch.make - config.status: configure dh_testdir ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ @@ -29,14 +27,14 @@ config.status: configure build: build-stamp -build-stamp: config.status $(DPATCH_STAMPFN) +build-stamp: config.status dh_testdir $(MAKE) all doc touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp @@ -83,5 +81,5 @@ binary-arch: build install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install patch unpatch +.PHONY: build clean binary-indep binary-arch binary install -- 2.30.2