--- log4cpp-1.0.orig/debian/control +++ log4cpp-1.0/debian/control @@ -0,0 +1,36 @@ +Source: log4cpp +Priority: optional +Maintainer: Fathi Boudra +Build-Depends: cdbs, debhelper (>= 5), quilt, libtool, automake +Standards-Version: 3.7.3 +Section: libs +Homepage: http://log4cpp.sourceforge.net + +Package: liblog4cpp5-dev +Section: libdevel +Architecture: any +Depends: liblog4cpp5 (= ${binary:Version}) +Conflicts: liblog4cpp4-dev, liblog4cpp3-dev, liblog4cpp1-dev, liblog4cpp-dev +Replaces: liblog4cpp4-dev, liblog4cpp3-dev, liblog4cpp1-dev, liblog4cpp-dev +Description: C++ library for flexible logging (development) + Log for C++ is a library of C++ classes for flexible logging to files, + syslog and other destinations. It is modeled after the Log for + Java library (http://jakarta.apache.org/log4j/), staying as close to + their API as is reasonable. + . + This package contains the log4cpp development files. + +Package: liblog4cpp5 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: liblog4cpp4, liblog4cpp3, liblog4cpp1c102 +Replaces: liblog4cpp4, liblog4cpp3, liblog4cpp0, liblog4cpp1c102 +Description: C++ library for flexible logging (runtime) + Log for C++ is a library of C++ classes for flexible logging to files, + syslog and other destinations. It is modeled after the Log for + Java library (http://jakarta.apache.org/log4j/), staying as close to + their API as is reasonable. + . + This package contains the files necessary for running applications that + use the log4cpp library. --- log4cpp-1.0.orig/debian/copyright +++ log4cpp-1.0/debian/copyright @@ -0,0 +1,176 @@ +This package was debianized by Marcel Harkema +on Sat, 7 Apr 2001 19:24:11 +0100. + +It is now maintained by Fathi Boudra + +It was downloaded from http://log4cpp.sourceforge.net + +Upstream Authors: + + Bastiaan Bakker + Thomas Wabner + +Copyright: + + (C) 2000-2002 LifeLine Networks BV (http://www.lifeline.nl) + (C) 2000-2002 Bastiaan Bakker + +Copyright for IdsaAppender: + + (C) 2000 Marc Welz + +Copyright for RemoteSyslogAppender: + + (C) 2001 Walter Stroebel + +Copyright for PatternLayout and Configurators (Simple and Property): + + (C) 2001 Glen Scott + +Copyright for PThreads support: + + (C) 2002 Emiliano Martin + +Copyright for Manipulator: + + (C) 2005 Francis ANDRE + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + +Copyright for snprintf: + (C) 1999 Mark Martinec + +snprintf is licensed under Frontier Artistic License, the complete +text of the Frontier Artistic License can be found below: + +THE FRONTIER ARTISTIC LICENSE Version 1.0 +Copyright © (c) 1999 by Samuel Reynolds. +Derived from the "Artistic License" at "OpenSource.org". +Submitted to OpenSource.org for Open Source Initiative certification. + +PREAMBLE + +The intent of this document is to state the conditions under which a +Package may be copied, such that the Copyright Holder maintains some +semblance of artistic control over the development of the package, +while giving the users of the package the right to use and distribute +the Package in a more-or-less customary fashion, plus the right to +make reasonable modifications. + +DEFINITIONS + +o "Package" refers to the script, suite, file, or collection of scripts, + suites, and/or files distributed by the Copyright Holder, and to + derivatives of that Package created through textual modification. + +o "Standard Version" refers to such a Package if it has not been + modified, or has been modified in accordance with the wishes of the + Copyright Holder. + +o "Copyright Holder" is whoever is named in the copyright statement or + statements for the package. + +o "You" is you, if you're thinking about copying or distributing this + Package. + +o "Reasonable copying fee" is whatever you can justify on the basis of + media cost, duplication charges, time of people involved, and so on. + (You will not be required to justify it to the Copyright Holder, but + only to the computing community at large as a market that must bear the + fee.) + +o "Freely Available" means that no fee is charged for the item itself, + though there may be fees involved in handling the item. It also means + that recipients of the item may redistribute it under the same + conditions they received it. + +TERMS + +1. You may make and give away verbatim copies of the source form of the + Standard Version of this Package without restriction, provided that you + duplicate all of the original copyright notices and associated disclaimers. + +2. You may apply bug fixes, portability fixes, and other modifications + derived from the Public Domain or from the Copyright Holder. A Package + modified in such a way shall still be considered the Standard Version. + +3. You may otherwise modify your copy of this Package in any way, provided + that you insert a prominent notice in each changed script, suite, or file + stating how and when you changed that script, suite, or file, and provided + that you do at least ONE of the following: + + a) Use the modified Package only within your corporation or + organization, or retain the modified Package solely for personal use. + + b) Place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or an + equivalent medium, or placing the modifications on a major archive site + such as ftp.uu.net, or by allowing the Copyright Holder to include your + modifications in the Standard Version of the Package. + + c) Rename any non-standard executables so the names do not conflict + with standard executables, which must also be provided, and provide a + separate manual page (or equivalent) for each non-standard executable + that clearly documents how it differs from the Standard Version. + + d) Make other distribution arrangements with the Copyright Holder. + +4. You may distribute the programs of this Package in object code or + executable form, provided that you do at least ONE of the following: + + a) Distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on where + to get the Standard Version. + + b) Accompany the distribution with the machine-readable source of the + Package with your modifications. + + c) Accompany any non-standard executables with their corresponding + Standard Version executables, give the non-standard executables + non-standard names, and clearly document the differences in manual + pages (or equivalent), together with instructions on where to get the + Standard Version. + + d) Make other distribution arrangements with the Copyright Holder. + +5. You may charge a reasonable copying fee for any distribution of this + Package. You may charge any fee you choose for support of this Package. + You may not charge a fee for this Package itself. However, you may + distribute this Package in aggregate with other (possibly commercial) + programs as part of a larger (possibly commercial) software distribution + provided that you do not advertise this Package as a product of your own. + +6. The scripts and library files supplied as input to or produced as + output from the programs of this Package do not automatically fall under + the copyright of this Package, but belong to whomever generated them, and + may be sold commercially, and may be aggregated with this Package. + +7. Scripts, suites, or programs supplied by you that depend on or + otherwise make use of this Package shall not be considered part of this + Package. + +8. The name of the Copyright Holder may not be used to endorse or promote + products derived from this software without specific prior written + permission. + +9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + --- log4cpp-1.0.orig/debian/changelog +++ log4cpp-1.0/debian/changelog @@ -0,0 +1,142 @@ +log4cpp (1.0-4) unstable; urgency=low + + * Add patch to fix FTBFS with gcc 4.3. Thanks to Barry deFreeze. + (Closes: #455336) + * Add patch to remove log4cpp_cflags from pkgconfig file. (Closes: #472289) + + -- Fathi Boudra Sun, 06 Apr 2008 09:45:37 +0200 + +log4cpp (1.0-3) unstable; urgency=low + + * Update my e-mail address. + * Add libtool and automake build dependencies. + * Bump Standards-Version to 3.7.3. + * Use Homepage field. + * Build with --as-needed linker flag. + * Fix failure on sparc auto-build due to the bump soname patch. + (Closes: #451513) + * Add ACLOCAL_AMFLAGS patch. + * Add doc install path patch. + + -- Fathi Boudra Fri, 07 Dec 2007 16:06:22 +0100 + +log4cpp (1.0-2) unstable; urgency=low + + * Bump SONAME. (Closes: #445928). + The 1.0 release of log4cpp removed the Category::Stream::operator<< method + that takes Category::Stream::Separator values and indeed the whole + Separator enum in favor of handling ends of lines differently. + This is a change to the public ABI that breaks existing programs and + libraries linked with the log log4cpp and results in run-time load errors. + + -- Fathi Boudra Wed, 10 Oct 2007 14:01:46 +0200 + +log4cpp (1.0-1) unstable; urgency=low + + * New upstream release. (Closes: #432729, #445173) + * Switch to cdbs/quilt. + * Remove patches. Merged upstream. + * Update control: + * Remove dpatch, libtool, automake1.9 build-dependencies. + * Add cdbs and quilt build-dependencies. + * Bump Standards-Version to 3.7.2. + * Add missing files in liblog4cpp4-dev.install: + * log4cpp-config + * log4cpp.m4 + * Add -lpthread to LDFLAGS to fix FTBFS. + + -- Fathi Boudra Thu, 04 Oct 2007 09:11:00 +0200 + +log4cpp (0.3.5-rc3-1) unstable; urgency=low + + * Updated version (Closes: #360015) + * Updated control and copyright files + * Fixed Manipulator.hh typo + + -- Fathi Boudra Thu, 30 Mar 2006 10:25:25 +0200 + +log4cpp (0.3.4b-1) unstable; urgency=low + + * New maintainer (Closes: #303794) + * New upstream release (Closes: #287204) + * GNU C++ 4.0 ABI transition + * Updated debian/control and debian/copyright + * Removed debian dir dependency + * Updated autotools build system + + -- Fathi Boudra Tue, 16 Aug 2005 12:59:12 +0200 + +log4cpp (0.2.8-2) unstable; urgency=low + + * QA Group upload orphaning this package + * debian/control: [liblog4cpp-dev]: change Section to libdevel + + -- Andrew Pollock Fri, 18 Mar 2005 12:26:35 +1100 + +log4cpp (0.2.8-1) unstable; urgency=low + + * Latest stable upstream release. (Closes: #199450) + * Close bugs fixed by NMU's (Closes: #192318, #203750) + + -- Marcel Harkema Wed, 21 July 2004 10:43:00 +0200 + +log4cpp (0.2.7-1.1) unstable; urgency=low + + * Non-maintainer upload + * tests/Clock.hh: Changed long long int to int64_t, thanks to + Matt Kraai (Closes: #203750) + * Makefile.am: Added "ACLOCAL_AMFLAGS = -I m4" line + * debian/rules: Removes config.{cache,status,log} in clean target + * Ran autoreconf --force --install, thanks to + Ryan Murray (Closes: #192318) + + -- Roland Stigge Thu, 4 Sep 2003 23:06:06 +0200 + +log4cpp (0.2.7-1) unstable; urgency=low + + * New upstream. (Closes: #176653) + * Package name now contains the proper library soname. (Closes: #145892) + * GNU C++ 3.2 ABI transition. + + -- Marcel Harkema Tue, 28 January 2003 10:02:00 +0100 + +log4cpp (0.2.5-3) unstable; urgency=low + + * Fix error in upstream source that may cause build errors on non-i386 + architectures. + + -- Marcel Harkema Tue, 9 October 2001 13:53:14 +0200 + +log4cpp (0.2.5-2) unstable; urgency=low + + * Use rdtscl() on i386 only in tests/Clock.cpp. (Closes: #106002) + + -- Marcel Harkema Fri, 20 July 2001 17:24:17 +0200 + +log4cpp (0.2.5-1) unstable; urgency=low + + * New upstream version. + * New upstream includes recent config.{sub,guess}. (Closes: #105780) + + -- Marcel Harkema Mon, 11 June 2001 18:27:13 +0200 + +log4cpp (0.2.4b-1) unstable; urgency=low + + * New upstream version. + * More precise build-depends. Split -doc package, doxygen & graphviz are + no longer needed. (Closes: #93843) + + -- Marcel Harkema Sat, 21 April 2001 11:12:39 +0200 + +log4cpp (0.2.3b-1) unstable; urgency=low + + * New upstream version. + + -- Marcel Harkema Wed, 11 April 2001 15:59:32 +0100 + +log4cpp (0.2.2-1) unstable; urgency=low + + * Initial release. (Closes: #88439) + + -- Marcel Harkema Sat, 7 April 2001 19:24:11 +0100 + --- log4cpp-1.0.orig/debian/liblog4cpp5.install +++ log4cpp-1.0/debian/liblog4cpp5.install @@ -0,0 +1 @@ +usr/lib/lib*.so.* --- log4cpp-1.0.orig/debian/compat +++ log4cpp-1.0/debian/compat @@ -0,0 +1 @@ +5 --- log4cpp-1.0.orig/debian/rules +++ log4cpp-1.0/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,--as-needed -lpthread" +DEB_DH_INSTALL_SOURCEDIR := debian/tmp + +configure/liblog4cpp5:: + aclocal -I m4 + autoconf + autoheader + automake --add-missing --copy + libtoolize --copy --force + --- log4cpp-1.0.orig/debian/patches/05_remove_log4cpp_cflags_from_pkgconfig_file.diff +++ log4cpp-1.0/debian/patches/05_remove_log4cpp_cflags_from_pkgconfig_file.diff @@ -0,0 +1,19 @@ +--- a/log4cpp.pc.in ++++ b/log4cpp.pc.in +@@ -7,4 +7,4 @@ + Description: C++ library for flexible logging, modeled after Log4j + Version: @VERSION@ + Libs: -L${libdir} @log4cpp_libs@ +-Cflags: -I${includedir} @log4cpp_cflags@ ++Cflags: -I${includedir} +--- a/m4/ac_config_pkgconfig_in.m4 ++++ b/m4/ac_config_pkgconfig_in.m4 +@@ -121,7 +121,7 @@ + fi + echo 'Version: @VERSION@' >>$PKGCONFIG_FILE + echo 'Libs: -L${libdir} @MODULE_DOWN[]_libs@' >>$PKGCONFIG_FILE +-echo 'Cflags: -I${includedir} @MODULE_DOWN[]_cflags@' >>$PKGCONFIG_FILE ++echo 'Cflags: -I${includedir}' >>$PKGCONFIG_FILE + m4_pushdef([PKGCONFIG_UP], [m4_translit([$1], [a-z], [A-Z])])dnl + PKGCONFIG_UP[]_PKGCONFIG="PKGCONFIG_DIR[]$1-config" + AC_SUBST(PKGCONFIG_UP[]_PKGCONFIG) --- log4cpp-1.0.orig/debian/patches/series +++ log4cpp-1.0/debian/patches/series @@ -0,0 +1,6 @@ +01_bump_soname.diff +02_doc_install_path.diff +03_aclocal_automake.diff +04_gcc43.diff + +05_remove_log4cpp_cflags_from_pkgconfig_file.diff --- log4cpp-1.0.orig/debian/patches/01_bump_soname.diff +++ log4cpp-1.0/debian/patches/01_bump_soname.diff @@ -0,0 +1,22 @@ +--- a/configure ++++ b/configure +@@ -1964,7 +1964,7 @@ + # ? :+1 : ? == just some internal changes, nothing breaks but might work + # better + # CURRENT : REVISION : AGE +-LT_VERSION=4:6:0 ++LT_VERSION=5:5:0 + + + +--- a/configure.in ++++ b/configure.in +@@ -11,7 +11,7 @@ + # ? :+1 : ? == just some internal changes, nothing breaks but might work + # better + # CURRENT : REVISION : AGE +-LT_VERSION=4:6:0 ++LT_VERSION=5:5:0 + + AC_SUBST(LT_VERSION) + --- log4cpp-1.0.orig/debian/patches/04_gcc43.diff +++ log4cpp-1.0/debian/patches/04_gcc43.diff @@ -0,0 +1,22 @@ +--- a/src/BasicLayout.cpp ++++ b/src/BasicLayout.cpp +@@ -15,6 +15,8 @@ + #include + #endif + ++#include ++ + namespace log4cpp { + + BasicLayout::BasicLayout() { +--- a/src/PatternLayout.cpp ++++ b/src/PatternLayout.cpp +@@ -370,7 +370,7 @@ + literal = ""; + } + if ((minWidth != 0) || (maxWidth != 0)) { +- component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0); ++ component = new FormatModifierComponent(component, std::abs((float)minWidth), maxWidth, minWidth < 0); + minWidth = maxWidth = 0; + } + _components.push_back(component); --- log4cpp-1.0.orig/debian/patches/03_aclocal_automake.diff +++ log4cpp-1.0/debian/patches/03_aclocal_automake.diff @@ -0,0 +1,8 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,3 +1,5 @@ ++ACLOCAL_AMFLAGS = -I m4 ++ + if DOC + SUBDIRS = msvc6 bcb5 config src include tests doc + else --- log4cpp-1.0.orig/debian/patches/02_doc_install_path.diff +++ log4cpp-1.0/debian/patches/02_doc_install_path.diff @@ -0,0 +1,38 @@ +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,7 +1,7 @@ + SUBDIRS = html + + man3dir = $(mandir)/man3 +-docdir = $(prefix)/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ ++docdir = $(prefix)/share/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ + + EXTRA_DIST = \ + mainPage.txt +@@ -22,18 +22,18 @@ + + + install-data-local: +- $(mkinstalldirs) $(man3dir) ++ $(mkinstalldirs) $(DESTDIR)/$(man3dir) + @for i in ./man/man3/log4cpp.3 ./man/man3/log4cpp_*.3; do \ + inst=`basename $$i | sed 's/_/::/g'`; \ + echo "$(INSTALL_DATA) $$i$(man3dir)/$$inst"; \ +- $(INSTALL_DATA) $$i $(man3dir)/$$inst; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(man3dir)/$$inst; \ + done +- $(mkinstalldirs) $(docdir) +- cp -r html/. $(docdir) +- $(RM) -r -f $(docdir)/CVS \ +- $(docdir)/Makefile.am \ +- $(docdir)/Makefile.in \ +- $(docdir)/Makefile ++ $(mkinstalldirs) $(DESTDIR)/$(docdir) ++ cp -r html/. $(DESTDIR)/$(docdir) ++ $(RM) -r -f $(DESTDIR)/$(docdir)/CVS \ ++ $(DESTDIR)/$(docdir)/Makefile.am \ ++ $(DESTDIR)/$(docdir)/Makefile.in \ ++ $(DESTDIR)/$(docdir)/Makefile + + uninstall-local: + $(RM) $(man3dir)/log4cpp.3 --- log4cpp-1.0.orig/debian/liblog4cpp5-dev.install +++ log4cpp-1.0/debian/liblog4cpp5-dev.install @@ -0,0 +1,6 @@ +usr/bin/log4cpp-config +usr/include/* +usr/lib/liblog4cpp.a +usr/lib/liblog4cpp.so +usr/lib/pkgconfig/log4cpp.pc +usr/share/aclocal/log4cpp.m4 --- log4cpp-1.0.orig/debian/watch +++ log4cpp-1.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/log4cpp/log4cpp-(.*)\.tar\.gz