diff -Nru ctpp2-2.8.3/debian/changelog ctpp2-2.8.3/debian/changelog --- ctpp2-2.8.3/debian/changelog 2015-08-04 14:27:17.000000000 +0000 +++ ctpp2-2.8.3/debian/changelog 2015-09-06 16:44:56.000000000 +0000 @@ -1,16 +1,18 @@ -ctpp2 (2.8.3-15ubuntu2) wily; urgency=medium +ctpp2 (2.8.3-17) unstable; urgency=medium - * Update symbols file for GCC 5. + * Update symbols file to build on all architecture. + * Bump S-V to 3.9.6, no change required to source. - -- Matthias Klose Tue, 04 Aug 2015 16:26:59 +0200 + -- Vasudev Kamath Sun, 06 Sep 2015 22:14:43 +0530 -ctpp2 (2.8.3-15ubuntu1) wily; urgency=medium +ctpp2 (2.8.3-16) unstable; urgency=medium - * Rename libctpp2-2-dbg to libctpp2-2v5-dbg, libctpp2-2 to libctpp2-2v5, - follow-up for the libstdc++6 ABI transition. - * Update symbols file. + * Fix FTBFS with GCC5, introduces library transition (Closes: bug#791016) + * Tighten build-depends on d-shlibs to 0.61, needed for --v5 option. + * Remove autogenerated doxygen files, only required for faster doc + regeneration. - -- Matthias Klose Tue, 04 Aug 2015 01:13:33 +0200 + -- Vasudev Kamath Fri, 21 Aug 2015 21:32:40 +0530 ctpp2 (2.8.3-15) unstable; urgency=medium diff -Nru ctpp2-2.8.3/debian/control ctpp2-2.8.3/debian/control --- ctpp2-2.8.3/debian/control 2015-08-04 12:08:57.000000000 +0000 +++ ctpp2-2.8.3/debian/control 2015-09-06 16:46:58.000000000 +0000 @@ -6,13 +6,13 @@ dh-buildinfo, devscripts, cmake, - d-shlibs(>=0.54), + d-shlibs(>=0.61), graphviz, pkg-kde-tools Build-Depends-Indep: doxygen Maintainer: Vasudev Kamath Uploaders: Jonas Smedegaard -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://ctpp.havoc.ru/en Vcs-Git: git://anonscm.debian.org/collab-maint/ctpp2.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ctpp2.git @@ -56,9 +56,9 @@ Pre-Depends: ${misc:Pre-Depends}, ${cdbs:Pre-Depends} Suggests: ctpp2-utils -Multi-Arch: same Conflicts: libctpp2-2 Replaces: libctpp2-2 +Multi-Arch: same Description: HTML template engine for C++ CTPP is a suitable choice for projects where a programmer and an HTML designer are different people. The goal of CTPP development was to diff -Nru ctpp2-2.8.3/debian/control.in ctpp2-2.8.3/debian/control.in --- ctpp2-2.8.3/debian/control.in 2015-08-04 14:27:21.000000000 +0000 +++ ctpp2-2.8.3/debian/control.in 2015-09-06 16:48:53.000000000 +0000 @@ -5,7 +5,7 @@ Build-Depends-Indep: doxygen Maintainer: Vasudev Kamath Uploaders: Jonas Smedegaard -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://ctpp.havoc.ru/en Vcs-Git: git://anonscm.debian.org/collab-maint/ctpp2.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ctpp2.git diff -Nru ctpp2-2.8.3/debian/control.in.in ctpp2-2.8.3/debian/control.in.in --- ctpp2-2.8.3/debian/control.in.in 2015-08-04 12:07:44.000000000 +0000 +++ ctpp2-2.8.3/debian/control.in.in 2015-09-06 16:43:02.000000000 +0000 @@ -5,7 +5,7 @@ Build-Depends-Indep: doxygen Maintainer: Vasudev Kamath Uploaders: Jonas Smedegaard -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://ctpp.havoc.ru/en Vcs-Git: git://anonscm.debian.org/collab-maint/ctpp2.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ctpp2.git diff -Nru ctpp2-2.8.3/debian/libctpp2-2v5.symbols ctpp2-2.8.3/debian/libctpp2-2v5.symbols --- ctpp2-2.8.3/debian/libctpp2-2v5.symbols 2015-08-04 14:25:59.000000000 +0000 +++ ctpp2-2.8.3/debian/libctpp2-2v5.symbols 2015-09-06 16:03:02.000000000 +0000 @@ -195,10 +195,10 @@ _ZN4CTPP12CTPP2GetText11SetLanguageERNS_14SyscallFactoryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.8.3 (arch=!ia64 !powerpcspe !s390)_ZN4CTPP12CTPP2GetText12CTPP2CatalogD1Ev@Base 2.8.3 (arch=!ia64 !powerpcspe !s390)_ZN4CTPP12CTPP2GetText12CTPP2CatalogD2Ev@Base 2.8.3 - (arch=armhf i386 powerpc)_ZN4CTPP12CTPP2GetText12IsLtOrGtExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 - (arch=!armhf !i386 !powerpc)_ZN4CTPP12CTPP2GetText12IsLtOrGtExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 - (arch=armhf i386 powerpc)_ZN4CTPP12CTPP2GetText13IsTernaryExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 - (arch=!armhf !i386 !powerpc)_ZN4CTPP12CTPP2GetText13IsTernaryExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 + (arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc x32)_ZN4CTPP12CTPP2GetText12IsLtOrGtExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 + (arch=!armel !armhf !hppa !hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc !x32)_ZN4CTPP12CTPP2GetText12IsLtOrGtExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 + (arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc x32)_ZN4CTPP12CTPP2GetText13IsTernaryExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 + (arch=!armel !armhf !hppa !hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc !x32)_ZN4CTPP12CTPP2GetText13IsTernaryExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 _ZN4CTPP12CTPP2GetText13ParseMetadataERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.8.3 _ZN4CTPP12CTPP2GetText14AddTranslationERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_S8_@Base 2.8.3 _ZN4CTPP12CTPP2GetText14ExtractMessageEPKhjii@Base 2.8.3 @@ -209,17 +209,17 @@ _ZN4CTPP12CTPP2GetText18InitSTDLibFunctionERNS_14SyscallFactoryE@Base 2.8.3 _ZN4CTPP12CTPP2GetText19CalculatePluralFormEjRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.8.3 _ZN4CTPP12CTPP2GetText20StringifyInstructionENS0_17eCTPP2InstructionE@Base 2.8.3 - (arch=armhf i386 powerpc)_ZN4CTPP12CTPP2GetText6IsTermERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 - (arch=!armhf !i386 !powerpc)_ZN4CTPP12CTPP2GetText6IsTermERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 - (arch=armhf i386 powerpc)_ZN4CTPP12CTPP2GetText8IsEqExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 - (arch=!armhf !i386 !powerpc)_ZN4CTPP12CTPP2GetText8IsEqExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 - (arch=armhf i386 powerpc)_ZN4CTPP12CTPP2GetText8IsOrExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 - (arch=!armhf !i386 !powerpc)_ZN4CTPP12CTPP2GetText8IsOrExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 + (arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc x32)_ZN4CTPP12CTPP2GetText6IsTermERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 + (arch=!armel !armhf !hppa !hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc !x32)_ZN4CTPP12CTPP2GetText6IsTermERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 + (arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc x32)_ZN4CTPP12CTPP2GetText8IsEqExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 + (arch=!armel !armhf !hppa !hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc !x32)_ZN4CTPP12CTPP2GetText8IsEqExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 + (arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc x32)_ZN4CTPP12CTPP2GetText8IsOrExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 + (arch=!armel !armhf !hppa !hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc !x32)_ZN4CTPP12CTPP2GetText8IsOrExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 _ZN4CTPP12CTPP2GetText8ReadFileEPKcRj@Base 2.8.3 - (arch=armhf i386 powerpc)_ZN4CTPP12CTPP2GetText9IsAndExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 - (arch=!armhf !i386 !powerpc)_ZN4CTPP12CTPP2GetText9IsAndExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 - (arch=armhf i386 powerpc)_ZN4CTPP12CTPP2GetText9IsModExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 - (arch=!armhf !i386 !powerpc)_ZN4CTPP12CTPP2GetText9IsModExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 + (arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc x32)_ZN4CTPP12CTPP2GetText9IsAndExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 + (arch=!armel !armhf !hppa !hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc !x32)_ZN4CTPP12CTPP2GetText9IsAndExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 + (arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc x32)_ZN4CTPP12CTPP2GetText9IsModExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.8.3 + (arch=!armel !armhf !hppa !hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc !x32)_ZN4CTPP12CTPP2GetText9IsModExprERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 2.8.3 _ZN4CTPP12CTPP2GetTextC1Ev@Base 2.8.3 _ZN4CTPP12CTPP2GetTextC2Ev@Base 2.8.3 _ZN4CTPP12CTPP2GetTextD1Ev@Base 2.8.3 @@ -1276,7 +1276,7 @@ _ZNK4CTPP9HashTable4SizeEv@Base 2.8.3 _ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN4CTPP12CTPP2GetText12CTPP2CatalogESt4lessIS5_ESaISt4pairIKS5_S8_EEEixERSC_@Base 2.8.3 _ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES_IS5_N4CTPP12CTPP2GetText12CTPP2CatalogESt4lessIS5_ESaISt4pairIKS5_S8_EEESA_SaISB_ISC_SF_EEEixERSC_@Base 2.8.3 - (optional=templinst|arch=!amd64 !arm64 !armhf !i386 !kfreebsd-amd64 !powerpc !ppc64el)_ZNSt3mapISsS_ISsN4CTPP12CTPP2GetText12CTPP2CatalogESt4lessISsESaISt4pairIKSsS2_EEES4_SaIS5_IS6_S9_EEEixERS6_@Base 2.8.3 + (optional=templinst|arch=!amd64 !arm64 !armel !armhf !hppa !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !ppc64 !ppc64el !s390x !x32)_ZNSt3mapISsS_ISsN4CTPP12CTPP2GetText12CTPP2CatalogESt4lessISsESaISt4pairIKSsS2_EEES4_SaIS5_IS6_S9_EEEixERS6_@Base 2.8.3 (optional=templinst|arch=ia64 powerpcspe s390)_ZNSt3mapISsSsSt4lessISsESaISt4pairIKSsSsEEEixERS3_@Base 2.8.3 (optional=templinst|arch=ia64 powerpcspe s390)_ZNSt3mapISsjSt4lessISsESaISt4pairIKSsjEEEixERS3_@Base 2.8.3 _ZNSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN4CTPP12CTPP2GetText12CTPP2CatalogEED1Ev@Base 2.8.3 @@ -1313,7 +1313,7 @@ _ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS5_SaIS5_EEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE7_M_copyINSH_11_Alloc_nodeEEEPSt13_Rb_tree_nodeISB_EPKSL_SM_RT_@Base 2.8.3 _ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS5_SaIS5_EEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E@Base 2.8.3 _ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_EN4CTPP14SyscallFactory15HandlerRefsSortESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.8.3 - (arch=!armhf !i386 !powerpc)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.8.3 + (arch=!armel !armhf !hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.8.3 _ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_11_Alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_SJ_RT_@Base 2.8.3 _ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_SJ_RT_@Base 2.8.3 _ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.8.3 diff -Nru ctpp2-2.8.3/debian/rules ctpp2-2.8.3/debian/rules --- ctpp2-2.8.3/debian/rules 2015-08-04 11:56:08.000000000 +0000 +++ ctpp2-2.8.3/debian/rules 2015-08-21 16:00:24.000000000 +0000 @@ -17,11 +17,12 @@ libname = lib$(stem) libpkgname = lib$(stem)-$(major)v5 devpkgname = lib$(stem)-dev +docpkgname = $(stem)-doc utilspkg = $(stem)-utils # Build Dependencies -# * recent d-shlibs needed for multiarch option and libc quirk -CDBS_BUILD_DEPENDS += , cmake, d-shlibs(>=0.54), graphviz, pkg-kde-tools +# * recent d-shlibs needed for --v5 option +CDBS_BUILD_DEPENDS += , cmake, d-shlibs(>=0.61), graphviz, pkg-kde-tools # Multiarch quirks CDBS_PREDEPENDS = $(if $(DEB_HOST_MULTIARCH),multiarch-support) @@ -87,3 +88,8 @@ touch $@ clean:: rm -f debian/stamp-local-shlibs-$(libname) + +# Remove the jquery +binary-post-install/$(docpkgname):: + find debian/$(docpkgname)/usr/share/doc/$(docpkgname)/html/ -name "*.md5" -exec rm -vf {} \; +