Merge branch 'master' into experimental

Conflicts:
	debian/control
	debian/rules

debian/changelog

@@ -45,6 +45,16 @@ cmake (3.0.0-1) experimental; urgency=medium
 
  -- Felix Geyer <fgeyer@debian.org>  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 <fgeyer@debian.org>  Mon, 08 Sep 2014 22:18:32 +0200
+
 cmake (2.8.12.2-1) unstable; urgency=medium
 
   [ Felix Geyer ]

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~

debian/cmake-curses-gui.postinst

@@ -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#

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~

debian/cmake-dbg.postinst

@@ -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#

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~

debian/cmake-qt-gui.postinst

@@ -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#

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~

debian/cmake.postinst

@@ -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#

debian/cmake.postrm

@@ -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#

debian/cmake.preinst

@@ -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#

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

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: