Your message dated Wed, 13 Jun 2007 11:17:03 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#408846: fixed in cmake 2.4.6-0
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: cmake
Version: 2.4.5-1
Severity: wishlist
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi
as Debian contains nsis, it would be nice to have support for it also in
CPack. I've made patch add nsis packing support (and I also submitted it
to upstream [1]. If you would be willing to include this patch it package,
I'd be happy.
[1]: http://www.cmake.org/Bug/bug.php?op=show&bugid=4376&pos=0
- --
Michal Čihař | http://cihar.com | http://blog.cihar.com
- -- System Information:
Debian Release: 4.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-3-686
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Versions of packages cmake depends on:
ii libc6 2.3.6.ds1-10 GNU C Library: Shared libraries
ii libgcc1 1:4.1.1-21 GCC support library
ii libncurses5 5.5-5 Shared libraries for terminal hand
ii libstdc++6 4.1.1-21 The GNU Standard C++ Library v3
cmake recommends no packages.
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFFvO493DVS6DbnVgQRAuKYAKCoQHN5fKNaBviqHyh5KmFpYpv4HwCgpX3u
E7HTQFAl7aSTAmwEz7pITzg=
=MMTd
-----END PGP SIGNATURE-----
--- cmake-2.4.5.orig/Source/CPack/cmCPackGenerators.cxx
+++ cmake-2.4.5/Source/CPack/cmCPackGenerators.cxx
@@ -35,10 +35,8 @@
cmCPackTGZGenerator::CreateGenerator);
this->RegisterGenerator("STGZ", "Self extracting Tar GZip compression",
cmCPackSTGZGenerator::CreateGenerator);
-#ifdef _WIN32
this->RegisterGenerator("NSIS", "Null Soft Installer",
cmCPackNSISGenerator::CreateGenerator);
-#endif
this->RegisterGenerator("ZIP", "ZIP file format",
cmCPackZIPGenerator::CreateGenerator);
this->RegisterGenerator("TBZ2", "Tar BZip2 compression",
--- cmake-2.4.5.orig/Source/CPack/cmCPackNSISGenerator.cxx
+++ cmake-2.4.5/Source/CPack/cmCPackNSISGenerator.cxx
@@ -29,6 +29,13 @@
#include <cmsys/Directory.hxx>
#include <cmsys/RegularExpression.hxx>
+/* NSIS uses different command line syntax on Windows and others */
+#ifdef WIN32
+#define NSIS_OPT "/"
+#else
+#define NSIS_OPT "-"
+#endif
+
//----------------------------------------------------------------------
cmCPackNSISGenerator::cmCPackNSISGenerator()
{
@@ -144,6 +151,7 @@
<< std::endl);
std::vector<std::string> path;
std::string nsisPath;
+#ifdef WIN32
if ( !cmsys::SystemTools::ReadRegistryValue(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS", nsisPath) )
{
@@ -156,6 +164,7 @@
return 0;
}
path.push_back(nsisPath);
+#endif
nsisPath = cmSystemTools::FindProgram("makensis", path, false);
if ( nsisPath.empty() )
{
@@ -163,7 +172,7 @@
<< std::endl);
return 0;
}
- std::string nsisCmd = "\"" + nsisPath + "\" /VERSION";
+ std::string nsisCmd = "\"" + nsisPath + "\" " NSIS_OPT "VERSION";
cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Test NSIS version: "
<< nsisCmd.c_str() << std::endl);
std::string output;
--- End Message ---
--- Begin Message ---
Source: cmake
Source-Version: 2.4.6-0
We believe that the bug you reported is fixed in the latest version of
cmake, which is due to be installed in the Debian FTP archive:
cmake_2.4.6-0.diff.gz
to pool/main/c/cmake/cmake_2.4.6-0.diff.gz
cmake_2.4.6-0.dsc
to pool/main/c/cmake/cmake_2.4.6-0.dsc
cmake_2.4.6-0_amd64.deb
to pool/main/c/cmake/cmake_2.4.6-0_amd64.deb
cmake_2.4.6.orig.tar.gz
to pool/main/c/cmake/cmake_2.4.6.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Pierre Habouzit <[EMAIL PROTECTED]> (supplier of updated cmake package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Wed, 13 Jun 2007 12:39:42 +0200
Source: cmake
Binary: cmake
Architecture: source amd64
Version: 2.4.6-0
Distribution: experimental
Urgency: low
Maintainer: A. Maitland Bottoms <[EMAIL PROTECTED]>
Changed-By: Pierre Habouzit <[EMAIL PROTECTED]>
Description:
cmake - A cross-platform, open-source make system
Closes: 407481 408846
Changes:
cmake (2.4.6-0) experimental; urgency=low
.
* New upstream release (experimental upload, 2.4.5 must propagate):
+ Ruby NAMES now includes ruby1.8 (Closes: 407481).
.
* Add patch to support NSIS on linux properly,
thanks to Michal ÄihaÅ (Closes: 408846).
Files:
e62954adb09a7271b2d1dfbaf908bbfa 643 devel optional cmake_2.4.6-0.dsc
c99c747ad8e9bfb3bef9cca875a52129 2604547 devel optional cmake_2.4.6.orig.tar.gz
be627fc27a57bc3767cf735cdade1689 19058 devel optional cmake_2.4.6-0.diff.gz
74e24776d7c633669b919ab142f0c3fc 5003680 devel optional cmake_2.4.6-0_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFGb8/FvGr7W6HudhwRAu9MAKCgcFuDV8dIQh4D6qGPD+fcAU9afwCcDUPS
dB9ox58HVz2W/0EoQlV/UPI=
=NUQg
-----END PGP SIGNATURE-----
--- End Message ---
