test error

debian/NEWS

@@ -1,9 +0,0 @@
-cmake (2.8.7-4) unstable; urgency=low
-
-  From now on, pass either -DPythonInterp_FIND_VERSION=<version> or
-  -DPythonLibs_FIND_VERSION=<version> respectively in order to tell cmake to
-  look for the specific Python version. However, if an explicit Python version
-  is requested via find_package(), it will override the one specified on the
-  command line.
-
- -- Modestas Vainius <modax@debian.org>  Fri, 16 Mar 2012 22:15:23 +0200

debian/clean

@@ -0,0 +1 @@
+debian/cmake-mode-pkg.el

debian/cmake-data.emacsen-compat

@@ -1 +0,0 @@
-0

debian/cmake-data.emacsen-install

@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# emacsen install script for the Debian GNU/Linux cmake package
-
-FLAVOR=$1
-PACKAGE=cmake-data
-
-ELDIR=/usr/share/emacs/site-lisp/
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-ELFILE="cmake-mode.el"
-FLAGS="-batch -no-site-file -l path.el -f batch-byte-compile"
-
-if [ ${FLAVOR} != emacs ]; then
-  echo install/${PACKAGE}: Byte-compiling for ${FLAVOR}
-
-  install -m 755 -d ${ELCDIR}
-
-  # Source file symlink (emacsen policy 5C)
-  ln -s "${ELDIR}/${ELFILE}" "${ELCDIR}/${ELFILE}"
-
-  # Compile cmake-mode.el
-  cd ${ELCDIR}
-  cat << EOF > path.el
-(setq load-path (cons "." load-path) byte-compile-warnings nil)
-EOF
-  ${FLAVOR} ${FLAGS} ${ELFILE}
-  rm -f path.el
-fi

debian/cmake-data.emacsen-remove

@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-
-FLAVOR=$1
-PACKAGE=cmake-data
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-
-if [ ${FLAVOR} != emacs ]; then
-  echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR}
-  rm -rf "${ELCDIR}"
-fi

debian/cmake-data.emacsen-startup

@@ -1,15 +0,0 @@
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file for the Debian GNU/Linux cmake package
-
-(if (file-exists-p "/usr/share/emacs/site-lisp/cmake-mode.el")
- (progn
-  (debian-pkg-add-load-path-item (concat "/usr/share/"
-                                  (symbol-name debian-emacs-flavor)
-                                  "/site-lisp/cmake-data"))
-  (autoload 'cmake-mode "cmake-mode")
-  (setq auto-mode-alist
-   (append '(("CMakeLists\\.txt\\'" . cmake-mode)
-             ("\\.cmake\\'" . cmake-mode))
-    auto-mode-alist)))
- (message "cmake-data removed but not purged, skipping setup"))

debian/cmake-data.install

@@ -1,6 +1,5 @@
 usr/share/aclocal/cmake.m4
 usr/share/cmake-*/
-usr/share/cmake-*/editors/emacs/cmake-mode.el  usr/share/emacs/site-lisp
 usr/share/man/man7/cmake-buildsystem.7
 usr/share/man/man7/cmake-commands.7
 usr/share/man/man7/cmake-compile-features.7
@@ -13,9 +12,12 @@ usr/share/man/man7/cmake-language.7
 usr/share/man/man7/cmake-modules.7
 usr/share/man/man7/cmake-packages.7
 usr/share/man/man7/cmake-policies.7
+usr/share/man/man7/cmake-presets.7
 usr/share/man/man7/cmake-properties.7
 usr/share/man/man7/cmake-qt.7
 usr/share/man/man7/cmake-server.7
 usr/share/man/man7/cmake-toolchains.7
 usr/share/man/man7/cmake-variables.7
 usr/share/man/man7/cpack-generators.7
+usr/share/vim/vimfiles/indent/cmake.vim
+usr/share/vim/vimfiles/syntax/cmake.vim

debian/cmake-data.lintian-overrides

