From: Sebastian Harl Date: Tue, 10 Apr 2007 20:55:09 +0000 (+0000) Subject: Updated changelog to tig-0.6-1. X-Git-Tag: tig-0.7-1~1 X-Git-Url: https://git.tokkee.org/?p=pkg-tig.git;a=commitdiff_plain;h=417e92d6e222208eee1a8997d6ee2446066b14cc Updated changelog to tig-0.6-1. Removed infiniteloop.dpatch, splitview.dpatch and v0.5.dpatch. --- diff --git a/debian/changelog b/debian/changelog index 88e45f7..0c4a2fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +tig (0.6-1) unstable; urgency=low + + * New upstream release. + - Handle cursor keys in split pane mode correctly (Closes: #410394). + * Removed infiniteloop.dpatch - included in the new release. + * Removed splitview.dpatch - included in the new release. + * Removed v0.5.dpatch - included in the new release. + + -- Sebastian Harl Tue, 10 Apr 2007 20:38:41 +0000 + tig (0.5-3) unstable; urgency=low * Added upstream patch by Jonas Fonseca to update the diff --git a/debian/control b/debian/control index a22bc43..e87c91c 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: tig Section: utils Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), libncurses5-dev, asciidoc (>= 7), xmlto, docbook-utils, dpatch +Build-Depends: debhelper (>= 5), libncurses5-dev, asciidoc (>= 7), xmlto, docbook-utils Standards-Version: 3.7.2 Package: tig diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 9ebe5db..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,4 +0,0 @@ -infiniteloop.dpatch -splitview.dpatch -v0.5.dpatch - diff --git a/debian/patches/infiniteloop.dpatch b/debian/patches/infiniteloop.dpatch deleted file mode 100644 index 7a7319e..0000000 --- a/debian/patches/infiniteloop.dpatch +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## infiniteloop.dpatch by Jonas Fonseca -## -## DP: add_keybinding: always allocate the new keybinding -## DP: -## DP: Fixes infinite loop repoted by Miciah. Also simply continue when wgetch -## DP: returns ERR (-1) instead of calling get_keybinding() etc. - -@DPATCH@ - -diff --git a/tig.c b/tig.c -index aac7c4e..6c2b7d0 100644 ---- a/tig.c -+++ b/tig.c -@@ -767,10 +767,9 @@ static struct keybinding *keybindings[AR - static void - add_keybinding(enum keymap keymap, enum request request, int key) - { -- struct keybinding *keybinding = keybindings[keymap]; -+ struct keybinding *keybinding; - -- if (!keybinding) -- keybinding = calloc(1, sizeof(*keybinding)); -+ keybinding = calloc(1, sizeof(*keybinding)); - if (!keybinding) - die("Failed to allocate keybinding"); - -@@ -3532,6 +3531,8 @@ main(int argc, char *argv[]) - - /* Refresh, accept single keystroke of input */ - key = wgetch(status_win); -+ if (key == ERR) -+ continue; - - request = get_keybinding(display[current_view]->keymap, key); - diff --git a/debian/patches/splitview.dpatch b/debian/patches/splitview.dpatch deleted file mode 100644 index 57c0f16..0000000 --- a/debian/patches/splitview.dpatch +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## splitview.dpatch by Jonas Fonseca -## -## DP: Never split the tree view when opening another tree view. -## DP: -## DP: The resulting bogus display[] state ment that the blob view was not -## DP: initialized causing segmentation faults in the redrawing code. -## DP: -## DP: Reported by Alexey Tourbin , Josh Triplett -## DP: and Jamey Sharp - -@DPATCH@ - -diff --git a/tig.c b/tig.c -index fcfbc43..3b320e6 100644 ---- a/tig.c -+++ b/tig.c -@@ -2580,7 +2580,7 @@ tree_read(struct view *view, char *text) - static bool - tree_enter(struct view *view, struct line *line) - { -- enum open_flags flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT; -+ enum open_flags flags; - enum request request; - - switch (line->type) { -@@ -2610,11 +2610,12 @@ tree_enter(struct view *view, struct lin - - /* Trees and subtrees share the same ID, so they are not not - * unique like blobs. */ -- flags |= OPEN_RELOAD; -+ flags = OPEN_RELOAD; - request = REQ_VIEW_TREE; - break; - - case LINE_TREE_FILE: -+ flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT; - request = REQ_VIEW_BLOB; - break; - diff --git a/debian/patches/v0.5.dpatch b/debian/patches/v0.5.dpatch deleted file mode 100644 index 825f2cd..0000000 --- a/debian/patches/v0.5.dpatch +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## v0.5.dpatch by Jonas Fonseca -## -## DP: Update the version string. - -@DPATCH@ - -diff --git a/tig.c b/tig.c -index f5f536c..aac7c4e 100644 ---- a/tig.c -+++ b/tig.c -@@ -12,7 +12,7 @@ - */ - - #ifndef VERSION --#define VERSION "tig-0.4.git" -+#define VERSION "tig-0.5.git" - #endif - - #ifndef DEBUG diff --git a/debian/rules b/debian/rules index ceae06e..3df0f09 100755 --- a/debian/rules +++ b/debian/rules @@ -14,18 +14,16 @@ else CFLAGS += -O2 endif -include /usr/share/dpatch/dpatch.make - build: build-stamp -build-stamp: patch +build-stamp: dh_testdir CFLAGS="$(FLAGS)" $(MAKE) all doc touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp