From b041fb2d6b454008751d98357e3bf0eb74bd02a9 Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Thu, 7 Nov 2013 00:53:44 +0200 Subject: [PATCH] Drop fixup_manpages.diff patch: merged upstream. --- debian/changelog | 1 + debian/patches/fixup_manpages.diff | 50 ------------------------------ debian/patches/series | 1 - 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 debian/patches/fixup_manpages.diff diff --git a/debian/changelog b/debian/changelog index f82c5ed47..c8503ba4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ cmake (2.8.12.1-1) UNRELEASED; urgency=low - Automoc no longer ignores ADD_DEFINITIONS. (Closes: #728793) * Migrate to emacs policy v2.0: cmake-data no longer needs to depend on emacsen-common but pretty recent debhelper is needed at build time. + * Drop fixup_manpages.diff patch: merged upstream. -- Modestas Vainius Mon, 04 Nov 2013 23:55:47 +0200 diff --git a/debian/patches/fixup_manpages.diff b/debian/patches/fixup_manpages.diff deleted file mode 100644 index 3d84ced47..000000000 --- a/debian/patches/fixup_manpages.diff +++ /dev/null @@ -1,50 +0,0 @@ -From: Modestas Vainius -Subject: Small fixes to manpages -Origin: vendor - -The patch fixes these problems: - -I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakeprops.1.gz overriden overridden -I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakeprops.1.gz overriden overridden -I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakeprops.1.gz overriden overridden -I: cmake-qt-gui: spelling-error-in-binary usr/bin/cmake-gui overriden overridden -I: cmake: spelling-error-in-binary usr/bin/cmake overriden overridden -I: cmake: spelling-error-in-binary usr/bin/cpack overriden overridden -I: cmake: spelling-error-in-binary usr/bin/ctest overriden overridden -I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden -I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden -I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden -I: cmake: spelling-error-in-manpage usr/share/man/man1/cpack.1.gz overriden overridden -I: cmake: spelling-error-in-manpage usr/share/man/man1/cpack.1.gz overriden overridden -I: cmake: spelling-error-in-manpage usr/share/man/man1/cpack.1.gz overriden overridden -I: cmake-curses-gui: spelling-error-in-binary usr/bin/ccmake overriden overridden - ---- a/Source/cmTarget.cxx -+++ b/Source/cmTarget.cxx -@@ -833,7 +833,7 @@ void cmTarget::DefineProperties(cmake *c - "CMAKE_LINK_INTERFACE_LIBRARIES if it is set when a target is " - "created. " - "This property is ignored for STATIC libraries.\n" -- "This property is overriden by the INTERFACE_LINK_LIBRARIES property if " -+ "This property is overridden by the INTERFACE_LINK_LIBRARIES property if " - "policy CMP0022 is NEW.\n" - "This property is deprecated. Use INTERFACE_LINK_LIBRARIES instead."); - -@@ -844,7 +844,7 @@ void cmTarget::DefineProperties(cmake *c - "LINK_INTERFACE_LIBRARIES. " - "If set, this property completely overrides the generic property " - "for the named configuration.\n" -- "This property is overriden by the INTERFACE_LINK_LIBRARIES property if " -+ "This property is overridden by the INTERFACE_LINK_LIBRARIES property if " - "policy CMP0022 is NEW.\n" - "This property is deprecated. Use INTERFACE_LINK_LIBRARIES instead."); - -@@ -855,7 +855,7 @@ void cmTarget::DefineProperties(cmake *c - "When the target is linked into another target the libraries " - "listed (and recursively their link interface libraries) will be " - "provided to the other target also. " -- "This property is overriden by the LINK_INTERFACE_LIBRARIES or " -+ "This property is overridden by the LINK_INTERFACE_LIBRARIES or " - "LINK_INTERFACE_LIBRARIES_ property if " - "policy CMP0022 is OLD or unset.\n" - "\n" diff --git a/debian/patches/series b/debian/patches/series index cd741930f..0a1f7ed0d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,5 +5,4 @@ multiarch-python-include-dirs.diff qt_import_dir_variable.diff FindPHP4_fix_typo.diff FindJNI_amd64_ppc_biarch.diff -fixup_manpages.diff fix-ftbfs-on-kfreebsd.patch