@@ -0,0 +1,4 @@
+# CMake modules and non-optional help files which must not be deleted by the admin
+package-contains-documentation-outside-usr-share-doc [usr/share/*]
+# False positive for AIX only shell script
+shell-script-fails-syntax-check [usr/share/cmake-3.25/Modules/Platform/AIX/ExportImportList]

debian/cmake-data.maintscript

@@ -0,0 +1 @@
+rm_conffile /etc/emacs/site-start.d/50cmake-data.el 3.21.3-1~

debian/cmake-doc.install

@@ -1 +1 @@
-usr/share/doc/cmake/html usr/share/doc/cmake-data/
+usr/share/doc/cmake-data/html

debian/cmake-qt-gui.install

@@ -3,3 +3,4 @@ usr/share/applications/cmake-gui.desktop
 usr/share/man/man1/cmake-gui.1
 usr/share/mime/packages/cmakecache.xml
 usr/share/icons/hicolor/*/apps/CMakeSetup.png
+debian/com.kitware.cmake_gui.metainfo.xml	usr/share/metainfo

debian/cmake.install

@@ -2,9 +2,9 @@ debian/debtoolchainfilegen usr/share/cmake/
 usr/bin/cmake
 usr/bin/cpack
 usr/bin/ctest
+usr/share/bash-completion/completions/cmake
+usr/share/bash-completion/completions/cpack
+usr/share/bash-completion/completions/ctest
 usr/share/man/man1/cmake.1
 usr/share/man/man1/cpack.1
 usr/share/man/man1/ctest.1
-usr/share/cmake-*/completions/cmake usr/share/bash-completion/completions/
-usr/share/cmake-*/completions/cpack usr/share/bash-completion/completions/
-usr/share/cmake-*/completions/ctest usr/share/bash-completion/completions/

debian/com.kitware.cmake_gui.metainfo.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2022 Timo Röhling <roehling@debian.org>
+
+  Copying and distribution of this file, with or without modification, are
+  permitted in any medium without royalty provided the copyright notice and
+  this notice are preserved. This file is offered as-is, without any warranty.
+-->
+<component type="desktop-application">
+  <id>com.kitware.cmake_gui</id>
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>BSD-3-Clause</project_license>
+  <name>CMake</name>
+  <summary>Cross-platform buildsystem</summary>
+  <description>
+    <p>
+      CMake is an open-source, cross-platform family of tools designed to
+      build, test and package software. CMake is used to control the software
+      compilation process using simple platform and compiler independent
+      configuration files, and generate native makefiles and workspaces that
+      can be used in the compiler environment of your choice.
+    </p>
+    <p>
+      The CMake Qt GUI provides an easy-to-use interface to configure your
+      build and customize settings.
+    </p>
+  </description>
+  <content_rating type="oars-1.0"/>
+  <launchable type="desktop-id">cmake-gui.desktop</launchable>
+  <url type="homepage">https://www.cmake.org</url>
+</component>
+

debian/control

@@ -1,40 +1,31 @@
 Source: cmake
 Section: devel
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Maintainer: Openkylin Developers <packaging@lists.openkylin.top>
-XSBC-Original-Maintainer: Debian CMake Team <pkg-cmake-team@lists.alioth.debian.org>
+Build-Depends:
-Uploaders: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
+ debhelper-compat (= 13),
-           Felix Geyer <fgeyer@debian.org>
+ cmake <cross>,
-Build-Depends: debhelper-compat (= 12),
+ freebsd-glue [kfreebsd-any],
-               freebsd-glue [kfreebsd-any],
+ libarchive-dev (>= 3.3.3) <!pkg.cmake.bootstrap>,
-               libarchive-dev (>= 2.8.0),
+ libcurl4-openssl-dev <!pkg.cmake.bootstrap> | libcurl-ssl-dev <!pkg.cmake.bootstrap>,
-               libbz2-dev,
+ libexpat1-dev <!pkg.cmake.bootstrap>,
-               libcurl4-openssl-dev | libcurl-ssl-dev,
+ libjsoncpp-dev <!pkg.cmake.bootstrap>,
-               libexpat1-dev,
+ libncurses5-dev <!pkg.cmake.bootstrap !pkg.cmake.nogui>,
-               libjsoncpp-dev,
+ librhash-dev <!pkg.cmake.bootstrap>,
-               liblzma-dev,
+ libssl-dev <pkg.cmake.bootstrap>,
-               libncurses5-dev,
+ libuv1-dev (>= 1.10) <!pkg.cmake.bootstrap>,
-               librhash-dev,
+ procps [!hurd-any],
-               libuv1-dev (>= 1.10),
+ python3-sphinx:native,
-               procps [!hurd-any],
+ python3-sphinxcontrib.qthelp:native,
-               python3-sphinx,
+ qtbase5-dev <!pkg.cmake.bootstrap !pkg.cmake.nogui>,
-               qtbase5-dev <!stage1>,
+ zlib1g-dev <!pkg.cmake.bootstrap>,
-               zlib1g-dev
+Build-Depends-Indep:
+ dh-sequence-sphinxdoc,
 Rules-Requires-Root: no
-Standards-Version: 4.1.3
+Standards-Version: 4.6.1
-Vcs-Git: https://salsa.debian.org/cmake-team/cmake.git
+Vcs-Git:https://gitee.com/openkylin/cmake.git
-Vcs-Browser: https://salsa.debian.org/cmake-team/cmake
+Vcs-Browser:https://gitee.com/openkylin/cmake
 Homepage: https://cmake.org/
-
-Package: cmake
-Architecture: any
-Multi-Arch: foreign
-Depends: cmake-data (= ${source:Version}),
-         procps [!hurd-any],
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: gcc, make
-Suggests: cmake-doc, ninja-build
 Description: cross-platform, open-source make system
  CMake is used to control the software compilation process using
  simple platform and compiler independent configuration files. CMake
@@ -43,29 +34,45 @@ Description: cross-platform, open-source make system
  is possible to support complex environments requiring system
  configuration, pre-processor generation, code generation, and template
  instantiation.
- .
+
- CMake was developed by Kitware as part of the NLM Insight
+Package: cmake
- Segmentation and Registration Toolkit project. The ASCI VIEWS project
+Architecture: any
- also provided support in the context of their parallel computation
+Multi-Arch: foreign
- environment. Other sponsors include the Insight, VTK, and VXL open
+Depends:
- source software communities.
+ ${misc:Depends},
+ ${shlibs:Depends},
+ cmake-data (= ${source:Version}),
+ procps [!hurd-any],
+Recommends: gcc, make
+Suggests:
+ cmake-doc,
+ cmake-format,
+ elpa-cmake-mode,
+ ninja-build,
+Description: ${source:Synopsis}
+ ${source:Extended-Description}
 
 Package: cmake-data
 Architecture: all
-Depends: ${misc:Depends}
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends},
 Description: CMake data files (modules, templates and documentation)
