diff -Nru world-0.2.0~dfsg3/debian/changelog world-0.2.0~dfsg3/debian/changelog --- world-0.2.0~dfsg3/debian/changelog 2015-08-21 23:41:11.000000000 +0800 +++ world-0.2.0~dfsg3/debian/changelog 2015-08-22 03:45:46.000000000 +0800 @@ -1,12 +1,13 @@ -world (0.2.0~dfsg3-1.4) UNRELEASED; urgency=medium - - * add cmake build dependency as a patch, multiarch, and other policy fixes - * upstream tarball replacked, only one exe file is deleted - - -- Tobias Platen Fri, 21 Aug 2015 17:39:09 +0200 - world (0.2.0~dfsg3-1) unstable; urgency=low + [ Tobias Platen ] + * add cmake build dependency as a patch, multiarch, and other policy fixes + * upstream tarball replacked, only one exe file is deleted * Initial release - -- Tobias Platen Thu, 06 Aug 2015 06:55:07 +0200 + [ Ying-Chun Liu (PaulLiu) ] + * Modify cmake build patch to multiarch + * Remove doc copying.txt to be installed + * Add misc:Depends to control files. + + -- Ying-Chun Liu (PaulLiu) Sat, 22 Aug 2015 03:44:58 +0800 diff -Nru world-0.2.0~dfsg3/debian/control world-0.2.0~dfsg3/debian/control --- world-0.2.0~dfsg3/debian/control 2015-08-16 19:11:25.000000000 +0800 +++ world-0.2.0~dfsg3/debian/control 2015-08-22 03:48:39.000000000 +0800 @@ -1,12 +1,10 @@ Source: world Priority: optional Maintainer: Tobias Platen -Build-Depends: debhelper (>= 8.0.0), cmake -Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 9), cmake +Standards-Version: 3.9.6 Section: libs Homepage: http://ml.cs.yamanashi.ac.jp/world/english/index.html -#Vcs-Git: git://git.debian.org/collab-maint/world.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/world.git;a=summary Package: world-tools Section: sound @@ -21,7 +19,7 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: libworld0 (= ${binary:Version}) +Depends: libworld0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: high-quality speech synthesis system: development files WORLD is a high-quality speech analysis synthesis system on the basis of Vocoder. diff -Nru world-0.2.0~dfsg3/debian/copyright world-0.2.0~dfsg3/debian/copyright --- world-0.2.0~dfsg3/debian/copyright 2015-08-16 19:02:00.000000000 +0800 +++ world-0.2.0~dfsg3/debian/copyright 2015-08-22 03:48:16.000000000 +0800 @@ -3,23 +3,12 @@ Source: http://ml.cs.yamanashi.ac.jp/world/english/ Files: * -Copyright: 2012-2015 Masanori Morise +Copyright: 2010-2015 Masanori Morise License: 3BSD - - WORLD: High-quality speech analysis, - modification and synthesis system - developed by M. Morise - http://ml.cs.yamanashi.ac.jp/world/ - - - Copyright (c) 2010-2015 M. Morise - - All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + . - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - Redistributions in binary form must reproduce the above @@ -29,7 +18,7 @@ - Neither the name of the M. Morise nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF @@ -43,7 +32,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - Files: debian Copyright: 2015 Tobias Platen diff -Nru world-0.2.0~dfsg3/debian/docs world-0.2.0~dfsg3/debian/docs --- world-0.2.0~dfsg3/debian/docs 2015-08-16 19:03:34.000000000 +0800 +++ world-0.2.0~dfsg3/debian/docs 2015-08-22 03:48:57.000000000 +0800 @@ -1,7 +1,5 @@ styleguide.txt doc/acknowledgment.txt -doc/changes_JP.txt -doc/copying.txt doc/dev_env.txt doc/readme_ENG.txt doc/readme_JP.txt diff -Nru world-0.2.0~dfsg3/debian/libworld0.install world-0.2.0~dfsg3/debian/libworld0.install --- world-0.2.0~dfsg3/debian/libworld0.install 1970-01-01 08:00:00.000000000 +0800 +++ world-0.2.0~dfsg3/debian/libworld0.install 2015-08-22 03:41:00.000000000 +0800 @@ -0,0 +1,2 @@ +usr/lib/*/libworld.so.0 +usr/lib/*/libworld.so.0.2.0 diff -Nru world-0.2.0~dfsg3/debian/libworld0.install.in world-0.2.0~dfsg3/debian/libworld0.install.in --- world-0.2.0~dfsg3/debian/libworld0.install.in 2015-08-21 23:26:45.000000000 +0800 +++ world-0.2.0~dfsg3/debian/libworld0.install.in 1970-01-01 08:00:00.000000000 +0800 @@ -1,2 +0,0 @@ -usr/lib/libworld.so.0 /usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/libworld.so.0.2.0 /usr/lib/@DEB_HOST_MULTIARCH@/ diff -Nru world-0.2.0~dfsg3/debian/libworld-dev.install world-0.2.0~dfsg3/debian/libworld-dev.install --- world-0.2.0~dfsg3/debian/libworld-dev.install 2015-08-21 23:24:35.000000000 +0800 +++ world-0.2.0~dfsg3/debian/libworld-dev.install 2015-08-22 03:39:29.000000000 +0800 @@ -1,2 +1,2 @@ usr/include -usr/lib/*.so /usr/lib/x86_64-linux-gnu/ +usr/lib/*/*.so diff -Nru world-0.2.0~dfsg3/debian/libworld-dev.install.in world-0.2.0~dfsg3/debian/libworld-dev.install.in --- world-0.2.0~dfsg3/debian/libworld-dev.install.in 2015-08-21 23:23:10.000000000 +0800 +++ world-0.2.0~dfsg3/debian/libworld-dev.install.in 1970-01-01 08:00:00.000000000 +0800 @@ -1,2 +0,0 @@ -usr/include -usr/lib/*.so /usr/lib/@DEB_HOST_MULTIARCH@/ diff -Nru world-0.2.0~dfsg3/debian/ls world-0.2.0~dfsg3/debian/ls --- world-0.2.0~dfsg3/debian/ls 2015-08-16 18:37:16.000000000 +0800 +++ world-0.2.0~dfsg3/debian/ls 1970-01-01 08:00:00.000000000 +0800 @@ -1,21 +0,0 @@ -cheaptrick.cpp -cheaptrick.h -common.cpp -common.h -constantnumbers.h -d4c.cpp -d4c.h -debian -dio.cpp -dio.h -doc -fft.cpp -fft.h -matlabfunctions.cpp -matlabfunctions.h -stonemask.cpp -stonemask.h -styleguide.txt -synthesis.cpp -synthesis.h -test.cpp diff -Nru world-0.2.0~dfsg3/debian/patches/cmake_usage.patch world-0.2.0~dfsg3/debian/patches/cmake_usage.patch --- world-0.2.0~dfsg3/debian/patches/cmake_usage.patch 2015-08-16 19:47:15.000000000 +0800 +++ world-0.2.0~dfsg3/debian/patches/cmake_usage.patch 2015-08-22 03:42:32.000000000 +0800 @@ -21,9 +21,11 @@ Reviewed-By: Last-Update: +Index: world-0.2.0~dfsg3/CMakeLists.txt +=================================================================== --- /dev/null +++ world-0.2.0~dfsg3/CMakeLists.txt -@@ -0,0 +1,40 @@ +@@ -0,0 +1,43 @@ +add_library(world SHARED +cheaptrick.cpp +common.cpp @@ -60,10 +62,15 @@ + +install(FILES ${HEADERS} DESTINATION include/world) + ++EXECUTE_PROCESS(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH OUTPUT_VARIABLE ++ CMAKE_ARCH_TRIPLET OUTPUT_STRIP_TRAILING_WHITESPACE) ++ +install(TARGETS world world_test + RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib ++ LIBRARY DESTINATION lib/${CMAKE_ARCH_TRIPLET} +) +Index: world-0.2.0~dfsg3/test.cpp +=================================================================== --- world-0.2.0~dfsg3.orig/test.cpp +++ world-0.2.0~dfsg3/test.cpp @@ -43,7 +43,7 @@ diff -Nru world-0.2.0~dfsg3/debian/rules world-0.2.0~dfsg3/debian/rules --- world-0.2.0~dfsg3/debian/rules 2015-08-21 23:24:06.000000000 +0800 +++ world-0.2.0~dfsg3/debian/rules 2015-08-22 03:54:50.000000000 +0800 @@ -4,9 +4,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -%: debian/libworld0.install debian/libworld-dev.install - dh $@ - -debian/%.install: debian/%.install.in - sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ +%: + dh $@ +override_dh_installchangelogs: + dh_installchangelogs doc/changes_JP.txt