[csw-devel] SF.net SVN: gar:[5247] csw/mgar/pkg/java/ajcpool/trunk

[wbonnet at users.sourceforge.net]

Revision: 5247
          http://gar.svn.sourceforge.net/gar/?rev=5247&view=rev
Author:   wbonnet
Date:     2009-06-14 12:10:44 +0000 (Sun, 14 Jun 2009)

Log Message:
-----------
Upgrade to 1.5

Modified Paths:
--------------
    csw/mgar/pkg/java/ajcpool/trunk/Makefile
    csw/mgar/pkg/java/ajcpool/trunk/checksums

Modified: csw/mgar/pkg/java/ajcpool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajcpool/trunk/Makefile	2009-06-14 11:54:58 UTC (rev 5246)
+++ csw/mgar/pkg/java/ajcpool/trunk/Makefile	2009-06-14 12:10:44 UTC (rev 5247)
@@ -17,20 +17,23 @@
 DISTFILES = $(GARNAME)-$(GARVERSION)-bin.tar.gz
 
 # Defines two packages, lib and doc
-DISTFILES += $(call admfiles,CSWajcpool,)
-DISTFILES += $(call admfiles,CSWajcpooldoc,)
+PACKAGES = CSWajcpool CSWajcpooldoc 
 
 # Defines package description
 SPKG_DESC_CSWajcpool    = $(DESCRIPTION)
 SPKG_DESC_CSWajcpooldoc = $(DESCRIPTION) documentation package
 
+CATALOGNAME_CSWajcpool = commons_pool
+CATALOGNAME_CSWajcpooldoc = commons_pool_doc
+
 # Defines dependencies
 REQUIRED_PKGS_CSWajcpool = CSWajclogging CSWajcdigester
 
 # Defines package content
-PKGFILES_CSWajcpool  = $(prefix)/share/doc/$(GARNAME)/License.txt
-PKGFILES_CSWajcpool += $(prefix)/share/java/.*
+PKGFILES_CSWajcpool = $(prefix)/share/java/.*
 
+LICENSE = LICENSE.txt
+
 # Defines custom steps since java libs do not use autotools
 WORKSRC = $(WORKDIR)
 
@@ -48,7 +51,5 @@
 	   ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \
 	   ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar )
 	@ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME)
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License.txt
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/License-documentation.txt
-	@gcp -frp $(WORKSRC)/$(DISTNAME)/docs/* $(DESTDIR)$(datadir)/doc/$(GARNAME)
+	@gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(GARNAME)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/java/ajcpool/trunk/checksums
===================================================================
--- csw/mgar/pkg/java/ajcpool/trunk/checksums	2009-06-14 11:54:58 UTC (rev 5246)
+++ csw/mgar/pkg/java/ajcpool/trunk/checksums	2009-06-14 12:10:44 UTC (rev 5247)
@@ -1,3 +1 @@
-1c9cd2c955587c0cfcbb6e0095370c45  download/CSWajcpool.gspec
-e7de03999dd2059480423261d46d9fbf  download/CSWajcpooldoc.gspec
 a05509a6674ce29317d809d64dfd2987  download/commons-pool-1.5-bin.tar.gz


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