diff -Nru cppformat-3.0.0+ds/CMakeLists.txt cppformat-3.0.0+ds/CMakeLists.txt --- cppformat-3.0.0+ds/CMakeLists.txt 2016-05-07 16:50:47.000000000 +0000 +++ cppformat-3.0.0+ds/CMakeLists.txt 2017-03-04 18:41:05.000000000 +0000 @@ -43,8 +43,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/support/cmake") -include(cxx11) - if (CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) set(PEDANTIC_COMPILE_FLAGS -Wall -Wextra -Wshadow -pedantic) endif () diff -Nru cppformat-3.0.0+ds/debian/changelog cppformat-3.0.0+ds/debian/changelog --- cppformat-3.0.0+ds/debian/changelog 2017-03-04 18:41:05.000000000 +0000 +++ cppformat-3.0.0+ds/debian/changelog 2017-03-04 18:41:05.000000000 +0000 @@ -1,6 +1,7 @@ -cppformat (3.0.0+ds-3~vivid) vivid; urgency=medium +cppformat (3.0.0+ds-4~vivid) vivid; urgency=medium * backport to vivid + * disable building docs, too old dependencies -- wsnipex Sat, 04 Mar 2017 19:41:05 +0100 diff -Nru cppformat-3.0.0+ds/debian/control cppformat-3.0.0+ds/debian/control --- cppformat-3.0.0+ds/debian/control 2017-03-04 18:41:05.000000000 +0000 +++ cppformat-3.0.0+ds/debian/control 2017-03-04 18:41:05.000000000 +0000 @@ -19,15 +19,15 @@ . This package contains the development files, include the static library. -Package: libfmt3-doc -Section: doc -Architecture: all -Depends: ${misc:Depends}, ${sphinxdoc:Depends} -Conflicts: libcppformat1-doc, libcppformat2-doc -Description: fast type-safe C++ formatting library -- documentation - This library provides fast, type-safe, small, C++11-aware replacement of - (s)printf and related machinery. In some cases it's noticeably faster - than boost::format, boost::lexical_cast and even sprintf itself. - . - This package contains the documentation files. +#Package: libfmt3-doc +#Section: doc +#Architecture: all +#Depends: ${misc:Depends}, ${sphinxdoc:Depends} +#Conflicts: libcppformat1-doc, libcppformat2-doc +#Description: fast type-safe C++ formatting library -- documentation +# This library provides fast, type-safe, small, C++11-aware replacement of +# (s)printf and related machinery. In some cases it's noticeably faster +# than boost::format, boost::lexical_cast and even sprintf itself. +# . +# This package contains the documentation files. diff -Nru cppformat-3.0.0+ds/debian/libfmt3-doc.docs cppformat-3.0.0+ds/debian/libfmt3-doc.docs --- cppformat-3.0.0+ds/debian/libfmt3-doc.docs 2016-09-29 11:15:56.000000000 +0000 +++ cppformat-3.0.0+ds/debian/libfmt3-doc.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -README.rst diff -Nru cppformat-3.0.0+ds/debian/libfmt3-doc.docs.dis cppformat-3.0.0+ds/debian/libfmt3-doc.docs.dis --- cppformat-3.0.0+ds/debian/libfmt3-doc.docs.dis 1970-01-01 00:00:00.000000000 +0000 +++ cppformat-3.0.0+ds/debian/libfmt3-doc.docs.dis 2016-09-29 11:15:56.000000000 +0000 @@ -0,0 +1 @@ +README.rst diff -Nru cppformat-3.0.0+ds/debian/libfmt3-doc.install cppformat-3.0.0+ds/debian/libfmt3-doc.install --- cppformat-3.0.0+ds/debian/libfmt3-doc.install 2016-09-29 11:15:56.000000000 +0000 +++ cppformat-3.0.0+ds/debian/libfmt3-doc.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/doc/fmt/* usr/share/doc/libfmt3-doc diff -Nru cppformat-3.0.0+ds/debian/libfmt3-doc.install.dis cppformat-3.0.0+ds/debian/libfmt3-doc.install.dis --- cppformat-3.0.0+ds/debian/libfmt3-doc.install.dis 1970-01-01 00:00:00.000000000 +0000 +++ cppformat-3.0.0+ds/debian/libfmt3-doc.install.dis 2016-09-29 11:15:56.000000000 +0000 @@ -0,0 +1 @@ +usr/share/doc/fmt/* usr/share/doc/libfmt3-doc diff -Nru cppformat-3.0.0+ds/debian/patches/series cppformat-3.0.0+ds/debian/patches/series --- cppformat-3.0.0+ds/debian/patches/series 2016-09-29 11:15:56.000000000 +0000 +++ cppformat-3.0.0+ds/debian/patches/series 2017-03-04 18:41:05.000000000 +0000 @@ -1,6 +1,5 @@ 0001-README-removed-autoloading-of-third-party-links-imag.patch 0002-test-cmakelists-use-system-provide-GTest-and-GMock.patch -0003-doc-cmakelists-unconditionally-build-documentation.patch 0004-test-cmakelists-force-declare-GTEST_HAS_PTHREAD.patch 0005-doc-build-removed-all-pip-internet-stuff.patch 0006-doc-build-removed-lessc-call.patch diff -Nru cppformat-3.0.0+ds/debian/rules cppformat-3.0.0+ds/debian/rules --- cppformat-3.0.0+ds/debian/rules 2017-03-04 18:41:05.000000000 +0000 +++ cppformat-3.0.0+ds/debian/rules 2017-03-04 18:41:05.000000000 +0000 @@ -1,6 +1,7 @@ #!/usr/bin/make -f CMAKE_FLAGS = -DCMAKE_CXX_FLAGS="-std=gnu++11" +INSTALLDIR = $(CURDIR)/debian/tmp %: dh $@ --parallel @@ -10,9 +11,9 @@ override_dh_auto_build: dh_auto_build - dh_auto_build -- doc + #dh_auto_build -- doc -override_dh_install: - dh_install - dh_sphinxdoc +override_dh_auto_install: + dh_auto_install --destdir=$(INSTALLDIR) + #dh_sphinxdoc diff -Nru cppformat-3.0.0+ds/debian/source/format cppformat-3.0.0+ds/debian/source/format --- cppformat-3.0.0+ds/debian/source/format 2016-09-29 11:15:56.000000000 +0000 +++ cppformat-3.0.0+ds/debian/source/format 2017-03-04 18:41:05.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru cppformat-3.0.0+ds/doc/build.py cppformat-3.0.0+ds/doc/build.py --- cppformat-3.0.0+ds/doc/build.py 2016-05-07 16:50:47.000000000 +0000 +++ cppformat-3.0.0+ds/doc/build.py 2017-03-04 18:41:05.000000000 +0000 @@ -4,53 +4,10 @@ from __future__ import print_function import errno, os, shutil, sys, tempfile from subprocess import check_call, check_output, CalledProcessError, Popen, PIPE -from distutils.version import LooseVersion - -def pip_install(package, commit=None, **kwargs): - "Install package using pip." - if commit: - check_version = kwargs.get('check_version', '') - #output = check_output(['pip', 'show', package.split('/')[1]]) - #if check_version in output: - # print('{} already installed'.format(package)) - # return - package = 'git+git://github.com/{0}.git@{1}'.format(package, commit) - print('Installing {}'.format(package)) - check_call(['pip', 'install', '--upgrade', package]) def build_docs(version='dev'): - # Create virtualenv. doc_dir = os.path.dirname(os.path.realpath(__file__)) - virtualenv_dir = 'virtualenv' - check_call(['virtualenv', virtualenv_dir]) - import sysconfig - scripts_dir = os.path.basename(sysconfig.get_path('scripts')) - activate_this_file = os.path.join(virtualenv_dir, scripts_dir, - 'activate_this.py') - with open(activate_this_file) as f: - exec(f.read(), dict(__file__=activate_this_file)) - # Upgrade pip because installation of sphinx with pip 1.1 available on Travis - # is broken (see #207) and it doesn't support the show command. - from pkg_resources import get_distribution, DistributionNotFound - pip_version = get_distribution('pip').version - if LooseVersion(pip_version) < LooseVersion('1.5.4'): - print("Updating pip") - check_call(['pip', 'install', '--upgrade', 'pip']) - # Upgrade distribute because installation of sphinx with distribute 0.6.24 - # available on Travis is broken (see #207). - try: - distribute_version = get_distribution('distribute').version - if LooseVersion(distribute_version) <= LooseVersion('0.6.24'): - print("Updating distribute") - check_call(['pip', 'install', '--upgrade', 'distribute']) - except DistributionNotFound: - pass - # Install Sphinx and Breathe. - pip_install('fmtlib/sphinx', - '12dde8afdb0a7bb5576e2656692c3478c69d8cc3', - check_version='1.4a0.dev-20151013') - pip_install('michaeljones/breathe', - '1c9d7f80378a92cffa755084823a78bb38ee4acc') + # Build docs. cmd = ['doxygen', '-'] p = Popen(cmd, stdin=PIPE) @@ -83,16 +40,6 @@ '-Dbreathe_projects.format=' + os.path.join(os.getcwd(), 'doxyxml'), '-Dversion=' + version, '-Drelease=' + version, '-Aversion=' + version, '-b', 'html', doc_dir, 'html']) - try: - check_call(['lessc', '--clean-css', - '--include-path=' + os.path.join(doc_dir, 'bootstrap'), - os.path.join(doc_dir, 'fmt.less'), - 'html/_static/fmt.css']) - except OSError as e: - if e.errno != errno.ENOENT: - raise - print('lessc not found; make sure that Less (http://lesscss.org/) is installed') - sys.exit(1) return 'html' if __name__ == '__main__': diff -Nru cppformat-3.0.0+ds/doc/CMakeLists.txt cppformat-3.0.0+ds/doc/CMakeLists.txt --- cppformat-3.0.0+ds/doc/CMakeLists.txt 2016-05-07 16:50:47.000000000 +0000 +++ cppformat-3.0.0+ds/doc/CMakeLists.txt 2017-03-04 18:41:05.000000000 +0000 @@ -4,7 +4,7 @@ return () endif () -add_custom_target(doc - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION}) +#add_custom_target(doc +# COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION}) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION share/doc/fmt) +#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION share/doc/fmt) diff -Nru cppformat-3.0.0+ds/doc/_templates/layout.html cppformat-3.0.0+ds/doc/_templates/layout.html --- cppformat-3.0.0+ds/doc/_templates/layout.html 2016-05-07 16:50:47.000000000 +0000 +++ cppformat-3.0.0+ds/doc/_templates/layout.html 2017-03-04 18:41:05.000000000 +0000 @@ -5,15 +5,6 @@ -{# Google Analytics #} - {% endblock %} {%- macro searchform(classes, button) %} @@ -44,20 +35,9 @@ {fmt} - {# Collect the nav links, forms, and other content for toggling #}