New Upstream Snapshot - arduino-ctags

Ready changes

Summary

Merged new upstream version: 5.8-arduino11+git20161123.2.abc8fca (was: 5.8-arduino11+git20161123.1.abc8fca).

Resulting package

Built on 2022-12-19T10:39 (took 4m35s)

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots arduino-ctags-dbgsymapt install -t fresh-snapshots arduino-ctags

Lintian Result

Diff

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 868b69d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.o
-Makefile
-config.log
-config.status
-ctags
diff --git a/debian/changelog b/debian/changelog
index c7d80cf..a96dc44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+arduino-ctags (5.8-arduino11+git20161123.2.abc8fca-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 19 Dec 2022 10:36:52 -0000
+
 arduino-ctags (5.8-arduino11-2) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/debian-hacks/Using-arduino-as-an-prefix-for-files-to-install.patch b/debian/patches/debian-hacks/Using-arduino-as-an-prefix-for-files-to-install.patch
index 637623a..e5b711f 100644
--- a/debian/patches/debian-hacks/Using-arduino-as-an-prefix-for-files-to-install.patch
+++ b/debian/patches/debian-hacks/Using-arduino-as-an-prefix-for-files-to-install.patch
@@ -8,10 +8,10 @@ use a prefix for the Arduino modified version.
  Makefile.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index c24764e..04f5131 100644
---- a/Makefile.in
-+++ b/Makefile.in
+Index: arduino-ctags.git/Makefile.in
+===================================================================
+--- arduino-ctags.git.orig/Makefile.in
++++ arduino-ctags.git/Makefile.in
 @@ -6,8 +6,8 @@
  # These are the names of the installed programs, in case you wish to change
  # them.
diff --git a/debian/patches/exuberant-debian-hacks/Add-Go-support.patch b/debian/patches/exuberant-debian-hacks/Add-Go-support.patch
index 7fc783b..c423dd0 100644
--- a/debian/patches/exuberant-debian-hacks/Add-Go-support.patch
+++ b/debian/patches/exuberant-debian-hacks/Add-Go-support.patch
@@ -13,11 +13,10 @@ Last-Update: 2011-07-20
  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
+Index: arduino-ctags.git/go.c
+===================================================================
 --- /dev/null
-+++ b/go.c
++++ arduino-ctags.git/go.c
 @@ -0,0 +1,670 @@
 +/*
 +*   INCLUDE FILES
@@ -689,10 +688,10 @@ index 0000000..6bd3a36
 +	def->initialize = initialize;
 +	return def;
 +}
-diff --git a/parsers.h b/parsers.h
-index e4a50e1..0476a2b 100644
---- a/parsers.h
-+++ b/parsers.h
+Index: arduino-ctags.git/parsers.h
+===================================================================
+--- arduino-ctags.git.orig/parsers.h
++++ arduino-ctags.git/parsers.h
 @@ -32,6 +32,7 @@
  	ErlangParser, \
  	FlexParser, \
@@ -701,10 +700,10 @@ index e4a50e1..0476a2b 100644
  	HtmlParser, \
  	JavaParser, \
  	JavaScriptParser, \
-diff --git a/source.mak b/source.mak
-index 3e5f740..d4c4c26 100644
---- a/source.mak
-+++ b/source.mak
+Index: arduino-ctags.git/source.mak
+===================================================================
+--- arduino-ctags.git.orig/source.mak
++++ arduino-ctags.git/source.mak
 @@ -24,6 +24,7 @@ SOURCES = \
  	flex.c \
  	fortran.c \
diff --git a/debian/patches/exuberant-debian-hacks/Adjust-__unused__-macro-after-glibc-changes-2.33.patch b/debian/patches/exuberant-debian-hacks/Adjust-__unused__-macro-after-glibc-changes-2.33.patch
index ada6a5c..860a766 100644
--- a/debian/patches/exuberant-debian-hacks/Adjust-__unused__-macro-after-glibc-changes-2.33.patch
+++ b/debian/patches/exuberant-debian-hacks/Adjust-__unused__-macro-after-glibc-changes-2.33.patch
@@ -21,11 +21,11 @@ Last-Update: 2022-08-16
  python.c  |  2 +-
  8 files changed, 33 insertions(+), 33 deletions(-)
 
-diff --git a/eiffel.c b/eiffel.c
-index e2f5a5c..f1293f1 100644
---- a/eiffel.c
-+++ b/eiffel.c
-@@ -807,7 +807,7 @@ static void findKeyword (tokenInfo *const token, const keywordId keyword)
+Index: arduino-ctags.git/eiffel.c
+===================================================================
+--- arduino-ctags.git.orig/eiffel.c
++++ arduino-ctags.git/eiffel.c
+@@ -807,7 +807,7 @@ static void findKeyword (tokenInfo *cons
  
  static boolean parseType (tokenInfo *const token);
  
@@ -34,10 +34,10 @@ index e2f5a5c..f1293f1 100644
  {
  	unsigned int depth = 0;
  #ifdef TYPE_REFERENCE_TOOL
-diff --git a/general.h b/general.h
-index 2d1d629..8282a8b 100644
---- a/general.h
-+++ b/general.h
+Index: arduino-ctags.git/general.h
+===================================================================
+--- arduino-ctags.git.orig/general.h
++++ arduino-ctags.git/general.h
 @@ -57,7 +57,7 @@
   *  to prevent warnings about unused variables.
   */
@@ -47,10 +47,10 @@ index 2d1d629..8282a8b 100644
  # define __printf__(s,f)  __attribute__((format (printf, s, f)))
  #else
  # define __unused__
-diff --git a/lregex.c b/lregex.c
-index 37d7ea0..addf35f 100644
---- a/lregex.c
-+++ b/lregex.c
+Index: arduino-ctags.git/lregex.c
+===================================================================
+--- arduino-ctags.git.orig/lregex.c
++++ arduino-ctags.git/lregex.c
 @@ -538,11 +538,11 @@ extern void findRegexTags (void)
  #endif  /* HAVE_REGEX */
  
@@ -101,7 +101,7 @@ index 37d7ea0..addf35f 100644
  {
  	boolean handled = FALSE;
  	const char* const dash = strchr (option, '-');
-@@ -624,7 +624,7 @@ extern boolean processRegexOption (const char *const option,
+@@ -624,7 +624,7 @@ extern boolean processRegexOption (const
  	return handled;
  }
  
@@ -110,7 +110,7 @@ index 37d7ea0..addf35f 100644
  {
  #ifdef HAVE_REGEX
  	if (language <= SetUpper  &&  Sets [language].count > 0)
-@@ -639,8 +639,8 @@ extern void disableRegexKinds (const langType language __unused__)
+@@ -639,8 +639,8 @@ extern void disableRegexKinds (const lan
  }
  
  extern boolean enableRegexKind (
@@ -130,10 +130,10 @@ index 37d7ea0..addf35f 100644
  {
  #ifdef HAVE_REGEX
  	if (language <= SetUpper  &&  Sets [language].count > 0)
-diff --git a/lua.c b/lua.c
-index d385544..91da6ab 100644
---- a/lua.c
-+++ b/lua.c
+Index: arduino-ctags.git/lua.c
+===================================================================
+--- arduino-ctags.git.orig/lua.c
++++ arduino-ctags.git/lua.c
 @@ -37,7 +37,7 @@ static kindOption LuaKinds [] = {
  */
  
@@ -143,10 +143,10 @@ index d385544..91da6ab 100644
  {
  	for ( ; p != q; p++)
  		fprintf (errout, "%c", *p);
-diff --git a/main.c b/main.c
-index 79948fe..8dbf31d 100644
---- a/main.c
-+++ b/main.c
+Index: arduino-ctags.git/main.c
+===================================================================
+--- arduino-ctags.git.orig/main.c
++++ arduino-ctags.git/main.c
 @@ -522,7 +522,7 @@ static void makeTags (cookedArgs *args)
   *		Start up code
   */
@@ -156,10 +156,10 @@ index 79948fe..8dbf31d 100644
  {
  	cookedArgs *args;
  #ifdef VMS
-diff --git a/options.c b/options.c
-index 8f68469..60623e1 100644
---- a/options.c
-+++ b/options.c
+Index: arduino-ctags.git/options.c
+===================================================================
+--- arduino-ctags.git.orig/options.c
++++ arduino-ctags.git/options.c
 @@ -731,7 +731,7 @@ static void processEtagsInclude (
  }
  
@@ -178,7 +178,7 @@ index 8f68469..60623e1 100644
  {
  	freeString (&Option.filterTerminator);
  	Option.filterTerminator = stringCopy (parameter);
-@@ -931,8 +931,8 @@ static void printProgramIdentification (void)
+@@ -931,8 +931,8 @@ static void printProgramIdentification (
  }
  
  static void processHelpOption (
@@ -222,7 +222,7 @@ index 8f68469..60623e1 100644
  {
  	printLanguageList ();
  	exit (0);
-@@ -1359,8 +1359,8 @@ static void processIgnoreOption (const char *const list)
+@@ -1359,8 +1359,8 @@ static void processIgnoreOption (const c
  }
  
  static void processVersionOption (
@@ -233,10 +233,10 @@ index 8f68469..60623e1 100644
  {
  	printProgramIdentification ();
  	exit (0);
-diff --git a/parse.c b/parse.c
-index 0b5e2c3..4fd4e08 100644
---- a/parse.c
-+++ b/parse.c
+Index: arduino-ctags.git/parse.c
+===================================================================
+--- arduino-ctags.git.orig/parse.c
++++ arduino-ctags.git/parse.c
 @@ -376,7 +376,7 @@ extern void freeParserResources (void)
  */
  
@@ -246,11 +246,11 @@ index 0b5e2c3..4fd4e08 100644
  {
  #ifdef HAVE_REGEX
  	if (parameter [0] == '\0')
-diff --git a/python.c b/python.c
-index bf797de..2eb3d96 100644
---- a/python.c
-+++ b/python.c
-@@ -135,7 +135,7 @@ static boolean isIdentifierCharacter (int c)
+Index: arduino-ctags.git/python.c
+===================================================================
+--- arduino-ctags.git.orig/python.c
++++ arduino-ctags.git/python.c
+@@ -135,7 +135,7 @@ static boolean isIdentifierCharacter (in
   * extract all relevant information and create a tag.
   */
  static void makeFunctionTag (vString *const function,
diff --git a/debian/patches/exuberant-debian-hacks/Changed-the-javascript-parser-to-set-the-tag-s-scope-rath.patch b/debian/patches/exuberant-debian-hacks/Changed-the-javascript-parser-to-set-the-tag-s-scope-rath.patch
index 9f2da70..d222402 100644
--- a/debian/patches/exuberant-debian-hacks/Changed-the-javascript-parser-to-set-the-tag-s-scope-rath.patch
+++ b/debian/patches/exuberant-debian-hacks/Changed-the-javascript-parser-to-set-the-tag-s-scope-rath.patch
@@ -13,11 +13,11 @@ Last-Update: 2014-09-27
  jscript.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 51 insertions(+), 3 deletions(-)
 
-diff --git a/jscript.c b/jscript.c
-index c4e5b1a..901641a 100644
---- a/jscript.c
-+++ b/jscript.c
-@@ -215,6 +215,7 @@ static void deleteToken (tokenInfo *const token)
+Index: arduino-ctags.git/jscript.c
+===================================================================
+--- arduino-ctags.git.orig/jscript.c
++++ arduino-ctags.git/jscript.c
+@@ -215,6 +215,7 @@ static void deleteToken (tokenInfo *cons
   *	 Tag generation functions
   */
  
@@ -25,7 +25,7 @@ index c4e5b1a..901641a 100644
  static void makeConstTag (tokenInfo *const token, const jsKind kind)
  {
  	if (JsKinds [kind].enabled && ! token->ignoreTag )
-@@ -238,12 +239,13 @@ static void makeJsTag (tokenInfo *const token, const jsKind kind)
+@@ -238,12 +239,13 @@ static void makeJsTag (tokenInfo *const
  
  	if (JsKinds [kind].enabled && ! token->ignoreTag )
  	{
@@ -41,7 +41,7 @@ index c4e5b1a..901641a 100644
  			fulltag = vStringNew ();
  			vStringCopy(fulltag, token->scope);
  			vStringCatS (fulltag, ".");
-@@ -251,8 +253,54 @@ static void makeJsTag (tokenInfo *const token, const jsKind kind)
+@@ -251,8 +253,54 @@ static void makeJsTag (tokenInfo *const
  			vStringTerminate(fulltag);
  			vStringCopy(token->string, fulltag);
  			vStringDelete (fulltag);
@@ -57,7 +57,8 @@ index c4e5b1a..901641a 100644
 + 
 + 			e.extensionFields.scope[0] = JsKinds [parent_kind].name;
 + 			e.extensionFields.scope[1] = vStringValue (token->scope);
-+		}
+ 		}
+-		makeConstTag (token, kind);
 +		* makeConstTag (token, kind); *
 + 		makeTagEntry (&e);
 +	}
@@ -90,8 +91,7 @@ index c4e5b1a..901641a 100644
 +
 +			e.extensionFields.scope[0] = JsKinds [parent_kind].name;
 +			e.extensionFields.scope[1] = vStringValue (token->scope);
- 		}
--		makeConstTag (token, kind);
++		}
 +
 +		makeTagEntry (&e);
  	}
diff --git a/debian/patches/exuberant-debian-hacks/Don-t-build-the-compilation-date-and-time-into-the-binary.patch b/debian/patches/exuberant-debian-hacks/Don-t-build-the-compilation-date-and-time-into-the-binary.patch
index 916a6f1..65a1f7f 100644
--- a/debian/patches/exuberant-debian-hacks/Don-t-build-the-compilation-date-and-time-into-the-binary.patch
+++ b/debian/patches/exuberant-debian-hacks/Don-t-build-the-compilation-date-and-time-into-the-binary.patch
@@ -9,11 +9,11 @@ Last-Update: 2015-03-14
  options.c | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/options.c b/options.c
-index 9e054f7..8f68469 100644
---- a/options.c
-+++ b/options.c
-@@ -926,7 +926,6 @@ static void printProgramIdentification (void)
+Index: arduino-ctags.git/options.c
+===================================================================
+--- arduino-ctags.git.orig/options.c
++++ arduino-ctags.git/options.c
+@@ -926,7 +926,6 @@ static void printProgramIdentification (
  	printf ("%s %s, %s %s\n",
  	        PROGRAM_NAME, PROGRAM_VERSION,
  	        PROGRAM_COPYRIGHT, AUTHOR_NAME);
diff --git a/debian/patches/exuberant-debian-hacks/Fix-build-with-gcc-fno-common.patch b/debian/patches/exuberant-debian-hacks/Fix-build-with-gcc-fno-common.patch
index ea322e9..498e985 100644
--- a/debian/patches/exuberant-debian-hacks/Fix-build-with-gcc-fno-common.patch
+++ b/debian/patches/exuberant-debian-hacks/Fix-build-with-gcc-fno-common.patch
@@ -14,11 +14,11 @@ removed so the patch can apply to the arduino-ctags version too.
  ocaml.c | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
-diff --git a/ocaml.c b/ocaml.c
-index 8fd6872..b1cdec5 100644
---- a/ocaml.c
-+++ b/ocaml.c
-@@ -494,26 +494,26 @@ typedef void (*parseNext) (vString * const ident, ocaToken what);
+Index: arduino-ctags.git/ocaml.c
+===================================================================
+--- arduino-ctags.git.orig/ocaml.c
++++ arduino-ctags.git/ocaml.c
+@@ -494,26 +494,26 @@ typedef void (*parseNext) (vString * con
  /********** Helpers */
  /* This variable hold the 'parser' which is going to
   * handle the next token */
diff --git a/debian/patches/exuberant-debian-hacks/Fix-infinite-loop-parsing-vim-commands.patch b/debian/patches/exuberant-debian-hacks/Fix-infinite-loop-parsing-vim-commands.patch
index 9321780..0f86a66 100644
--- a/debian/patches/exuberant-debian-hacks/Fix-infinite-loop-parsing-vim-commands.patch
+++ b/debian/patches/exuberant-debian-hacks/Fix-infinite-loop-parsing-vim-commands.patch
@@ -13,11 +13,11 @@ Last-Update: 2011-03-17
  vim.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/vim.c b/vim.c
-index 951ee5f..2be3777 100644
---- a/vim.c
-+++ b/vim.c
-@@ -394,7 +394,9 @@ static boolean parseCommand (const unsigned char *line)
+Index: arduino-ctags.git/vim.c
+===================================================================
+--- arduino-ctags.git.orig/vim.c
++++ arduino-ctags.git/vim.c
+@@ -394,7 +394,9 @@ static boolean parseCommand (const unsig
  			while (*cp && !isspace ((int) *cp))
  				++cp; 
  		}
diff --git a/debian/patches/exuberant-debian-hacks/Use-memmove-on-overlapping-strings.patch b/debian/patches/exuberant-debian-hacks/Use-memmove-on-overlapping-strings.patch
index 94cb562..d3fa6c5 100644
--- a/debian/patches/exuberant-debian-hacks/Use-memmove-on-overlapping-strings.patch
+++ b/debian/patches/exuberant-debian-hacks/Use-memmove-on-overlapping-strings.patch
@@ -12,11 +12,11 @@ Last-Update: 2011-02-17
  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 @@ extern char* absoluteFilename (const char *file)
+Index: arduino-ctags.git/routines.c
+===================================================================
+--- arduino-ctags.git.orig/routines.c
++++ arduino-ctags.git/routines.c
+@@ -757,13 +757,13 @@ extern char* absoluteFilename (const cha
  				else if (cp [0] != PATH_SEPARATOR)
  					cp = slashp;
  #endif
diff --git a/debian/patches/exuberant-debian-hacks/python-Disable-import-parsing-by-default.patch b/debian/patches/exuberant-debian-hacks/python-Disable-import-parsing-by-default.patch
index 48333c2..65a5813 100644
--- a/debian/patches/exuberant-debian-hacks/python-Disable-import-parsing-by-default.patch
+++ b/debian/patches/exuberant-debian-hacks/python-Disable-import-parsing-by-default.patch
@@ -14,10 +14,10 @@ Last-Update: 2010-08-17
  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
+Index: arduino-ctags.git/python.c
+===================================================================
+--- arduino-ctags.git.orig/python.c
++++ arduino-ctags.git/python.c
 @@ -56,7 +56,7 @@ static kindOption PythonKinds[] = {
  	{TRUE, 'f', "function", "functions"},
  	{TRUE, 'm', "member",   "class members"},
diff --git a/debian/patches/fixes/Fix-misspelled-word-langauge.patch b/debian/patches/fixes/Fix-misspelled-word-langauge.patch
index 3b46f80..62e27ac 100644
--- a/debian/patches/fixes/Fix-misspelled-word-langauge.patch
+++ b/debian/patches/fixes/Fix-misspelled-word-langauge.patch
@@ -7,11 +7,11 @@ Forwarded: https://github.com/arduino/ctags/pull/17
  options.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/options.c b/options.c
-index 1bee61d..9e054f7 100644
---- a/options.c
-+++ b/options.c
-@@ -238,7 +238,7 @@ static optionDescription LongOptionDescription [] = {
+Index: arduino-ctags.git/options.c
+===================================================================
+--- arduino-ctags.git.orig/options.c
++++ arduino-ctags.git/options.c
+@@ -238,7 +238,7 @@ static optionDescription LongOptionDescr
   {1,"  --language-force=language"},
   {1,"       Force all files to be interpreted using specified language."},
   {1,"  --languages=[+|-]list"},
diff --git a/debian/patches/fixes/Remove-unneeded-quote-for-apostrophe.patch b/debian/patches/fixes/Remove-unneeded-quote-for-apostrophe.patch
index 55babb8..a2344ec 100644
--- a/debian/patches/fixes/Remove-unneeded-quote-for-apostrophe.patch
+++ b/debian/patches/fixes/Remove-unneeded-quote-for-apostrophe.patch
@@ -8,11 +8,11 @@ needed in this case.
  ctags.1 | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/ctags.1 b/ctags.1
-index 2d89006..fe76569 100644
---- a/ctags.1
-+++ b/ctags.1
-@@ -171,7 +171,7 @@ identifiers are separated with the '=' character, the first identifiers is
+Index: arduino-ctags.git/ctags.1
+===================================================================
+--- arduino-ctags.git.orig/ctags.1
++++ arduino-ctags.git/ctags.1
+@@ -171,7 +171,7 @@ identifiers are separated with the '=' c
  replaced by the second identifiers for parsing purposes. The list of
  identifiers may be supplied directly on the command line or read in from a
  separate file. If the first character of \fIidentifier\-list\fP is '@', '.' or
@@ -21,7 +21,7 @@ index 2d89006..fe76569 100644
  drive letter (e.g. "C:"), the parameter \fIidentifier\-list\fP will be
  interpreted as a filename from which to read a list of identifiers, one per
  input line. Otherwise, \fIidentifier\-list\fP is a list of identifiers (or
-@@ -705,7 +705,7 @@ line is found, a tag will be generated for the name defined by
+@@ -705,7 +705,7 @@ line is found, a tag will be generated f
  \\1 through \\9 to refer to matching sub-expression groups within
  \fIregexp\fP. The '/' separator characters shown in the parameter to the
  option can actually be replaced by any character. Note that whichever

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/78/bc68d215f4d72d9e23001e296fba83da55fa06.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/e3/1bccd33c72d4b342b3025931c83c605c267976.debug

No differences were encountered between the control files of package arduino-ctags

Control files of package arduino-ctags-dbgsym: lines which differ (wdiff format)

  • Build-Ids: e31bccd33c72d4b342b3025931c83c605c267976 78bc68d215f4d72d9e23001e296fba83da55fa06

More details

Full run details