diff -Nru log4c-1.2.1/debian/changelog log4c-1.2.1/debian/changelog --- log4c-1.2.1/debian/changelog 2011-05-03 08:36:38.000000000 +0000 +++ log4c-1.2.1/debian/changelog 2011-05-02 15:41:37.000000000 +0000 @@ -1,3 +1,18 @@ +log4c (1.2.1-3) unstable; urgency=low + + * Switch to dh usage. + * Bump compat/debhelper to 7. + * Bump Standards-Version to 3.9.2. + * Add libexpat1-dev build dependency. + * Replace gs-common build dependency with ghostscript. + * Replace doxygen and texlive-latex-recommended build dependencies with + doxygen-latex. (Closes: #616268) + * Add texlive-fonts-recommended build dependency. (Closes: #621943) + * Remove liblog4c.la file. (Closes: #622550) + * Add symbols file. + + -- Fathi Boudra Mon, 02 May 2011 16:12:10 +0300 + log4c (1.2.1-2) unstable; urgency=low * Drop docdir path patch. Use an install target. (Closes: #464293) diff -Nru log4c-1.2.1/debian/compat log4c-1.2.1/debian/compat --- log4c-1.2.1/debian/compat 2011-05-03 08:36:38.000000000 +0000 +++ log4c-1.2.1/debian/compat 2011-05-02 13:11:28.000000000 +0000 @@ -1 +1 @@ -6 +7 diff -Nru log4c-1.2.1/debian/control log4c-1.2.1/debian/control --- log4c-1.2.1/debian/control 2011-05-03 08:36:38.000000000 +0000 +++ log4c-1.2.1/debian/control 2011-05-02 15:44:10.000000000 +0000 @@ -1,16 +1,16 @@ Source: log4c +Section: libs Priority: extra Maintainer: Fathi Boudra -Build-Depends: cdbs, debhelper (>= 6), quilt, automake, libtool, doxygen, - gs-common, texlive-latex-recommended -Standards-Version: 3.7.3 -Section: libs +Build-Depends: debhelper (>= 8.0.0), dh-autoreconf, doxygen-latex, ghostscript, + libexpat1-dev, texlive-fonts-recommended +Standards-Version: 3.9.2 Homepage: http://log4c.sourceforge.net Package: liblog4c-dev Section: libdevel Architecture: any -Depends: liblog4c3 (= ${binary:Version}) +Depends: liblog4c3 (= ${binary:Version}), ${misc:Depends} Description: C library for flexible logging (development) Log4c is a library of C for flexible logging to files, syslog and other destinations. @@ -21,7 +21,6 @@ This package contains the Log4c development files. Package: liblog4c3 -Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: C library for flexible logging (runtime) @@ -37,6 +36,7 @@ Package: liblog4c-doc Section: doc Architecture: all +Depends: ${misc:Depends} Recommends: w3m | www-browser Description: C library for flexible logging (documentation) Log4c is a library of C for flexible logging to files, syslog and other diff -Nru log4c-1.2.1/debian/copyright log4c-1.2.1/debian/copyright --- log4c-1.2.1/debian/copyright 2011-05-03 08:36:38.000000000 +0000 +++ log4c-1.2.1/debian/copyright 2011-05-02 15:57:10.000000000 +0000 @@ -1,18 +1,23 @@ -This package was debianized by Fathi Boudra on -Thu, 26 Jul 2007 09:14:41 +0200. +This work was packaged for Debian by: -It was downloaded from + Fathi Boudra on Thu, 26 Jul 2007 09:14:41 +0200. + +It was downloaded from: + + http://log4c.sourceforge.net Upstream Authors: Cedric Le Goater Robert Byrne -Copyright: (C) 2001-2004 Meiosys +Copyright: + + Copyright (C) 2001-2004 Meiosys Copyright for stack, a dynamically resizing stack: - (C) 2001 Michael B. Allen + Copyright (C) 2001 Michael B. Allen stack source code is licensed under the MIT license: @@ -56,7 +61,14 @@ 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'. +Public License can be found in : + - /usr/share/common-licenses/LGPL-2 + - /usr/share/common-licenses/LGPL-2.1 + - /usr/share/common-licenses/LGPL-3 + +The Debian packaging is: + + Copyright (C) 2007-2011 Fathi Boudra -The Debian packaging is (C) 2007, Fathi Boudra and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +you can redistribute it and/or modify it under the terms of the GNU General +Public License version 2 as published by the Free Software Foundation. diff -Nru log4c-1.2.1/debian/liblog4c3.symbols log4c-1.2.1/debian/liblog4c3.symbols --- log4c-1.2.1/debian/liblog4c3.symbols 1970-01-01 00:00:00.000000000 +0000 +++ log4c-1.2.1/debian/liblog4c3.symbols 2011-05-02 15:38:55.000000000 +0000 @@ -0,0 +1,202 @@ +liblog4c.so.3 liblog4c3 #MINVER# + __log4c_category_vlog@Base 1.2.1 + __log4c_fini@Base 1.2.1 + __log4c_init@Base 1.2.1 + __log4c_reread@Base 1.2.1 + __sd_domnode_new@Base 1.2.1 + _sp@Base 1.2.1 + getopt_reset@Base 1.2.1 + log4c_appender_append@Base 1.2.1 + log4c_appender_close@Base 1.2.1 + log4c_appender_delete@Base 1.2.1 + log4c_appender_factory@Base 1.2.1 + log4c_appender_get@Base 1.2.1 + log4c_appender_get_layout@Base 1.2.1 + log4c_appender_get_name@Base 1.2.1 + log4c_appender_get_type@Base 1.2.1 + log4c_appender_get_udata@Base 1.2.1 + log4c_appender_new@Base 1.2.1 + log4c_appender_open@Base 1.2.1 + log4c_appender_print@Base 1.2.1 + log4c_appender_set_layout@Base 1.2.1 + log4c_appender_set_type@Base 1.2.1 + log4c_appender_set_udata@Base 1.2.1 + log4c_appender_type_get@Base 1.2.1 + log4c_appender_type_mmap@Base 1.2.1 + log4c_appender_type_rollingfile@Base 1.2.1 + log4c_appender_type_set@Base 1.2.1 + log4c_appender_type_stream2@Base 1.2.1 + log4c_appender_type_stream@Base 1.2.1 + log4c_appender_type_syslog@Base 1.2.1 + log4c_appender_types_print@Base 1.2.1 + log4c_category_delete@Base 1.2.1 + log4c_category_factory@Base 1.2.1 + log4c_category_get@Base 1.2.1 + log4c_category_get_additivity@Base 1.2.1 + log4c_category_get_appender@Base 1.2.1 + log4c_category_get_chainedpriority@Base 1.2.1 + log4c_category_get_name@Base 1.2.1 + log4c_category_get_priority@Base 1.2.1 + log4c_category_list@Base 1.2.1 + log4c_category_new@Base 1.2.1 + log4c_category_print@Base 1.2.1 + log4c_category_set_additivity@Base 1.2.1 + log4c_category_set_appender@Base 1.2.1 + log4c_category_set_priority@Base 1.2.1 + log4c_dump_all_instances@Base 1.2.1 + log4c_dump_all_types@Base 1.2.1 + log4c_fini@Base 1.2.1 + log4c_init@Base 1.2.1 + log4c_layout_delete@Base 1.2.1 + log4c_layout_factory@Base 1.2.1 + log4c_layout_format@Base 1.2.1 + log4c_layout_get@Base 1.2.1 + log4c_layout_get_name@Base 1.2.1 + log4c_layout_get_type@Base 1.2.1 + log4c_layout_get_udata@Base 1.2.1 + log4c_layout_new@Base 1.2.1 + log4c_layout_print@Base 1.2.1 + log4c_layout_set_type@Base 1.2.1 + log4c_layout_set_udata@Base 1.2.1 + log4c_layout_type_basic@Base 1.2.1 + log4c_layout_type_basic_r@Base 1.2.1 + log4c_layout_type_dated@Base 1.2.1 + log4c_layout_type_dated_r@Base 1.2.1 + log4c_layout_type_get@Base 1.2.1 + log4c_layout_type_set@Base 1.2.1 + log4c_layout_types_print@Base 1.2.1 + log4c_load@Base 1.2.1 + log4c_logging_event_delete@Base 1.2.1 + log4c_logging_event_new@Base 1.2.1 + log4c_major_version@Base 1.2.1 + log4c_micro_version@Base 1.2.1 + log4c_minor_version@Base 1.2.1 + log4c_priority_to_int@Base 1.2.1 + log4c_priority_to_string@Base 1.2.1 + log4c_rc@Base 1.2.1 + log4c_rc_load@Base 1.2.1 + log4c_reread@Base 1.2.1 + log4c_rollingpolicy_delete@Base 1.2.1 + log4c_rollingpolicy_factory@Base 1.2.1 + log4c_rollingpolicy_fini@Base 1.2.1 + log4c_rollingpolicy_get@Base 1.2.1 + log4c_rollingpolicy_get_name@Base 1.2.1 + log4c_rollingpolicy_get_rfudata@Base 1.2.1 + log4c_rollingpolicy_get_udata@Base 1.2.1 + log4c_rollingpolicy_init@Base 1.2.1 + log4c_rollingpolicy_is_initialized@Base 1.2.1 + log4c_rollingpolicy_is_triggering_event@Base 1.2.1 + log4c_rollingpolicy_new@Base 1.2.1 + log4c_rollingpolicy_print@Base 1.2.1 + log4c_rollingpolicy_rollover@Base 1.2.1 + log4c_rollingpolicy_set_type@Base 1.2.1 + log4c_rollingpolicy_set_udata@Base 1.2.1 + log4c_rollingpolicy_type_get@Base 1.2.1 + log4c_rollingpolicy_type_set@Base 1.2.1 + log4c_rollingpolicy_type_sizewin@Base 1.2.1 + log4c_rollingpolicy_types_print@Base 1.2.1 + log4c_stream2_get_flags@Base 1.2.1 + log4c_stream2_get_fp@Base 1.2.1 + log4c_stream2_set_flags@Base 1.2.1 + log4c_stream2_set_fp@Base 1.2.1 + log4c_version@Base 1.2.1 + rollingfile_get_current_file_size@Base 1.2.1 + rollingfile_make_udata@Base 1.2.1 + rollingfile_udata_get_files_prefix@Base 1.2.1 + rollingfile_udata_get_logdir@Base 1.2.1 + rollingfile_udata_set_files_prefix@Base 1.2.1 + rollingfile_udata_set_logdir@Base 1.2.1 + rollingfile_udata_set_policy@Base 1.2.1 + sd_calloc@Base 1.2.1 + sd_debug@Base 1.2.1 + sd_domnode_attrs_get@Base 1.2.1 + sd_domnode_attrs_put@Base 1.2.1 + sd_domnode_attrs_remove@Base 1.2.1 + sd_domnode_delete@Base 1.2.1 + sd_domnode_fread@Base 1.2.1 + sd_domnode_fwrite@Base 1.2.1 + sd_domnode_load@Base 1.2.1 + sd_domnode_new@Base 1.2.1 + sd_domnode_read@Base 1.2.1 + sd_domnode_search@Base 1.2.1 + sd_domnode_store@Base 1.2.1 + sd_error@Base 1.2.1 + sd_factory_delete@Base 1.2.1 + sd_factory_destroy@Base 1.2.1 + sd_factory_get@Base 1.2.1 + sd_factory_list@Base 1.2.1 + sd_factory_new@Base 1.2.1 + sd_factory_print@Base 1.2.1 + sd_getopt@Base 1.2.1 + sd_hash_add@Base 1.2.1 + sd_hash_begin@Base 1.2.1 + sd_hash_clear@Base 1.2.1 + sd_hash_del@Base 1.2.1 + sd_hash_delete@Base 1.2.1 + sd_hash_end@Base 1.2.1 + sd_hash_foreach@Base 1.2.1 + sd_hash_get_nelem@Base 1.2.1 + sd_hash_get_size@Base 1.2.1 + sd_hash_hash_string@Base 1.2.1 + sd_hash_iter_del@Base 1.2.1 + sd_hash_iter_next@Base 1.2.1 + sd_hash_iter_prev@Base 1.2.1 + sd_hash_lookadd@Base 1.2.1 + sd_hash_lookup@Base 1.2.1 + sd_hash_new@Base 1.2.1 + sd_list_add@Base 1.2.1 + sd_list_append@Base 1.2.1 + sd_list_begin@Base 1.2.1 + sd_list_clear@Base 1.2.1 + sd_list_del@Base 1.2.1 + sd_list_delete@Base 1.2.1 + sd_list_end@Base 1.2.1 + sd_list_foreach@Base 1.2.1 + sd_list_get_nelem@Base 1.2.1 + sd_list_iter_del@Base 1.2.1 + sd_list_iter_insert@Base 1.2.1 + sd_list_iter_next@Base 1.2.1 + sd_list_iter_prev@Base 1.2.1 + sd_list_lookadd@Base 1.2.1 + sd_list_lookup@Base 1.2.1 + sd_list_new@Base 1.2.1 + sd_list_prepend@Base 1.2.1 + sd_list_rbegin@Base 1.2.1 + sd_list_rend@Base 1.2.1 + sd_list_rforeach@Base 1.2.1 + sd_list_sortadd@Base 1.2.1 + sd_malloc@Base 1.2.1 + sd_malloc_set_handler@Base 1.2.1 + sd_optarg@Base 1.2.1 + sd_opterr@Base 1.2.1 + sd_optind@Base 1.2.1 + sd_optopt@Base 1.2.1 + sd_realloc@Base 1.2.1 + sd_sprintf@Base 1.2.1 + sd_stack_begin@Base 1.2.1 + sd_stack_clear@Base 1.2.1 + sd_stack_delete@Base 1.2.1 + sd_stack_end@Base 1.2.1 + sd_stack_get_nelem@Base 1.2.1 + sd_stack_new@Base 1.2.1 + sd_stack_next@Base 1.2.1 + sd_stack_peek@Base 1.2.1 + sd_stack_pop@Base 1.2.1 + sd_stack_push@Base 1.2.1 + sd_stat_ctime@Base 1.2.1 + sd_strdup@Base 1.2.1 + sd_test_add@Base 1.2.1 + sd_test_delete@Base 1.2.1 + sd_test_err@Base 1.2.1 + sd_test_get_name@Base 1.2.1 + sd_test_get_verbose@Base 1.2.1 + sd_test_in@Base 1.2.1 + sd_test_new@Base 1.2.1 + sd_test_out@Base 1.2.1 + sd_test_run@Base 1.2.1 + sd_test_set_verbose@Base 1.2.1 + sd_vsprintf@Base 1.2.1 + sizewin_make_udata@Base 1.2.1 + sizewin_udata_set_file_maxsize@Base 1.2.1 + sizewin_udata_set_max_num_files@Base 1.2.1 + sizewin_udata_set_rfudata@Base 1.2.1 diff -Nru log4c-1.2.1/debian/liblog4c-dev.install log4c-1.2.1/debian/liblog4c-dev.install --- log4c-1.2.1/debian/liblog4c-dev.install 2011-05-03 08:36:38.000000000 +0000 +++ log4c-1.2.1/debian/liblog4c-dev.install 2011-05-02 14:58:28.000000000 +0000 @@ -24,6 +24,5 @@ usr/include/log4c/rollingpolicy_type_sizewin.h usr/include/log4c/version.h usr/lib/liblog4c.a -usr/lib/liblog4c.la usr/lib/liblog4c.so usr/share/aclocal/log4c.m4 diff -Nru log4c-1.2.1/debian/liblog4c-doc.install log4c-1.2.1/debian/liblog4c-doc.install --- log4c-1.2.1/debian/liblog4c-doc.install 2011-05-03 08:36:38.000000000 +0000 +++ log4c-1.2.1/debian/liblog4c-doc.install 2011-05-02 16:09:34.000000000 +0000 @@ -1,2 +1,6 @@ -usr/share/doc/liblog4c-doc/log4c.pdf +usr/share/doc/liblog4c-doc/AUTHORS +usr/share/doc/liblog4c-doc/ChangeLog +usr/share/doc/liblog4c-doc/README usr/share/doc/liblog4c-doc/html +usr/share/doc/liblog4c-doc/log4c.pdf +usr/share/man/man3/log4c_*.3 diff -Nru log4c-1.2.1/debian/liblog4c-doc.manpages log4c-1.2.1/debian/liblog4c-doc.manpages --- log4c-1.2.1/debian/liblog4c-doc.manpages 2011-05-03 08:36:38.000000000 +0000 +++ log4c-1.2.1/debian/liblog4c-doc.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/tmp/usr/share/man/man3/log4c_*.3 diff -Nru log4c-1.2.1/debian/patches/11_doc_install.diff log4c-1.2.1/debian/patches/11_doc_install.diff --- log4c-1.2.1/debian/patches/11_doc_install.diff 2011-05-03 08:36:38.000000000 +0000 +++ log4c-1.2.1/debian/patches/11_doc_install.diff 2011-05-02 15:22:35.000000000 +0000 @@ -1,12 +1,12 @@ -diff -Nur log4c-1.2.0/doc/Makefile.am log4c-1.2.0.new/doc/Makefile.am ---- log4c-1.2.0/doc/Makefile.am 2007-07-26 11:10:28.000000000 +0200 -+++ log4c-1.2.0.new/doc/Makefile.am 2007-07-26 11:11:52.000000000 +0200 -@@ -3,8 +3,6 @@ - docfiles = \ - $(top_srcdir)/README \ - $(top_srcdir)/AUTHORS \ -- $(top_srcdir)/NEWS \ -- $(top_srcdir)/COPYING \ - $(top_srcdir)/ChangeLog - - .PHONY: doxygen +Description: remove NEWS/COPYING files from installation +Author: Fathi Boudra +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -171,7 +171,6 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + man3dir = $(mandir)/man3 + docfiles = $(top_srcdir)/README $(top_srcdir)/AUTHORS \ +- $(top_srcdir)/NEWS $(top_srcdir)/COPYING \ + $(top_srcdir)/ChangeLog $(am__append_2) + targets = doxygen $(am__append_1) + all: all-am diff -Nru log4c-1.2.1/debian/patches/add_AC_PROG_CXX.diff log4c-1.2.1/debian/patches/add_AC_PROG_CXX.diff --- log4c-1.2.1/debian/patches/add_AC_PROG_CXX.diff 1970-01-01 00:00:00.000000000 +0000 +++ log4c-1.2.1/debian/patches/add_AC_PROG_CXX.diff 2011-05-02 15:20:23.000000000 +0000 @@ -0,0 +1,12 @@ +Description: add AC_PROG_CXX to allow autoreconf +Author: Fathi Boudra +--- a/configure.in ++++ b/configure.in +@@ -38,6 +38,7 @@ AC_DEFINE(_GNU_SOURCE,1,"POSIXandGNU ext + AC_PROG_YACC + AC_PROG_CC + AC_PROG_CPP ++AC_PROG_CXX + AM_PROG_LEX + AC_PROG_AWK + AC_PROG_INSTALL diff -Nru log4c-1.2.1/debian/patches/series log4c-1.2.1/debian/patches/series --- log4c-1.2.1/debian/patches/series 2011-05-03 08:36:38.000000000 +0000 +++ log4c-1.2.1/debian/patches/series 2011-05-02 13:51:24.000000000 +0000 @@ -1,3 +1,4 @@ +add_AC_PROG_CXX.diff 11_doc_install.diff #12_stream_appender_hack.diff #13_basic_layout_hack.diff diff -Nru log4c-1.2.1/debian/rules log4c-1.2.1/debian/rules --- log4c-1.2.1/debian/rules 2011-05-03 08:36:38.000000000 +0000 +++ log4c-1.2.1/debian/rules 2011-05-02 14:59:11.000000000 +0000 @@ -1,26 +1,23 @@ #!/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 +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -DEB_COMPRESS_EXCLUDE := .pdf -DEB_CONFIGURE_EXTRA_FLAGS := --disable-test --enable-doc -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed" -DEB_DH_INSTALL_SOURCEDIR := debian/tmp +upstream_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d '-') -SOURCE_VERSION := $(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1) -UPSTREAM_VERSION := $(shell echo "$(SOURCE_VERSION)"| cut -d- -f1) +%: + dh $@ --list-missing -install/liblog4c-doc:: - mv $(DEB_DESTDIR)/usr/share/doc/log4c-$(UPSTREAM_VERSION) \ - $(DEB_DESTDIR)/usr/share/doc/liblog4c-doc - -install/liblog4c3:: +override_dh_auto_configure: + autoreconf --verbose --force --install --include=config + dh_auto_configure -- --disable-test --enable-doc + cd doc && doxygen -u + +override_dh_auto_install: + dh_auto_install + mv debian/tmp/usr/share/doc/log4c-$(upstream_version) \ + debian/tmp/usr/share/doc/liblog4c-doc install -D -p -m0644 log4crc.sample \ - $(DEB_DESTDIR)/usr/share/doc/liblog4c3/sample/log4crc.sample - -binary-post-install/liblog4c3:: - rm -rf $(DEB_DESTDIR)/etc/log4crc.sample - + debian/tmp/usr/share/doc/liblog4c3/sample/log4crc.sample + rm -rf debian/tmp/etc + rm -f debian/tmp/usr/lib/liblog4c.la diff -Nru log4c-1.2.1/debian/source/format log4c-1.2.1/debian/source/format --- log4c-1.2.1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ log4c-1.2.1/debian/source/format 2011-05-03 08:36:38.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)