diff --git a/debian/control b/debian/control index 6db5e4bff..db2f0e7f9 100644 --- a/debian/control +++ b/debian/control @@ -7,21 +7,22 @@ Uploaders: Lisandro Damián Nicanor Pérez Meyer , Timo Röhling Build-Depends: debhelper-compat (= 13), freebsd-glue [kfreebsd-any], - libarchive-dev (>= 3.3.3), - libcurl4-openssl-dev | libcurl-ssl-dev, - libexpat1-dev, - libjsoncpp-dev, - libncurses5-dev, - librhash-dev, - libuv1-dev (>= 1.10), + libarchive-dev (>= 3.3.3) , + libcurl4-openssl-dev | libcurl-ssl-dev , + libexpat1-dev , + libjsoncpp-dev , + libncurses5-dev , + librhash-dev , + libssl-dev , + libuv1-dev (>= 1.10) , procps [!hurd-any], - qtbase5-dev , - zlib1g-dev, python3-sphinx, python3-sphinxcontrib.qthelp | python3-sphinx (<< 2.0), - dh-sequence-sphinxdoc, + qtbase5-dev , + zlib1g-dev Build-Depends-Indep: - dh-elpa + dh-elpa, + dh-sequence-sphinxdoc Rules-Requires-Root: no Standards-Version: 4.6.0 Vcs-Git: https://salsa.debian.org/cmake-team/cmake.git @@ -64,6 +65,7 @@ Description: CMake data files (modules, templates and documentation) Package: cmake-curses-gui Architecture: any +Build-Profiles: Depends: ${misc:Depends}, ${shlibs:Depends}, cmake (= ${binary:Version}) @@ -80,10 +82,10 @@ Description: curses based user interface for CMake (ccmake) Package: cmake-qt-gui Architecture: any -Build-Profiles: +Build-Profiles: Depends: ${misc:Depends}, - ${shlibs:Depends} - cmake (= ${binary:Version}), + ${shlibs:Depends}, + cmake (= ${binary:Version}) Provides: cmake-gui Description: Qt based user interface for CMake (cmake-gui) CMake is used to control the software compilation process using simple @@ -98,6 +100,7 @@ Description: Qt based user interface for CMake (cmake-gui) Package: cmake-doc Architecture: all +Build-Profiles: Multi-Arch: foreign Section: doc Built-Using: ${sphinxdoc:Built-Using} diff --git a/debian/not-installed b/debian/not-installed index 1aa115a78..916a8b439 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,5 +1,13 @@ -usr/share/doc/cmake/cmcompress/Copyright.txt usr/share/doc/cmake-data/Copyright.txt +usr/share/doc/cmake-data/cmcurl/COPYING +usr/share/doc/cmake-data/cmlibarchive/COPYING +usr/share/doc/cmake-data/cmliblzma/COPYING +usr/share/doc/cmake-data/cmlibrhash/COPYING +usr/share/doc/cmake-data/cmlibuv/LICENSE +usr/share/doc/cmake-data/cmnghttp2/COPYING usr/share/doc/cmake-data/cmsys/Copyright.txt usr/share/doc/cmake-data/cmsys/Copyright.txt +usr/share/doc/cmake-data/cmzlib/Copyright.txt +usr/share/doc/cmake-data/cmzstd/LICENSE +usr/share/doc/cmake/cmcompress/Copyright.txt usr/share/emacs/site-lisp/cmake-mode.el diff --git a/debian/rules b/debian/rules index e414948d8..b8a680600 100755 --- a/debian/rules +++ b/debian/rules @@ -6,12 +6,6 @@ export DEB_CXXFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS) export DEB_CFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS) export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - BOOTSTRAP_PARALLEL = --parallel=$(NUMJOBS) -else - NUMJOBS = 1 -endif BUILD_DATE = $(shell LC_ALL=C date -u "+%B %d, %Y" -d "@$(SOURCE_DATE_EPOCH)") @@ -31,8 +25,8 @@ $(BUILD_FLAGS_FILE) verify-build-flags: $(call $(flag_action),CMAKE_C_FLAGS,"$(CFLAGS)","C flags") $(call $(flag_action),CMAKE_CXX_FLAGS,"$(CXXFLAGS)","C++ flags") $(call $(flag_action),CMAKE_SKIP_BOOTSTRAP_TEST,ON,"Skip BootstrapTest") +ifeq ($(filter pkg.cmake.bootstrap,$(DEB_BUILD_PROFILES)),) $(call $(flag_action),BUILD_CursesDialog,ON,"Build curses GUI") -ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) $(call $(flag_action),BUILD_QtDialog,ON,"Build Qt GUI") endif ifeq ($(DEB_HOST_ARCH_OS),hurd) @@ -44,18 +38,29 @@ $(BUILD_FLAGS_FILE): flag_action := set_build_flag verify-build-flags: flag_action := verify_build_flag .PHONY: verify-build-flags +BOOTSTRAP_FLAGS = --prefix=/usr --docdir=/share/doc/cmake-data --mandir=/share/man \ + --sphinx-man --sphinx-html --sphinx-flags="-D today=\"$(BUILD_DATE)\"" \ + --init=../$(BUILD_FLAGS_FILE) --verbose + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + BOOTSTRAP_FLAGS += --parallel=$(NUMJOBS) +else + NUMJOBS = 1 +endif +ifeq (,$(filter pkg.cmake.bootstrap,$(DEB_BUILD_PROFILES))) + BOOTSTRAP_FLAGS += --system-libs +endif + override_dh_auto_configure: $(BUILD_FLAGS_FILE) rm -rf Build && mkdir -p Build - cd Build && ../bootstrap --prefix=/usr --docdir=/share/doc/cmake-data --mandir=/share/man \ - --init=../$(BUILD_FLAGS_FILE) --system-libs \ - --sphinx-man --sphinx-html --sphinx-flags="-D today=\"$(BUILD_DATE)\"" \ - $(BOOTSTRAP_PARALLEL) --verbose + cd Build && ../bootstrap $(BOOTSTRAP_FLAGS) ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) # Workaround for Bug #815231: skip spuriously failing tests - EXCLUDED_TESTS = CTestTestUpload\|kwsys.testSystemTools\|BuildDepends\|RunCMake.Configure + EXCLUDED_TESTS = CTestTestUpload\|curl\|kwsys.testSystemTools\|BuildDepends\|RunCMake.Configure else - EXCLUDED_TESTS = CTestTestUpload + EXCLUDED_TESTS = CTestTestUpload\|curl endif override_dh_auto_test: