Bug#640131: [checks/patch-systems] claims patch modifying debian/* while actually the patch doesn't
Package: lintian
Version: 2.5.2
Severity: minor
Hi!
While preparing a new release for opencity I got the following
lintian report:
E: opencity source: patch-modifying-debian-files remove-use-of-embedded-tinyxml.patch debian/patches/remove-use-of-embedded-tinyxml.patch
I guess lintian either uses the '^diff' lines (content filtered out
by filterdiff) ir the mentioning in '^Only in'. Patch in question
attached.
Regards
Christoph
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-1-amd64 (SMP w/6 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages lintian depends on:
ii binutils 2.21.52.20110606-2 The GNU assembler, linker and bina
ii bzip2 1.0.5-6 high-quality block-sorting file co
ii diffstat 1.54-1 produces graph of changes introduc
ii file 5.04-5+b1 Determines file type using "magic"
ii gettext 0.18.1.1-4 GNU Internationalization utilities
ii intltool-debian 0.35.0+20060710.1 Help i18n of RFC822 compliant conf
ii libapt-pkg-perl 0.1.24+b2 Perl interface to libapt-pkg
ii libclass-accessor-per 0.34-1 Perl module that automatically gen
ii libdpkg-perl 1.16.0.3 Dpkg perl modules
ii libemail-valid-perl 0.185-1 Perl module for checking the valid
ii libipc-run-perl 0.90-1 Perl module for running processes
ii libparse-debianchange 1.2.0-1 parse Debian changelogs and output
ii libtimedate-perl 1.2000-1 collection of modules to manipulat
ii liburi-perl 1.59-1 module to manipulate and access UR
ii locales 2.13-16 Embedded GNU C Library: National L
ii man-db 2.6.0.2-2 on-line manual pager
ii perl [libdigest-sha-p 5.12.4-4 Larry Wall's Practical Extraction
ii unzip 6.0-5 De-archiver for .zip files
lintian recommends no packages.
Versions of packages lintian suggests:
pn binutils-multiarch <none> (no description available)
ii dpkg-dev 1.16.0.3 Debian package development tools
ii libhtml-parser-per 3.68-1+b1 collection of modules that parse H
ii libtext-template-p 1.45-2 Text::Template perl module
ii man-db 2.6.0.2-2 on-line manual pager
ii xz-utils 5.1.1alpha+20110809-2 XZ-format compression utilities
-- no debconf information
Only in opencity-0.0.6.4stable: config.guess
Only in opencity-0.0.6.4stable: config.sub
diff -ur opencity-0.0.6.4stable/configure opencity-0.0.6.4stable.work/configure
--- opencity-0.0.6.4stable/configure 2011-07-03 19:14:48.000000000 +0200
+++ opencity-0.0.6.4stable.work/configure 2011-09-02 19:45:54.253932007 +0200
@@ -6194,8 +6194,6 @@
ac_config_files="$ac_config_files src/structure/Makefile"
-ac_config_files="$ac_config_files src/tinyxml/Makefile"
-
ac_config_files="$ac_config_files src/tinyxpath/Makefile"
ac_config_files="$ac_config_files src/triangulation/Makefile"
@@ -6856,7 +6854,6 @@
"src/pngfuncs/Makefile") CONFIG_FILES="$CONFIG_FILES src/pngfuncs/Makefile" ;;
"src/simulator/Makefile") CONFIG_FILES="$CONFIG_FILES src/simulator/Makefile" ;;
"src/structure/Makefile") CONFIG_FILES="$CONFIG_FILES src/structure/Makefile" ;;
- "src/tinyxml/Makefile") CONFIG_FILES="$CONFIG_FILES src/tinyxml/Makefile" ;;
"src/tinyxpath/Makefile") CONFIG_FILES="$CONFIG_FILES src/tinyxpath/Makefile" ;;
"src/triangulation/Makefile") CONFIG_FILES="$CONFIG_FILES src/triangulation/Makefile" ;;
"viewer/Makefile") CONFIG_FILES="$CONFIG_FILES viewer/Makefile" ;;
diff -ur opencity-0.0.6.4stable/debian/changelog opencity-0.0.6.4stable.work/debian/changelog
diff -ur opencity-0.0.6.4stable/debian/control opencity-0.0.6.4stable.work/debian/control
Only in opencity-0.0.6.4stable/debian/patches: remove-use-of-embedded-tinyxml.patch
diff -ur opencity-0.0.6.4stable/debian/patches/series opencity-0.0.6.4stable.work/debian/patches/series
diff -ur opencity-0.0.6.4stable/src/Makefile.in opencity-0.0.6.4stable.work/src/Makefile.in
--- opencity-0.0.6.4stable/src/Makefile.in 2011-07-03 19:14:47.000000000 +0200
+++ opencity-0.0.6.4stable.work/src/Makefile.in 2011-09-02 19:18:19.921844387 +0200
@@ -64,7 +64,7 @@
oczen_DEPENDENCIES = binreloc/libbinreloc.a mapgen/libmapgen.a \
mas/libmas.a model/libmodel.a networking/libnet.a \
pngfuncs/libpngfuncs.a simulator/libsim.a \
- structure/libstruct.a tinyxml/libtinyxml.a \
+ structure/libstruct.a \
tinyxpath/libtinyxpath.a triangulation/libtriangulation.a
am__opencity_SOURCES_DIST = audiomanager.cpp audiomanagersdl.cpp \
buildinglayer.cpp city.cpp conf.cpp destination.cpp \
@@ -92,7 +92,7 @@
opencity_DEPENDENCIES = binreloc/libbinreloc.a mapgen/libmapgen.a \
mas/libmas.a model/libmodel.a networking/libnet.a \
pngfuncs/libpngfuncs.a simulator/libsim.a \
- structure/libstruct.a tinyxml/libtinyxml.a \
+ structure/libstruct.a \
tinyxpath/libtinyxpath.a triangulation/libtriangulation.a
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -226,7 +226,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = binreloc enum mapgen mas model networking pngfuncs simulator structure tinyxml tinyxpath triangulation
+SUBDIRS = binreloc enum mapgen mas model networking pngfuncs simulator structure tinyxpath triangulation
AM_CPPFLAGS = \
-I@top_srcdir@/src/ \
-I@top_srcdir@/src/binreloc/ \
@@ -238,7 +238,6 @@
-I@top_srcdir@/src/pngfuncs/ \
-I@top_srcdir@/src/simulator/ \
-I@top_srcdir@/src/structure/ \
- -I@top_srcdir@/src/tinyxml/ \
-I@top_srcdir@/src/tinyxpath/ \
-I@top_srcdir@/src/triangulation/ \
-DDATADIR=\"@datadir@\" \
@@ -257,7 +256,7 @@
pngfuncs/libpngfuncs.a \
simulator/libsim.a \
structure/libstruct.a \
-tinyxml/libtinyxml.a \
+-ltinyxml \
tinyxpath/libtinyxpath.a \
triangulation/libtriangulation.a
@@ -342,7 +341,7 @@
pngfuncs/libpngfuncs.a \
simulator/libsim.a \
structure/libstruct.a \
-tinyxml/libtinyxml.a \
+-ltinyxml \
tinyxpath/libtinyxpath.a \
triangulation/libtriangulation.a
Only in opencity-0.0.6.4stable/src: tinyxml
diff -ur opencity-0.0.6.4stable/src/tinyxpath/Makefile.in opencity-0.0.6.4stable.work/src/tinyxpath/Makefile.in
--- opencity-0.0.6.4stable/src/tinyxpath/Makefile.in 2011-07-03 19:14:47.000000000 +0200
+++ opencity-0.0.6.4stable.work/src/tinyxpath/Makefile.in 2011-09-02 19:34:36.870620447 +0200
@@ -178,8 +178,6 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CPPFLAGS = \
- -I@top_srcdir@/src/tinyxml/
noinst_LIBRARIES = libtinyxpath.a
libtinyxpath_a_SOURCES = \
diff -ur opencity-0.0.6.4stable/src/tinyxpath/node_set.cpp opencity-0.0.6.4stable.work/src/tinyxpath/node_set.cpp
--- opencity-0.0.6.4stable/src/tinyxpath/node_set.cpp 2011-07-03 18:36:33.000000000 +0200
+++ opencity-0.0.6.4stable.work/src/tinyxpath/node_set.cpp 2011-09-02 19:39:08.579948777 +0200
@@ -95,7 +95,7 @@
if ((! cp_lookup) || ! strcmp (XNp_root -> Value (), cp_lookup))
v_add_node_in_set (XNp_root);
- if (XNp_root -> Type () == TiXmlNode::ELEMENT)
+ if (XNp_root -> Type () == TiXmlNode::TINYXML_ELEMENT)
{
XAp_attrib = XNp_root -> ToElement () -> FirstAttribute ();
while (XAp_attrib)
@@ -142,7 +142,7 @@
if (! op_attrib [u_node])
{
XNp_node = (const TiXmlNode *) vpp_node_set [u_node];
- if (XNp_node -> Type () == TiXmlNode::TEXT)
+ if (XNp_node -> Type () == TiXmlNode::TINYXML_TEXT)
S_res += XNp_node -> Value ();
}
}
@@ -211,7 +211,7 @@
XNp_ptr = XNp_ptr -> NextSiblingElement ();
}
XNp_ptr = XNp_node -> Parent ();
- if (XNp_ptr && XNp_ptr -> Type () == TiXmlNode::ELEMENT)
+ if (XNp_ptr && XNp_ptr -> Type () == TiXmlNode::TINYXML_ELEMENT)
v_add_all_foll_node (XNp_ptr, S_name);
}
@@ -234,7 +234,7 @@
XNp_ptr = XNp_node -> PreviousSibling ();
while (XNp_ptr)
{
- if (XNp_ptr -> Type () == TiXmlNode::ELEMENT)
+ if (XNp_ptr -> Type () == TiXmlNode::TINYXML_ELEMENT)
{
v_add_node_in_set_if_name_or_star (XNp_ptr, S_name);
v_copy_node_children (XNp_ptr, cp_lookup);
diff -ur opencity-0.0.6.4stable/src/tinyxpath/xpath_processor.cpp opencity-0.0.6.4stable.work/src/tinyxpath/xpath_processor.cpp
--- opencity-0.0.6.4stable/src/tinyxpath/xpath_processor.cpp 2011-07-03 18:36:33.000000000 +0200
+++ opencity-0.0.6.4stable.work/src/tinyxpath/xpath_processor.cpp 2011-09-02 19:40:09.756247843 +0200
@@ -49,7 +49,7 @@
class TiXmlNodeManip : public TiXmlNode
{
public :
- TiXmlNodeManip () : TiXmlNode (TiXmlNode::UNKNOWN) {}
+ TiXmlNodeManip () : TiXmlNode (TiXmlNode::TINYXML_UNKNOWN) {}
void v_reset (const TiXmlNode * XNp_parent, const TiXmlNode * XNp_next, const TiXmlNode * XNp_prev)
{
parent = (TiXmlNode *) XNp_parent;
@@ -1196,7 +1196,7 @@
XNp_next = XEp_father -> PreviousSibling ();
while (XNp_next)
{
- if (XNp_next -> Type () == TiXmlNode::ELEMENT)
+ if (XNp_next -> Type () == TiXmlNode::TINYXML_ELEMENT)
ns_target . v_add_node_in_set_if_name_or_star (XNp_next, S_name);
XNp_next = XNp_next -> PreviousSibling ();
}
@@ -1229,7 +1229,7 @@
XNp_next = XEp_father -> FirstChild ();
while (XNp_next)
{
- if (XNp_next -> Type () == TiXmlNode::COMMENT)
+ if (XNp_next -> Type () == TiXmlNode::TINYXML_COMMENT)
ns_target . v_add_node_in_set (XNp_next);
XNp_next = XNp_next -> NextSibling ();
}
@@ -1238,7 +1238,7 @@
XNp_next = XEp_father -> FirstChild ();
while (XNp_next)
{
- if (XNp_next -> Type () == TiXmlNode::TEXT)
+ if (XNp_next -> Type () == TiXmlNode::TINYXML_TEXT)
ns_target . v_add_node_in_set (XNp_next);
XNp_next = XNp_next -> NextSibling ();
}
@@ -1728,7 +1728,7 @@
XNp_child = XEp_context -> FirstChild ();
while (XNp_child)
{
- if (XNp_child -> Type () == TiXmlNode::TEXT)
+ if (XNp_child -> Type () == TiXmlNode::TINYXML_TEXT)
S_res += XNp_child -> Value ();
XNp_child = XNp_child -> NextSibling ();
}
diff -ur opencity-0.0.6.4stable/src/tinyxpath/xpath_stream.h opencity-0.0.6.4stable.work/src/tinyxpath/xpath_stream.h
--- opencity-0.0.6.4stable/src/tinyxpath/xpath_stream.h 2011-07-03 18:36:33.000000000 +0200
+++ opencity-0.0.6.4stable.work/src/tinyxpath/xpath_stream.h 2011-09-02 19:48:56.646823680 +0200
@@ -34,7 +34,6 @@
#include "byte_stream.h"
#include "xpath_syntax.h"
#include "tinyxml.h"
-#include "tinystr.h"
namespace TinyXPath
{
Only in opencity-0.0.6.4stable.work/src/tinyxpath: xpath_stream.h~
diff -ur opencity-0.0.6.4stable/src/zen.cpp opencity-0.0.6.4stable.work/src/zen.cpp
--- opencity-0.0.6.4stable/src/zen.cpp 2011-07-03 18:36:34.000000000 +0200
+++ opencity-0.0.6.4stable.work/src/zen.cpp 2011-09-02 19:47:20.726354749 +0200
@@ -37,7 +37,7 @@
// Libraries headers
#include "SDL_image.h"
#include "binreloc.h" // BinReloc routines from AutoPackage
-#include "tinyxml/tinyxml.h"
+#include "tinyxml.h"
#include "SimpleOpt.h" // Simple command line argument parser
// Standard headers
diff -ur opencity-0.0.6.4stable/viewer/Makefile.in opencity-0.0.6.4stable.work/viewer/Makefile.in
--- opencity-0.0.6.4stable/viewer/Makefile.in 2011-07-03 19:14:47.000000000 +0200
+++ opencity-0.0.6.4stable.work/viewer/Makefile.in 2011-09-02 19:31:26.905691759 +0200
@@ -54,7 +54,7 @@
viewer_DEPENDENCIES = ../src/model/libmodel.a \
../src/pngfuncs/libpngfuncs.a ../src/structure/libstruct.a \
../src/triangulation/libtriangulation.a \
- ../src/tinyxml/libtinyxml.a ../src/tinyxpath/libtinyxpath.a
+ ../src/tinyxpath/libtinyxpath.a
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -185,7 +185,6 @@
-I@top_srcdir@/src/networking/ \
-I@top_srcdir@/src/pngfuncs/ \
-I@top_srcdir@/src/structure/ \
- -I@top_srcdir@/src/tinyxml/ \
-I@top_srcdir@/src/tinyxpath/
viewer_LDADD = \
@@ -193,7 +192,7 @@
../src/pngfuncs/libpngfuncs.a \
../src/structure/libstruct.a \
../src/triangulation/libtriangulation.a \
- ../src/tinyxml/libtinyxml.a \
+ -ltinyxml \
../src/tinyxpath/libtinyxpath.a
viewer_SOURCES = \
Reply to: