diff -Nru exuberant-ctags-5.9~svn20110310/debian/changelog exuberant-ctags-5.9~svn20110310/debian/changelog --- exuberant-ctags-5.9~svn20110310/debian/changelog 2013-07-04 11:27:59.000000000 +0000 +++ exuberant-ctags-5.9~svn20110310/debian/changelog 2014-02-15 23:52:26.000000000 +0000 @@ -1,3 +1,13 @@ +exuberant-ctags (1:5.9~svn20110310-7) unstable; urgency=medium + + * Add a Homepage field. + * Switch to git; add Vcs-* fields. + * Add a hacky "debian/rules git-svn-setup", making it possible to set up + git-svn metadata again after cloning. + * Policy version 3.9.5: no changes required. + + -- Colin Watson Sat, 15 Feb 2014 23:52:23 +0000 + exuberant-ctags (1:5.9~svn20110310-6) unstable; urgency=low * Convert debian/copyright to copyright-format 1.0, dropping obsolete diff -Nru exuberant-ctags-5.9~svn20110310/debian/control exuberant-ctags-5.9~svn20110310/debian/control --- exuberant-ctags-5.9~svn20110310/debian/control 2012-10-04 12:54:23.000000000 +0000 +++ exuberant-ctags-5.9~svn20110310/debian/control 2014-02-15 23:36:23.000000000 +0000 @@ -3,7 +3,10 @@ Priority: optional Maintainer: Colin Watson Build-Depends: dpkg (>= 1.16.1~), debhelper (>= 9), dh-autoreconf -Standards-Version: 3.8.4 +Standards-Version: 3.9.5 +Homepage: http://ctags.sourceforge.net/ +Vcs-Git: git://anonscm.debian.org/users/cjwatson/exuberant-ctags.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/cjwatson/exuberant-ctags.git Package: exuberant-ctags Architecture: any diff -Nru exuberant-ctags-5.9~svn20110310/debian/.git-dpm exuberant-ctags-5.9~svn20110310/debian/.git-dpm --- exuberant-ctags-5.9~svn20110310/debian/.git-dpm 1970-01-01 00:00:00.000000000 +0000 +++ exuberant-ctags-5.9~svn20110310/debian/.git-dpm 2014-02-15 22:59:42.000000000 +0000 @@ -0,0 +1,8 @@ +# see git-dpm(1) from git-dpm package +18e7bce7b0a8c8761c0b911f3039a7f949703fb3 +18e7bce7b0a8c8761c0b911f3039a7f949703fb3 +4b0ebb9d344fd369c889291478986c65a5a36ea8 +4b0ebb9d344fd369c889291478986c65a5a36ea8 +exuberant-ctags_5.9~svn20110310.orig.tar.gz +8d2a9214b26e2b9046f9264ade2f2a528eaf6e23 +497076 diff -Nru exuberant-ctags-5.9~svn20110310/debian/patches/go.patch exuberant-ctags-5.9~svn20110310/debian/patches/go.patch --- exuberant-ctags-5.9~svn20110310/debian/patches/go.patch 2011-07-20 13:21:46.000000000 +0000 +++ exuberant-ctags-5.9~svn20110310/debian/patches/go.patch 2014-02-15 22:59:42.000000000 +0000 @@ -1,11 +1,23 @@ -Description: Add Go support +From 18e7bce7b0a8c8761c0b911f3039a7f949703fb3 Mon Sep 17 00:00:00 2001 +From: Alexey Marinichev +Date: Sat, 15 Feb 2014 22:47:04 +0000 +Subject: Add Go support + Bug-Debian: http://bugs.debian.org/634166 -Author: Alexey Marinichev Origin: other, https://github.com/lyosha/ctags-go/commit/ca097bd639e35470a9abccbf348016b7cc44f811 Last-Update: 2011-07-20 -Index: b/go.c -=================================================================== +Patch-Name: go.patch +--- + go.c | 670 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + parsers.h | 1 + + source.mak | 2 + + 3 files changed, 673 insertions(+) + create mode 100644 go.c + +diff --git a/go.c b/go.c +new file mode 100644 +index 0000000..6bd3a36 --- /dev/null +++ b/go.c @@ -0,0 +1,670 @@ @@ -679,8 +691,8 @@ + def->initialize = initialize; + return def; +} -Index: b/parsers.h -=================================================================== +diff --git a/parsers.h b/parsers.h +index 600f636..3a24d6e 100644 --- a/parsers.h +++ b/parsers.h @@ -31,6 +31,7 @@ @@ -691,11 +703,11 @@ HtmlParser, \ JavaParser, \ JavaScriptParser, \ -Index: b/source.mak -=================================================================== +diff --git a/source.mak b/source.mak +index c97617f..985d56c 100644 --- a/source.mak +++ b/source.mak -@@ -24,6 +24,7 @@ +@@ -24,6 +24,7 @@ SOURCES = \ flex.c \ fortran.c \ get.c \ @@ -703,7 +715,7 @@ html.c \ jscript.c \ keyword.c \ -@@ -87,6 +88,7 @@ +@@ -87,6 +88,7 @@ OBJECTS = \ flex.$(OBJEXT) \ fortran.$(OBJEXT) \ get.$(OBJEXT) \ diff -Nru exuberant-ctags-5.9~svn20110310/debian/patches/memmove.patch exuberant-ctags-5.9~svn20110310/debian/patches/memmove.patch --- exuberant-ctags-5.9~svn20110310/debian/patches/memmove.patch 2011-02-17 13:45:04.000000000 +0000 +++ exuberant-ctags-5.9~svn20110310/debian/patches/memmove.patch 2014-02-15 22:59:42.000000000 +0000 @@ -1,16 +1,25 @@ -Description: Use memmove on overlapping strings - strcpy is not guaranteed to work on overlapping strings, and this can lead - to broken paths appearing in tag files. Use memmove instead. -Author: Ben Spencer +From fb56c83886b3c1caf8a483d1e449595e740292e6 Mon Sep 17 00:00:00 2001 +From: Ben Spencer +Date: Sat, 15 Feb 2014 22:47:00 +0000 +Subject: Use memmove on overlapping strings + +strcpy is not guaranteed to work on overlapping strings, and this can lead +to broken paths appearing in tag files. Use memmove instead. + Origin: other, http://sourceforge.net/tracker/?func=detail&aid=3034816&group_id=6556&atid=306556 Forwarded: yes Last-Update: 2011-02-17 -Index: b/routines.c -=================================================================== +Patch-Name: memmove.patch +--- + routines.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/routines.c b/routines.c +index 83bcdcc..8ebe2e0 100644 --- a/routines.c +++ b/routines.c -@@ -757,13 +757,13 @@ +@@ -757,13 +757,13 @@ extern char* absoluteFilename (const char *file) else if (cp [0] != PATH_SEPARATOR) cp = slashp; #endif diff -Nru exuberant-ctags-5.9~svn20110310/debian/patches/python-disable-imports.patch exuberant-ctags-5.9~svn20110310/debian/patches/python-disable-imports.patch --- exuberant-ctags-5.9~svn20110310/debian/patches/python-disable-imports.patch 2010-08-17 17:09:25.000000000 +0000 +++ exuberant-ctags-5.9~svn20110310/debian/patches/python-disable-imports.patch 2014-02-15 22:59:42.000000000 +0000 @@ -1,18 +1,27 @@ -Description: python: Disable import parsing by default - Parsing imports mixes up imports with actual class definitions. If you - need to re-enable this, use the --python-kinds=+i option. +From 80c99317f1bfb4333757cad0819924f83f62b24e Mon Sep 17 00:00:00 2001 +From: Barry Warsaw +Date: Sat, 15 Feb 2014 22:47:01 +0000 +Subject: python: Disable import parsing by default + +Parsing imports mixes up imports with actual class definitions. If you need +to re-enable this, use the --python-kinds=+i option. + Bug: http://sourceforge.net/tracker/?func=detail&aid=2829739&group_id=6556&atid=106556 Bug-Ubuntu: https://bugs.launchpad.net/bugs/618979 -Author: Barry Warsaw Reviewed-by: Colin Watson Forwarded: no Last-Update: 2010-08-17 -Index: b/python.c -=================================================================== +Patch-Name: python-disable-imports.patch +--- + python.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python.c b/python.c +index a90d072..bf797de 100644 --- a/python.c +++ b/python.c -@@ -56,7 +56,7 @@ +@@ -56,7 +56,7 @@ static kindOption PythonKinds[] = { {TRUE, 'f', "function", "functions"}, {TRUE, 'm', "member", "class members"}, {TRUE, 'v', "variable", "variables"}, diff -Nru exuberant-ctags-5.9~svn20110310/debian/patches/vim-command-loop.patch exuberant-ctags-5.9~svn20110310/debian/patches/vim-command-loop.patch --- exuberant-ctags-5.9~svn20110310/debian/patches/vim-command-loop.patch 2011-03-17 16:45:31.000000000 +0000 +++ exuberant-ctags-5.9~svn20110310/debian/patches/vim-command-loop.patch 2014-02-15 22:59:42.000000000 +0000 @@ -1,17 +1,26 @@ -Description: Fix infinite loop parsing vim commands - This happens if a non-alphanumeric character other than whitespace or '-' - is found before the first alphanumeric character after 'command'. -Author: Colin Watson +From 15b3c591abd3b0e4334f9fba19a9b75330b33c26 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Sat, 15 Feb 2014 22:47:02 +0000 +Subject: Fix infinite loop parsing vim commands + +This happens if a non-alphanumeric character other than whitespace or '-' is +found before the first alphanumeric character after 'command'. + Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=3214129&group_id=6556&atid=106556 Bug-Ubuntu: https://bugs.launchpad.net/bugs/736367 Forwarded: no Last-Update: 2011-03-17 -Index: b/vim.c -=================================================================== +Patch-Name: vim-command-loop.patch +--- + vim.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/vim.c b/vim.c +index 4e6fba8..d17a1ba 100644 --- a/vim.c +++ b/vim.c -@@ -405,7 +405,9 @@ +@@ -405,7 +405,9 @@ static boolean parseCommand (const unsigned char *line) while (*cp && !isspace ((int) *cp)) ++cp; } diff -Nru exuberant-ctags-5.9~svn20110310/debian/rules exuberant-ctags-5.9~svn20110310/debian/rules --- exuberant-ctags-5.9~svn20110310/debian/rules 2012-10-04 12:54:18.000000000 +0000 +++ exuberant-ctags-5.9~svn20110310/debian/rules 2014-02-15 23:19:41.000000000 +0000 @@ -13,3 +13,15 @@ override_dh_installchangelogs: dh_installchangelogs NEWS + +# git clones do not contain git-svn metadata. This can be used to set it +# back up if you need it. +git-svn-setup: + set -e; if [ -d .git ] && [ ! -d .git/svn ]; then \ + git config svn-remote.svn.url svn://svn.code.sf.net/p/ctags/code; \ + git config svn-remote.svn.fetch trunk:refs/remotes/svn/trunk; \ + git config svn-remote.svn.branches 'branches/*:refs/remotes/svn/*'; \ + git config svn-remote.svn.tags 'tags/*:refs/remotes/svn/tags/*'; \ + git update-ref refs/remotes/svn/trunk "$$(git log -n1 --grep git-svn-id: --format=%H)"; \ + git svn fetch; \ + fi