View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

patch_source_260 [^] (2,126 bytes) 2009-03-02 11:02 [Show Content] [Hide Content]

--- Source.orig/CPack/cmCPackDebGenerator.cxx	2008-05-05 11:25:55.000000000 -0700
+++ Source/CPack/cmCPackDebGenerator.cxx	2009-02-28 12:59:58.000000000 -0800
@@ -97,6 +97,20 @@
   const char* debian_pkg_sug = 
                               this->GetOption("CPACK_DEBIAN_PACKAGE_SUGGESTS");
 
+  // added missing binary package fields, added by Michael Lasmanis, 2009-02-28
+  const char* debian_pkg_predep = 
+                    this->GetOption("CPACK_DEBIAN_PACKAGE_PREDEPENDS");
+  const char* debian_pkg_enhances = 
+                    this->GetOption("CPACK_DEBIAN_PACKAGE_ENHANCES");
+  const char* debian_pkg_breaks = 
+                    this->GetOption("CPACK_DEBIAN_PACKAGE_BREAKS");
+  const char* debian_pkg_conflicts = 
+                    this->GetOption("CPACK_DEBIAN_PACKAGE_CONFLICTS");
+  const char* debian_pkg_provides = 
+                    this->GetOption("CPACK_DEBIAN_PACKAGE_PROVIDES");
+  const char* debian_pkg_replaces = 
+                    this->GetOption("CPACK_DEBIAN_PACKAGE_REPLACES");
+
     { // the scope is needed for cmGeneratedFileStream
     cmGeneratedFileStream out(ctlfilename.c_str());
     out << "Package: " << debian_pkg_name << "\n";
@@ -116,6 +130,33 @@
       {
       out << "Suggests: " << debian_pkg_sug << "\n";
       }
+
+    // added missing binary package fields, added by Michael Lasmanis, 2009-02-28
+    if (debian_pkg_predep)
+      {
+      out << "Pre-Depends: " << debian_pkg_predep << "\n";
+      }
+    if (debian_pkg_enhances)
+      {
+      out << "Enhances: " << debian_pkg_enhances << "\n";
+      }
+    if (debian_pkg_breaks)
+      {
+      out << "Breaks: " << debian_pkg_breaks << "\n";
+      }
+    if (debian_pkg_conflicts)
+      {
+      out << "Conflicts: " << debian_pkg_conflicts << "\n";
+      }
+    if (debian_pkg_provides)
+      {
+      out << "Provides: " << debian_pkg_provides << "\n";
+      }
+    if (debian_pkg_replaces)
+      {
+      out << "Replaces: " << debian_pkg_replaces << "\n";
+      }
+
     out << "Maintainer: " << maintainer << "\n";
     out << "Description: " << desc << "\n";
     out << std::endl;

patch_source_263 [^] (2,124 bytes) 2009-03-02 11:02 [Show Content] [Hide Content]

--- Source.orig/CPack/cmCPackDebGenerator.cxx	2009-02-21 12:36:53.000000000 -0800
+++ Source/CPack/cmCPackDebGenerator.cxx	2009-03-02 07:51:10.000000000 -0800
@@ -97,6 +97,20 @@
   const char* debian_pkg_sug = 
                               this->GetOption("CPACK_DEBIAN_PACKAGE_SUGGESTS");
 
+  // added missing binary package fields, added by Michael Lasmanis, 2009-02-28
+  const char* debian_pkg_predep = 
+                    this->GetOption("CPACK_DEBIAN_PACKAGE_PREDEPENDS");
+  const char* debian_pkg_enhances = 
+                    this->GetOption("CPACK_DEBIAN_PACKAGE_ENHANCES");
+  const char* debian_pkg_breaks = 
+                    this->GetOption("CPACK_DEBIAN_PACKAGE_BREAKS");
+  const char* debian_pkg_conflicts = 
+                    this->GetOption("CPACK_DEBIAN_PACKAGE_CONFLICTS");
+  const char* debian_pkg_provides = 
+                    this->GetOption("CPACK_DEBIAN_PACKAGE_PROVIDES");
+  const char* debian_pkg_replaces = 
+                    this->GetOption("CPACK_DEBIAN_PACKAGE_REPLACES");
+
     { // the scope is needed for cmGeneratedFileStream
     cmGeneratedFileStream out(ctlfilename.c_str());
     out << "Package: " << debian_pkg_name << "\n";
@@ -116,6 +130,33 @@
       {
       out << "Suggests: " << debian_pkg_sug << "\n";
       }
+
+    // added missing binary package fields, added by Michael Lasmanis, 2009-02-28
+    if (debian_pkg_predep)
+      {
+      out << "Pre-Depends: " << debian_pkg_predep << "\n";
+      }
+    if (debian_pkg_enhances)
+      {
+      out << "Enhances: " << debian_pkg_enhances << "\n";
+      }
+    if (debian_pkg_breaks)
+      {
+      out << "Breaks: " << debian_pkg_breaks << "\n";
+      }
+    if (debian_pkg_conflicts)
+      {
+      out << "Conflicts: " << debian_pkg_conflicts << "\n";
+      }
+    if (debian_pkg_provides)
+      {
+      out << "Provides: " << debian_pkg_provides << "\n";
+      }
+    if (debian_pkg_replaces)
+      {
+      out << "Replaces: " << debian_pkg_replaces << "\n";
+      }
+
     unsigned long totalSize = 0;
     {
       std::string dirName = this->GetOption("CPACK_TEMPORARY_DIRECTORY");

Relationships

related to

0011355

closed

Eric NOULARD

[PATCH] Added optional debian binary package fields

Notes
(0015490) Michael Lasmanis (reporter) 2009-03-02 11:03	Hi, I actually just prepped a patch to solve this on my own. I've tested this on the 2.6.0 debian source and the 2.6.0 and 2.6.3 cmake source. This adds the following directives and the corresponding contol file directives: CPACK_DEBIAN_PACKAGE_PREDEPENDS -> Pre-Depends: CPACK_DEBIAN_PACKAGE_ENHANCES -> Enhances: CPACK_DEBIAN_PACKAGE_BREAKS ->Breaks: CPACK_DEBIAN_PACKAGE_CONFLICTS -> Conflicts: CPACK_DEBIAN_PACKAGE_PROVIDES -> Provides: CPACK_DEBIAN_PACKAGE_REPLACES-> Replaces: I've attached patches for the 2.6.3 source and the 2.6.0 source. I provided the 2.6.0 patch in case anyone wants to rebuild their existing cmake install on debian/ubuntu from source and add this functionality. I couldn't get a common patch file to work for both trees. I hope this helps things along. Cheers Michael

(0018091) João Henrique F. Freitas (reporter) 2009-10-16 21:31	Hello, I need it. Could a CMake developer do the oficial commit? Thanks

(0021541) Eric NOULARD (developer) 2010-07-29 09:04	I'll try to handle that one. After some other patches for DEB generator are merged from next to master. Do any of you be able to create up-to-date patches? (against git master would be great). If you do please wait for master to have those: commit ded3a1585b5a7848df6f6e8e3cf2133aa99719a5 CPackDeb optionally generates auto-dependency list part fix of bug 10292 commit 5495a6d9756099d5eddfc99c938ab6ba9bd95113 CPackDEB: merge wrong installed size patch. see bugs 10296 (and 10292)

(0022667) Petri Hodju (reporter) 2010-10-23 17:20	I just filed a feature request [0011355] related to this one. The patch I included is against the current HEAD [185582d5feb2925975cb669b0874a4a9cbe452d9]. If that gets merged, please give credit to Michael too - my patch is based on his patch.

(0022676) Eric NOULARD (developer) 2010-10-25 14:46	The related bug patch has been merged fixing this one at the same time.

(0022677) Eric NOULARD (developer) 2010-10-25 14:48	commit a74972402910610ab3ab62066d6b9e65b5202078 Author: Eric NOULARD <eric.noulard@gmail.com> Date: Mon Oct 25 20:40:45 2010 +0200 CPackDeb Added several optional debian binary package fields This fixes bugs 0011355 and 0008342. The merged patch is a contribution from Michael Lasmanis and Petri Hodju with some extra documentation added by the merger.

Issue History
Date Modified	Username	Field	Change
2009-01-03 12:58	Peter Grasch	New Issue
2009-01-29 12:07	Bill Hoffman	Status	new => assigned
2009-01-29 12:07	Bill Hoffman	Assigned To	=> Mathieu Malaterre
2009-03-02 11:02	Michael Lasmanis	File Added: patch_source_260
2009-03-02 11:02	Michael Lasmanis	File Added: patch_source_263
2009-03-02 11:03	Michael Lasmanis	Note Added: 0015490
2009-10-16 21:31	João Henrique F. Freitas	Note Added: 0018091
2010-07-29 09:04	Eric NOULARD	Note Added: 0021541
2010-10-23 17:20	Petri Hodju	Note Added: 0022667
2010-10-23 18:08	Eric NOULARD	Relationship added	related to 0011355
2010-10-25 13:47	Eric NOULARD	Assigned To	Mathieu Malaterre => Eric NOULARD
2010-10-25 14:46	Eric NOULARD	Note Added: 0022676
2010-10-25 14:48	Eric NOULARD	Note Added: 0022677
2010-10-25 14:48	Eric NOULARD	Status	assigned => closed
2010-10-25 14:48	Eric NOULARD	Resolution	open => fixed
2010-10-25 14:48	Eric NOULARD	Fixed in Version	=> CMake-2-8