Author: bdefreese Date: 2013-06-28 21:55:45 +0000 (Fri, 28 Jun 2013) New Revision: 14356
Added: packages/trunk/libclaw/debian/libclaw-dev.manpages packages/trunk/libclaw/debian/libclaw-doc.doc-base packages/trunk/libclaw/debian/libclaw-doc.links packages/trunk/libclaw/debian/source/ packages/trunk/libclaw/debian/source/format Removed: packages/trunk/libclaw/debian/README.source packages/trunk/libclaw/debian/libclaw.doc-base packages/trunk/libclaw/debian/patches/cmake-module-install-dir.diff packages/trunk/libclaw/debian/patches/ftbfs-gcc-4.7.diff packages/trunk/libclaw/debian/patches/libpng1.5-transition.diff packages/trunk/libclaw/debian/patches/ptrdiff_t.diff packages/trunk/libclaw/debian/patches/version-file-in-binary-dir.diff Modified: packages/trunk/libclaw/debian/changelog packages/trunk/libclaw/debian/compat packages/trunk/libclaw/debian/control packages/trunk/libclaw/debian/patches/html-doc-paths.diff packages/trunk/libclaw/debian/patches/series packages/trunk/libclaw/debian/rules Log: New upstream release. Significant packaging restructuring. Deleted: packages/trunk/libclaw/debian/README.source =================================================================== --- packages/trunk/libclaw/debian/README.source 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/README.source 2013-06-28 21:55:45 UTC (rev 14356) @@ -1 +0,0 @@ -See /usr/share/doc/quilt/README.source Modified: packages/trunk/libclaw/debian/changelog =================================================================== --- packages/trunk/libclaw/debian/changelog 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/changelog 2013-06-28 21:55:45 UTC (rev 14356) @@ -1,5 +1,12 @@ -libclaw (1.7.0-4) unstable; urgency=low +libclaw (1.7.3-1) unstable; urgency=low + * New upstream release. + + Drop unneeded patches. + * Build-dep libpng-dev not libpng12-dev. (Closes: #662394). + * Move to source format 3.0 (quilt). + + Drop quilt build-dep. + + Remove file debian/README.source. + * Bump debhelper build-dep and compat to 9. * Add Homepage tag to source package. * Update VCS tags. * Fix watch file. Modified: packages/trunk/libclaw/debian/compat =================================================================== --- packages/trunk/libclaw/debian/compat 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/compat 2013-06-28 21:55:45 UTC (rev 14356) @@ -1 +1 @@ -5 +9 Modified: packages/trunk/libclaw/debian/control =================================================================== --- packages/trunk/libclaw/debian/control 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/control 2013-06-28 21:55:45 UTC (rev 14356) @@ -4,8 +4,8 @@ Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Uploaders: Julien Jorge <julien.jo...@gamned.org>, Barry deFreese <bdefre...@debian.org>, Gonéri Le Bouder <gon...@rulezlan.org> -Build-Depends: quilt, docbook-to-man, debhelper (>= 5), cmake (>= 2.8), - libjpeg-dev, libpng12-dev (>= 1.2.8), doxygen (>= 1.5), +Build-Depends: debhelper (>= 9), docbook-to-man, cmake (>= 2.8), + libjpeg-dev, libpng-dev, doxygen (>= 1.5), gettext (>= 0.17), libboost-dev (>= 1.42) Standards-Version: 3.9.4 Homepage: http://libclaw.sourceforge.net Added: packages/trunk/libclaw/debian/libclaw-dev.manpages =================================================================== --- packages/trunk/libclaw/debian/libclaw-dev.manpages (rev 0) +++ packages/trunk/libclaw/debian/libclaw-dev.manpages 2013-06-28 21:55:45 UTC (rev 14356) @@ -0,0 +1 @@ +debian/claw-config.1 Added: packages/trunk/libclaw/debian/libclaw-doc.doc-base =================================================================== --- packages/trunk/libclaw/debian/libclaw-doc.doc-base (rev 0) +++ packages/trunk/libclaw/debian/libclaw-doc.doc-base 2013-06-28 21:55:45 UTC (rev 14356) @@ -0,0 +1,10 @@ +Document: libclaw1-api +Title: libclaw API documentation +Author: Julien Jorge <julien_jo...@yahoo.fr> +Abstract: This manual describes the C++ API for libclaw1. +Section: unknown + +Format: HTML +Index: /usr/share/doc/libclaw1/html/index.html +Files: /usr/share/doc/libclaw1/html/*.html + Added: packages/trunk/libclaw/debian/libclaw-doc.links =================================================================== --- packages/trunk/libclaw/debian/libclaw-doc.links (rev 0) +++ packages/trunk/libclaw/debian/libclaw-doc.links 2013-06-28 21:55:45 UTC (rev 14356) @@ -0,0 +1 @@ +/usr/share/javascript/jquery/jquery.js usr/share/doc/libclaw1/html/jquery.js Deleted: packages/trunk/libclaw/debian/libclaw.doc-base =================================================================== --- packages/trunk/libclaw/debian/libclaw.doc-base 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/libclaw.doc-base 2013-06-28 21:55:45 UTC (rev 14356) @@ -1,10 +0,0 @@ -Document: libclaw1-api -Title: libclaw API documentation -Author: Julien Jorge <julien_jo...@yahoo.fr> -Abstract: This manual describes the C++ API for libclaw1. -Section: unknown - -Format: HTML -Index: /usr/share/doc/libclaw1/html/index.html -Files: /usr/share/doc/libclaw1/html/*.html - Deleted: packages/trunk/libclaw/debian/patches/cmake-module-install-dir.diff =================================================================== --- packages/trunk/libclaw/debian/patches/cmake-module-install-dir.diff 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/patches/cmake-module-install-dir.diff 2013-06-28 21:55:45 UTC (rev 14356) @@ -1,21 +0,0 @@ -Index: libclaw-1.6.1/cmake-module/CMakeLists.txt -=================================================================== ---- libclaw-1.6.1.orig/cmake-module/CMakeLists.txt 2011-08-21 15:50:43.000000000 +0200 -+++ libclaw-1.6.1/cmake-module/CMakeLists.txt 2011-08-21 15:53:41.000000000 +0200 -@@ -3,7 +3,7 @@ - project(claw:cmake-modules) - - if( NOT CLAW_CMAKE_MODULES_INSTALL_PATH ) -- set( CLAW_CMAKE_MODULES_INSTALL_PATH "${CMAKE_ROOT}/Modules" ) -+ set( CLAW_CMAKE_MODULES_INSTALL_PATH "share/cmake/libclaw" ) - endif( NOT CLAW_CMAKE_MODULES_INSTALL_PATH ) - - set( CLAW_CMAKE_MODULES -@@ -14,5 +14,6 @@ - # installation - install( - FILES ${CLAW_CMAKE_MODULES} -- DESTINATION "${CLAW_CMAKE_MODULES_INSTALL_PATH}" ) -+ DESTINATION "${CLAW_CMAKE_MODULES_INSTALL_PATH}" -+ RENAME libclaw-config.cmake ) - Deleted: packages/trunk/libclaw/debian/patches/ftbfs-gcc-4.7.diff =================================================================== --- packages/trunk/libclaw/debian/patches/ftbfs-gcc-4.7.diff 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/patches/ftbfs-gcc-4.7.diff 2013-06-28 21:55:45 UTC (rev 14356) @@ -1,56 +0,0 @@ -Index: libclaw-1.7.0/claw/impl/socket_stream.tpp -=================================================================== ---- libclaw-1.7.0.orig/claw/impl/socket_stream.tpp 2012-05-04 11:19:54.732395906 +0000 -+++ libclaw-1.7.0/claw/impl/socket_stream.tpp 2012-05-04 11:20:47.852397882 +0000 -@@ -39,7 +39,7 @@ - ( int read_delay ) - : m_buffer(read_delay) - { -- init(&m_buffer); -+ this->init(&m_buffer); - } // basic_socket_stream::basic_socket_stream() - - /*----------------------------------------------------------------------------*/ -@@ -55,7 +55,7 @@ - ( const char* address, int port, int read_delay ) - : m_buffer(read_delay) - { -- init(&m_buffer); -+ this->init(&m_buffer); - open(address, port); - } // basic_socket_stream::basic_socket_stream() - ---- libclaw-1.7.0.orig/claw/impl/basic_socketbuf.tpp -+++ libclaw-1.7.0/claw/impl/basic_socketbuf.tpp -@@ -178,7 +178,7 @@ - length, 0 ); - - if ( write_count >= 0 ) -- setp( m_output_buffer, m_output_buffer + m_output_buffer_size ); -+ this->setp( m_output_buffer, m_output_buffer + m_output_buffer_size ); - else - result = -1; - -@@ -214,11 +214,11 @@ - - if ( read_count > 0 ) - { -- setg( m_input_buffer, m_input_buffer, m_input_buffer + read_count); -+ this->setg( m_input_buffer, m_input_buffer, m_input_buffer + read_count); - result = this->sgetc(); - } - else -- setg( m_input_buffer, m_input_buffer + m_input_buffer_size, -+ this->setg( m_input_buffer, m_input_buffer + m_input_buffer_size, - m_input_buffer + m_input_buffer_size ); - - return result; -@@ -243,7 +243,7 @@ - result = traits_type::not_eof(c); - - if ( !traits_type::eq_int_type(c, traits_type::eof()) ) -- sputc(c); -+ this->sputc(c); - } - - return result; Modified: packages/trunk/libclaw/debian/patches/html-doc-paths.diff =================================================================== --- packages/trunk/libclaw/debian/patches/html-doc-paths.diff 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/patches/html-doc-paths.diff 2013-06-28 21:55:45 UTC (rev 14356) @@ -1,10 +1,10 @@ -Set the correct input path for doxygen, relatively to the debian folder.Index: libclaw-1.7.0/doc/Doxyfile +Description: Set the correct input path for doxygen, relatively to the debian folder.Index: libclaw-1.7.0/doc/Doxyfile +Author: Unknown +Index: libclaw-1.7.3/doc/Doxyfile =================================================================== -Index: libclaw-1.7.0/doc/Doxyfile -=================================================================== ---- libclaw-1.7.0.orig/doc/Doxyfile 2011-08-27 18:48:30.000000000 +0200 -+++ libclaw-1.7.0/doc/Doxyfile 2011-08-27 18:49:44.000000000 +0200 -@@ -124,7 +124,7 @@ +--- libclaw-1.7.3.orig/doc/Doxyfile 2013-03-14 17:09:41.000000000 -0400 ++++ libclaw-1.7.3/doc/Doxyfile 2013-06-28 10:05:30.000000000 -0400 +@@ -138,7 +138,7 @@ # If left blank the directory from which doxygen is run is used as the # path to strip. @@ -13,12 +13,14 @@ # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of # the path mentioned in the documentation of a class, which tells -@@ -578,7 +578,7 @@ +@@ -665,8 +665,8 @@ # directories like "/usr/src/myproject". Separate the files or directories # with spaces. --INPUT = ../claw ./doc-src -+INPUT = ../../claw ../doc/doc-src +-INPUT = ../claw \ +- ./doc-src ++INPUT = ../../claw \ ++ ../doc/doc-src # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is Deleted: packages/trunk/libclaw/debian/patches/libpng1.5-transition.diff =================================================================== --- packages/trunk/libclaw/debian/patches/libpng1.5-transition.diff 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/patches/libpng1.5-transition.diff 2013-06-28 21:55:45 UTC (rev 14356) @@ -1,12 +0,0 @@ -Index: libclaw-1.6.1/claw/png.hpp -=================================================================== ---- libclaw-1.6.1.orig/claw/png.hpp 2011-08-21 16:09:33.000000000 +0200 -+++ libclaw-1.6.1/claw/png.hpp 2011-08-21 16:09:52.000000000 +0200 -@@ -32,6 +32,7 @@ - - #include <claw/image.hpp> - #include <png.h> -+#include <zlib.h> - #include <setjmp.h> - #include <iostream> - #include <string> Deleted: packages/trunk/libclaw/debian/patches/ptrdiff_t.diff =================================================================== --- packages/trunk/libclaw/debian/patches/ptrdiff_t.diff 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/patches/ptrdiff_t.diff 2013-06-28 21:55:45 UTC (rev 14356) @@ -1,24 +0,0 @@ -Index: libclaw-1.6.1/claw/avl_base.hpp -=================================================================== ---- libclaw-1.6.1.orig/claw/avl_base.hpp 2011-05-02 21:11:07.897390615 +0200 -+++ libclaw-1.6.1/claw/avl_base.hpp 2011-05-02 21:11:39.649548040 +0200 -@@ -31,6 +31,7 @@ - #define __CLAW_AVL_BASE_HPP__ - - #include <iterator> -+#include <cstddef> - - #include <claw/binary_node.hpp> - -Index: libclaw-1.6.1/claw/image.hpp -=================================================================== ---- libclaw-1.6.1.orig/claw/image.hpp 2011-05-02 21:11:07.917390718 +0200 -+++ libclaw-1.6.1/claw/image.hpp 2011-05-02 21:11:52.241610770 +0200 -@@ -36,6 +36,7 @@ - #include <vector> - #include <iterator> - #include <iostream> -+#include <cstddef> - - namespace claw - { Modified: packages/trunk/libclaw/debian/patches/series =================================================================== --- packages/trunk/libclaw/debian/patches/series 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/patches/series 2013-06-28 21:55:45 UTC (rev 14356) @@ -1,3 +1 @@ html-doc-paths.diff -libpng1.5-transition.diff -ftbfs-gcc-4.7.diff Deleted: packages/trunk/libclaw/debian/patches/version-file-in-binary-dir.diff =================================================================== --- packages/trunk/libclaw/debian/patches/version-file-in-binary-dir.diff 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/patches/version-file-in-binary-dir.diff 2013-06-28 21:55:45 UTC (rev 14356) @@ -1,19 +0,0 @@ -Index: libclaw-1.6.1/CMakeLists.txt -=================================================================== ---- libclaw-1.6.1.orig/CMakeLists.txt 2010-11-25 21:51:09.751366001 +0100 -+++ libclaw-1.6.1/CMakeLists.txt 2010-11-25 21:56:21.959365995 +0100 -@@ -242,9 +242,13 @@ - # version - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/claw/version.hpp.in" -- "${CMAKE_CURRENT_SOURCE_DIR}/claw/version.hpp" -+ "${CMAKE_CURRENT_BINARY_DIR}/claw/version.hpp" - ) - -+install( FILES -+ "${CMAKE_CURRENT_BINARY_DIR}/claw/version.hpp" -+ DESTINATION "${CLAW_INSTALLDIR_SOURCE}" ) -+ - if(WIN32) - subdirs(win) - endif(WIN32) Modified: packages/trunk/libclaw/debian/rules =================================================================== --- packages/trunk/libclaw/debian/rules 2013-06-28 13:31:15 UTC (rev 14355) +++ packages/trunk/libclaw/debian/rules 2013-06-28 21:55:45 UTC (rev 14356) @@ -2,84 +2,13 @@ #export DH_VERBOSE=1 -BUILD_TREE=$(CURDIR)/build-tree +%: + dh $@ --buildsystem=cmake --parallel -configure: configure-stamp -configure-stamp: - dh_testdir - QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - - # Perform an out-of-tree build to keep a clean source tree - mkdir $(BUILD_TREE) - cd $(BUILD_TREE); cmake .. \ - -DCMAKE_INSTALL_PREFIX:STRING="/usr" -DCMAKE_C_FLAGS:STRING="$(CFLAGS)" \ - -DBUILD_STATIC:BOOL=ON - - touch configure-stamp - - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: configure-stamp - dh_testdir - - cd $(BUILD_TREE); $(MAKE) - cd $(BUILD_TREE); \ - find . -name "*-static.a" | while read f; do \ - mv $$f `echo $$f | sed s/-static//`; \ - done - - touch $@ - -clean: - dh_testdir - dh_testroot - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 - rm -f build-stamp configure-stamp - rm -fr $(BUILD_TREE) - rm -f debian/claw-config.1 - rm -fr .pc - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - cd $(BUILD_TREE); $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - find . -name "*-static.a" | while read f; do \ - mv $$f `echo $$f | sed s/-static//`; \ - done - #rm $(CURDIR)/debian/tmp/usr/share/doc/libclaw1/html/jquery.js - ln -s /usr/share/javascript/jquery/jquery.js \ - $(CURDIR)/debian/tmp/usr/share/doc/libclaw1/html/jquery.js +override_dh_installman: docbook-to-man doc/man/claw-config.man.sgml > debian/claw-config.1 + dh_installman -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - - dh_install - dh_installman -plibclaw-dev debian/claw-config.1 - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_clean: + rm -f debian/claw-config.1 + dh_clean Added: packages/trunk/libclaw/debian/source/format =================================================================== --- packages/trunk/libclaw/debian/source/format (rev 0) +++ packages/trunk/libclaw/debian/source/format 2013-06-28 21:55:45 UTC (rev 14356) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits