diff --git a/debian/changelog b/debian/changelog index 9a74d0101..3d65f2d0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -cmake (2.6.2-2~pre1) UNRELEASED; urgency=low +cmake (2.6.2-2~pre6) UNRELEASED; urgency=low * Add Vcs fields. * Add patches: @@ -16,8 +16,17 @@ cmake (2.6.2-2~pre1) UNRELEASED; urgency=low * Rewrite cmake cache initialization code. Pass initial cmake flags via file (--init= argument to the bootstrap script). * Make build verbose again. - - -- Modestas Vainius Thu, 16 Oct 2008 20:12:16 +0300 + * Prepare for multiple binary packages: switch to install files and to + debhelper v7 (due to more convenient install file handling), install + everything to debian/tmp initially. + * Add new binary packages: + - cmake-data - split off data files needed for each cmake flavour to run. + Move emacsen stuff in here too; + - cmake-curses-gui - splif off ccache here from the cmake package; + - cmake-qt-gui - build & install Qt4 based GUI (cmake-gui). Add menu file + and manual page (Closes: #482787). + + -- Modestas Vainius Thu, 16 Oct 2008 20:48:13 +0300 cmake (2.6.2-1) experimental; urgency=low diff --git a/debian/cmake-curses-gui.install b/debian/cmake-curses-gui.install new file mode 100644 index 000000000..1f278419d --- /dev/null +++ b/debian/cmake-curses-gui.install @@ -0,0 +1,5 @@ +usr/bin/ccmake +usr/share/doc/cmake/ccmake.docbook +usr/share/doc/cmake/ccmake.html +usr/share/doc/cmake/ccmake.txt +usr/share/man/man1/ccmake.1 diff --git a/debian/cmake-curses-gui.lintian-overrides b/debian/cmake-curses-gui.lintian-overrides new file mode 100644 index 000000000..9c12f25d3 --- /dev/null +++ b/debian/cmake-curses-gui.lintian-overrides @@ -0,0 +1,2 @@ +# Can be found in cmake-data +cmake-curses-gui: menu-icon-missing /usr/share/pixmaps/cmake.xpm diff --git a/debian/cmake-curses-gui.menu b/debian/cmake-curses-gui.menu new file mode 100644 index 000000000..684c71f06 --- /dev/null +++ b/debian/cmake-curses-gui.menu @@ -0,0 +1,5 @@ +?package(cmake-curses-gui):needs="text" \ + section="Applications/Programming"\ + title="CMake curses GUI (ccmake)"\ + command="/usr/bin/ccmake"\ + icon="/usr/share/pixmaps/cmake.xpm" diff --git a/debian/cmake.emacsen-install b/debian/cmake-data.emacsen-install similarity index 96% rename from debian/cmake.emacsen-install rename to debian/cmake-data.emacsen-install index 669b683f0..0b03baa02 100644 --- a/debian/cmake.emacsen-install +++ b/debian/cmake-data.emacsen-install @@ -3,7 +3,7 @@ # emacsen install script for the Debian GNU/Linux cmake package FLAVOR=$1 -PACKAGE=cmake +PACKAGE=cmake-data ELDIR=/usr/share/emacs/site-lisp/ ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} diff --git a/debian/cmake.emacsen-remove b/debian/cmake-data.emacsen-remove similarity index 91% rename from debian/cmake.emacsen-remove rename to debian/cmake-data.emacsen-remove index c8db8bb3f..82c83aa05 100644 --- a/debian/cmake.emacsen-remove +++ b/debian/cmake-data.emacsen-remove @@ -2,7 +2,7 @@ set -e FLAVOR=$1 -PACKAGE=cmake +PACKAGE=cmake-data ELCFILE=cmake-mode.elc if [ ${FLAVOR} != emacs ]; then diff --git a/debian/cmake.emacsen-startup b/debian/cmake-data.emacsen-startup similarity index 100% rename from debian/cmake.emacsen-startup rename to debian/cmake-data.emacsen-startup diff --git a/debian/cmake-data.install b/debian/cmake-data.install new file mode 100644 index 000000000..12f76c179 --- /dev/null +++ b/debian/cmake-data.install @@ -0,0 +1,30 @@ +Docs/cmake-mode.el usr/share/emacs/site-lisp +debian/cmake.xpm usr/share/pixmaps +usr/share/cmake-2.6/* +usr/share/doc/cmake/cmake-commands.html +usr/share/doc/cmake/cmake-commands.txt +usr/share/doc/cmake/cmake-compatcommands.html +usr/share/doc/cmake/cmake-compatcommands.txt +usr/share/doc/cmake/cmake-modules.html +usr/share/doc/cmake/cmake-modules.txt +usr/share/doc/cmake/cmake-policies.html +usr/share/doc/cmake/cmake-policies.txt +usr/share/doc/cmake/cmake-properties.html +usr/share/doc/cmake/cmake-properties.txt +usr/share/doc/cmake/cmake-variables.html +usr/share/doc/cmake/cmake-variables.txt +usr/share/doc/cmake/cmake.docbook +usr/share/doc/cmake/cmake.html +usr/share/doc/cmake/cmake.txt +usr/share/doc/cmake/cpack.docbook +usr/share/doc/cmake/cpack.html +usr/share/doc/cmake/cpack.txt +usr/share/doc/cmake/ctest.docbook +usr/share/doc/cmake/ctest.html +usr/share/doc/cmake/ctest.txt +usr/share/man/man1/cmakecommands.1 +usr/share/man/man1/cmakecompat.1 +usr/share/man/man1/cmakemodules.1 +usr/share/man/man1/cmakepolicies.1 +usr/share/man/man1/cmakeprops.1 +usr/share/man/man1/cmakevars.1 diff --git a/debian/cmake-data.lintian-overrides b/debian/cmake-data.lintian-overrides new file mode 100644 index 000000000..0befbc592 --- /dev/null +++ b/debian/cmake-data.lintian-overrides @@ -0,0 +1,2 @@ +# this file is a template, not a real license +cmake-data: extra-license-file usr/share/cmake-2.6/Templates/CPack.GenericLicense.txt diff --git a/debian/cmake-gui.1 b/debian/cmake-gui.1 new file mode 100644 index 000000000..929bbf143 --- /dev/null +++ b/debian/cmake-gui.1 @@ -0,0 +1,78 @@ +.TH cmake 1 "spalio 16, 2008" "cmake 2.6-patch 2" +.SH NAME +.PP +.nf + cmake\-gui \- CMake GUI. +.fi +.SH USAGE +.PP +.nf + cmake\-gui [options] + cmake\-gui [options] + cmake\-gui [options] +.fi +.SH DESCRIPTION +.PP +The "cmake\-gui" executable is the CMake GUI. Project configuration settings may be specified interactively. Brief instructions are provided at the bottom of the window when the program is running. + +.PP +CMake is a cross\-platform build system generator. Projects specify their build process with platform\-independent CMake listfiles included in each directory of a source tree with the name CMakeLists.txt. Users build a project by using CMake to generate a build system for a native tool on their platform. + +.SH OPTIONS +.TP +.B --copyright [file] +Print the CMake copyright and exit. + +If a file is specified, the copyright is written into it. + +.TP +.B --help +Print usage information and exit. + +Usage describes the basic command line interface and its options. + +.TP +.B --help-full [file] +Print full help and exit. + +Full help displays most of the documentation provided by the UNIX man page. It is provided for use on non\-UNIX platforms, but is also convenient if the man page is not installed. If a file is specified, the help is written into it. + +.TP +.B --help-html [file] +Print full help in HTML format. + +This option is used by CMake authors to help produce web pages. If a file is specified, the help is written into it. + +.TP +.B --help-man [file] +Print full help as a UNIX man page and exit. + +This option is used by the cmake build to generate the UNIX man page. If a file is specified, the help is written into it. + +.TP +.B --version [file] +Show program name/version banner and exit. + +If a file is specified, the version is written into it. + +.SH COPYRIGHT +.PP +Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. + +.PP +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +.PP +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +.PP +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +.PP +The names of Kitware, Inc., the Insight Consortium, or the names of any consortium members, or of any contributors, may not be used to endorse or promote products derived from this software without specific prior written permission. + +.PP +Modified source versions must be plainly marked as such, and must not be misrepresented as being the original software. + +.PP +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 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. diff --git a/debian/cmake-qt-gui.install b/debian/cmake-qt-gui.install new file mode 100644 index 000000000..0160dda92 --- /dev/null +++ b/debian/cmake-qt-gui.install @@ -0,0 +1,4 @@ +usr/bin/cmake-gui +usr/share/applications/CMake.desktop +usr/share/mime/packages/cmakecache.xml +usr/share/pixmaps/CMakeSetup.png diff --git a/debian/cmake-qt-gui.lintian-overrides b/debian/cmake-qt-gui.lintian-overrides new file mode 100644 index 000000000..ec9c9207d --- /dev/null +++ b/debian/cmake-qt-gui.lintian-overrides @@ -0,0 +1,2 @@ +# Can be found in cmake-data. +cmake-qt-gui: menu-icon-missing /usr/share/pixmaps/cmake.xpm diff --git a/debian/cmake-qt-gui.manpages b/debian/cmake-qt-gui.manpages new file mode 100644 index 000000000..bf7d32166 --- /dev/null +++ b/debian/cmake-qt-gui.manpages @@ -0,0 +1 @@ +debian/cmake-gui.1 diff --git a/debian/cmake-qt-gui.menu b/debian/cmake-qt-gui.menu new file mode 100644 index 000000000..01d6e8dd7 --- /dev/null +++ b/debian/cmake-qt-gui.menu @@ -0,0 +1,5 @@ +?package(cmake-qt-gui):needs="X11" \ + section="Applications/Programming"\ + title="CMake Qt4 GUI (cmake-gui)"\ + command="/usr/bin/cmake-gui"\ + icon="/usr/share/pixmaps/cmake.xpm" diff --git a/debian/cmake.install b/debian/cmake.install new file mode 100644 index 000000000..c856c826a --- /dev/null +++ b/debian/cmake.install @@ -0,0 +1,6 @@ +usr/bin/cmake +usr/bin/cpack +usr/bin/ctest +usr/share/man/man1/cmake.1 +usr/share/man/man1/cpack.1 +usr/share/man/man1/ctest.1 diff --git a/debian/cmake.lintian-overrides b/debian/cmake.lintian-overrides deleted file mode 100644 index 597d44850..000000000 --- a/debian/cmake.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# this file is a template, not a real license -cmake: extra-license-file usr/share/cmake-2.6/Templates/CPack.GenericLicense.txt diff --git a/debian/cmake.menu b/debian/cmake.menu deleted file mode 100644 index 9b8de5cf2..000000000 --- a/debian/cmake.menu +++ /dev/null @@ -1,4 +0,0 @@ -?package(cmake):needs="text" \ - section="Applications/Programming"\ - title="ccmake" command="/usr/bin/ccmake"\ - icon="/usr/share/pixmaps/cmake.xpm" diff --git a/debian/compat b/debian/compat index 1e8b31496..7f8f011eb 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +7 diff --git a/debian/control b/debian/control index 558c63c0f..e0419652c 100644 --- a/debian/control +++ b/debian/control @@ -4,14 +4,15 @@ Priority: optional Maintainer: A. Maitland Bottoms Uploaders: Pierre Habouzit , Modestas Vainius DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 6.0.7~), libncurses5-dev, tcl8.4, quilt, libcurl4-gnutls-dev +Build-Depends: debhelper (>= 7), tcl8.4, quilt, libcurl4-gnutls-dev, + libncurses5-dev, libqt4-dev Standards-Version: 3.8.0 Vcs-Git: git://git.debian.org/git/collab-maint/cmake.git Vcs-Browser: http://git.debian.org/?p=collab-maint/cmake.git;a=summary Package: cmake Architecture: any -Depends: ${shlibs:Depends}, emacsen-common +Depends: ${shlibs:Depends}, cmake-data (= ${source:Version}) Description: A cross-platform, open-source make system CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake @@ -26,3 +27,42 @@ Description: A cross-platform, open-source make system also provided support in the context of their parallel computation environment. Other sponsors include the Insight, VTK, and VXL open source software communities. + +Package: cmake-data +Architecture: all +Depends: ${shlibs:Depends}, emacsen-common +Replaces: cmake (<= 2.6.2-1) +Conflicts: cmake (<= 2.6.2-1) +Description: CMake data files (modules, templates and documentation) + 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: ${shlibs:Depends}, cmake (= ${binary:Version}) +Replaces: cmake (<= 2.6.2-1) +Description: Curses based user interface for CMake (ccmake) + CMake is used to control the software compilation process using simple + 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 + are provided at the bottom of the terminal when the program is running. The + main executable file for this GUI is "ccmake". + +Package: cmake-qt-gui +Architecture: any +Depends: ${shlibs:Depends}, cmake (= ${binary:Version}) +Description: Qt4 based user interface for CMake (cmake-gui) + CMake is used to control the software compilation process using simple + 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 Qt4 based GUI. Project configuration + settings may be specified interactively. Brief instructions are provided at + the bottom of the window when the program is running. Then main executable + file for this GUI is "cmake-gui". diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 3e37cb1d9..000000000 --- a/debian/dirs +++ /dev/null @@ -1,5 +0,0 @@ -usr/bin -usr/share/doc/cmake -usr/share/man/man1 -usr/share/pixmaps -usr/share/emacs/site-lisp diff --git a/debian/rules b/debian/rules index 12da3b766..d539e6667 100755 --- a/debian/rules +++ b/debian/rules @@ -29,6 +29,8 @@ $(BUILD_FLAGS_FILE): echo 'set(CMAKE_C_FLAGS "$(CFLAGS)" CACHE STRING "C flags" FORCE)' >> $@ echo 'set(CMAKE_CXX_FLAGS "$(CFLAGS)" CACHE STRING "C++ flags" FORCE)' >> $@ # echo 'set(BUILD_WXDialog ON CACHE STRING "Build WXDialog" FORCE)' >> $@ + echo 'set(BUILD_CursesDialog TRUE CACHE BOOL "Build curses GUI" FORCE)' >> $@ + echo 'set(BUILD_QtDialog TRUE CACHE BOOL "Build Qt4 GUI" FORCE)' >> $@ # echo 'set(TARGET_VERSION CACHE STRING ""FORCE)' >> $@ # echo 'set(TARGET_SOVERSION CACHE STRING "" FORCE)' >> $@ # echo 'set(BUILD_DOCUMENTATION ON CACHE BOOL "" FORCE)' >> $@ @@ -66,12 +68,10 @@ install: build dh_clean -k dh_installdirs # Add here commands to install the package into debian/cmake. - cd Build && $(MAKE) DESTDIR=$(CURDIR)/debian/cmake install - install -D -m 644 debian/cmake.xpm debian/cmake/usr/share/pixmaps/cmake.xpm + cd Build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install dh_lintian #cp Docs/cmake-indent.vim debian/cmake/usr/share/vim/addons/indent/cmake.vim #cp Docs/cmake-syntax.vim debian/cmake/usr/share/vim/addons/syntax/cmake.vim - cp Docs/cmake-mode.el debian/cmake/usr/share/emacs/site-lisp/ # Build architecture-independent files here. binary-indep: build install @@ -80,6 +80,7 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot + dh_install dh_installdocs dh_installexamples dh_installmenu