+ ${source:Extended-Description}
+ .
  This package provides CMake architecture independent data files (modules,
  templates, documentation etc.). Unless you have cmake installed, you probably
  do not need this package.
 
 Package: cmake-curses-gui
 Architecture: any
-Depends: cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Build-Profiles: <!pkg.cmake.bootstrap !pkg.cmake.nogui>
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ cmake (= ${binary:Version}),
 Description: curses based user interface for CMake (ccmake)
- CMake is used to control the software compilation process using simple
+ ${source:Extended-Description}
- platform and compiler independent configuration files. CMake generates native
- makefiles and workspaces that can be used in the compiler environment of your
- choice.
  .
  This package provides the CMake curses interface. Project configuration
  settings may be specified interactively through this GUI. Brief instructions
@@ -74,14 +81,14 @@ Description: curses based user interface for CMake (ccmake)
 
 Package: cmake-qt-gui
 Architecture: any
-Build-Profiles: <!stage1>
+Build-Profiles: <!pkg.cmake.bootstrap !pkg.cmake.nogui>
-Depends: cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${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
+ ${source:Extended-Description}
- platform and compiler independent configuration files. CMake generates native
- makefiles and workspaces that can be used in the compiler environment of your
- choice.
  .
  This package provides the CMake Qt based GUI. Project configuration
  settings may be specified interactively. Brief instructions are provided at
@@ -90,15 +97,17 @@ Description: Qt based user interface for CMake (cmake-gui)
 
 Package: cmake-doc
 Architecture: all
+Build-Profiles: <!pkg.cmake.bootstrap>
+Multi-Arch: foreign
 Section: doc
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}, cmake-data (= ${source:Version})
+Depends:
+ ${misc:Depends},
+ ${sphinxdoc:Depends},
+ cmake-data (= ${source:Version}),
 Recommends: doc-base
 Suggests: cmake
 Description: extended documentation in various formats for CMake
- CMake is used to control the software compilation process using simple
+ ${source:Extended-Description}
- platform and compiler independent configuration files. CMake generates native
- makefiles and workspaces that can be used in the compiler environment of your
- choice.
  .
  This package provides additional documentation in various formats like HTML or
  plain text.

debian/not-installed

@@ -1,3 +1,13 @@
-usr/share/doc/cmake/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/doc/cmake/cmsys/Copyright.txt
+usr/share/emacs/site-lisp/cmake-mode.el

debian/patches/series

@@ -0,0 +1 @@
+0001-test-error.patch

debian/rules

@@ -6,10 +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)
-endif
 
 BUILD_DATE = $(shell LC_ALL=C date -u "+%B %d, %Y" -d "@$(SOURCE_DATE_EPOCH)")
 
