diff --git a/debian/changelog b/debian/changelog index b67b59019..e52e53c82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,16 @@ cmake (3.0.0-1) experimental; urgency=medium -- Felix Geyer Thu, 07 Aug 2014 23:38:00 +0200 +cmake (2.8.12.2-2) unstable; urgency=high + + * Search for Python 3.4 in FindPython{Interp,Libs}. + - Add search_for_python3.4.diff + * Don't create docs symlinks from arch-dep to arch-indep packages. + (Closes: #760823) + * Move the rm_conffile calls to cmake.maintscript. + + -- Felix Geyer Mon, 08 Sep 2014 22:18:32 +0200 + cmake (2.8.12.2-1) unstable; urgency=medium [ Felix Geyer ] diff --git a/debian/cmake-curses-gui.maintscript b/debian/cmake-curses-gui.maintscript new file mode 100644 index 000000000..068e1b227 --- /dev/null +++ b/debian/cmake-curses-gui.maintscript @@ -0,0 +1 @@ +symlink_to_dir /usr/share/doc/cmake-curses-gui /usr/share/doc/cmake-data 2.8.12.2-2~ diff --git a/debian/cmake-curses-gui.postinst b/debian/cmake-curses-gui.postinst deleted file mode 100644 index 2734aab9c..000000000 --- a/debian/cmake-curses-gui.postinst +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -set -e - -pkgname=`basename "$0" .postinst` -docdir="/usr/share/doc/$pkgname" - -# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850) -if [ "$1" = "configure" ] && [ -n "$2" ] && \ - [ ! -L "$docdir" ] && [ -d "$docdir" ] && \ - dpkg --compare-versions "$2" lt "2.8.3-3"; -then - rmdir "$docdir" - ln -s "cmake-data" "$docdir" -fi - -#DEBHELPER# diff --git a/debian/cmake-dbg.maintscript b/debian/cmake-dbg.maintscript new file mode 100644 index 000000000..ab59ae625 --- /dev/null +++ b/debian/cmake-dbg.maintscript @@ -0,0 +1 @@ +symlink_to_dir /usr/share/doc/cmake-dbg /usr/share/doc/cmake-data 2.8.12.2-2~ diff --git a/debian/cmake-dbg.postinst b/debian/cmake-dbg.postinst deleted file mode 100644 index 2734aab9c..000000000 --- a/debian/cmake-dbg.postinst +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -set -e - -pkgname=`basename "$0" .postinst` -docdir="/usr/share/doc/$pkgname" - -# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850) -if [ "$1" = "configure" ] && [ -n "$2" ] && \ - [ ! -L "$docdir" ] && [ -d "$docdir" ] && \ - dpkg --compare-versions "$2" lt "2.8.3-3"; -then - rmdir "$docdir" - ln -s "cmake-data" "$docdir" -fi - -#DEBHELPER# diff --git a/debian/cmake-qt-gui.maintscript b/debian/cmake-qt-gui.maintscript new file mode 100644 index 000000000..e89fa9d8f --- /dev/null +++ b/debian/cmake-qt-gui.maintscript @@ -0,0 +1 @@ +symlink_to_dir /usr/share/doc/cmake-qt-gui /usr/share/doc/cmake-data 2.8.12.2-2~ diff --git a/debian/cmake-qt-gui.postinst b/debian/cmake-qt-gui.postinst deleted file mode 100644 index 2734aab9c..000000000 --- a/debian/cmake-qt-gui.postinst +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -set -e - -pkgname=`basename "$0" .postinst` -docdir="/usr/share/doc/$pkgname" - -# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850) -if [ "$1" = "configure" ] && [ -n "$2" ] && \ - [ ! -L "$docdir" ] && [ -d "$docdir" ] && \ - dpkg --compare-versions "$2" lt "2.8.3-3"; -then - rmdir "$docdir" - ln -s "cmake-data" "$docdir" -fi - -#DEBHELPER# diff --git a/debian/cmake.maintscript b/debian/cmake.maintscript new file mode 100644 index 000000000..0afca56bc --- /dev/null +++ b/debian/cmake.maintscript @@ -0,0 +1,2 @@ +symlink_to_dir /usr/share/doc/cmake /usr/share/doc/cmake-data 2.8.12.2-2~ +rm_conffile /etc/emacs/site-start.d/50cmake.el 2.8.9~rc3-1~ diff --git a/debian/cmake.postinst b/debian/cmake.postinst deleted file mode 100644 index e1916881c..000000000 --- a/debian/cmake.postinst +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -pkgname=`basename "$0" .postinst` -docdir="/usr/share/doc/$pkgname" - -# Manually create /usr/share/doc/$pkgname symlink on upgrades (see #404850) -if [ "$1" = "configure" ] && [ -n "$2" ] && \ - [ ! -L "$docdir" ] && [ -d "$docdir" ] && \ - dpkg --compare-versions "$2" lt "2.8.3-3"; -then - rmdir "$docdir" - ln -s "cmake-data" "$docdir" -fi - -# Remove obsolete 50cmake.el -dpkg-maintscript-helper rm_conffile /etc/emacs/site-start.d/50cmake.el 2.8.9~rc3-1~ cmake -- "$@" - -#DEBHELPER# diff --git a/debian/cmake.postrm b/debian/cmake.postrm deleted file mode 100755 index c2619c333..000000000 --- a/debian/cmake.postrm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -# Remove obsolete 50cmake.el -dpkg-maintscript-helper rm_conffile /etc/emacs/site-start.d/50cmake.el 2.8.9~rc3-1~ cmake -- "$@" - -#DEBHELPER# diff --git a/debian/cmake.preinst b/debian/cmake.preinst deleted file mode 100755 index c2619c333..000000000 --- a/debian/cmake.preinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -# Remove obsolete 50cmake.el -dpkg-maintscript-helper rm_conffile /etc/emacs/site-start.d/50cmake.el 2.8.9~rc3-1~ cmake -- "$@" - -#DEBHELPER# diff --git a/debian/control b/debian/control index a9728dfe1..23af4bcd4 100644 --- a/debian/control +++ b/debian/control @@ -25,6 +25,7 @@ Homepage: http://cmake.org/ Package: cmake Architecture: any Multi-Arch: foreign +Pre-Depends: dpkg (>= 1.17.5~) Depends: cmake-data (= ${source:Version}), procps [!hurd-any], ${misc:Depends}, @@ -57,6 +58,7 @@ Description: CMake data files (modules, templates and documentation) Package: cmake-curses-gui Architecture: any +Pre-Depends: dpkg (>= 1.17.5~) Depends: cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: curses based user interface for CMake (ccmake) CMake is used to control the software compilation process using simple @@ -71,6 +73,7 @@ Description: curses based user interface for CMake (ccmake) Package: cmake-qt-gui Architecture: any +Pre-Depends: dpkg (>= 1.17.5~) Depends: cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Provides: cmake-gui Description: Qt4 based user interface for CMake (cmake-gui) @@ -87,7 +90,7 @@ Description: Qt4 based user interface for CMake (cmake-gui) Package: cmake-doc Architecture: all Section: doc -Depends: ${misc:Depends}, ${sphinxdoc:Depends} +Depends: ${misc:Depends}, ${sphinxdoc:Depends}, cmake-data (= ${source:Version}) Recommends: doc-base Breaks: cmake (<= 2.8.2-1), cmake-curses-gui (<= 2.8.2-1), @@ -111,6 +114,7 @@ Package: cmake-dbg Architecture: any Section: debug Priority: extra +Pre-Depends: dpkg (>= 1.17.5~) Depends: cmake (= ${binary:Version}), ${misc:Depends} Description: debugging symbols for CMake CMake is used to control the software compilation process using simple diff --git a/debian/rules b/debian/rules index 5e56b2419..c92d6df89 100755 --- a/debian/rules +++ b/debian/rules @@ -50,7 +50,11 @@ override_dh_auto_clean: override_dh_install: dh_install --list-missing -override_dh_installdocs: +override_dh_installdocs-arch: + # dh_installdocs --link-doc generates binNMU unsafe deps (Bug #747141) + dh_installdocs + +override_dh_installdocs-indep: dh_installdocs --link-doc=cmake-data override_dh_sphinxdoc: