Don't create docs symlinks from arch-dep to arch-indep packages.
Closes: #760823
This commit is contained in:
parent
36de5ba0ce
commit
b53e877de7
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -2,6 +2,8 @@ cmake (2.8.12.2-2) UNRELEASED; urgency=medium
|
|||||||
|
|
||||||
* Search for Python 3.4 in FindPython{Interp,Libs}.
|
* Search for Python 3.4 in FindPython{Interp,Libs}.
|
||||||
- Add search_for_python3.4.diff
|
- Add search_for_python3.4.diff
|
||||||
|
* Don't create docs symlinks from arch-dep to arch-indep packages.
|
||||||
|
(Closes: #760823)
|
||||||
|
|
||||||
-- Felix Geyer <fgeyer@debian.org> Sun, 31 Aug 2014 21:27:28 +0200
|
-- Felix Geyer <fgeyer@debian.org> Sun, 31 Aug 2014 21:27:28 +0200
|
||||||
|
|
||||||
|
1
debian/cmake-curses-gui.maintscript
vendored
Normal file
1
debian/cmake-curses-gui.maintscript
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
symlink_to_dir /usr/share/doc/cmake-curses-gui /usr/share/doc/cmake-data 2.8.12.2-2~
|
17
debian/cmake-curses-gui.postinst
vendored
17
debian/cmake-curses-gui.postinst
vendored
@ -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#
|
|
1
debian/cmake-dbg.maintscript
vendored
Normal file
1
debian/cmake-dbg.maintscript
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
symlink_to_dir /usr/share/doc/cmake-dbg /usr/share/doc/cmake-data 2.8.12.2-2~
|
17
debian/cmake-dbg.postinst
vendored
17
debian/cmake-dbg.postinst
vendored
@ -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#
|
|
1
debian/cmake-qt-gui.maintscript
vendored
Normal file
1
debian/cmake-qt-gui.maintscript
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
symlink_to_dir /usr/share/doc/cmake-qt-gui /usr/share/doc/cmake-data 2.8.12.2-2~
|
17
debian/cmake-qt-gui.postinst
vendored
17
debian/cmake-qt-gui.postinst
vendored
@ -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#
|
|
1
debian/cmake.maintscript
vendored
Normal file
1
debian/cmake.maintscript
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
symlink_to_dir /usr/share/doc/cmake /usr/share/doc/cmake-data 2.8.12.2-2~
|
12
debian/cmake.postinst
vendored
12
debian/cmake.postinst
vendored
@ -2,18 +2,6 @@
|
|||||||
|
|
||||||
set -e
|
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
|
# Remove obsolete 50cmake.el
|
||||||
dpkg-maintscript-helper rm_conffile /etc/emacs/site-start.d/50cmake.el 2.8.9~rc3-1~ cmake -- "$@"
|
dpkg-maintscript-helper rm_conffile /etc/emacs/site-start.d/50cmake.el 2.8.9~rc3-1~ cmake -- "$@"
|
||||||
|
|
||||||
|
6
debian/control
vendored
6
debian/control
vendored
@ -24,6 +24,7 @@ Homepage: http://cmake.org/
|
|||||||
Package: cmake
|
Package: cmake
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Multi-Arch: foreign
|
Multi-Arch: foreign
|
||||||
|
Pre-Depends: dpkg (>= 1.17.5~)
|
||||||
Depends: cmake-data (= ${source:Version}),
|
Depends: cmake-data (= ${source:Version}),
|
||||||
procps [!hurd-any],
|
procps [!hurd-any],
|
||||||
${misc:Depends},
|
${misc:Depends},
|
||||||
@ -56,6 +57,7 @@ Description: CMake data files (modules, templates and documentation)
|
|||||||
|
|
||||||
Package: cmake-curses-gui
|
Package: cmake-curses-gui
|
||||||
Architecture: any
|
Architecture: any
|
||||||
|
Pre-Depends: dpkg (>= 1.17.5~)
|
||||||
Depends: cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
|
Depends: cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
|
||||||
Description: curses based user interface for CMake (ccmake)
|
Description: curses based user interface for CMake (ccmake)
|
||||||
CMake is used to control the software compilation process using simple
|
CMake is used to control the software compilation process using simple
|
||||||
@ -70,6 +72,7 @@ Description: curses based user interface for CMake (ccmake)
|
|||||||
|
|
||||||
Package: cmake-qt-gui
|
Package: cmake-qt-gui
|
||||||
Architecture: any
|
Architecture: any
|
||||||
|
Pre-Depends: dpkg (>= 1.17.5~)
|
||||||
Depends: cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
|
Depends: cmake (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
|
||||||
Provides: cmake-gui
|
Provides: cmake-gui
|
||||||
Description: Qt4 based user interface for CMake (cmake-gui)
|
Description: Qt4 based user interface for CMake (cmake-gui)
|
||||||
@ -86,7 +89,7 @@ Description: Qt4 based user interface for CMake (cmake-gui)
|
|||||||
Package: cmake-doc
|
Package: cmake-doc
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Section: doc
|
Section: doc
|
||||||
Depends: ${misc:Depends}
|
Depends: ${misc:Depends}, cmake-data (= ${source:Version})
|
||||||
Recommends: doc-base
|
Recommends: doc-base
|
||||||
Breaks: cmake (<= 2.8.2-1),
|
Breaks: cmake (<= 2.8.2-1),
|
||||||
cmake-curses-gui (<= 2.8.2-1),
|
cmake-curses-gui (<= 2.8.2-1),
|
||||||
@ -110,6 +113,7 @@ Package: cmake-dbg
|
|||||||
Architecture: any
|
Architecture: any
|
||||||
Section: debug
|
Section: debug
|
||||||
Priority: extra
|
Priority: extra
|
||||||
|
Pre-Depends: dpkg (>= 1.17.5~)
|
||||||
Depends: cmake (= ${binary:Version}), ${misc:Depends}
|
Depends: cmake (= ${binary:Version}), ${misc:Depends}
|
||||||
Description: debugging symbols for CMake
|
Description: debugging symbols for CMake
|
||||||
CMake is used to control the software compilation process using simple
|
CMake is used to control the software compilation process using simple
|
||||||
|
6
debian/rules
vendored
6
debian/rules
vendored
@ -45,7 +45,11 @@ override_dh_auto_clean:
|
|||||||
dh_auto_clean
|
dh_auto_clean
|
||||||
rm -f $(BUILD_FLAGS_FILE)
|
rm -f $(BUILD_FLAGS_FILE)
|
||||||
|
|
||||||
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
|
dh_installdocs --link-doc=cmake-data
|
||||||
|
|
||||||
%:
|
%:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user