[csw-devel] SF.net SVN: gar:[13575] csw/mgar/pkg/apache2/branches/open-bug-squash

[bdwalton at users.sourceforge.net]

Revision: 13575
          http://gar.svn.sourceforge.net/gar/?rev=13575&view=rev
Author:   bdwalton
Date:     2011-03-05 04:10:30 +0000 (Sat, 05 Mar 2011)

Log Message:
-----------
apache2/branches/open-bug-squash: rename devel to dev for new standard; use obsoletes mechanism to smooth this over

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile

Added Paths:
-----------
    csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-dev.cswreleasenotes

Removed Paths:
-------------
    csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-devel.cswreleasenotes

Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-03-05 04:03:25 UTC (rev 13574)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-03-05 04:10:30 UTC (rev 13575)
@@ -41,7 +41,7 @@
 DISTFILES += CSWap2-worker.postinstall CSWap2-worker.postremove
 DISTFILES += CSWap2-worker.preinstall
 
-DISTFILES += CSWapache2-devel.cswreleasenotes
+DISTFILES += CSWapache2-dev.cswreleasenotes
 
 # Configuration templates
 DISTFILES += update20to22
@@ -55,7 +55,7 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 # The PACKAGES variable tell GAR which packages to build
-PACKAGES  = CSWapache2 CSWapache2-devel CSWapache2-manual CSWap2-suexec
+PACKAGES  = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2-suexec
 PACKAGES += CSWap2-worker
 # These packages are dummy versions to make dependencies nicer
 # as various things depend on CSWap2prefork currently
@@ -64,6 +64,7 @@
 OBSOLETES_CSWap2-suexec = CSWap2suexec
 OBSOLETES_CSWap2-prefork = CSWap2prefork
 OBSOLETES_CSWap2-worker = CSWap2worker
+OBSOLETES_CSWapache2-dev = CSWapache2-devel
 
 ARCHALL_CSWapache2-manual = 1
 ARCHALL_CSWap2-prefork = 1
@@ -72,7 +73,7 @@
 OBSOLETES_CSWapache2 = CSWapache2c
 
 CATALOGNAME_CSWapache2 = apache2
-CATALOGNAME_CSWapache2-devel = apache2_devel
+CATALOGNAME_CSWapache2-dev = apache2_dev
 CATALOGNAME_CSWapache2-manual = apache2_manual
 CATALOGNAME_CSWap2suexec = ap2_suexec
 CATALOGNAME_CSWap2prefork = ap2_prefork
@@ -80,7 +81,7 @@
 CATALOGNAME_CSWapache2rt = apache2rt
 
 SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server.
-SPKG_DESC_CSWapache2-devel = The development files for Apache2.
+SPKG_DESC_CSWapache2-dev = The development files for Apache2.
 SPKG_DESC_CSWapache2-manual = The Apache2 manual files.
 SPKG_DESC_CSWap2-suexec = The standard suEXEC binary for Apache2.
 SPKG_DESC_CSWap2-worker = The apache worker mpm.
@@ -91,7 +92,7 @@
 RUNTIME_DEP_PKGS_CSWapache2       += CSWoldaprt CSWosslrt CSWzlib
 RUNTIME_DEP_PKGS_CSWapache2       += CSWapr CSWapr-util CSWbdb48
 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
-RUNTIME_DEP_PKGS_CSWapache2-devel  = CSWapache2
+RUNTIME_DEP_PKGS_CSWapache2-dev  = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2-suexec	   = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2-prefork     = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2-worker      = CSWapache2 CSWapr CSWexpat CSWap2-prefork
@@ -105,7 +106,7 @@
 CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWalternatives
 CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2
 
-CHECKPKG_OVERRIDES_CSWapache2-devel += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h
+CHECKPKG_OVERRIDES_CSWapache2-dev += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h
 
 # We need this to get bdb48/lib into the runpath
 EXTRA_LIB = $(prefix)/bdb48/lib
@@ -208,7 +209,7 @@
 
 PKGFILES_CSWap2-suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.*
 PKGFILES_CSWap2-suexec += .*ap2mod/suexec
-PKGFILES_CSWapache2-devel = .*include/.* .*\.(a|la)
+PKGFILES_CSWapache2-dev = .*include/.* .*\.(a|la)
 PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf
 PKGFILES_CSWap2-prefork = .*share/doc/ap2_prefork.*
 PKGFILES_CSWap2-worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker

Copied: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-dev.cswreleasenotes (from rev 13546, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-devel.cswreleasenotes)
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-dev.cswreleasenotes	                        (rev 0)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-dev.cswreleasenotes	2011-03-05 04:10:30 UTC (rev 13575)
@@ -0,0 +1,3 @@
+* /usr/local references:
+  - include/httpd.h: specifies default if no HTTPD_ROOT set, overridden via
+    		     ap_config_auto.h

Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-devel.cswreleasenotes
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-devel.cswreleasenotes	2011-03-05 04:03:25 UTC (rev 13574)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWapache2-devel.cswreleasenotes	2011-03-05 04:10:30 UTC (rev 13575)
@@ -1,3 +0,0 @@
-* /usr/local references:
-  - include/httpd.h: specifies default if no HTTPD_ROOT set, overridden via
-    		     ap_config_auto.h


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