View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

0001-added-missing-optional-debian-binary-package-fields.patch [^] (3,430 bytes) 2010-10-23 17:00 [Show Content] [Hide Content]

From 6e713b321f278f1615f4690cc41bb6743c57f324 Mon Sep 17 00:00:00 2001
From: Petri Hodju <petrihodju@yahoo.com>
Date: Sat, 23 Oct 2010 23:27:26 +0300
Subject: [PATCH] added missing optional debian binary package fields

Added Pre-Depends, Enhances, Breaks, Conflicts, Provides and Replaces fields.
Optional fields are not included if the corresponding CMake variable is set
but is empty
---
 Source/CPack/cmCPackDebGenerator.cxx |   44 ++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index ac2e151..595af8d 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -94,6 +94,18 @@ int cmCPackDebGenerator::PackageFiles()
                               this->GetOption("CPACK_DEBIAN_PACKAGE_SUGGESTS");
   const char* debian_pkg_url =
                               this->GetOption("CPACK_DEBIAN_PACKAGE_HOMEPAGE");
+  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());
@@ -102,22 +114,46 @@ int cmCPackDebGenerator::PackageFiles()
     out << "Section: " << debian_pkg_section << "\n";
     out << "Priority: " << debian_pkg_priority << "\n";
     out << "Architecture: " << debian_pkg_arch << "\n";
-    if(debian_pkg_dep)
+    if(debian_pkg_dep && *debian_pkg_dep)
       {
       out << "Depends: " << debian_pkg_dep << "\n";
       }
-    if(debian_pkg_rec)
+    if(debian_pkg_rec && *debian_pkg_rec)
       {
       out << "Recommends: " << debian_pkg_rec << "\n";
       }
-    if(debian_pkg_sug)
+    if(debian_pkg_sug && *debian_pkg_sug)
       {
       out << "Suggests: " << debian_pkg_sug << "\n";
       }
-    if(debian_pkg_url)
+    if(debian_pkg_url && debian_pkg_url)
       {
       out << "Homepage: " << debian_pkg_url << "\n";
       }
+    if (debian_pkg_predep && *debian_pkg_predep)
+      {
+      out << "Pre-Depends: " << debian_pkg_predep << "\n";
+      }
+    if (debian_pkg_enhances && *debian_pkg_enhances)
+      {
+      out << "Enhances: " << debian_pkg_enhances << "\n";
+      }
+    if (debian_pkg_breaks && *debian_pkg_breaks)
+      {
+      out << "Breaks: " << debian_pkg_breaks << "\n";
+      }
+    if (debian_pkg_conflicts && *debian_pkg_conflicts)
+      {
+      out << "Conflicts: " << debian_pkg_conflicts << "\n";
+      }
+    if (debian_pkg_provides && *debian_pkg_provides)
+      {
+      out << "Provides: " << debian_pkg_provides << "\n";
+      }
+    if (debian_pkg_replaces && *debian_pkg_replaces)
+      {
+      out << "Replaces: " << debian_pkg_replaces << "\n";
+      }
     unsigned long totalSize = 0;
     {
       std::string dirName = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
-- 
1.7.1

0001-added-missing-optional-debian-binary-package-fields-CORRECTED.patch [^] (3,431 bytes) 2010-10-24 12:29 [Show Content] [Hide Content]

From e7ae70b81a1933b55926dde8a598458bcad8a8ae Mon Sep 17 00:00:00 2001
From: Petri Hodju <petrihodju@yahoo.com>
Date: Sun, 24 Oct 2010 19:20:58 +0300
Subject: [PATCH] added missing optional debian binary package fields

Added Pre-Depends, Enhances, Breaks, Conflicts, Provides and Replaces fields.
Optional fields are not included if the corresponding CMake variable is set
but is empty
---
 Source/CPack/cmCPackDebGenerator.cxx |   44 ++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index ac2e151..47a1ff6 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -94,6 +94,18 @@ int cmCPackDebGenerator::PackageFiles()
                               this->GetOption("CPACK_DEBIAN_PACKAGE_SUGGESTS");
   const char* debian_pkg_url =
                               this->GetOption("CPACK_DEBIAN_PACKAGE_HOMEPAGE");
+  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());
@@ -102,22 +114,46 @@ int cmCPackDebGenerator::PackageFiles()
     out << "Section: " << debian_pkg_section << "\n";
     out << "Priority: " << debian_pkg_priority << "\n";
     out << "Architecture: " << debian_pkg_arch << "\n";
