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

[wbonnet at users.sourceforge.net]

Revision: 13362
          http://gar.svn.sourceforge.net/gar/?rev=13362&view=rev
Author:   wbonnet
Date:     2011-02-18 15:48:09 +0000 (Fri, 18 Feb 2011)

Log Message:
-----------
java/digester Upgrade to 2.1

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

Modified: csw/mgar/pkg/java/ajcdigester/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajcdigester/trunk/Makefile	2011-02-18 15:14:18 UTC (rev 13361)
+++ csw/mgar/pkg/java/ajcdigester/trunk/Makefile	2011-02-18 15:48:09 UTC (rev 13362)
@@ -1,5 +1,5 @@
 SHORTNAME = digester
-VERSION = 2.0
+VERSION = 2.1
 
 NAME = commons-$(SHORTNAME)
 CATEGORIES = java
@@ -11,15 +11,21 @@
 
 # Use jakarta sources
 MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz
 
 # Set archive filename
 DISTFILES = $(NAME)-$(VERSION)-bin.tar.gz
 
 # Defines two packages, lib and doc
-DISTFILES += $(call admfiles,CSWajcdigester,)
-DISTFILES += $(call admfiles,CSWajcdigesterdoc,)
+PACKAGES = CSWajcdigester CSWajcdigesterdoc
 
+# Package architecture is ALL (pure java)
+ARCHALL = 1
+
+CATALOGNAME_CSWajcdigester = commons_digester
+CATALOGNAME_CSWajcdigesterdoc = commons_digester_doc
+
+LICENSE = LICENSE.txt
+
 # Defines package description
 SPKG_DESC_CSWajcdigester    = $(DESCRIPTION)
 SPKG_DESC_CSWajcdigesterdoc = $(DESCRIPTION) documentation package
@@ -27,6 +33,9 @@
 # Defines dependencies
 RUNTIME_DEP_PKGS_CSWajcdigester = CSWajclogging CSWajcbeanutils 	
 
+CHECKPKG_OVERRIDES_CSWajcdigesterdoc += catalogname-does-not-match-pkgname|pkgname=CSWajcdigesterdoc|catalogname=commons_digester_doc|expected-catalogname=ajcdigesterdoc
+CHECKPKG_OVERRIDES_CSWajcdigester += catalogname-does-not-match-pkgname|pkgname=CSWajcdigester|catalogname=commons_digester|expected-catalogname=ajcdigester
+
 # Defines package content
 PKGFILES_CSWajcdigester  = $(prefix)/share/doc/$(NAME)/License.txt
 PKGFILES_CSWajcdigester += $(prefix)/share/java/.*
@@ -48,7 +57,5 @@
 	   ln -s $(NAME)-$(VERSION).jar $(NAME)-2.jar ; \
 	   ln -s $(NAME)-$(VERSION).jar $(NAME).jar )
 	@ginstall -d $(DESTDIR)$(datadir)/doc/$(NAME)
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(NAME)/License.txt
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(NAME)/License-documentation.txt
 	@gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(NAME)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/java/ajcdigester/trunk/checksums
===================================================================
--- csw/mgar/pkg/java/ajcdigester/trunk/checksums	2011-02-18 15:14:18 UTC (rev 13361)
+++ csw/mgar/pkg/java/ajcdigester/trunk/checksums	2011-02-18 15:48:09 UTC (rev 13362)
@@ -1,3 +1 @@
-1f90462c586b6afb85e2c637d8f1c02e  download/commons-digester-2.0-bin.tar.gz
-a16a590e5792157bd3d8301e2e1660af  download/CSWajcdigester.gspec
-4fc0640df8176c252c7071a8bb45273c  download/CSWajcdigesterdoc.gspec
+aba0ed75f9c0947609295480b5e5fd3d  commons-digester-2.1-bin.tar.gz


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