tags 417062 + patch thanks Hi,
Attached is the diff for my id3lib3.8.3 3.8.3-7.1 NMU. Cheers, -- ----------------------------------------------------------------- | ,''`. Stephen Gran | | : :' : [EMAIL PROTECTED] | | `. `' Debian user, admin, and developer | | `- http://www.debian.org | -----------------------------------------------------------------
diff -u id3lib3.8.3-3.8.3/doc/man/id3convert.1 id3lib3.8.3-3.8.3/doc/man/id3convert.1
--- id3lib3.8.3-3.8.3/doc/man/id3convert.1
+++ id3lib3.8.3-3.8.3/doc/man/id3convert.1
@@ -6,11 +6,9 @@
.RB [
.I OPTION
.RB ]
-...
.RB [
.I FILE
.RB ]
-...
.br
.SH DESCRIPTION
.B Id3convert
diff -u id3lib3.8.3-3.8.3/doc/man/id3info.1 id3lib3.8.3-3.8.3/doc/man/id3info.1
--- id3lib3.8.3-3.8.3/doc/man/id3info.1
+++ id3lib3.8.3-3.8.3/doc/man/id3info.1
@@ -6,11 +6,9 @@
.RB [
.I OPTION
.RB ]
-...
.RB [
.I FILE
.RB ]
-...
.br
.SH DESCRIPTION
.B Id3info
reverted:
--- id3lib3.8.3-3.8.3/src/tag_file.loT
+++ id3lib3.8.3-3.8.3.orig/src/tag_file.loT
@@ -1,7 +0,0 @@
-# tag_file.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.6 (1.1220.2.95 2004/04/11 05:50:42) Debian: 215 $
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
diff -u id3lib3.8.3-3.8.3/debian/changelog id3lib3.8.3-3.8.3/debian/changelog
--- id3lib3.8.3-3.8.3/debian/changelog
+++ id3lib3.8.3-3.8.3/debian/changelog
@@ -1,3 +1,16 @@
+id3lib3.8.3 (3.8.3-7.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc-4.3 (closes: #417062)
+ * Lintian warnigns repaired:
+ - Update DH_COMPAT from, er, 1
+ - Don't ignore make clean failures
+ - Add link to LGPL-2 in common-licenses
+ - Add © to debian/copyright
+ - remove some broken non-roff form manpages
+
+ -- Stephen Gran <[EMAIL PROTECTED]> Sat, 05 Apr 2008 15:55:14 +0100
+
id3lib3.8.3 (3.8.3-7) unstable; urgency=high
* SECURITY: Change #ifdef logic to select mkstemp() code instead of
diff -u id3lib3.8.3-3.8.3/debian/copyright id3lib3.8.3-3.8.3/debian/copyright
--- id3lib3.8.3-3.8.3/debian/copyright
+++ id3lib3.8.3-3.8.3/debian/copyright
@@ -13,16 +13,3 @@
-Copyright 1999, 2000 Scott Thomas Haug
-
-This library is free software; you can redistribute it and/or modify it
-under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-This library is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with this library; if not, write to the Free Software Foundation,
-Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+© 1999, 2000 Scott Thomas Haug
+On Debian systems, this file can be found at /usr/share/common-licenses/LGPL-2
reverted:
--- id3lib3.8.3-3.8.3/debian/dirs
+++ id3lib3.8.3-3.8.3.orig/debian/dirs
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff -u id3lib3.8.3-3.8.3/debian/control id3lib3.8.3-3.8.3/debian/control
--- id3lib3.8.3-3.8.3/debian/control
+++ id3lib3.8.3-3.8.3/debian/control
@@ -8,7 +8,7 @@
Package: libid3-3.8.3-dev
Section: libdevel
Architecture: any
-Depends: libid3-3.8.3c2a (= ${Source-Version}), zlib1g-dev
+Depends: libid3-3.8.3c2a (= ${binary:Version}), zlib1g-dev
Replaces: libid3-dev
Provides: libid3-dev
Conflicts: libid3-dev
diff -u id3lib3.8.3-3.8.3/debian/rules id3lib3.8.3-3.8.3/debian/rules
--- id3lib3.8.3-3.8.3/debian/rules
+++ id3lib3.8.3-3.8.3/debian/rules
@@ -6,7 +6,7 @@
#export DH_VERBOSE=1
# This is the debhelper compatability version to use.
-export DH_COMPAT=1
+#export DH_COMPAT=1
# shared library versions, option 1
version=3.8.3
@@ -38,7 +38,9 @@
rm -f build-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ifeq (Makefile,$(wildcard Makefile))
+ $(MAKE) distclean
+endif
rm -f popt/intl/libintl.h
rm -f configure
dh_clean
only in patch2:
unchanged:
--- id3lib3.8.3-3.8.3.orig/configure.in
+++ id3lib3.8.3-3.8.3/configure.in
@@ -227,7 +227,6 @@
)
AC_CHECK_HEADERS( \
string \
- iomanip.h \
,,AC_MSG_ERROR([Missing a vital header file for id3lib])
)
only in patch2:
unchanged:
--- id3lib3.8.3-3.8.3.orig/include/id3/writers.h
+++ id3lib3.8.3-3.8.3/include/id3/writers.h
@@ -30,7 +30,7 @@
#include "id3/writer.h"
#include "id3/id3lib_streams.h"
-//#include <string.h>
+#include <cstring>
class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
{
only in patch2:
unchanged:
--- id3lib3.8.3-3.8.3.orig/include/id3/id3lib_strings.h
+++ id3lib3.8.3-3.8.3/include/id3/id3lib_strings.h
@@ -30,6 +30,7 @@
#define _ID3LIB_STRINGS_H_
#include <string>
+#include <cstring>
#if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
namespace std
only in patch2:
unchanged:
--- id3lib3.8.3-3.8.3.orig/examples/demo_convert.cpp
+++ id3lib3.8.3-3.8.3/examples/demo_convert.cpp
@@ -84,7 +84,7 @@
}
}
-int main( unsigned int argc, char * const argv[])
+int main(int argc, char * const argv[])
{
flags_t ulFlag = ID3TT_ALL;
gengetopt_args_info args;
only in patch2:
unchanged:
--- id3lib3.8.3-3.8.3.orig/examples/demo_copy.cpp
+++ id3lib3.8.3-3.8.3/examples/demo_copy.cpp
@@ -81,7 +81,7 @@
}
}
-int main( unsigned int argc, char * const argv[])
+int main(int argc, char * const argv[])
{
int ulFlag = ID3TT_ID3;
ID3D_INIT_DOUT();
only in patch2:
unchanged:
--- id3lib3.8.3-3.8.3.orig/examples/demo_info.cpp
+++ id3lib3.8.3-3.8.3/examples/demo_info.cpp
@@ -309,7 +309,7 @@
#define DEBUG
-int main( unsigned int argc, char * const argv[])
+int main(int argc, char * const argv[])
{
ID3D_INIT_DOUT();
only in patch2:
unchanged:
--- id3lib3.8.3-3.8.3.orig/examples/demo_tag.cpp
+++ id3lib3.8.3-3.8.3/examples/demo_tag.cpp
@@ -46,7 +46,7 @@
os << "v2";
}
-int main( unsigned int argc, char * const argv[])
+int main(int argc, char * const argv[])
{
int ulFlag = ID3TT_ID3;
ID3D_INIT_DOUT();
only in patch2:
unchanged:
--- id3lib3.8.3-3.8.3.orig/debian/compat
+++ id3lib3.8.3-3.8.3/debian/compat
@@ -0,0 +1 @@
+5
signature.asc
Description: Digital signature