@@ -29,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 pkg.cmake.nogui,$(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)
@@ -42,25 +38,51 @@ $(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
+
+CROSS_CMAKE_FLAGS = -C../$(BUILD_FLAGS_FILE) \
+                    -DCMAKE_DOC_DIR=share/doc/cmake-data \
+                    -DCMAKE_MAN_DIR=share/man \
+                    -DSPHINX_HTML=ON -DSPHINX_MAN=ON \
+                    -DSPHINX_FLAGS="-D today=\"$(BUILD_DATE)\""
+
+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
+    CROSS_CMAKE_FLAGS += -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+endif
+
 override_dh_auto_configure: $(BUILD_FLAGS_FILE)
+ifeq (,$(filter cross,$(DEB_BUILD_PROFILES)))
 	rm -rf Build && mkdir -p Build
-	cd Build && ../bootstrap --prefix=/usr --docdir=/share/doc/cmake --mandir=/share/man \
+	cd Build && ../bootstrap $(BOOTSTRAP_FLAGS)
-	                         --init=../$(BUILD_FLAGS_FILE) --system-libs \
+else
-	                         --sphinx-man --sphinx-html --sphinx-flags="-D today=\"$(BUILD_DATE)\"" \
+	dh_auto_configure --buildsystem=cmake --builddirectory=Build -- \
-	                         $(BOOTSTRAP_PARALLEL) --verbose
+		$(CROSS_CMAKE_FLAGS)
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+    # Workaround for Bug #815231: skip spuriously failing tests
+    EXCLUDED_TESTS = CTestTestUpload\|curl\|kwsys.testSystemTools\|BuildDepends\|RunCMake.Configure
+else
+    EXCLUDED_TESTS = CTestTestUpload\|curl
+endif
 
 override_dh_auto_test:
 	# Pass -j1 to "make test" as a workaround, see https://gitlab.kitware.com/cmake/cmake/issues/17165
-	# The tests are still run in parallel as debhelper pass -jX as ARGS to ctest.
+	# The tests are still run in parallel as -jX is passed via ARGS to ctest.
-	dh_auto_test --buildsystem=cmake -- -j1 ARGS="-E CTestTestUpload --timeout 5000"
+	dh_auto_test --buildsystem=cmake -- -j1 ARGS="-E $(EXCLUDED_TESTS) --timeout 5000 -j$(NUMJOBS)"
 
-override_dh_auto_clean:
+execute_after_dh_auto_clean:
-	dh_auto_clean
 	rm -f $(BUILD_FLAGS_FILE)
 
-override_dh_missing:
-	dh_missing --fail-missing
-
 override_dh_installdocs-arch:
 	# dh_installdocs --link-doc generates binNMU unsafe deps (Bug #747141)
 	dh_installdocs
@@ -71,10 +93,5 @@ override_dh_installdocs-indep:
 override_dh_sphinxdoc:
 	dh_sphinxdoc -pcmake-doc
 
-override_dh_strip:
-	dh_strip --dbgsym-migration='cmake-dbg (<< 3.5.0-1~)'
-
 %:
-	dh $@ --with=sphinxdoc --builddirectory=Build
+	dh $@ --builddirectory=Build
-
-.PHONY: override_dh_auto_configure override_dh_auto_clean

debian/source/lintian-overrides

@@ -1,2 +1,6 @@
 # binary test files used by the test suite to verify that changing the RPATH works fine
-cmake source: source-is-missing Tests/CMakeTests/ELF/elf*.bin
+cmake source: source-is-missing [Tests/RunCMake/file-RPATH/ELF/elf*.bin]
+# binary test files used by the test suite to verify that changing the RPATH works fine
+cmake source: source-contains-prebuilt-binary [Tests/RunCMake/file-RPATH/ELF/elf*.bin]
+# test files
+cmake source: source-contains-cmake-cache-file [Tests/*/CMakeCache.txt]

debian/watch

@@ -1,6 +1,3 @@
-version=3
+version=4
-
+opts="uversionmangle=s/-RC-?/~rc/i" \
-# Track CMake 2.6.x releases including RCs
+  https://cmake.org/files/LatestRelease/ cmake-([\d.]+(?i:-RC-?\d+)?)@ARCHIVE_EXT@
-opts="uversionmangle=s/-[Rr][Cc]-?(\d+)/~rc$1/i" \
-    https://cmake.org/files/v([\d.]+)/ \
-    cmake-([\d.]+(?i:-RC-?\d+)?).tar.gz