This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 875b04503391d9c127396088ee1e27862c3eb489 (commit)
via 93ea78709d164f461b1420b90aa75f24d5f0a3f0 (commit)
from c18cee97e21abbe1fb54f1ac00f4d763387d28f5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=875b04503391d9c127396088ee1e27862c3eb489
commit 875b04503391d9c127396088ee1e27862c3eb489
Merge: c18cee9 93ea787
Author: Eric Noulard <eric.noul...@gmail.com>
AuthorDate: Mon Jun 18 10:15:09 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jun 18 10:15:09 2012 -0400
Merge topic 'CPackDeb-docUpdate' into next
93ea787 Revert "CPackDeb add missing documentation for some CPACK_DEBIAN_xx
variables."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93ea78709d164f461b1420b90aa75f24d5f0a3f0
commit 93ea78709d164f461b1420b90aa75f24d5f0a3f0
Author: Eric NOULARD <eric.noul...@gmail.com>
AuthorDate: Mon Jun 18 16:12:31 2012 +0200
Commit: Eric NOULARD <eric.noul...@gmail.com>
CommitDate: Mon Jun 18 16:12:31 2012 +0200
Revert "CPackDeb add missing documentation for some CPACK_DEBIAN_xx
variables."
This reverts commit e4d9005791a820c2b3f3edb02b99b9e4f1fd7a2b.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index bd3b94d..fe81dc9 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -68,11 +68,7 @@
# CPACK_DEBIAN_PACKAGE_HOMEPAGE
# Mandatory : NO
# Default : -
-# The URL of the web site for this package, preferably (when applicable)
the
-# site from which the original source can be obtained and any additional
-# upstream documentation or information may be found.
-# The content of this field is a simple URL without any surrounding
-# characters such as <>.
+# The URL of the web site for this package
##end
##variable
# CPACK_DEBIAN_PACKAGE_SHLIBDEPS
@@ -141,30 +137,6 @@
# Packages can declare in their control file that they should overwrite
# files in certain other packages, or completely replace other packages.
##end
-##variable
-# CPACK_DEBIAN_PACKAGE_RECOMMENDS
-# Mandatory : NO
-# Default : -
-# see
http://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps
-# Allows packages to declare a strong, but not absolute, dependency on
other packages.
-##end
-##variable
-# CPACK_DEBIAN_PACKAGE_SUGGESTS
-# Mandatory : NO
-# Default : -
-# see
http://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps
-# Allows packages to declare a suggested package install grouping.
-##end
-##variable
-# CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
-# Mandatory : NO
-# Default : -
-# This variable allow advanced user to add custom script to the
control.tar.gz
-# Typical usage is for conffiles, postinst, postrm, prerm.
-# Usage: SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
-#
"${CMAKE_CURRENT_SOURCE_DIR/prerm;${CMAKE_CURRENT_SOURCE_DIR}/postrm")
-##end
-
#=============================================================================
# Copyright 2007-2009 Kitware, Inc.
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackDeb.cmake | 30 +-----------------------------
1 files changed, 1 insertions(+), 29 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
