[csw-devel] SF.net SVN: gar:[16718] csw/mgar/pkg/cfengine3/trunk

[guengel at users.sourceforge.net]

Revision: 16718
          http://gar.svn.sourceforge.net/gar/?rev=16718&view=rev
Author:   guengel
Date:     2012-01-06 15:36:39 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
cfengine3/trunk: Merged CSWlibpromises1 into CSWcfengine3rt.

Modified Paths:
--------------
    csw/mgar/pkg/cfengine3/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-06 15:05:21 UTC (rev 16717)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-06 15:36:39 UTC (rev 16718)
@@ -21,8 +21,11 @@
 DISTFILES += csw$(NAME)-cfmonitord
 DISTFILES += csw$(NAME)-cfserverd
 DISTFILES += README.CSW
+DISTFILES += changelog.CSW
 VENDOR_URL = http://www.cfengine.com/community
 
+UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz
+
 # File name regex to get notifications about upstream software releases
 # NOTE: Use this only if the automatic regex creation
 #       does not work for your package
@@ -40,22 +43,15 @@
 initddir		= $(sysconfdir)/init.d
 
 PACKAGES = CSW$(NAME)rt
+# Catch all
 CATALOGNAME_CSW$(NAME)rt = $(NAME)_rt
 SPKG_DESC_CSW$(NAME)rt = CFEngine 3 runtime and documentation
 RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWbdb48
 RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWosslrt
 RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWlibpcre0
-RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWlibpromises1
 CHECKPKG_OVERRIDES_CSW$(NAME)rt += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)rt|catalogname=$(NAME)_rt|expected-catalogname=$(NAME)rt
+OBSOLETED_BY_CSW$(name)rt = CSWlibpromises1
 
-PACKAGES += CSWlibpromises1
-SPKG_DESC_CSWlibpromises1 = CFEngine 3 promises library
-RUNTIME_DEP_PKGS_CSWlibpromises1 += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibpromises1 += CSWlibpcre0
-RUNTIME_DEP_PKGS_CSWlibpromises1 += CSWbdb48
-PKGFILES_CSWlibpromises1 = $(PKGFILES_RT)
-PKGFILES_CSWlibpromises1 += .*/libpromises1/README.CSW
-
 PACKAGES += CSW$(NAME)server
 CATALOGNAME_CSW$(NAME)server = $(NAME)_server
 SPKG_DESC_CSW$(NAME)server = CFEngine 3 server binary
@@ -63,7 +59,6 @@
 RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWosslrt
 RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibpcre0
 RUNTIME_DEP_PKGS_CSW$(NAME)server += CSW$(NAME)rt
-RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibpromises1
 PKGFILES_CSW$(NAME)server += $(sbindir)/cf-serverd
 PKGFILES_CSW$(NAME)server += $(sbindir)/cf-runagent
 PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-serverd.*
@@ -80,7 +75,6 @@
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre0
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)rt
-RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpromises1
 PKGFILES_CSW$(NAME)client += $(sbindir)/cf-agent
 PKGFILES_CSW$(NAME)client += $(sbindir)/cf-execd
 PKGFILES_CSW$(NAME)client += $(sbindir)/cf-monitord

Added: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW	2012-01-06 15:36:39 UTC (rev 16718)
@@ -0,0 +1,5 @@
+cfengine3 (3.2.3,REV=2012.01.06)
+
+  * Obsoleted CSWlibpromises1.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Fri, 06 Jan 2012 16:24:39 +0100

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.