-    if(debian_pkg_dep)
+    if(debian_pkg_dep && *debian_pkg_dep)
       {
       out << "Depends: " << debian_pkg_dep << "\n";
       }
-    if(debian_pkg_rec)
+    if(debian_pkg_rec && *debian_pkg_rec)
       {
       out << "Recommends: " << debian_pkg_rec << "\n";
       }
-    if(debian_pkg_sug)
+    if(debian_pkg_sug && *debian_pkg_sug)
       {
       out << "Suggests: " << debian_pkg_sug << "\n";
       }
-    if(debian_pkg_url)
+    if(debian_pkg_url && *debian_pkg_url)
       {
       out << "Homepage: " << debian_pkg_url << "\n";
       }
+    if (debian_pkg_predep && *debian_pkg_predep)
+      {
+      out << "Pre-Depends: " << debian_pkg_predep << "\n";
+      }
+    if (debian_pkg_enhances && *debian_pkg_enhances)
+      {
+      out << "Enhances: " << debian_pkg_enhances << "\n";
+      }
+    if (debian_pkg_breaks && *debian_pkg_breaks)
+      {
+      out << "Breaks: " << debian_pkg_breaks << "\n";
+      }
+    if (debian_pkg_conflicts && *debian_pkg_conflicts)
+      {
+      out << "Conflicts: " << debian_pkg_conflicts << "\n";
+      }
+    if (debian_pkg_provides && *debian_pkg_provides)
+      {
+      out << "Provides: " << debian_pkg_provides << "\n";
+      }
+    if (debian_pkg_replaces && *debian_pkg_replaces)
+      {
+      out << "Replaces: " << debian_pkg_replaces << "\n";
+      }
     unsigned long totalSize = 0;
     {
       std::string dirName = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
-- 
1.7.1

Relationships

related to

0008342

closed

Eric NOULARD

The Deb Generator needs support for the fields Conflicts and Replaces

Notes
(0022668) Petri Hodju (reporter) 2010-10-24 12:30	There was still bug in the patch. The url field inclusion test was missing dereference operator for the second operand.

(0022669) Eric NOULARD (developer) 2010-10-24 15:18	Thank you Petri, I'll try to have a look (and may be merge your patch) during this week.

(0022673) Eric NOULARD (developer) 2010-10-25 13:53	I'm reviewing the patch. Small note to say that the vars are CPACK_DEBIAN_PACKAGE_xxx and not CMAKE_DEBIAN_PACKAGE_xxx as stated in the initial description... i.e. the patch is good the description is not.

(0022675) Eric NOULARD (developer) 2010-10-25 14:46	I've just merged your patch into next. I did add some documentation about the extra fields in CPackDeb.cmake that way one can have the CPackDeb documentation with cmake --help-module CPackDeb (it was already the case for other options). 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.

(0022678) 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.

(0025314) David Cole (manager) 2011-02-07 10:41	Closing resolved issues that have not been updated in more than 3 months.

Issue History
Date Modified	Username	Field	Change
2010-10-23 17:00	Petri Hodju	New Issue
2010-10-23 17:00	Petri Hodju	File Added: 0001-added-missing-optional-debian-binary-package-fields.patch
2010-10-23 18:08	Eric NOULARD	Relationship added	related to 0008342
2010-10-24 12:29	Petri Hodju	File Added: 0001-added-missing-optional-debian-binary-package-fields-CORRECTED.patch
2010-10-24 12:30	Petri Hodju	Note Added: 0022668
2010-10-24 15:18	Eric NOULARD	Note Added: 0022669
2010-10-25 13:47	Eric NOULARD	Status	new => assigned
2010-10-25 13:47	Eric NOULARD	Assigned To	=> Eric NOULARD
2010-10-25 13:53	Eric NOULARD	Note Added: 0022673
2010-10-25 14:46	Eric NOULARD	Note Added: 0022675
2010-10-25 14:48	Eric NOULARD	Note Added: 0022678
2010-10-25 14:48	Eric NOULARD	Status	assigned => resolved
2010-10-25 14:48	Eric NOULARD	Fixed in Version	=> CMake-2-8
2010-10-25 14:48	Eric NOULARD	Resolution	open => fixed
2011-02-07 10:41	David Cole	Note Added: 0025314
2011-02-07 10:41	David Cole	Status	resolved => closed