tags 413432 + patch thanks Hi,
Attached is the diff for my libloki 0.1.5-3.1 NMU. Cheers, -- ----------------------------------------------------------------- | ,''`. Stephen Gran | | : :' : [EMAIL PROTECTED] | | `. `' Debian user, admin, and developer | | `- http://www.debian.org | -----------------------------------------------------------------
diff -u libloki-0.1.5/debian/rules libloki-0.1.5/debian/rules --- libloki-0.1.5/debian/rules +++ libloki-0.1.5/debian/rules @@ -26,9 +26,9 @@ dh_testroot rm -f build-stamp - - -$(MAKE) distclean - +ifeq (Makefile,$(wildcard Makefile)) + $(MAKE) distclean +endif dh_clean install: build diff -u libloki-0.1.5/debian/changelog libloki-0.1.5/debian/changelog --- libloki-0.1.5/debian/changelog +++ libloki-0.1.5/debian/changelog @@ -1,3 +1,17 @@ +libloki (0.1.5-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with gcc-4.3 (closes: #413432) + * Update Standards-Version (no changes) + * Make lintian happy: + - Change from Source-Version to binary:Version in debian/control + - Don't ignore errors on clean + - Add copyright symbol to debian/copyright + - Move Homepage: from description to control field + - Register doc-base files with right section + + -- Stephen Gran <[EMAIL PROTECTED]> Sat, 05 Apr 2008 14:57:24 +0100 + libloki (0.1.5-3) unstable; urgency=low * debian/rules: Always build with OS=Linux to fix FTBFS on kFreeBSD, Hurd diff -u libloki-0.1.5/debian/libloki-doc.doc-base libloki-0.1.5/debian/libloki-doc.doc-base --- libloki-0.1.5/debian/libloki-doc.doc-base +++ libloki-0.1.5/debian/libloki-doc.doc-base @@ -4,7 +4,7 @@ Abstract: This documentation is automatically generated from the libloki source code by doxygen, and describes the classes of the Loki C++ library in detail. -Section: Apps/Programming +Section: Programming Format: HTML Index: /usr/share/doc/libloki-doc/html/index.html diff -u libloki-0.1.5/debian/control libloki-0.1.5/debian/control --- libloki-0.1.5/debian/control +++ libloki-0.1.5/debian/control @@ -3,7 +3,8 @@ Priority: optional Maintainer: Lukas Fittl <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 5.0.0) -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 +Homepage: http://loki-lib.sourceforge.net/ Package: libloki0.1.5 Section: libs @@ -17,13 +18,12 @@ . The code accompanies the (non-free) book, _Modern C++ Design_ (Alexandrescu, 2001), which goes into depth on the design of the library. - . - Homepage: http://loki-lib.sourceforge.net/ Package: libloki0.1.5-dbg Section: libs +Priority: extra Architecture: any -Depends: libloki0.1.5 (= ${Source-Version}) +Depends: libloki0.1.5 (= ${binary:Version}) Description: a C++ library of generic design patterns (debug information) Loki is a ("the"?) C++ library of generic programming techniques, containing flexible implementations of common design patterns and idioms. It is an @@ -32,13 +32,11 @@ . This package contains debugging symbols useful for tracing bugs in the libloki package. - . - Homepage: http://loki-lib.sourceforge.net/ Package: libloki-dev Section: libdevel Architecture: any -Depends: libloki0.1.5 (= ${Source-Version}) +Depends: libloki0.1.5 (= ${binary:Version}) Suggests: libloki-doc Description: a C++ library of generic design patterns (development files) Loki is a ("the"?) C++ library of generic programming techniques, containing @@ -51,8 +49,6 @@ . This package contains the header files and static libraries needed to build programs that use loki. - . - Homepage: http://loki-lib.sourceforge.net/ Package: libloki-doc Section: doc @@ -67,2 +62,0 @@ - . - Homepage: http://loki-lib.sourceforge.net/ diff -u libloki-0.1.5/debian/copyright libloki-0.1.5/debian/copyright --- libloki-0.1.5/debian/copyright +++ libloki-0.1.5/debian/copyright @@ -10,7 +10,7 @@ Copyright: - Copyright (c) Andrei Alexandrescu + Copyright (©) 2000-2005 Andrei Alexandrescu - 2000 - ScopeGuard - 2001 @@ -20,19 +20,19 @@ - 2005 - SafeFormat - Copyright (c) Petru Marginean + Copyright (©) 2000 Petru Marginean - 2000 - ScopeGuard - Copyright (c) Curtis Krauskopf + Copyright (©) 2004 Curtis Krauskopf - 2004 - Singleton - Copyright (c) Joshua Lehrer + Copyright (©) 2005 Joshua Lehrer - 2005 - ScopeGuard - Copyright (c) Peter Kümmel + Copyright (©) 2005-2006 Peter Kümmel - 2005 - OrderedStatic - Factory @@ -46,7 +46,7 @@ - RefToValue - Register - Copyright (c) Richard Sposato + Copyright (©) 2005 Richard Sposato - 2006 - StrongPtr - SmartPtr only in patch2: unchanged: --- libloki-0.1.5.orig/include/loki/SafeFormat.h +++ libloki-0.1.5/include/loki/SafeFormat.h @@ -22,7 +22,8 @@ // $Header: /cvsroot/loki-lib/loki/include/loki/SafeFormat.h,v 1.25 2006/06/19 12:39:08 syntheticpp Exp $ #include <cstdio> -#include <string> +#include <climits> +#include <cstring> #include <stdexcept> #include <utility> #include <cassert> only in patch2: unchanged: --- libloki-0.1.5.orig/src/SmallObj.cpp +++ libloki-0.1.5/src/SmallObj.cpp @@ -19,6 +19,7 @@ #include <loki/SmallObj.h> #include <cassert> +#include <climits> #include <vector> #include <bitset> only in patch2: unchanged: --- libloki-0.1.5.orig/test/SmartPtr/main.cpp +++ libloki-0.1.5/test/SmartPtr/main.cpp @@ -998,7 +998,7 @@ // ---------------------------------------------------------------------------- -int main( unsigned int , const char * [] ) +int main( unsigned int , char * [] ) { DoRefLinkTests();
signature.asc
Description: Digital signature
